dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

global labels

Browse Source
This commit is contained in:
YamaArashi
2016-09-03 01:17:20 -07:00
parent b12e80fc04
commit a11fe6f83b
124 changed files with 16129 additions and 16129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_frontier/battle_arena_move_mind_ratings.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gBattleArenaMoveMindRatings: @ 8611DC0
gBattleArenaMoveMindRatings:: @ 8611DC0
.byte 0 @ -
.byte 1 @ Pound
.byte 1 @ Karate Chop
data/battle_frontier/battle_factory_style_move_lists.s
+9 -9
View File
@@ -1,6 +1,6 @@
.align 2, 0
gBattleFactoryStyleRequiredMoveCounts: @ 8611FC0
gBattleFactoryStyleRequiredMoveCounts:: @ 8611FC0
.byte 3
.byte 3
.byte 3
@@ -11,7 +11,7 @@ gBattleFactoryStyleRequiredMoveCounts: @ 8611FC0
.align 2, 0
gBattleFactoryStyleMoveList_TotalPreparation: @ 8611FC8
gBattleFactoryStyleMoveList_TotalPreparation:: @ 8611FC8
.2byte MOVE_SWORDS_DANCE
.2byte MOVE_GROWTH
.2byte MOVE_MEDITATE
@@ -41,7 +41,7 @@ gBattleFactoryStyleMoveList_TotalPreparation: @ 8611FC8
.2byte MOVE_DRAGON_DANCE
.2byte 0
gBattleFactoryStyleMoveList_ImpossibleToPredict: @ 8612000
gBattleFactoryStyleMoveList_ImpossibleToPredict:: @ 8612000
.2byte MOVE_MIMIC
.2byte MOVE_METRONOME
.2byte MOVE_MIRROR_MOVE
@@ -58,7 +58,7 @@ gBattleFactoryStyleMoveList_ImpossibleToPredict: @ 8612000
.2byte MOVE_CAMOUFLAGE
.2byte 0
gBattleFactoryStyleMoveList_WeakeningTheFoe: @ 861201E
gBattleFactoryStyleMoveList_WeakeningTheFoe:: @ 861201E
.2byte MOVE_SAND_ATTACK
.2byte MOVE_TAIL_WHIP
.2byte MOVE_LEER
@@ -80,7 +80,7 @@ gBattleFactoryStyleMoveList_WeakeningTheFoe: @ 861201E
.2byte MOVE_TICKLE
.2byte 0
gBattleFactoryStyleMoveList_HighRiskHighReturn: @ 8612046
gBattleFactoryStyleMoveList_HighRiskHighReturn:: @ 8612046
.2byte MOVE_GUILLOTINE
.2byte MOVE_HORN_DRILL
.2byte MOVE_DOUBLE_EDGE
@@ -109,7 +109,7 @@ gBattleFactoryStyleMoveList_HighRiskHighReturn: @ 8612046
.2byte MOVE_VOLT_TACKLE
.2byte 0
gBattleFactoryStyleMoveList_Endurance: @ 861207C
gBattleFactoryStyleMoveList_Endurance:: @ 861207C
.2byte MOVE_MIST
.2byte MOVE_RECOVER
.2byte MOVE_LIGHT_SCREEN
@@ -139,7 +139,7 @@ gBattleFactoryStyleMoveList_Endurance: @ 861207C
.2byte MOVE_WATER_SPORT
.2byte 0
gBattleFactoryStyleMoveList_SlowAndSteady: @ 86120B4
gBattleFactoryStyleMoveList_SlowAndSteady:: @ 86120B4
.2byte MOVE_SING
.2byte MOVE_SUPERSONIC
.2byte MOVE_DISABLE
@@ -174,7 +174,7 @@ gBattleFactoryStyleMoveList_SlowAndSteady: @ 86120B4
.2byte MOVE_BLOCK
.2byte 0
gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: @ 86120F6
gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow:: @ 86120F6
.2byte MOVE_SANDSTORM
.2byte MOVE_RAIN_DANCE
.2byte MOVE_SUNNY_DAY
@@ -184,7 +184,7 @@ gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: @ 86120F6
.align 2, 0
gBattleFactoryStyleMoveListPointers: @ 8612104
gBattleFactoryStyleMoveListPointers:: @ 8612104
.4byte gBattleFactoryStyleMoveList_TotalPreparation
.4byte gBattleFactoryStyleMoveList_SlowAndSteady
.4byte gBattleFactoryStyleMoveList_Endurance
data/battle_frontier/battle_frontier_held_items.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gBattleFrontierHeldItems: @ 85CECB0
gBattleFrontierHeldItems:: @ 85CECB0
.2byte ITEM_NONE
.2byte ITEM_KINGS_ROCK
.2byte ITEM_SITRUS_BERRY
data/battle_frontier/battle_frontier_mons.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gBattleFrontierMons: @ 85D97BC
gBattleFrontierMons:: @ 85D97BC
@ 0
.2byte SPECIES_SUNKERN
.2byte MOVE_MEGA_DRAIN, MOVE_HELPING_HAND, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN
data/battle_frontier/battle_frontier_trainer_mons.s
+300 -300
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/battle_frontier_trainers.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gBattleFrontierTrainers: @ 85D5ACC
gBattleFrontierTrainers:: @ 85D5ACC
@ 0
.4byte TRAINER_CLASS_YOUNGSTER
.string "BRADY$", 8
data/battle_frontier/battle_pyramid_level_50_wild_mons.s
+21 -21
View File
@@ -1,6 +1,6 @@
.align 2, 0
gBattlePyramidLevel50WildMons_Round1: @ 86126B0
gBattlePyramidLevel50WildMons_Round1:: @ 86126B0
@ 0
.2byte SPECIES_PLUSLE
.byte 35 @ base level
@@ -49,7 +49,7 @@ gBattlePyramidLevel50WildMons_Round1: @ 86126B0
.byte 2 @ unknown
.2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK
gBattlePyramidLevel50WildMons_Round2: @ 8612710
gBattlePyramidLevel50WildMons_Round2:: @ 8612710
@ 0
.2byte SPECIES_GULPIN
.byte 36 @ base level
@@ -98,7 +98,7 @@ gBattlePyramidLevel50WildMons_Round2: @ 8612710
.byte 2 @ unknown
.2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE
gBattlePyramidLevel50WildMons_Round3: @ 8612770
gBattlePyramidLevel50WildMons_Round3:: @ 8612770
@ 0
.2byte SPECIES_GROWLITHE
.byte 37 @ base level
@@ -147,7 +147,7 @@ gBattlePyramidLevel50WildMons_Round3: @ 8612770
.byte 2 @ unknown
.2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT
gBattlePyramidLevel50WildMons_Round4: @ 86127D0
gBattlePyramidLevel50WildMons_Round4:: @ 86127D0
@ 0
.2byte SPECIES_DUNSPARCE
.byte 42 @ base level
@@ -196,7 +196,7 @@ gBattlePyramidLevel50WildMons_Round4: @ 86127D0
.byte 2 @ unknown
.2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE
gBattlePyramidLevel50WildMons_Round5: @ 8612830
gBattlePyramidLevel50WildMons_Round5:: @ 8612830
@ 0
.2byte SPECIES_HAUNTER
.byte 41 @ base level
@@ -245,7 +245,7 @@ gBattlePyramidLevel50WildMons_Round5: @ 8612830
.byte 2 @ unknown
.2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE
gBattlePyramidLevel50WildMons_Round6: @ 8612890
gBattlePyramidLevel50WildMons_Round6:: @ 8612890
@ 0
.2byte SPECIES_DIGLETT
.byte 41 @ base level
@@ -294,7 +294,7 @@ gBattlePyramidLevel50WildMons_Round6: @ 8612890
.byte 1 @ unknown
.2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT
gBattlePyramidLevel50WildMons_Round7: @ 86128F0
gBattlePyramidLevel50WildMons_Round7:: @ 86128F0
@ 0
.2byte SPECIES_GLALIE
.byte 41 @ base level
@@ -343,7 +343,7 @@ gBattlePyramidLevel50WildMons_Round7: @ 86128F0
.byte 2 @ unknown
.2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC
gBattlePyramidLevel50WildMons_Round8: @ 8612950
gBattlePyramidLevel50WildMons_Round8:: @ 8612950
@ 0
.2byte SPECIES_WEEZING
.byte 41 @ base level
@@ -392,7 +392,7 @@ gBattlePyramidLevel50WildMons_Round8: @ 8612950
.byte 2 @ unknown
.2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT
gBattlePyramidLevel50WildMons_Round9: @ 86129B0
gBattlePyramidLevel50WildMons_Round9:: @ 86129B0
@ 0
.2byte SPECIES_WOBBUFFET
.byte 41 @ base level
@@ -441,7 +441,7 @@ gBattlePyramidLevel50WildMons_Round9: @ 86129B0
.byte 2 @ unknown
.2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE
gBattlePyramidLevel50WildMons_Round10: @ 8612A10
gBattlePyramidLevel50WildMons_Round10:: @ 8612A10
@ 0
.2byte SPECIES_GOLEM
.byte 41 @ base level
@@ -490,7 +490,7 @@ gBattlePyramidLevel50WildMons_Round10: @ 8612A10
.byte 2 @ unknown
.2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE
gBattlePyramidLevel50WildMons_Round11: @ 8612A70
gBattlePyramidLevel50WildMons_Round11:: @ 8612A70
@ 0
.2byte SPECIES_POLIWRATH
.byte 41 @ base level
@@ -539,7 +539,7 @@ gBattlePyramidLevel50WildMons_Round11: @ 8612A70
.byte 2 @ unknown
.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS
gBattlePyramidLevel50WildMons_Round12: @ 8612AD0
gBattlePyramidLevel50WildMons_Round12:: @ 8612AD0
@ 0
.2byte SPECIES_QUAGSIRE
.byte 41 @ base level
@@ -588,7 +588,7 @@ gBattlePyramidLevel50WildMons_Round12: @ 8612AD0
.byte 2 @ unknown
.2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE
gBattlePyramidLevel50WildMons_Round13: @ 8612B30
gBattlePyramidLevel50WildMons_Round13:: @ 8612B30
@ 0
.2byte SPECIES_PINECO
.byte 42 @ base level
@@ -637,7 +637,7 @@ gBattlePyramidLevel50WildMons_Round13: @ 8612B30
.byte 2 @ unknown
.2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE
gBattlePyramidLevel50WildMons_Round14: @ 8612B90
gBattlePyramidLevel50WildMons_Round14:: @ 8612B90
@ 0
.2byte SPECIES_SABLEYE
.byte 42 @ base level
@@ -686,7 +686,7 @@ gBattlePyramidLevel50WildMons_Round14: @ 8612B90
.byte 2 @ unknown
.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK
gBattlePyramidLevel50WildMons_Round15: @ 8612BF0
gBattlePyramidLevel50WildMons_Round15:: @ 8612BF0
@ 0
.2byte SPECIES_OCTILLERY
.byte 42 @ base level
@@ -735,7 +735,7 @@ gBattlePyramidLevel50WildMons_Round15: @ 8612BF0
.byte 2 @ unknown
.2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE
gBattlePyramidLevel50WildMons_Round16: @ 8612C50
gBattlePyramidLevel50WildMons_Round16:: @ 8612C50
@ 0
.2byte SPECIES_DUSKULL
.byte 42 @ base level
@@ -784,7 +784,7 @@ gBattlePyramidLevel50WildMons_Round16: @ 8612C50
.byte 2 @ unknown
.2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE
gBattlePyramidLevel50WildMons_Round17: @ 8612CB0
gBattlePyramidLevel50WildMons_Round17:: @ 8612CB0
@ 0
.2byte SPECIES_MAWILE
.byte 42 @ base level
@@ -833,7 +833,7 @@ gBattlePyramidLevel50WildMons_Round17: @ 8612CB0
.byte 2 @ unknown
.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK
gBattlePyramidLevel50WildMons_Round18: @ 8612D10
gBattlePyramidLevel50WildMons_Round18:: @ 8612D10
@ 0
.2byte SPECIES_DRAGONAIR
.byte 42 @ base level
@@ -882,7 +882,7 @@ gBattlePyramidLevel50WildMons_Round18: @ 8612D10
.byte 2 @ unknown
.2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL
gBattlePyramidLevel50WildMons_Round19: @ 8612D70
gBattlePyramidLevel50WildMons_Round19:: @ 8612D70
@ 0
.2byte SPECIES_ARCANINE
.byte 42 @ base level
@@ -931,7 +931,7 @@ gBattlePyramidLevel50WildMons_Round19: @ 8612D70
.byte 2 @ unknown
.2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC
gBattlePyramidLevel50WildMons_Round20: @ 8612DD0
gBattlePyramidLevel50WildMons_Round20:: @ 8612DD0
@ 0
.2byte SPECIES_KANGASKHAN
.byte 42 @ base level
@@ -982,7 +982,7 @@ gBattlePyramidLevel50WildMons_Round20: @ 8612DD0
.align 2, 0
gBattlePyramidLevel50WildMonPointers: @ 8612E30
gBattlePyramidLevel50WildMonPointers:: @ 8612E30
.4byte gBattlePyramidLevel50WildMons_Round1
.4byte gBattlePyramidLevel50WildMons_Round2
.4byte gBattlePyramidLevel50WildMons_Round3
data/battle_frontier/battle_pyramid_open_level_wild_mons.s
+21 -21
View File
@@ -1,6 +1,6 @@
.align 2, 0
gBattlePyramidOpenLevelWildMons_Round1: @ 8612E80
gBattlePyramidOpenLevelWildMons_Round1:: @ 8612E80
@ 0
.2byte SPECIES_PLUSLE
.byte 15 @ base level difference
@@ -49,7 +49,7 @@ gBattlePyramidOpenLevelWildMons_Round1: @ 8612E80
.byte 2 @ unknown
.2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK
gBattlePyramidOpenLevelWildMons_Round2: @ 8612EE0
gBattlePyramidOpenLevelWildMons_Round2:: @ 8612EE0
@ 0
.2byte SPECIES_GULPIN
.byte 14 @ base level difference
@@ -98,7 +98,7 @@ gBattlePyramidOpenLevelWildMons_Round2: @ 8612EE0
.byte 2 @ unknown
.2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE
gBattlePyramidOpenLevelWildMons_Round3: @ 8612F40
gBattlePyramidOpenLevelWildMons_Round3:: @ 8612F40
@ 0
.2byte SPECIES_GROWLITHE
.byte 13 @ base level difference
@@ -147,7 +147,7 @@ gBattlePyramidOpenLevelWildMons_Round3: @ 8612F40
.byte 2 @ unknown
.2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT
gBattlePyramidOpenLevelWildMons_Round4: @ 8612FA0
gBattlePyramidOpenLevelWildMons_Round4:: @ 8612FA0
@ 0
.2byte SPECIES_DUNSPARCE
.byte 10 @ base level difference
@@ -196,7 +196,7 @@ gBattlePyramidOpenLevelWildMons_Round4: @ 8612FA0
.byte 2 @ unknown
.2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE
gBattlePyramidOpenLevelWildMons_Round5: @ 8613000
gBattlePyramidOpenLevelWildMons_Round5:: @ 8613000
@ 0
.2byte SPECIES_HAUNTER
.byte 10 @ base level difference
@@ -245,7 +245,7 @@ gBattlePyramidOpenLevelWildMons_Round5: @ 8613000
.byte 2 @ unknown
.2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE
gBattlePyramidOpenLevelWildMons_Round6: @ 8613060
gBattlePyramidOpenLevelWildMons_Round6:: @ 8613060
@ 0
.2byte SPECIES_DIGLETT
.byte 10 @ base level difference
@@ -294,7 +294,7 @@ gBattlePyramidOpenLevelWildMons_Round6: @ 8613060
.byte 1 @ unknown
.2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT
gBattlePyramidOpenLevelWildMons_Round7: @ 86130C0
gBattlePyramidOpenLevelWildMons_Round7:: @ 86130C0
@ 0
.2byte SPECIES_GLALIE
.byte 10 @ base level difference
@@ -343,7 +343,7 @@ gBattlePyramidOpenLevelWildMons_Round7: @ 86130C0
.byte 2 @ unknown
.2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC
gBattlePyramidOpenLevelWildMons_Round8: @ 8613120
gBattlePyramidOpenLevelWildMons_Round8:: @ 8613120
@ 0
.2byte SPECIES_WEEZING
.byte 10 @ base level difference
@@ -392,7 +392,7 @@ gBattlePyramidOpenLevelWildMons_Round8: @ 8613120
.byte 2 @ unknown
.2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT
gBattlePyramidOpenLevelWildMons_Round9: @ 8613180
gBattlePyramidOpenLevelWildMons_Round9:: @ 8613180
@ 0
.2byte SPECIES_WOBBUFFET
.byte 10 @ base level difference
@@ -441,7 +441,7 @@ gBattlePyramidOpenLevelWildMons_Round9: @ 8613180
.byte 2 @ unknown
.2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE
gBattlePyramidOpenLevelWildMons_Round10: @ 86131E0
gBattlePyramidOpenLevelWildMons_Round10:: @ 86131E0
@ 0
.2byte SPECIES_GOLEM
.byte 10 @ base level difference
@@ -490,7 +490,7 @@ gBattlePyramidOpenLevelWildMons_Round10: @ 86131E0
.byte 2 @ unknown
.2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE
gBattlePyramidOpenLevelWildMons_Round11: @ 8613240
gBattlePyramidOpenLevelWildMons_Round11:: @ 8613240
@ 0
.2byte SPECIES_POLIWRATH
.byte 10 @ base level difference
@@ -539,7 +539,7 @@ gBattlePyramidOpenLevelWildMons_Round11: @ 8613240
.byte 2 @ unknown
.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS
gBattlePyramidOpenLevelWildMons_Round12: @ 86132A0
gBattlePyramidOpenLevelWildMons_Round12:: @ 86132A0
@ 0
.2byte SPECIES_QUAGSIRE
.byte 10 @ base level difference
@@ -588,7 +588,7 @@ gBattlePyramidOpenLevelWildMons_Round12: @ 86132A0
.byte 2 @ unknown
.2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE
gBattlePyramidOpenLevelWildMons_Round13: @ 8613300
gBattlePyramidOpenLevelWildMons_Round13:: @ 8613300
@ 0
.2byte SPECIES_PINECO
.byte 10 @ base level difference
@@ -637,7 +637,7 @@ gBattlePyramidOpenLevelWildMons_Round13: @ 8613300
.byte 2 @ unknown
.2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE
gBattlePyramidOpenLevelWildMons_Round14: @ 8613360
gBattlePyramidOpenLevelWildMons_Round14:: @ 8613360
@ 0
.2byte SPECIES_SABLEYE
.byte 10 @ base level difference
@@ -686,7 +686,7 @@ gBattlePyramidOpenLevelWildMons_Round14: @ 8613360
.byte 2 @ unknown
.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK
gBattlePyramidOpenLevelWildMons_Round15: @ 86133C0
gBattlePyramidOpenLevelWildMons_Round15:: @ 86133C0
@ 0
.2byte SPECIES_OCTILLERY
.byte 10 @ base level difference
@@ -735,7 +735,7 @@ gBattlePyramidOpenLevelWildMons_Round15: @ 86133C0
.byte 2 @ unknown
.2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE
gBattlePyramidOpenLevelWildMons_Round16: @ 8613420
gBattlePyramidOpenLevelWildMons_Round16:: @ 8613420
@ 0
.2byte SPECIES_DUSKULL
.byte 10 @ base level difference
@@ -784,7 +784,7 @@ gBattlePyramidOpenLevelWildMons_Round16: @ 8613420
.byte 2 @ unknown
.2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE
gBattlePyramidOpenLevelWildMons_Round17: @ 8613480
gBattlePyramidOpenLevelWildMons_Round17:: @ 8613480
@ 0
.2byte SPECIES_MAWILE
.byte 10 @ base level difference
@@ -833,7 +833,7 @@ gBattlePyramidOpenLevelWildMons_Round17: @ 8613480
.byte 2 @ unknown
.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK
gBattlePyramidOpenLevelWildMons_Round18: @ 86134E0
gBattlePyramidOpenLevelWildMons_Round18:: @ 86134E0
@ 0
.2byte SPECIES_DRAGONAIR
.byte 10 @ base level difference
@@ -882,7 +882,7 @@ gBattlePyramidOpenLevelWildMons_Round18: @ 86134E0
.byte 2 @ unknown
.2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL
gBattlePyramidOpenLevelWildMons_Round19: @ 8613540
gBattlePyramidOpenLevelWildMons_Round19:: @ 8613540
@ 0
.2byte SPECIES_ARCANINE
.byte 10 @ base level difference
@@ -931,7 +931,7 @@ gBattlePyramidOpenLevelWildMons_Round19: @ 8613540
.byte 2 @ unknown
.2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC
gBattlePyramidOpenLevelWildMons_Round20: @ 86135A0
gBattlePyramidOpenLevelWildMons_Round20:: @ 86135A0
@ 0
.2byte SPECIES_KANGASKHAN
.byte 10 @ base level difference
@@ -982,7 +982,7 @@ gBattlePyramidOpenLevelWildMons_Round20: @ 86135A0
.align 2, 0
gBattlePyramidOpenLevelWildMonPointers: @ 8613600
gBattlePyramidOpenLevelWildMonPointers:: @ 8613600
.4byte gBattlePyramidOpenLevelWildMons_Round1
.4byte gBattlePyramidOpenLevelWildMons_Round2
.4byte gBattlePyramidOpenLevelWildMons_Round3
data/battle_frontier/fallarbor_battle_tent_mons.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gFallarborBattleTentMons: @ 85DF69C
gFallarborBattleTentMons:: @ 85DF69C
@ 0
.2byte SPECIES_NUMEL
.2byte MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY
data/battle_frontier/fallarbor_battle_tent_trainer_mons.s
+30 -30
View File
@@ -1,6 +1,6 @@
.align 1, 0
gFallarborBattleTentTrainerMons_Amber: @ 85DEEF8
gFallarborBattleTentTrainerMons_Amber:: @ 85DEEF8
.2byte 39
.2byte 40
.2byte 41
@@ -9,7 +9,7 @@ gFallarborBattleTentTrainerMons_Amber: @ 85DEEF8
.2byte 44
.2byte -1
gFallarborBattleTentTrainerMons_Javier: @ 85DEF06
gFallarborBattleTentTrainerMons_Javier:: @ 85DEF06
.2byte 6
.2byte 35
.2byte 36
@@ -18,7 +18,7 @@ gFallarborBattleTentTrainerMons_Javier: @ 85DEF06
.2byte 44
.2byte -1
gFallarborBattleTentTrainerMons_Natalie: @ 85DEF14
gFallarborBattleTentTrainerMons_Natalie:: @ 85DEF14
.2byte 5
.2byte 29
.2byte 30
@@ -26,7 +26,7 @@ gFallarborBattleTentTrainerMons_Natalie: @ 85DEF14
.2byte 34
.2byte -1
gFallarborBattleTentTrainerMons_Treve: @ 85DEF20
gFallarborBattleTentTrainerMons_Treve:: @ 85DEF20
.2byte 28
.2byte 29
.2byte 30
@@ -34,7 +34,7 @@ gFallarborBattleTentTrainerMons_Treve: @ 85DEF20
.2byte 33
.2byte -1
gFallarborBattleTentTrainerMons_Arianna: @ 85DEF2C
gFallarborBattleTentTrainerMons_Arianna:: @ 85DEF2C
.2byte 18
.2byte 23
.2byte 24
@@ -42,7 +42,7 @@ gFallarborBattleTentTrainerMons_Arianna: @ 85DEF2C
.2byte 44
.2byte -1
gFallarborBattleTentTrainerMons_Jadyn: @ 85DEF38
gFallarborBattleTentTrainerMons_Jadyn:: @ 85DEF38
.2byte 0
.2byte 22
.2byte 24
@@ -51,7 +51,7 @@ gFallarborBattleTentTrainerMons_Jadyn: @ 85DEF38
.2byte 39
.2byte -1
gFallarborBattleTentTrainerMons_Gerardo: @ 85DEF46
gFallarborBattleTentTrainerMons_Gerardo:: @ 85DEF46
.2byte 6
.2byte 18
.2byte 23
@@ -59,7 +59,7 @@ gFallarborBattleTentTrainerMons_Gerardo: @ 85DEF46
.2byte 29
.2byte -1
gFallarborBattleTentTrainerMons_Jonn: @ 85DEF52
gFallarborBattleTentTrainerMons_Jonn:: @ 85DEF52
.2byte 16
.2byte 17
.2byte 21
@@ -67,7 +67,7 @@ gFallarborBattleTentTrainerMons_Jonn: @ 85DEF52
.2byte 37
.2byte -1
gFallarborBattleTentTrainerMons_Esteban: @ 85DEF5E
gFallarborBattleTentTrainerMons_Esteban:: @ 85DEF5E
.2byte 5
.2byte 28
.2byte 30
@@ -75,7 +75,7 @@ gFallarborBattleTentTrainerMons_Esteban: @ 85DEF5E
.2byte 42
.2byte -1
gFallarborBattleTentTrainerMons_Jameson: @ 85DEF6A
gFallarborBattleTentTrainerMons_Jameson:: @ 85DEF6A
.2byte 1
.2byte 2
.2byte 3
@@ -83,7 +83,7 @@ gFallarborBattleTentTrainerMons_Jameson: @ 85DEF6A
.2byte 9
.2byte -1
gFallarborBattleTentTrainerMons_Alanzo: @ 85DEF76
gFallarborBattleTentTrainerMons_Alanzo:: @ 85DEF76
.2byte 9
.2byte 10
.2byte 11
@@ -93,7 +93,7 @@ gFallarborBattleTentTrainerMons_Alanzo: @ 85DEF76
.2byte 15
.2byte -1
gFallarborBattleTentTrainerMons_Howard: @ 85DEF86
gFallarborBattleTentTrainerMons_Howard:: @ 85DEF86
.2byte 18
.2byte 23
.2byte 31
@@ -101,7 +101,7 @@ gFallarborBattleTentTrainerMons_Howard: @ 85DEF86
.2byte 43
.2byte -1
gFallarborBattleTentTrainerMons_Conrad: @ 85DEF92
gFallarborBattleTentTrainerMons_Conrad:: @ 85DEF92
.2byte 18
.2byte 19
.2byte 20
@@ -109,7 +109,7 @@ gFallarborBattleTentTrainerMons_Conrad: @ 85DEF92
.2byte 22
.2byte -1
gFallarborBattleTentTrainerMons_Makenna: @ 85DEF9E
gFallarborBattleTentTrainerMons_Makenna:: @ 85DEF9E
.2byte 4
.2byte 21
.2byte 25
@@ -117,7 +117,7 @@ gFallarborBattleTentTrainerMons_Makenna: @ 85DEF9E
.2byte 40
.2byte -1
gFallarborBattleTentTrainerMons_Brayan: @ 85DEFAA
gFallarborBattleTentTrainerMons_Brayan:: @ 85DEFAA
.2byte 0
.2byte 4
.2byte 6
@@ -127,7 +127,7 @@ gFallarborBattleTentTrainerMons_Brayan: @ 85DEFAA
.2byte 28
.2byte -1
gFallarborBattleTentTrainerMons_Mariana: @ 85DEFBA
gFallarborBattleTentTrainerMons_Mariana:: @ 85DEFBA
.2byte 0
.2byte 4
.2byte 13
@@ -137,7 +137,7 @@ gFallarborBattleTentTrainerMons_Mariana: @ 85DEFBA
.2byte 37
.2byte -1
gFallarborBattleTentTrainerMons_Sheldon: @ 85DEFCA
gFallarborBattleTentTrainerMons_Sheldon:: @ 85DEFCA
.2byte 2
.2byte 3
.2byte 21
@@ -145,7 +145,7 @@ gFallarborBattleTentTrainerMons_Sheldon: @ 85DEFCA
.2byte 39
.2byte -1
gFallarborBattleTentTrainerMons_Gianna: @ 85DEFD6
gFallarborBattleTentTrainerMons_Gianna:: @ 85DEFD6
.2byte 1
.2byte 2
.2byte 30
@@ -153,7 +153,7 @@ gFallarborBattleTentTrainerMons_Gianna: @ 85DEFD6
.2byte 41
.2byte -1
gFallarborBattleTentTrainerMons_Yahir: @ 85DEFE2
gFallarborBattleTentTrainerMons_Yahir:: @ 85DEFE2
.2byte 4
.2byte 8
.2byte 15
@@ -162,7 +162,7 @@ gFallarborBattleTentTrainerMons_Yahir: @ 85DEFE2
.2byte 24
.2byte -1
gFallarborBattleTentTrainerMons_Britney: @ 85DEFF0
gFallarborBattleTentTrainerMons_Britney:: @ 85DEFF0
.2byte 4
.2byte 7
.2byte 14
@@ -171,7 +171,7 @@ gFallarborBattleTentTrainerMons_Britney: @ 85DEFF0
.2byte 43
.2byte -1
gFallarborBattleTentTrainerMons_Hecter: @ 85DEFFE
gFallarborBattleTentTrainerMons_Hecter:: @ 85DEFFE
.2byte 0
.2byte 1
.2byte 2
@@ -180,7 +180,7 @@ gFallarborBattleTentTrainerMons_Hecter: @ 85DEFFE
.2byte 35
.2byte -1
gFallarborBattleTentTrainerMons_Tannor: @ 85DF00C
gFallarborBattleTentTrainerMons_Tannor:: @ 85DF00C
.2byte 5
.2byte 30
.2byte 31
@@ -188,7 +188,7 @@ gFallarborBattleTentTrainerMons_Tannor: @ 85DF00C
.2byte 34
.2byte -1
gFallarborBattleTentTrainerMons_Benji: @ 85DF018
gFallarborBattleTentTrainerMons_Benji:: @ 85DF018
.2byte 25
.2byte 26
.2byte 27
@@ -196,7 +196,7 @@ gFallarborBattleTentTrainerMons_Benji: @ 85DF018
.2byte 29
.2byte -1
gFallarborBattleTentTrainerMons_Rory: @ 85DF024
gFallarborBattleTentTrainerMons_Rory:: @ 85DF024
.2byte 9
.2byte 11
.2byte 14
@@ -205,7 +205,7 @@ gFallarborBattleTentTrainerMons_Rory: @ 85DF024
.2byte 39
.2byte -1
gFallarborBattleTentTrainerMons_Eleanor: @ 85DF032
gFallarborBattleTentTrainerMons_Eleanor:: @ 85DF032
.2byte 23
.2byte 28
.2byte 31
@@ -215,7 +215,7 @@ gFallarborBattleTentTrainerMons_Eleanor: @ 85DF032
.2byte 44
.2byte -1
gFallarborBattleTentTrainerMons_Evelyn: @ 85DF042
gFallarborBattleTentTrainerMons_Evelyn:: @ 85DF042
.2byte 29
.2byte 31
.2byte 32
@@ -223,7 +223,7 @@ gFallarborBattleTentTrainerMons_Evelyn: @ 85DF042
.2byte 34
.2byte -1
gFallarborBattleTentTrainerMons_Arielle: @ 85DF04E
gFallarborBattleTentTrainerMons_Arielle:: @ 85DF04E
.2byte 1
.2byte 3
.2byte 38
@@ -231,7 +231,7 @@ gFallarborBattleTentTrainerMons_Arielle: @ 85DF04E
.2byte 41
.2byte -1
gFallarborBattleTentTrainerMons_Connar: @ 85DF05A
gFallarborBattleTentTrainerMons_Connar:: @ 85DF05A
.2byte 7
.2byte 8
.2byte 28
@@ -240,7 +240,7 @@ gFallarborBattleTentTrainerMons_Connar: @ 85DF05A
.2byte 32
.2byte -1
gFallarborBattleTentTrainerMons_Maurice: @ 85DF068
gFallarborBattleTentTrainerMons_Maurice:: @ 85DF068
.2byte 4
.2byte 5
.2byte 6
@@ -248,7 +248,7 @@ gFallarborBattleTentTrainerMons_Maurice: @ 85DF068
.2byte 13
.2byte -1
gFallarborBattleTentTrainerMons_Kianna: @ 85DF074
gFallarborBattleTentTrainerMons_Kianna:: @ 85DF074
.2byte 22
.2byte 24
.2byte 26
data/battle_frontier/fallarbor_battle_tent_trainers.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gFallarborBattleTentTrainers: @ 85DF084
gFallarborBattleTentTrainers:: @ 85DF084
@ 0
.4byte TRAINER_CLASS_AROMA_LADY
.string "AMBER$", 8
data/battle_frontier/slateport_battle_tent_mons.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gSlateportBattleTentMons: @ 85DE02C
gSlateportBattleTentMons:: @ 85DE02C
@ 0
.2byte SPECIES_ZIGZAGOON
.2byte MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE
data/battle_frontier/slateport_battle_tent_trainer_mons.s
+30 -30
View File
@@ -1,6 +1,6 @@
.align 1, 0
gSlateportBattleTentTrainerMons_Jolie: @ 85DD70C
gSlateportBattleTentTrainerMons_Jolie:: @ 85DD70C
.2byte 9
.2byte 10
.2byte 13
@@ -14,7 +14,7 @@ gSlateportBattleTentTrainerMons_Jolie: @ 85DD70C
.2byte 63
.2byte -1
gSlateportBattleTentTrainerMons_Malachi: @ 85DD724
gSlateportBattleTentTrainerMons_Malachi:: @ 85DD724
.2byte 9
.2byte 16
.2byte 17
@@ -28,7 +28,7 @@ gSlateportBattleTentTrainerMons_Malachi: @ 85DD724
.2byte 53
.2byte -1
gSlateportBattleTentTrainerMons_Kelsie: @ 85DD73C
gSlateportBattleTentTrainerMons_Kelsie:: @ 85DD73C
.2byte 4
.2byte 5
.2byte 6
@@ -42,7 +42,7 @@ gSlateportBattleTentTrainerMons_Kelsie: @ 85DD73C
.2byte 53
.2byte -1
gSlateportBattleTentTrainerMons_Davon: @ 85DD754
gSlateportBattleTentTrainerMons_Davon:: @ 85DD754
.2byte 4
.2byte 5
.2byte 6
@@ -57,7 +57,7 @@ gSlateportBattleTentTrainerMons_Davon: @ 85DD754
.2byte 50
.2byte -1
gSlateportBattleTentTrainerMons_Glenda: @ 85DD76E
gSlateportBattleTentTrainerMons_Glenda:: @ 85DD76E
.2byte 0
.2byte 1
.2byte 17
@@ -73,7 +73,7 @@ gSlateportBattleTentTrainerMons_Glenda: @ 85DD76E
.2byte 66
.2byte -1
gSlateportBattleTentTrainerMons_Helena: @ 85DD78A
gSlateportBattleTentTrainerMons_Helena:: @ 85DD78A
.2byte 18
.2byte 19
.2byte 21
@@ -87,7 +87,7 @@ gSlateportBattleTentTrainerMons_Helena: @ 85DD78A
.2byte 63
.2byte -1
gSlateportBattleTentTrainerMons_Rodolfo: @ 85DD7A2
gSlateportBattleTentTrainerMons_Rodolfo:: @ 85DD7A2
.2byte 0
.2byte 1
.2byte 4
@@ -103,7 +103,7 @@ gSlateportBattleTentTrainerMons_Rodolfo: @ 85DD7A2
.2byte 62
.2byte -1
gSlateportBattleTentTrainerMons_Davion: @ 85DD7BE
gSlateportBattleTentTrainerMons_Davion:: @ 85DD7BE
.2byte 17
.2byte 23
.2byte 24
@@ -120,7 +120,7 @@ gSlateportBattleTentTrainerMons_Davion: @ 85DD7BE
.2byte 69
.2byte -1
gSlateportBattleTentTrainerMons_Kendall: @ 85DD7DC
gSlateportBattleTentTrainerMons_Kendall:: @ 85DD7DC
.2byte 4
.2byte 7
.2byte 8
@@ -137,7 +137,7 @@ gSlateportBattleTentTrainerMons_Kendall: @ 85DD7DC
.2byte 63
.2byte -1
gSlateportBattleTentTrainerMons_Colten: @ 85DD7FA
gSlateportBattleTentTrainerMons_Colten:: @ 85DD7FA
.2byte 0
.2byte 2
.2byte 12
@@ -152,7 +152,7 @@ gSlateportBattleTentTrainerMons_Colten: @ 85DD7FA
.2byte 57
.2byte -1
gSlateportBattleTentTrainerMons_Irvin: @ 85DD814
gSlateportBattleTentTrainerMons_Irvin:: @ 85DD814
.2byte 0
.2byte 1
.2byte 2
@@ -168,7 +168,7 @@ gSlateportBattleTentTrainerMons_Irvin: @ 85DD814
.2byte 60
.2byte -1
gSlateportBattleTentTrainerMons_Shaun: @ 85DD830
gSlateportBattleTentTrainerMons_Shaun:: @ 85DD830
.2byte 17
.2byte 18
.2byte 19
@@ -184,7 +184,7 @@ gSlateportBattleTentTrainerMons_Shaun: @ 85DD830
.2byte 69
.2byte -1
gSlateportBattleTentTrainerMons_Kyler: @ 85DD84C
gSlateportBattleTentTrainerMons_Kyler:: @ 85DD84C
.2byte 22
.2byte 23
.2byte 28
@@ -199,7 +199,7 @@ gSlateportBattleTentTrainerMons_Kyler: @ 85DD84C
.2byte 67
.2byte -1
gSlateportBattleTentTrainerMons_Maggie: @ 85DD866
gSlateportBattleTentTrainerMons_Maggie:: @ 85DD866
.2byte 10
.2byte 13
.2byte 17
@@ -213,7 +213,7 @@ gSlateportBattleTentTrainerMons_Maggie: @ 85DD866
.2byte 63
.2byte -1
gSlateportBattleTentTrainerMons_Stephon: @ 85DD87E
gSlateportBattleTentTrainerMons_Stephon:: @ 85DD87E
.2byte 8
.2byte 10
.2byte 16
@@ -227,7 +227,7 @@ gSlateportBattleTentTrainerMons_Stephon: @ 85DD87E
.2byte 68
.2byte -1
gSlateportBattleTentTrainerMons_Rebecca: @ 85DD896
gSlateportBattleTentTrainerMons_Rebecca:: @ 85DD896
.2byte 8
.2byte 13
.2byte 21
@@ -241,7 +241,7 @@ gSlateportBattleTentTrainerMons_Rebecca: @ 85DD896
.2byte 68
.2byte -1
gSlateportBattleTentTrainerMons_Reggie: @ 85DD8AE
gSlateportBattleTentTrainerMons_Reggie:: @ 85DD8AE
.2byte 6
.2byte 7
.2byte 17
@@ -256,7 +256,7 @@ gSlateportBattleTentTrainerMons_Reggie: @ 85DD8AE
.2byte 65
.2byte -1
gSlateportBattleTentTrainerMons_Janae: @ 85DD8C8
gSlateportBattleTentTrainerMons_Janae:: @ 85DD8C8
.2byte 0
.2byte 1
.2byte 27
@@ -271,7 +271,7 @@ gSlateportBattleTentTrainerMons_Janae: @ 85DD8C8
.2byte 65
.2byte -1
gSlateportBattleTentTrainerMons_Caiden: @ 85DD8E2
gSlateportBattleTentTrainerMons_Caiden:: @ 85DD8E2
.2byte 10
.2byte 14
.2byte 15
@@ -287,7 +287,7 @@ gSlateportBattleTentTrainerMons_Caiden: @ 85DD8E2
.2byte 69
.2byte -1
gSlateportBattleTentTrainerMons_Kirsten: @ 85DD8FE
gSlateportBattleTentTrainerMons_Kirsten:: @ 85DD8FE
.2byte 10
.2byte 16
.2byte 18
@@ -303,7 +303,7 @@ gSlateportBattleTentTrainerMons_Kirsten: @ 85DD8FE
.2byte 69
.2byte -1
gSlateportBattleTentTrainerMons_Kurtis: @ 85DD91A
gSlateportBattleTentTrainerMons_Kurtis:: @ 85DD91A
.2byte 0
.2byte 1
.2byte 36
@@ -317,7 +317,7 @@ gSlateportBattleTentTrainerMons_Kurtis: @ 85DD91A
.2byte 68
.2byte -1
gSlateportBattleTentTrainerMons_Stefan: @ 85DD932
gSlateportBattleTentTrainerMons_Stefan:: @ 85DD932
.2byte 4
.2byte 5
.2byte 21
@@ -331,7 +331,7 @@ gSlateportBattleTentTrainerMons_Stefan: @ 85DD932
.2byte 65
.2byte -1
gSlateportBattleTentTrainerMons_Avery: @ 85DD94A
gSlateportBattleTentTrainerMons_Avery:: @ 85DD94A
.2byte 2
.2byte 3
.2byte 7
@@ -345,7 +345,7 @@ gSlateportBattleTentTrainerMons_Avery: @ 85DD94A
.2byte 67
.2byte -1
gSlateportBattleTentTrainerMons_Dwane: @ 85DD962
gSlateportBattleTentTrainerMons_Dwane:: @ 85DD962
.2byte 14
.2byte 15
.2byte 30
@@ -359,7 +359,7 @@ gSlateportBattleTentTrainerMons_Dwane: @ 85DD962
.2byte 63
.2byte -1
gSlateportBattleTentTrainerMons_Mckenna: @ 85DD97A
gSlateportBattleTentTrainerMons_Mckenna:: @ 85DD97A
.2byte 27
.2byte 29
.2byte 30
@@ -373,7 +373,7 @@ gSlateportBattleTentTrainerMons_Mckenna: @ 85DD97A
.2byte 67
.2byte -1
gSlateportBattleTentTrainerMons_Camryn: @ 85DD992
gSlateportBattleTentTrainerMons_Camryn:: @ 85DD992
.2byte 5
.2byte 6
.2byte 7
@@ -388,7 +388,7 @@ gSlateportBattleTentTrainerMons_Camryn: @ 85DD992
.2byte 44
.2byte -1
gSlateportBattleTentTrainerMons_Natasha: @ 85DD9AC
gSlateportBattleTentTrainerMons_Natasha:: @ 85DD9AC
.2byte 1
.2byte 3
.2byte 4
@@ -402,7 +402,7 @@ gSlateportBattleTentTrainerMons_Natasha: @ 85DD9AC
.2byte 51
.2byte -1
gSlateportBattleTentTrainerMons_Austyn: @ 85DD9C4
gSlateportBattleTentTrainerMons_Austyn:: @ 85DD9C4
.2byte 25
.2byte 31
.2byte 35
@@ -417,7 +417,7 @@ gSlateportBattleTentTrainerMons_Austyn: @ 85DD9C4
.2byte 69
.2byte -1
gSlateportBattleTentTrainerMons_Donovan: @ 85DD9DE
gSlateportBattleTentTrainerMons_Donovan:: @ 85DD9DE
.2byte 10
.2byte 16
.2byte 17
@@ -434,7 +434,7 @@ gSlateportBattleTentTrainerMons_Donovan: @ 85DD9DE
.2byte 65
.2byte -1
gSlateportBattleTentTrainerMons_Tamia: @ 85DD9FC
gSlateportBattleTentTrainerMons_Tamia:: @ 85DD9FC
.2byte 2
.2byte 6
.2byte 9
data/battle_frontier/slateport_battle_tent_trainers.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gSlateportBattleTentTrainers: @ 85DDA14
gSlateportBattleTentTrainers:: @ 85DDA14
@ 0
.4byte TRAINER_CLASS_AROMA_LADY
.string "JOLIE$", 8
data/battle_frontier/verdanturf_battle_tent_mons.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gVerdanturfBattleTentMons: @ 85DEC28
gVerdanturfBattleTentMons:: @ 85DEC28
@ 0
.2byte SPECIES_POOCHYENA
.2byte MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL
data/battle_frontier/verdanturf_battle_tent_trainer_mons.s
+30 -30
View File
@@ -1,6 +1,6 @@
.align 1, 0
gVerdanturfBattleTentTrainerMons_Brenna: @ 85DE48C
gVerdanturfBattleTentTrainerMons_Brenna:: @ 85DE48C
.2byte 4
.2byte 11
.2byte 13
@@ -8,7 +8,7 @@ gVerdanturfBattleTentTrainerMons_Brenna: @ 85DE48C
.2byte 26
.2byte -1
gVerdanturfBattleTentTrainerMons_Dilan: @ 85DE498
gVerdanturfBattleTentTrainerMons_Dilan:: @ 85DE498
.2byte 30
.2byte 37
.2byte 13
@@ -16,7 +16,7 @@ gVerdanturfBattleTentTrainerMons_Dilan: @ 85DE498
.2byte 42
.2byte -1
gVerdanturfBattleTentTrainerMons_Eliana: @ 85DE4A4
gVerdanturfBattleTentTrainerMons_Eliana:: @ 85DE4A4
.2byte 6
.2byte 7
.2byte 17
@@ -24,7 +24,7 @@ gVerdanturfBattleTentTrainerMons_Eliana: @ 85DE4A4
.2byte 40
.2byte -1
gVerdanturfBattleTentTrainerMons_Markus: @ 85DE4B0
gVerdanturfBattleTentTrainerMons_Markus:: @ 85DE4B0
.2byte 6
.2byte 7
.2byte 18
@@ -32,7 +32,7 @@ gVerdanturfBattleTentTrainerMons_Markus: @ 85DE4B0
.2byte 38
.2byte -1
gVerdanturfBattleTentTrainerMons_Caitlyn: @ 85DE4BC
gVerdanturfBattleTentTrainerMons_Caitlyn:: @ 85DE4BC
.2byte 0
.2byte 12
.2byte 25
@@ -41,7 +41,7 @@ gVerdanturfBattleTentTrainerMons_Caitlyn: @ 85DE4BC
.2byte 44
.2byte -1
gVerdanturfBattleTentTrainerMons_Desiree: @ 85DE4CA
gVerdanturfBattleTentTrainerMons_Desiree:: @ 85DE4CA
.2byte 8
.2byte 12
.2byte 21
@@ -49,7 +49,7 @@ gVerdanturfBattleTentTrainerMons_Desiree: @ 85DE4CA
.2byte 31
.2byte -1
gVerdanturfBattleTentTrainerMons_Ronald: @ 85DE4D6
gVerdanturfBattleTentTrainerMons_Ronald:: @ 85DE4D6
.2byte 1
.2byte 20
.2byte 23
@@ -57,7 +57,7 @@ gVerdanturfBattleTentTrainerMons_Ronald: @ 85DE4D6
.2byte 32
.2byte -1
gVerdanturfBattleTentTrainerMons_Ashten: @ 85DE4E2
gVerdanturfBattleTentTrainerMons_Ashten:: @ 85DE4E2
.2byte 9
.2byte 12
.2byte 27
@@ -65,7 +65,7 @@ gVerdanturfBattleTentTrainerMons_Ashten: @ 85DE4E2
.2byte 43
.2byte -1
gVerdanturfBattleTentTrainerMons_Gerard: @ 85DE4EE
gVerdanturfBattleTentTrainerMons_Gerard:: @ 85DE4EE
.2byte 36
.2byte 7
.2byte 34
@@ -73,7 +73,7 @@ gVerdanturfBattleTentTrainerMons_Gerard: @ 85DE4EE
.2byte 40
.2byte -1
gVerdanturfBattleTentTrainerMons_Bradly: @ 85DE4FA
gVerdanturfBattleTentTrainerMons_Bradly:: @ 85DE4FA
.2byte 26
.2byte 3
.2byte 0
@@ -81,7 +81,7 @@ gVerdanturfBattleTentTrainerMons_Bradly: @ 85DE4FA
.2byte 17
.2byte -1
gVerdanturfBattleTentTrainerMons_Dennis: @ 85DE506
gVerdanturfBattleTentTrainerMons_Dennis:: @ 85DE506
.2byte 14
.2byte 37
.2byte 2
@@ -89,7 +89,7 @@ gVerdanturfBattleTentTrainerMons_Dennis: @ 85DE506
.2byte 27
.2byte -1
gVerdanturfBattleTentTrainerMons_Prestin: @ 85DE512
gVerdanturfBattleTentTrainerMons_Prestin:: @ 85DE512
.2byte 31
.2byte 28
.2byte 22
@@ -99,7 +99,7 @@ gVerdanturfBattleTentTrainerMons_Prestin: @ 85DE512
.2byte 41
.2byte -1
gVerdanturfBattleTentTrainerMons_Ernesto: @ 85DE522
gVerdanturfBattleTentTrainerMons_Ernesto:: @ 85DE522
.2byte 33
.2byte 32
.2byte 25
@@ -107,7 +107,7 @@ gVerdanturfBattleTentTrainerMons_Ernesto: @ 85DE522
.2byte 34
.2byte -1
gVerdanturfBattleTentTrainerMons_Nala: @ 85DE52E
gVerdanturfBattleTentTrainerMons_Nala:: @ 85DE52E
.2byte 1
.2byte 4
.2byte 8
@@ -117,7 +117,7 @@ gVerdanturfBattleTentTrainerMons_Nala: @ 85DE52E
.2byte 34
.2byte -1
gVerdanturfBattleTentTrainerMons_Darnell: @ 85DE53E
gVerdanturfBattleTentTrainerMons_Darnell:: @ 85DE53E
.2byte 0
.2byte 29
.2byte 35
@@ -126,7 +126,7 @@ gVerdanturfBattleTentTrainerMons_Darnell: @ 85DE53E
.2byte 43
.2byte -1
gVerdanturfBattleTentTrainerMons_Ashlyn: @ 85DE54C
gVerdanturfBattleTentTrainerMons_Ashlyn:: @ 85DE54C
.2byte 29
.2byte 36
.2byte 32
@@ -136,7 +136,7 @@ gVerdanturfBattleTentTrainerMons_Ashlyn: @ 85DE54C
.2byte 44
.2byte -1
gVerdanturfBattleTentTrainerMons_Addison: @ 85DE55C
gVerdanturfBattleTentTrainerMons_Addison:: @ 85DE55C
.2byte 0
.2byte 1
.2byte 16
@@ -144,7 +144,7 @@ gVerdanturfBattleTentTrainerMons_Addison: @ 85DE55C
.2byte 6
.2byte -1
gVerdanturfBattleTentTrainerMons_Justine: @ 85DE568
gVerdanturfBattleTentTrainerMons_Justine:: @ 85DE568
.2byte 0
.2byte 1
.2byte 16
@@ -152,7 +152,7 @@ gVerdanturfBattleTentTrainerMons_Justine: @ 85DE568
.2byte 18
.2byte -1
gVerdanturfBattleTentTrainerMons_Tyson: @ 85DE574
gVerdanturfBattleTentTrainerMons_Tyson:: @ 85DE574
.2byte 5
.2byte 15
.2byte 22
@@ -162,7 +162,7 @@ gVerdanturfBattleTentTrainerMons_Tyson: @ 85DE574
.2byte 43
.2byte -1
gVerdanturfBattleTentTrainerMons_Laila: @ 85DE584
gVerdanturfBattleTentTrainerMons_Laila:: @ 85DE584
.2byte 5
.2byte 15
.2byte 19
@@ -171,7 +171,7 @@ gVerdanturfBattleTentTrainerMons_Laila: @ 85DE584
.2byte 43
.2byte -1
gVerdanturfBattleTentTrainerMons_Waren: @ 85DE592
gVerdanturfBattleTentTrainerMons_Waren:: @ 85DE592
.2byte 0
.2byte 9
.2byte 10
@@ -179,7 +179,7 @@ gVerdanturfBattleTentTrainerMons_Waren: @ 85DE592
.2byte 23
.2byte -1
gVerdanturfBattleTentTrainerMons_Tobias: @ 85DE59E
gVerdanturfBattleTentTrainerMons_Tobias:: @ 85DE59E
.2byte 6
.2byte 7
.2byte 24
@@ -187,7 +187,7 @@ gVerdanturfBattleTentTrainerMons_Tobias: @ 85DE59E
.2byte 40
.2byte -1
gVerdanturfBattleTentTrainerMons_Josiah: @ 85DE5AA
gVerdanturfBattleTentTrainerMons_Josiah:: @ 85DE5AA
.2byte 8
.2byte 16
.2byte 23
@@ -195,7 +195,7 @@ gVerdanturfBattleTentTrainerMons_Josiah: @ 85DE5AA
.2byte 3
.2byte -1
gVerdanturfBattleTentTrainerMons_Dion: @ 85DE5B6
gVerdanturfBattleTentTrainerMons_Dion:: @ 85DE5B6
.2byte 14
.2byte 2
.2byte 11
@@ -204,7 +204,7 @@ gVerdanturfBattleTentTrainerMons_Dion: @ 85DE5B6
.2byte 38
.2byte -1
gVerdanturfBattleTentTrainerMons_Kenzie: @ 85DE5C4
gVerdanturfBattleTentTrainerMons_Kenzie:: @ 85DE5C4
.2byte 18
.2byte 10
.2byte 16
@@ -213,7 +213,7 @@ gVerdanturfBattleTentTrainerMons_Kenzie: @ 85DE5C4
.2byte 27
.2byte -1
gVerdanturfBattleTentTrainerMons_Lillian: @ 85DE5D2
gVerdanturfBattleTentTrainerMons_Lillian:: @ 85DE5D2
.2byte 24
.2byte 34
.2byte 36
@@ -221,7 +221,7 @@ gVerdanturfBattleTentTrainerMons_Lillian: @ 85DE5D2
.2byte 5
.2byte -1
gVerdanturfBattleTentTrainerMons_Lesley: @ 85DE5DE
gVerdanturfBattleTentTrainerMons_Lesley:: @ 85DE5DE
.2byte 26
.2byte 0
.2byte 18
@@ -229,7 +229,7 @@ gVerdanturfBattleTentTrainerMons_Lesley: @ 85DE5DE
.2byte 25
.2byte -1
gVerdanturfBattleTentTrainerMons_Marquis: @ 85DE5EA
gVerdanturfBattleTentTrainerMons_Marquis:: @ 85DE5EA
.2byte 24
.2byte 34
.2byte 5
@@ -238,7 +238,7 @@ gVerdanturfBattleTentTrainerMons_Marquis: @ 85DE5EA
.2byte 42
.2byte -1
gVerdanturfBattleTentTrainerMons_Freddy: @ 85DE5F8
gVerdanturfBattleTentTrainerMons_Freddy:: @ 85DE5F8
.2byte 18
.2byte 21
.2byte 26
@@ -246,7 +246,7 @@ gVerdanturfBattleTentTrainerMons_Freddy: @ 85DE5F8
.2byte 41
.2byte -1
gVerdanturfBattleTentTrainerMons_Cecilia: @ 85DE604
gVerdanturfBattleTentTrainerMons_Cecilia:: @ 85DE604
.2byte 23
.2byte 26
.2byte 27
data/battle_frontier/verdanturf_battle_tent_trainers.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0
gVerdanturfBattleTentTrainers: @ 85DE610
gVerdanturfBattleTentTrainers:: @ 85DE610
@ 0
.4byte TRAINER_CLASS_AROMA_LADY
.string "BRENNA$", 8