Merge branch 'master' into build_more_roms

11 files changed, 1102 insertions, 207 deletions

diff --git a/data/items/names.asm b/data/items/names.asm
index a37acce..942af41 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -120,7 +120,7 @@ ItemNames::
 	db "おうじゃのべルト@" ; CHAMPION_BELT
 	db "おふだ@" ; TAG
 	db "のろいのおふだ@" ; SPELL_TAG
-	db "5えんだま@" ; 5_YEN_COIN
+	db "５えんだま@" ; 5_YEN_COIN
 	db "まもりのいと@" ; GUARD_THREAD
 	db "しげきだま@" ; STIMULUS_ORB
 	db "おちつきのみ@" ; CALM_BERRY
@@ -145,7 +145,7 @@ ItemNames::
 	db "こおりのビキニ@" ; ICE_BIKINI
 	db "いかずちのキバ@" ; THUNDER_FANG
 	db "ほのおのツメ@" ; FIRE_CLAW
-	db "2ほんのツノ@" ; TWIN_HORNS
+	db "２ほんのツノ@" ; TWIN_HORNS
 	db "ごすんくぎ@" ; SPIKE
 	db "きのみ@" ; BERRY
 	db "りンゴ@" ; APPLE
@@ -202,63 +202,63 @@ ItemNames::
 	db "みしよう@" ; C1
 	db "みしよう@" ; C2
 	db "みしよう@" ; C3
-	db "わざマシン01@" ; TM01
-	db "わざマシン02@" ; TM02
-	db "わざマシン03@" ; TM03
-	db "わざマシン04@" ; TM04
+	db "わざマシン０１@" ; TM01
+	db "わざマシン０２@" ; TM02
+	db "わざマシン０３@" ; TM03
+	db "わざマシン０４@" ; TM04
 	db "しようきんし@" ; C8
-	db "わざマシン05@" ; TM05
-	db "わざマシン06@" ; TM06
-	db "わざマシン07@" ; TM07
-	db "わざマシン08@" ; TM08
-	db "わざマシン09@" ; TM09
-	db "わざマシン10@" ; TM10
-	db "わざマシン11@" ; TM11
-	db "わざマシン12@" ; TM12
-	db "わざマシン13@" ; TM13
-	db "わざマシン14@" ; TM14
-	db "わざマシン15@" ; TM15
-	db "わざマシン16@" ; TM16
-	db "わざマシン17@" ; TM17
-	db "わざマシン18@" ; TM18
-	db "わざマシン19@" ; TM19
-	db "わざマシン20@" ; TM20
-	db "わざマシン21@" ; TM21
-	db "わざマシン22@" ; TM22
-	db "わざマシン23@" ; TM23
-	db "わざマシン24@" ; TM24
-	db "わざマシン25@" ; TM25
-	db "わざマシン26@" ; TM26
-	db "わざマシン27@" ; TM27
-	db "わざマシン28@" ; TM28
+	db "わざマシン０５@" ; TM05
+	db "わざマシン０６@" ; TM06
+	db "わざマシン０７@" ; TM07
+	db "わざマシン０８@" ; TM08
+	db "わざマシン０９@" ; TM09
+	db "わざマシン１０@" ; TM10
+	db "わざマシン１１@" ; TM11
+	db "わざマシン１２@" ; TM12
+	db "わざマシン１３@" ; TM13
+	db "わざマシン１４@" ; TM14
+	db "わざマシン１５@" ; TM15
+	db "わざマシン１６@" ; TM16
+	db "わざマシン１７@" ; TM17
+	db "わざマシン１８@" ; TM18
+	db "わざマシン１９@" ; TM19
+	db "わざマシン２０@" ; TM20
+	db "わざマシン２１@" ; TM21
+	db "わざマシン２２@" ; TM22
+	db "わざマシン２３@" ; TM23
+	db "わざマシン２４@" ; TM24
+	db "わざマシン２５@" ; TM25
+	db "わざマシン２６@" ; TM26
+	db "わざマシン２７@" ; TM27
+	db "わざマシン２８@" ; TM28
 	db "しようきんし@" ; E1
-	db "わざマシン29@" ; TM29
-	db "わざマシン30@" ; TM30
-	db "わざマシン31@" ; TM31
-	db "わざマシン32@" ; TM32
-	db "わざマシン33@" ; TM33
-	db "わざマシン34@" ; TM34
-	db "わざマシン35@" ; TM35
-	db "わざマシン36@" ; TM36
-	db "わざマシン37@" ; TM37
-	db "わざマシン38@" ; TM38
-	db "わざマシン39@" ; TM39
-	db "わざマシン40@" ; TM40
-	db "わざマシン41@" ; TM41
-	db "わざマシン42@" ; TM42
-	db "わざマシン43@" ; TM43
-	db "わざマシン44@" ; TM44
-	db "わざマシン45@" ; TM45
-	db "わざマシン46@" ; TM46
-	db "わざマシン47@" ; TM47
-	db "わざマシン48@" ; TM48
-	db "わざマシン49@" ; TM49
-	db "わざマシン50@" ; TM50
-	db "ひでんマシン01@" ; HM01
-	db "ひでんマシン02@" ; HM02
-	db "ひでんマシン03@" ; HM03
-	db "ひでんマシン04@" ; HM04
-	db "ひでんマシン05@" ; HM05
-	db "ひでんマシン06@" ; HM06
-	db "ひでんマシン07@" ; HM07
+	db "わざマシン２９@" ; TM29
+	db "わざマシン３０@" ; TM30
+	db "わざマシン３１@" ; TM31
+	db "わざマシン３２@" ; TM32
+	db "わざマシン３３@" ; TM33
+	db "わざマシン３４@" ; TM34
+	db "わざマシン３５@" ; TM35
+	db "わざマシン３６@" ; TM36
+	db "わざマシン３７@" ; TM37
+	db "わざマシン３８@" ; TM38
+	db "わざマシン３９@" ; TM39
+	db "わざマシン４０@" ; TM40
+	db "わざマシン４１@" ; TM41
+	db "わざマシン４２@" ; TM42
+	db "わざマシン４３@" ; TM43
+	db "わざマシン４４@" ; TM44
+	db "わざマシン４５@" ; TM45
+	db "わざマシン４６@" ; TM46
+	db "わざマシン４７@" ; TM47
+	db "わざマシン４８@" ; TM48
+	db "わざマシン４９@" ; TM49
+	db "わざマシン５０@" ; TM50
+	db "ひでんマシン０１@" ; HM01
+	db "ひでんマシン０２@" ; HM02
+	db "ひでんマシン０３@" ; HM03
+	db "ひでんマシン０４@" ; HM04
+	db "ひでんマシン０５@" ; HM05
+	db "ひでんマシン０６@" ; HM06
+	db "ひでんマシン０７@" ; HM07
 	db "しようきんし@" ; FF
diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
new file mode 100644
index 0000000..314e4ba
--- /dev/null
+++ b/data/maps/landmarks.asm
@@ -0,0 +1,50 @@
+INCLUDE "constants.asm"
+
+SECTION "LandmarkNames", ROMX[$4AAF], BANK[$3F]
+
+LandmarkNames::
+	db "サイレント@"
+	db "オールド@"
+	db "ウエスト@"
+	db "ハイテク@"
+	db "フォント@"
+	db "バードン@"
+	db "ニュータイプ@"
+	db "シュガー@"
+	db "ブルーフォレスト@"
+	db "スタンド@"
+	db "カントー@"
+	db "プりンス@"
+	db "フジヤマ@"
+	db "サウス@"
+	db "ノース@"
+	db "１５ばんどうろ@"
+	db "１８ばんどうろ@"
+	db "はつでんしょ１@"
+	db "はつでんしょ２@"
+	db "はつでんしょ３@"
+	db "はつでんしょ４@"
+	db "いせき　１@"
+	db "いせき　２@"
+	db "はいこう１@"
+	db "はいこう２@"
+	db "はいこう３@"
+	db "はいこう４@"
+	db "はいこう５@"
+	db "はいこう６@"
+	db "はいこう７@"
+	db "アジト　１@"
+	db "アジト　２@"
+	db "アジト　３@"
+	db "ヤドンの　いど１@"
+	db "ヤドンの　いど２@"
+	db "#りーぐ１@"
+	db "#りーぐ１@"
+	db "#りーぐ２@"
+	db "#りーぐ３@"
+	db "#りーぐ４@"
+	db "#りーぐ５@"
+	db "#りーぐ６@"
+	db "#りーぐ７@"
+	db "#りーぐ７@"
+	db "しずかなおか@"
diff --git a/data/moves/names.asm b/data/moves/names.asm
index 2ca2749..db98d65 100644
--- a/data/moves/names.asm
+++ b/data/moves/names.asm
@@ -87,7 +87,7 @@ MoveNames::
 	db "りゅうのいかり@" ; DRAGON_RAGE
 	db "ほのおのうず@" ; FIRE_SPIN
 	db "でんきショック@" ; THUNDERSHOCK
-	db "10まんボルト@" ; THUNDERBOLT
+	db "１０まんボルト@" ; THUNDERBOLT
 	db "でんじは@" ; THUNDER_WAVE
 	db "かみなり@" ; THUNDER
 	db "いわおとし@" ; ROCK_THROW
@@ -178,7 +178,7 @@ MoveNames::
 	db "いびき@" ; SNORE
 	db "クギをうつ@" ; NAIL_DOWN
 	db "じたばた@" ; FLAIL
-	db "テクスチャー2@" ; CONVERSION2
+	db "テクスチャー２@" ; CONVERSION2
 	db "こばんなげ@" ; COIN_HURL
 	db "わたほうし@" ; COTTON_SPORE
 	db "きしかいせい@" ; REVERSAL
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index e78a5d0..c18757b 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -622,7 +622,7 @@ KongpangEvosAttacks: ; 42a1c
 	db 35, MOVE_LEECH_LIFE
 	db 42, MOVE_PSYBEAM
 	db 49, MOVE_SLEEP_POWDER
-	db 56, MOVE_PSYCHIC_M
+	db 56, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 MorphonEvosAttacks: ; 42a33
@@ -635,7 +635,7 @@ MorphonEvosAttacks: ; 42a33
 	db 40, MOVE_LEECH_LIFE
 	db 48, MOVE_PSYBEAM
 	db 56, MOVE_SLEEP_POWDER
-	db 64, MOVE_PSYCHIC_M
+	db 64, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 DigdaEvosAttacks: ; 42a47
@@ -825,7 +825,7 @@ YungererEvosAttacks: ; 42b5d
 	db 36, MOVE_RECOVER
 	db 41, MOVE_REFLECT
 	db 41, MOVE_LIGHT_SCREEN
-	db 46, MOVE_PSYCHIC_M
+	db 46, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 FoodinEvosAttacks: ; 42b76
@@ -839,7 +839,7 @@ FoodinEvosAttacks: ; 42b76
 	db 36, MOVE_RECOVER
 	db 41, MOVE_REFLECT
 	db 41, MOVE_LIGHT_SCREEN
-	db 46, MOVE_PSYCHIC_M
+	db 46, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 WanrikyEvosAttacks: ; 42b8c
@@ -1032,7 +1032,7 @@ YadonEvosAttacks: ; 42cb3
 	db 22, MOVE_WATER_GUN
 	db 31, MOVE_HEADBUTT
 	db 41, MOVE_AMNESIA
-	db 52, MOVE_PSYCHIC_M
+	db 52, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 YadoranEvosAttacks: ; 42cc6
@@ -1045,7 +1045,7 @@ YadoranEvosAttacks: ; 42cc6
 	db 37, MOVE_WITHDRAW
 	db 39, MOVE_HEADBUTT
 	db 51, MOVE_AMNESIA
-	db 64, MOVE_PSYCHIC_M
+	db 64, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 CoilEvosAttacks: ; 42cdc
@@ -1269,7 +1269,7 @@ SleepeEvosAttacks: ; 42e30
 	db 26, MOVE_POISON_GAS
 	db 31, MOVE_MEDITATE
 	db 36, MOVE_STALKER
-	db 41, MOVE_PSYCHIC_M
+	db 41, MOVE_PSYCHIC
 	db 46, MOVE_CONFUSE_RAY
 	db 0 ; no more level-up moves
 
@@ -1283,7 +1283,7 @@ SleeperEvosAttacks: ; 42e49
 	db 31, MOVE_POISON_GAS
 	db 37, MOVE_MEDITATE
 	db 43, MOVE_STALKER
-	db 49, MOVE_PSYCHIC_M
+	db 49, MOVE_PSYCHIC
 	db 55, MOVE_CONFUSE_RAY
 	db 0 ; no more level-up moves
 
@@ -1994,7 +1994,7 @@ MewtwoEvosAttacks: ; 432bf
 	db 46, MOVE_RECOVER
 	db 58, MOVE_SAFEGUARD
 	db 71, MOVE_BARRIER
-	db 85, MOVE_PSYCHIC_M
+	db 85, MOVE_PSYCHIC
 	db 100, MOVE_AMNESIA
 	db 0 ; no more level-up moves
 
@@ -2465,7 +2465,7 @@ KokumoEvosAttacks: ; 435a2
 	db 26, MOVE_BITE
 	db 34, MOVE_SPIDER_WEB
 	db 43, MOVE_NIGHT_SHADE
-	db 53, MOVE_PSYCHIC_M
+	db 53, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 TwoheadEvosAttacks: ; 435b9
@@ -2478,7 +2478,7 @@ TwoheadEvosAttacks: ; 435b9
 	db 31, MOVE_BITE
 	db 40, MOVE_SPIDER_WEB
 	db 50, MOVE_NIGHT_SHADE
-	db 61, MOVE_PSYCHIC_M
+	db 61, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 YoroidoriEvosAttacks: ; 435cd
@@ -2644,7 +2644,7 @@ YadokingEvosAttacks: ; 436b6
 	db 37, MOVE_SWAGGER
 	db 39, MOVE_HEADBUTT
 	db 51, MOVE_AMNESIA
-	db 64, MOVE_PSYCHIC_M
+	db 64, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 AnnonEvosAttacks: ; 436ca
@@ -2697,7 +2697,7 @@ EifieEvosAttacks: ; 436ff
 	db 42, MOVE_AGILITY
 	db 49, MOVE_REFLECT
 	db 56, MOVE_LIGHT_SCREEN
-	db 63, MOVE_PSYCHIC_M
+	db 63, MOVE_PSYCHIC
 	db 0 ; no more level-up moves
 
 BlackyEvosAttacks: ; 43715
@@ -2998,7 +2998,7 @@ NorowaraEvosAttacks: ; 438d5
 	db 35, MOVE_CONFUSION
 	db 46, MOVE_NIGHT_SHADE
 	db 58, MOVE_SUBSTITUTE
-	db 71, MOVE_PSYCHIC_M
+	db 71, MOVE_PSYCHIC
 	db 85, MOVE_PAIN_SPLIT
 	db 100, MOVE_NAIL_DOWN
 	db 0 ; no more level-up moves
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 29cf7e2..54d5263 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -182,7 +182,7 @@ PokemonNames::
 	db "ネイティオ" ; NATIO
 	db "ギョピン@" ; GYOPIN
 	db "マりル@@" ; MARIL
-	db "マンボー1" ; MANBO1
+	db "マンボー１" ; MANBO1
 	db "イカり@@" ; IKARI
 	db "グロテス@" ; GROTESS
 	db "エクシング" ; EKSING
@@ -241,7 +241,7 @@ PokemonNames::
 	db "へルガー@" ; HELGAA
 	db "ウルフマン" ; WOLFMAN
 	db "ワーウルフ" ; WARWOLF
-	db "ポりゴン2" ; PORYGON2
+	db "ポりゴン２" ; PORYGON2
 	db "ナメール@" ; NAMEIL
 	db "ハガネール" ; HAGANEIL
 	db "キングドラ" ; KINGDRA
diff --git a/data/pokemon_palettes.inc b/data/pokemon/palettes.inc
index 41ca0d5..41ca0d5 100755
--- a/data/pokemon_palettes.inc
+++ b/data/pokemon/palettes.inc
diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc
index ca710dd..0cc8d67 100644
--- a/data/predef_pointers.inc
+++ b/data/predef_pointers.inc
@@ -24,8 +24,8 @@ PredefPointers:: ; 1:62d3
 	add_predef Function_cdf9
 	add_predef Function_ce10_2
 	add_predef Function_cd33
-Function_366cPredef::
-	dbw 3, Function_366c
+GiveItemPredef::
+	dbw 3, GiveItem
 	add_predef Function_ce3c
 	add_predef Function_da28
 	add_predef Function_d886
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
new file mode 100644
index 0000000..b901b7a
--- /dev/null
+++ b/data/sprites/sprites.asm
@@ -0,0 +1,102 @@
+INCLUDE "constants.asm"
+
+SECTION "OverworldSprites", ROMX[$423B], BANK[$05]
+
+overworld_sprite: MACRO
+; pointer, length, bank
+	dw \1
+	db \2 tiles, BANK(\1)
+ENDM
+
+OverworldSprites::
+	overworld_sprite GoldSpriteGFX, 12
+	overworld_sprite GoldBikeSpriteGFX, 12
+	overworld_sprite GoldSkateboardSpriteGFX, 12
+	overworld_sprite SilverSpriteGFX, 12
+	overworld_sprite OkidoSpriteGFX, 12
+	overworld_sprite RedSpriteGFX, 12
+	overworld_sprite BlueSpriteGFX, 12
+	overworld_sprite MasakiSpriteGFX, 12
+	overworld_sprite ElderSpriteGFX, 12
+	overworld_sprite SakakiSpriteGFX, 12
+	overworld_sprite GantetsuSpriteGFX, 12
+	overworld_sprite MomSpriteGFX, 12
+	overworld_sprite SilversMomSpriteGFX, 12
+	overworld_sprite RedsMomSpriteGFX, 12
+	overworld_sprite RedsMomSpriteGFX, 12
+	overworld_sprite NanamiSpriteGFX, 12
+	overworld_sprite EvilOkidoSpriteGFX, 12
+	overworld_sprite KikukoSpriteGFX, 12
+	overworld_sprite HayatoSpriteGFX, 12
+	overworld_sprite TsukushiSpriteGFX, 12
+	overworld_sprite TsukushiSpriteGFX, 12
+	overworld_sprite EnokiSpriteGFX, 12
+	overworld_sprite MikanSpriteGFX, 12
+	overworld_sprite MikanSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerFSpriteGFX, 12
+	overworld_sprite BugCatcherBoySpriteGFX, 12
+	overworld_sprite TwinSpriteGFX, 12
+	overworld_sprite YoungsterSpriteGFX, 12
+	overworld_sprite LassSpriteGFX, 12
+	overworld_sprite TeacherSpriteGFX, 12
+	overworld_sprite GirlSpriteGFX, 12
+	overworld_sprite SuperNerdSpriteGFX, 12
+	overworld_sprite RockerSpriteGFX, 12
+	overworld_sprite PokefanMSpriteGFX, 12
+	overworld_sprite PokefanFSpriteGFX, 12
+	overworld_sprite GrampsSpriteGFX, 12
+	overworld_sprite GrannySpriteGFX, 12
+	overworld_sprite SwimmerMSpriteGFX, 12
+	overworld_sprite SwimmerFSpriteGFX, 12
+	overworld_sprite RocketMSpriteGFX, 12
+	overworld_sprite RocketMSpriteGFX, 12
+	overworld_sprite RocketMSpriteGFX, 12
+	overworld_sprite RocketFSpriteGFX, 12
+	overworld_sprite NurseSpriteGFX, 12
+	overworld_sprite LinkReceptionistSpriteGFX, 12
+	overworld_sprite ClerkSpriteGFX, 12
+	overworld_sprite FisherSpriteGFX, 12
+	overworld_sprite FishingGuruSpriteGFX, 12
+	overworld_sprite ScientistSpriteGFX, 12
+	overworld_sprite MediumSpriteGFX, 12
+	overworld_sprite SageSpriteGFX, 12
+	overworld_sprite FrowningManSpriteGFX, 12
+	overworld_sprite GentlemanSpriteGFX, 12
+	overworld_sprite BlackbeltSpriteGFX, 12
+	overworld_sprite ReceptionistSpriteGFX, 12
+	overworld_sprite OfficerSpriteGFX, 12
+	overworld_sprite CaptainSpriteGFX, 12
+	overworld_sprite CaptainSpriteGFX, 12
+	overworld_sprite CaptainSpriteGFX, 12
+	overworld_sprite MohawkSpriteGFX, 12
+	overworld_sprite GymGuySpriteGFX, 12
+	overworld_sprite SailorSpriteGFX, 12
+	overworld_sprite HelmetSpriteGFX, 12
+	overworld_sprite BurglarSpriteGFX, 12
+	overworld_sprite SidonSpriteGFX, 12
+	overworld_sprite PippiSpriteGFX, 12
+	overworld_sprite PoppoSpriteGFX, 12
+	overworld_sprite LizardonSpriteGFX, 12
+	overworld_sprite KabigonSpriteGFX, 4
+	overworld_sprite PawouSpriteGFX, 12
+	overworld_sprite NyorobonSpriteGFX, 12
+	overworld_sprite LaplaceSpriteGFX, 12
+	overworld_sprite PokeBallSpriteGFX, 4
+	overworld_sprite PokedexSpriteGFX, 4
+	overworld_sprite PaperSpriteGFX, 4
+	overworld_sprite OldLinkReceptionistSpriteGFX, 4
+	overworld_sprite OldLinkReceptionistSpriteGFX, 4
+	overworld_sprite EggSpriteGFX, 4
+	overworld_sprite BoulderSpriteGFX, 4
diff --git a/data/super_palettes.inc b/data/super_palettes.inc
index 052bcaf..cf654c3 100644
--- a/data/super_palettes.inc
+++ b/data/super_palettes.inc
@@ -1,5 +1,5 @@
 SuperPalettes::
-	RGB 28,28,28, 23,21,16, 15,20,20, 04,04,04 ; TOWN_00
+	RGB 28,28,28, 23,21,16, 15,20,20, 04,04,04 ; ROUTE
 	RGB 28,28,28, 25,24,29, 15,20,20, 04,04,04 ; TOWN_01
 	RGB 28,28,28, 11,31,03, 15,20,20, 04,04,04 ; TOWN_02
 	RGB 28,28,28, 18,18,18, 15,20,20, 04,04,04 ; TOWN_03
@@ -24,19 +24,19 @@ SuperPalettes::
 	RGB 28,28,28, 30,22,24, 28,15,21, 04,04,04 ; PINKMON
 	RGB 28,28,28, 31,28,14, 26,20,00, 04,04,04 ; YELLOWMON
 	RGB 28,28,28, 26,21,22, 15,15,18, 04,04,04 ; GREYMON
-	RGB 28,28,28, 23,19,13, 14,12,17, 04,04,04 ; DARKMEWMON
-	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; DARKBLUEMON
-	RGB 28,28,28, 22,15,16, 17,02,05, 04,04,04 ; DARKREDMON
-	RGB 28,28,28, 15,20,20, 05,16,16, 04,04,04 ; DARKCYANMON
-	RGB 28,28,28, 23,15,19, 14,04,12, 04,04,04 ; DARKPURPLEMON
-	RGB 28,28,28, 20,17,18, 18,13,11, 04,04,04 ; DARKBROWNMON
-	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; TANMON
-	RGB 28,28,28, 21,25,29, 30,22,24, 04,04,04 ; BLUEPINKMON
-	RGB 28,28,28, 26,23,16, 29,14,09, 04,04,04 ; ORANGEMON
-	RGB 28,28,28, 18,18,18, 10,10,10, 04,04,04 ; DARKGREYMON
-	RGB 28,28,28, 30,26,15, 09,20,11, 04,04,04 ; GREENBAR
-	RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOWBAR
-	RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; REDBAR
+	RGB 28,28,28, 23,19,13, 14,12,17, 04,04,04 ; SHINY_MEWMON
+	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; SHINY_BLUEMON
+	RGB 28,28,28, 22,15,16, 17,02,05, 04,04,04 ; SHINY_REDMON
+	RGB 28,28,28, 15,20,20, 05,16,16, 04,04,04 ; SHINY_CYANMON
+	RGB 28,28,28, 23,15,19, 14,04,12, 04,04,04 ; SHINY_PURPLEMON
+	RGB 28,28,28, 20,17,18, 18,13,11, 04,04,04 ; SHINY_BROWNMON
+	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; SHINY_GREENMON
+	RGB 28,28,28, 21,25,29, 30,22,24, 04,04,04 ; SHINY_PINKMON
+	RGB 28,28,28, 26,23,16, 29,14,09, 04,04,04 ; SHINY_YELLOWMON
+	RGB 28,28,28, 18,18,18, 10,10,10, 04,04,04 ; SHINY_GREYMON
+	RGB 28,28,28, 30,26,15, 09,20,11, 04,04,04 ; GREEN_BAR
+	RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOW_BAR
+	RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; RED_BAR
 	RGB 28,28,28, 20,26,31, 17,23,10, 04,04,04 ; TOWN_MAP
 if def(GOLD)
 	RGB 28,28,28, 24,20,10, 21,00,04, 04,04,04 ; LOGO_1
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index d31c34c..f91aba7 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -16,6 +16,8 @@ INCLUDE "data/trainers/party_pointers.inc"
 ; TODO: decode all data
 
 if def(GOLD)
+HayatoGroup::
+
 SECTION "Trainer Parties 1 TEMPORARY", ROMX[$51BF],BANK[$E]
 AkaneGroup::
 BugCatcherBoyGroup::
@@ -29,168 +31,239 @@ BugCatcherBoyGroup::
 	db  9, DEX_REDIBA, ITEM_NONE, MOVE_SCRATCH, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE
 	db -1 ; end
 
-SECTION "Trainer Parties 2 TEMPORARY", ROMX[$52B4],BANK[$E]
-MikanGroup::
-
-SECTION "Trainer Parties 3 TEMPORARY", ROMX[$53BC],BANK[$E]
-OkidoGroup::
+; Leftover Bug Catcher data from Red/Blue
+	db  6, MON_BEEDLE, MON_CATERPIE, 0
+	db  7, MON_BEEDLE, MON_COCOON, MON_BEEDLE, 0
+	db  9, MON_BEEDLE, 0
+	db 10, MON_CATERPIE, MON_BEEDLE, MON_CATERPIE, 0
+	db  9, MON_BEEDLE, MON_COCOON, MON_CATERPIE, MON_TRANSEL, 0
+	db 11, MON_CATERPIE, MON_TRANSEL, 0
+	db 11, MON_BEEDLE, MON_COCOON, 0
+	db 10, MON_CATERPIE, MON_TRANSEL, MON_CATERPIE, 0
+	db 14, MON_CATERPIE, MON_BEEDLE, 0
+	db 16, MON_BEEDLE, MON_CATERPIE, MON_BEEDLE, 0
+	db 20, MON_BUTTERFREE, 0
+	db 18, MON_TRANSEL, MON_CATERPIE, MON_KONGPANG, 0
+	db 19, MON_SPEAR, MON_SPEAR, 0
+	db 20, MON_CATERPIE, MON_BEEDLE, MON_KONGPANG, 0
 
-SECTION "Trainer Parties 4 TEMPORARY", ROMX[$54B6],BANK[$E]
-WataruGroup::
-
-SECTION "Trainer Parties 5 TEMPORARY", ROMX[$54DC],BANK[$E]
-GerugeMemberMGroup::
-
-SECTION "Trainer Parties 6 TEMPORARY", ROMX[$54FA],BANK[$E]
-Trio1Group::
-BeautyGroup::
-	; BEAUTY_MEGUMI
-	db "めぐみ@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_NYARTH, ITEM_NONE, MOVE_PAY_DAY, MOVE_GROWL, MOVE_NONE, MOVE_NONE
+TsukishiGroup::
+LassGroup::
+	; LASS_ATSUKO
+	db "あつこ@", TRAINERTYPE_ITEM_MOVES
+	db  8, DEX_NAZONOKUSA, ITEM_NONE
+	; No moves?
 	db -1 ; end
 
-SECTION "Trainer Parties 7 TEMPORARY", ROMX[$55F4],BANK[$E]
-FledglingGroup::
+; Leftover Lass data from Red/Blue
+	db  9, MON_POPPO, MON_POPPO, 0
+	db 10, MON_KORATTA, MON_NIDORAN_M, 0
+	db 14, MON_PURIN, 0
+	db 31, MON_PARAS, MON_PARAS, MON_PARASECT, 0
+	db 11, MON_NAZONOKUSA, MON_MADATSUBOMI, 0
+	db 14, MON_PIPPI, 0
+	db 16, MON_POPPO, MON_NIDORAN_F, 0
+	db 14, MON_POPPO, MON_NIDORAN_F, 0
+	db 15, MON_NIDORAN_M, MON_NIDORAN_F, 0
+	db 13, MON_NAZONOKUSA, MON_POPPO, MON_NAZONOKUSA, 0
+	db 18, MON_POPPO, MON_NIDORAN_F, 0
+	db 18, MON_KORATTA, MON_PIKACHU, 0
+	db 23, MON_NIDORAN_F, MON_NIDORINA, 0
+	db 24, MON_NYARTH, MON_NYARTH, MON_NYARTH, 0
+	db 19, MON_POPPO, MON_KORATTA, MON_NIDORAN_M, MON_NYARTH, MON_PIKACHU, 0
+	db 22, MON_PIPPI, MON_PIPPI, 0
+	db 23, MON_MADATSUBOMI, MON_UTSUDON, 0
+	db 23, MON_NAZONOKUSA, MON_KUSAIHANA, 0
 
-SECTION "Trainer Parties 8 TEMPORARY", ROMX[$56D7],BANK[$E]
-PokeManiacGroup::
+EnokiGroup::
+; Leftover Sailor data from Red/Blue
+	db 18, MON_WANRIKY, MON_SHELLDER, 0
+	db 17, MON_WANRIKY, MON_MENOKURAGE, 0
+	db 21, MON_SHELLDER, 0
+	db 17, MON_TATTU, MON_SHELLDER, MON_MENOKURAGE, 0
+	db 18, MON_MENOKURAGE, MON_HITODEMAN, 0
+	db 17, MON_TATTU, MON_TATTU, MON_TATTU, 0
+	db 20, MON_WANRIKY, 0
+	db 21, MON_PIKACHU, MON_PIKACHU, 0
 
-SECTION "Trainer Parties 9 TEMPORARY", ROMX[$57C5],BANK[$E]
-GentlemanGroup::
+OkeraGroup::
+; Leftover Jr.Trainer♂ data from Red/Blue
+	db 11, MON_DIGDA, MON_SAND, 0
+	db 14, MON_KORATTA, MON_ARBO, 0
+	db 18, MON_MANKEY, 0
+	db 20, MON_ZENIGAME, 0
+	db 16, MON_ONISUZUME, MON_RATTA, 0
+	db 18, MON_DIGDA, MON_DIGDA, MON_SAND, 0
+	db 21, MON_GARDIE, MON_HITOKAGE, 0
+	db 19, MON_KORATTA, MON_DIGDA, MON_ARBO, MON_SAND, 0
+	db 29, MON_NIDORAN_M, MON_NIDORINO, 0
+
+SECTION "Trainer Parties 4 TEMPORARY", ROMX[$52B4],BANK[$E]
+MikanGroup::
 
-SECTION "Trainer Parties 10 TEMPORARY", ROMX[$57E9],BANK[$E]
-TeacherMGroup::
+SECTION "Trainer Parties 5 TEMPORARY", ROMX[$5320],BANK[$E]
+BlueGroup::
 
-SECTION "Trainer Parties 11 TEMPORARY", ROMX[$57F5],BANK[$E]
-TeacherFGroup::
+SECTION "Trainer Parties 6 TEMPORARY", ROMX[$533D],BANK[$E]
+GamaGroup::
 
-SECTION "Trainer Parties 12 TEMPORARY", ROMX[$57FB],BANK[$E]
-ManchildGroup::
+SECTION "Trainer Parties 7 TEMPORARY", ROMX[$5375],BANK[$E]
+RivalGroup::
+	db  5, DEX_KURUSU, 0
+	db  5, DEX_HAPPA, 0
+	db  5, DEX_HONOGUMA, 0
 
-SECTION "Trainer Parties 13 TEMPORARY", ROMX[$58CC],BANK[$E]
-RockerGroup::
+SECTION "Trainer Parties 8 TEMPORARY", ROMX[$53BC],BANK[$E]
+OkidoGroup::
 
-SECTION "Trainer Parties 14 TEMPORARY", ROMX[$58FB],BANK[$E]
-HikerGroup::
+SECTION "Trainer Parties 9 TEMPORARY", ROMX[$5404],BANK[$E]
+SakakiGroup::
 
-SECTION "Trainer Parties 15 TEMPORARY", ROMX[$59A2],BANK[$E]
-KimonoGirlGroup::
-	; KIMONO_GIRL_TAMAO
-	db "たまお@", TRAINERTYPE_ITEM_MOVES
-	db 12, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_ENCORE, MOVE_POUND, MOVE_NONE
-	db -1 ; end
+SECTION "Trainer Parties 10 TEMPORARY", ROMX[$5427],BANK[$E]
+ProtagonistGroup::
 
-	; KIMONO_GIRL_KOUME
-	db "こうめ@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_PIPPI, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
+SECTION "Trainer Parties 11 TEMPORARY", ROMX[$5433],BANK[$E]
+SibaGroup::
+KasumiGroup::
+FisherGroup::
+	; FISHER_HISASHI
+	db "ひさし@", TRAINERTYPE_ITEM_MOVES
+	db  8, DEX_PUKU, ITEM_NONE
+	; No moves?
 	db -1 ; end
 
-SECTION "Trainer Parties 16 TEMPORARY", ROMX[$518A],BANK[$E]
-HayatoGroup::
-
-SECTION "Trainer Parties 17 TEMPORARY", ROMX[$521A],BANK[$E]
-TsukishiGroup::
-LassGroup::
+SECTION "Trainer Parties 12 TEMPORARY", ROMX[$5472],BANK[$E]
+KannaGroup::
 
-SECTION "Trainer Parties 18 TEMPORARY", ROMX[$526F],BANK[$E]
-EnokiGroup::
+SECTION "Trainer Parties 13 TEMPORARY", ROMX[$54B6],BANK[$E]
+WataruGroup::
 
-SECTION "Trainer Parties 19 TEMPORARY", ROMX[$528F],BANK[$E]
-OkeraGroup::
+SECTION "Trainer Parties 14 TEMPORARY", ROMX[$54DC],BANK[$E]
+GerugeMemberMGroup::
 
-SECTION "Trainer Parties 20 TEMPORARY", ROMX[$533D],BANK[$E]
-GamaGroup::
+SECTION "Trainer Parties 15 TEMPORARY", ROMX[$54FA],BANK[$E]
+Trio1Group::
+BeautyGroup::
+	; BEAUTY_MEGUMI
+	db "めぐみ@", TRAINERTYPE_ITEM_MOVES
+	db 10, DEX_NYARTH, ITEM_NONE, MOVE_PAY_DAY, MOVE_GROWL, MOVE_NONE, MOVE_NONE
+	db -1 ; end
 
-SECTION "Trainer Parties 21 TEMPORARY", ROMX[$554B],BANK[$E]
+SECTION "Trainer Parties 16 TEMPORARY", ROMX[$554B],BANK[$E]
 Trio2Group::
 
-SECTION "Trainer Parties 22 TEMPORARY", ROMX[$555D],BANK[$E]
+SECTION "Trainer Parties 17 TEMPORARY", ROMX[$555D],BANK[$E]
 Trio3Group::
 
-SECTION "Trainer Parties 23 TEMPORARY", ROMX[$567C],BANK[$E]
-ProfessionalMGroup::
-ProfessionalFGroup::
+SECTION "Trainer Parties 18 TEMPORARY", ROMX[$5566],BANK[$E]
+RocketFGroup::
 
-SECTION "Trainer Parties 24 TEMPORARY", ROMX[$581B],BANK[$E]
-SwimmerMGroup::
+SECTION "Trainer Parties 19 TEMPORARY", ROMX[$5587],BANK[$E]
+YoungsterGroup::
 
-SECTION "Trainer Parties 25 TEMPORARY", ROMX[$582A],BANK[$E]
-SuperNerdGroup::
+SECTION "Trainer Parties 20 TEMPORARY", ROMX[$55F4],BANK[$E]
+FledglingGroup::
 
-SECTION "Trainer Parties 26 TEMPORARY", ROMX[$583C],BANK[$E]
-EngineerGroup::
+SECTION "Trainer Parties 21 TEMPORARY", ROMX[$5658],BANK[$E]
+ProdigyGroup::
 
-SECTION "Trainer Parties 27 TEMPORARY", ROMX[$596E],BANK[$E]
-JugglerGroup::
+SECTION "Trainer Parties 22 TEMPORARY", ROMX[$567C],BANK[$E]
+ProfessionalMGroup::
+ProfessionalFGroup::
 
-SECTION "Trainer Parties 28 TEMPORARY", ROMX[$597A],BANK[$E]
-TwinsGroup::
+SECTION "Trainer Parties 23 TEMPORARY", ROMX[$56D7],BANK[$E]
+PokeManiacGroup::
 
-SECTION "Trainer Parties 29 TEMPORARY", ROMX[$597F],BANK[$E]
-SchoolboyGroup::
-	; SCHOOLBOY_TETSUYA
-	db "てつや@", TRAINERTYPE_ITEM_MOVES
-	db  9, DEX_YADOKING, ITEM_NONE, MOVE_DISABLE, MOVE_CONFUSION, MOVE_NONE, MOVE_NONE
-	db -1 ; end
+SECTION "Trainer Parties 24 TEMPORARY", ROMX[$5795],BANK[$E]
+RocketMGroup::
 
-SECTION "Trainer Parties 30 TEMPORARY", ROMX[$598C],BANK[$E]
-FirebreatherGroup::
-	; FIREBREATHER_AKITO
-	db "あきと@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_BOOBY, ITEM_NONE, MOVE_SCRATCH, MOVE_SMOG, MOVE_NONE, MOVE_NONE
-	db -1 ; end
+SECTION "Trainer Parties 25 TEMPORARY", ROMX[$57C5],BANK[$E]
+GentlemanGroup::
 
-SECTION "Trainer Parties 31 TEMPORARY", ROMX[$5320],BANK[$E]
-BlueGroup::
+SECTION "Trainer Parties 26 TEMPORARY", ROMX[$57E9],BANK[$E]
+TeacherMGroup::
+; Leftover Bruno data from Red/Blue
+	db -1, 53, MON_IWARK, 55, MON_EBIWALAR, 55, MON_SAWAMULAR, 56, MON_IWARK, 58, MON_KAIRIKY, 0
 
-SECTION "Trainer Parties 32 TEMPORARY", ROMX[$5375],BANK[$E]
-RivalGroup::
+TeacherFGroup::
+; Leftover Brock data from Red/Blue
+	db -1, 12, MON_ISITSUBUTE, 14, MON_IWARK, 0
 
-SECTION "Trainer Parties 33 TEMPORARY", ROMX[$5404],BANK[$E]
-SakakiGroup::
+ManchildGroup::
+; Leftover Misty data from Red/Blue
+	db -1, 18, MON_HITODEMAN, 21, MON_STARMIE, 0
 
-SECTION "Trainer Parties 34 TEMPORARY", ROMX[$5427],BANK[$E]
-ProtagonistGroup::
+; Leftover Lt.Surge data from Red/Blue
+	db -1, 21, MON_BIRIRIDAMA, 18, MON_PIKACHU, 24, MON_RAICHU, 0
 
-SECTION "Trainer Parties 35 TEMPORARY", ROMX[$5433],BANK[$E]
-SibaGroup::
-KasumiGroup::
-FisherGroup::
+; Leftover Erika data from Red/Blue
+	db -1, 29, MON_UTSUBOT, 24, MON_MONJARA, 29, MON_RUFFRESIA, 0
 
-SECTION "Trainer Parties 36 TEMPORARY", ROMX[$5472],BANK[$E]
-KannaGroup::
+SwimmerFGroup::
+; Leftover Koga data from Red/Blue
+	db -1, 37, MON_DOGARS, 39, MON_BETBETON, 37, MON_DOGARS, 43, MON_MATADOGAS, 0
 
-SECTION "Trainer Parties 37 TEMPORARY", ROMX[$5566],BANK[$E]
-RocketFGroup::
+SwimmerMGroup::
+	db 10, DEX_BARIRINA, DEX_KIRINRIKI, DEX_PUCHICORN, 0
 
-SECTION "Trainer Parties 38 TEMPORARY", ROMX[$5587],BANK[$E]
-YoungsterGroup::
+SailorGroup::
+; Leftover Sabrina data from Red/Blue
+	db -1, 38, MON_YUNGERER, 37, MON_BARRIERD, 38, MON_MORPHON, 43, MON_FOODIN, 0
 
-SECTION "Trainer Parties 39 TEMPORARY", ROMX[$5658],BANK[$E]
-ProdigyGroup::
+SuperNerdGroup::
 
-SECTION "Trainer Parties 40 TEMPORARY", ROMX[$5795],BANK[$E]
-RocketMGroup::
+SECTION "Trainer Parties 27 TEMPORARY", ROMX[$583C],BANK[$E]
+EngineerGroup::
 
-SECTION "Trainer Parties 41 TEMPORARY", ROMX[$5811],BANK[$E]
-SwimmerFGroup::
+SECTION "Trainer Parties 28 TEMPORARY", ROMX[$58CC],BANK[$E]
+RockerGroup::
 
-SECTION "Trainer Parties 42 TEMPORARY", ROMX[$5820],BANK[$E]
-SailorGroup::
+SECTION "Trainer Parties 29 TEMPORARY", ROMX[$58FB],BANK[$E]
+HikerGroup::
 
-SECTION "Trainer Parties 43 TEMPORARY", ROMX[$5907],BANK[$E]
+SECTION "Trainer Parties 30 TEMPORARY", ROMX[$5907],BANK[$E]
 BikerGroup::
-
-SECTION "Trainer Parties 44 TEMPORARY", ROMX[$5956],BANK[$E]
+; Leftover Channeler data from Red/Blue
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOS, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 24, MON_GHOST, 0
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOS, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOST, 0
+	db 24, MON_GHOS, 0
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 22, MON_GHOST, 0
+	db 22, MON_GHOS, MON_GHOS, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 34, MON_GHOS, MON_GHOST, 0
+	db 38, MON_GHOST, 0
+	db 33, MON_GHOS, MON_GHOS, MON_GHOST, 0
+
+SECTION "Trainer Parties 31 TEMPORARY", ROMX[$5956],BANK[$E]
 RockClimberGroup::
+; Leftover Agatha data from Red/Blue
+	db -1, 56, MON_GANGAR, 56, MON_GOLBAT, 55, MON_GHOST, 58, MON_ARBOK, 60, MON_GANGAR, 0
 
-SECTION "Trainer Parties 45 TEMPORARY", ROMX[$5962],BANK[$E]
 BurglarGroup::
+; Leftover Lance data from Red/Blue
+	db -1, 58, MON_GYARADOS, 56, MON_HAKURYU, 56, MON_HAKURYU, 60, MON_PTERA, 62, MON_KAIRYU, 0
+
+JugglerGroup::
+	db  6, DEX_MARIL, DEX_GYOPIN, 0
 
-SECTION "Trainer Parties 46 TEMPORARY", ROMX[$5972],BANK[$E]
 BlackbeltGroup::
+	db  6, DEX_PY, DEX_GYOPIN, 0
 
-SECTION "Trainer Parties 47 TEMPORARY", ROMX[$5976],BANK[$E]
 PsychicGroup::
 KungFuMasterGroup::
 FortuneTellerGroup::
@@ -199,14 +272,39 @@ SageGroup::
 MediumGroup::
 SoldierGroup::
 GerugeMemberFGroup::
+	db 12, DEX_SHIBIREFUGU, DEX_MADAME, 0
+
+TwinsGroup::
+	db 13, DEX_MADAME, DEX_ELEBABY, DEX_MIZUUO, 0
+
+SchoolboyGroup::
+	; SCHOOLBOY_TETSUYA
+	db "てつや@", TRAINERTYPE_ITEM_MOVES
+	db  9, DEX_YADOKING, ITEM_NONE, MOVE_DISABLE, MOVE_CONFUSION, MOVE_NONE, MOVE_NONE
+	db -1 ; end
+
+FirebreatherGroup::
+	; FIREBREATHER_AKITO
+	db "あきと@", TRAINERTYPE_ITEM_MOVES
+	db 10, DEX_BOOBY, ITEM_NONE, MOVE_SCRATCH, MOVE_SMOG, MOVE_NONE, MOVE_NONE
+	db -1 ; end
 
-SECTION "Trainer Parties 48 TEMPORARY", ROMX[$5999],BANK[$E]
 SportsmanGroup::
 	; SPORTSMAN_SHIGEKI
 	db "しげき@", TRAINERTYPE_ITEM
 	db  8, DEX_DONPHAN, ITEM_NONE
 	db -1 ; end
 
+KimonoGirlGroup::
+	; KIMONO_GIRL_TAMAO
+	db "たまお@", TRAINERTYPE_ITEM_MOVES
+	db 12, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_ENCORE, MOVE_POUND, MOVE_NONE
+	db -1 ; end
+
+	; KIMONO_GIRL_KOUME
+	db "こうめ@", TRAINERTYPE_ITEM_MOVES
+	db 10, DEX_PIPPI, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
+	db -1 ; end
 else
 
 
diff --git a/data/wild.asm b/data/wild.asm
new file mode 100644
index 0000000..515985d
--- /dev/null
+++ b/data/wild.asm
@@ -0,0 +1,645 @@
+INCLUDE "constants.asm"
+
+SECTION "Wild Pokémon", ROMX[$6A3C], BANK[$0F]
+
+GrassWildMons:: ; f:6a3c
+
+	db $01, $01 ; map group, map id
+	db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+if def(GOLD)
+	db 7, DEX_SUNNY
+	db 3, DEX_SUNNY
+	db 5, DEX_SUNNY
+else
+	db 8, DEX_POPPO
+	db 8, DEX_POPPO
+	db 7, DEX_POPPO
+endc
+	db 5, DEX_PIKACHU
+	db 5, DEX_POPPO
+	db 5, DEX_POPPO
+	; day
+	db 4, DEX_KORATTA
+	db 6, DEX_KIRINRIKI
+	db 4, DEX_KIRINRIKI
+if def(GOLD)
+	db 4, DEX_HANEKO
+else
+	db 4, DEX_MARIL
+endc
+	db 4, DEX_POPPO
+	db 8, DEX_KORATTA
+	; nite
+	db 7, DEX_KORATTA
+	db 5, DEX_KORATTA
+	db 5, DEX_KORATTA
+if def(GOLD)
+	db 7, DEX_KORATTA
+	db 8, DEX_KORATTA
+else
+	db 5, DEX_HOHO
+	db 3, DEX_HOHO
+endc
+	db 5, DEX_PIKACHU
+
+	db $01, $02 ; map group, map id
+	db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+if def(GOLD)
+	db 6, DEX_SUNNY
+	db 6, DEX_SUNNY
+	db 6, DEX_SUNNY
+else
+	db 8, DEX_POPPO
+	db 8, DEX_POPPO
+	db 6, DEX_POPPO
+endc
+	db 5, DEX_PIKACHU
+	db 4, DEX_ARBO
+	db 5, DEX_KORATTA
+	; day
+	db 5, DEX_POPPO
+	db 7, DEX_YOROIDORI
+	db 5, DEX_KORATTA
+if def(GOLD)
+	db 8, DEX_HANEKO
+else
+	db 8, DEX_MARIL
+endc
+	db 4, DEX_POPPO
+	db 7, DEX_KORATTA
+	; nite
+	db 7, DEX_KORATTA
+	db 6, DEX_ARBO
+if def(GOLD)
+	db 6, DEX_KORATTA
+else
+	db 6, DEX_HOHO
+endc
+	db 7, DEX_ARBO
+	db 8, DEX_KORATTA
+	db 5, DEX_PIKACHU
+
+	db $02, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 9, DEX_CATERPIE
+	db 9, DEX_TRANSEL
+	db 8, DEX_CATERPIE
+	db 7, DEX_TRANSEL
+	db 10, DEX_POPPO
+	db 7, DEX_CATERPIE
+	; day
+	db 8, DEX_CATERPIE
+	db 9, DEX_POPPO
+	db 11, DEX_KORATTA
+	db 9, DEX_KORATTA
+	db 10, DEX_KORATTA
+	db 8, DEX_CATERPIE
+	; nite
+	db 9, DEX_KORATTA
+	db 10, DEX_HOHO
+	db 11, DEX_NAZONOKUSA
+	db 12, DEX_HOHO
+	db 11, DEX_NAZONOKUSA
+	db 13, DEX_NAZONOKUSA
+
+	db $06, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 19, DEX_METAMON
+	db 20, DEX_ONIDRILL
+	db 18, DEX_METAMON
+	db 17, DEX_TRANSEL
+	db 21, DEX_ONIDRILL
+	db 17, DEX_METAMON
+	; day
+	db 17, DEX_ONISUZUME
+	db 18, DEX_ONISUZUME
+	db 21, DEX_DODO
+	db 19, DEX_DODO
+	db 20, DEX_DODO
+	db 18, DEX_METAMON
+	; nite
+	db 19, DEX_SLEEPE
+	db 20, DEX_SLEEPE
+	db 21, DEX_SLEEPE
+	db 22, DEX_SLEEPE
+	db 23, DEX_SLEEPE
+	db 23, DEX_SLEEPE
+
+	db $04, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 12, DEX_TAMATAMA
+	db 12, DEX_KONGPANG
+	db 11, DEX_TAMATAMA
+	db 10, DEX_KONGPANG
+	db 13, DEX_ONISUZUME
+	db 10, DEX_TAMATAMA
+	; day
+	db 11, DEX_ONISUZUME
+	db 12, DEX_ONISUZUME
+	db 14, DEX_ISITSUBUTE
+	db 12, DEX_ISITSUBUTE
+	db 13, DEX_ISITSUBUTE
+	db 11, DEX_TAMATAMA
+	; nite
+	db 12, DEX_ARBO
+	db 13, DEX_ARBO
+	db 14, DEX_ARBO
+	db 15, DEX_ARBO
+	db 16, DEX_ARBO
+	db 16, DEX_ARBO
+
+	db $04, $02 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 25, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 20, DEX_MENOKURAGE
+	db 15, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 15, DEX_MENOKURAGE
+	; day
+	db 20, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 35, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	; nite
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 35, DEX_MENOKURAGE
+	db 40, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 45, DEX_MENOKURAGE
+
+	db $05, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 25, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 20, DEX_MENOKURAGE
+	db 15, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 15, DEX_MENOKURAGE
+	; day
+	db 20, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 35, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	; nite
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 35, DEX_MENOKURAGE
+	db 40, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 45, DEX_MENOKURAGE
+
+	db $05, $02 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 25, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 20, DEX_MENOKURAGE
+	db 15, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 15, DEX_MENOKURAGE
+	; day
+	db 20, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 35, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	; nite
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 35, DEX_MENOKURAGE
+	db 40, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 45, DEX_MENOKURAGE
+
+	db $05, $03 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 16, DEX_WANRIKY
+	db 16, DEX_WANRIKY
+	db 15, DEX_WANRIKY
+	db 14, DEX_WANRIKY
+	db 17, DEX_ONISUZUME
+	db 14, DEX_WANRIKY
+	; day
+	db 15, DEX_ONISUZUME
+	db 16, DEX_ONISUZUME
+	db 18, DEX_KORATTA
+	db 16, DEX_KORATTA
+	db 17, DEX_KORATTA
+	db 15, DEX_ONISUZUME
+	; nite
+	db 16, DEX_SLEEPE
+	db 17, DEX_SLEEPE
+	db 18, DEX_SLEEPE
+	db 19, DEX_SLEEPE
+	db 20, DEX_SLEEPE
+	db 20, DEX_SLEEPE
+
+	db $05, $04 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 17, DEX_ONISUZUME
+	db 17, DEX_ONISUZUME
+	db 16, DEX_ONISUZUME
+	db 15, DEX_ONISUZUME
+	db 18, DEX_DODO
+	db 15, DEX_ONISUZUME
+	; day
+	db 16, DEX_DODO
+	db 17, DEX_DONPHAN
+	db 19, DEX_SAND
+	db 17, DEX_SAND
+	db 18, DEX_SAND
+	db 16, DEX_DODO
+	; nite
+	db 17, DEX_DODO
+	db 18, DEX_DODO
+	db 19, DEX_DODO
+	db 20, DEX_DODO
+	db 21, DEX_BULU
+	db 21, DEX_BULU
+
+	db $06, $02 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 21, DEX_ONISUZUME
+	db 21, DEX_ONISUZUME
+	db 20, DEX_ONIDRILL
+	db 19, DEX_ONIDRILL
+	db 22, DEX_ONIDRILL
+	db 19, DEX_ONISUZUME
+	; day
+	db 20, DEX_DODO
+	db 22, DEX_SANDPAN
+	db 21, DEX_DONPHAN
+	db 21, DEX_SAND
+	db 23, DEX_SAND
+	db 20, DEX_DODO
+	; nite
+	db 21, DEX_DODO
+	db 22, DEX_DODO
+	db 23, DEX_DODO
+	db 24, DEX_DODO
+	db 25, DEX_BULU
+	db 25, DEX_BULU
+
+	db $06, $03 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 23, DEX_HANEKO
+	db 23, DEX_POPONEKO
+	db 22, DEX_HANEKO
+	db 25, DEX_POPONEKO
+	db 24, DEX_SAND
+	db 21, DEX_HANEKO
+	; day
+	db 22, DEX_SAND
+	db 23, DEX_SANDPAN
+	db 25, DEX_ROKON
+	db 23, DEX_ROKON
+	db 21, DEX_MIKON
+	db 22, DEX_HANEKO
+	; nite
+	db 23, DEX_HOHO
+	db 24, DEX_HOHO
+	db 25, DEX_HOHO
+	db 26, DEX_HOHO
+	db 27, DEX_BULU
+	db 27, DEX_BULU
+
+	db $07, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 24, DEX_HANEKO
+	db 24, DEX_POPONEKO
+	db 23, DEX_HANEKO
+	db 22, DEX_POPONEKO
+	db 25, DEX_POPONEKO
+	db 22, DEX_HANEKO
+	; day
+	db 23, DEX_POPPO
+	db 24, DEX_PIGEON
+	db 26, DEX_ROKON
+	db 24, DEX_ROKON
+	db 25, DEX_ROKON
+	db 23, DEX_HANEKO
+	; nite
+	db 24, DEX_HOHO
+	db 25, DEX_HOHO
+	db 26, DEX_SLEEPE
+	db 27, DEX_SLEEPE
+	db 28, DEX_SLEEPER
+	db 28, DEX_SLEEPER
+
+	db $08, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 25, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 20, DEX_MENOKURAGE
+	db 15, DEX_MENOKURAGE
+	db 35, DEX_IKARI
+	db 15, DEX_MENOKURAGE
+	; day
+	db 20, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 35, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	; nite
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 35, DEX_MENOKURAGE
+	db 40, DEX_MENOKURAGE
+	db 35, DEX_IKARI
+	db 45, DEX_MENOKURAGE
+
+	db $07, $02 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 28, DEX_HANEKO
+	db 28, DEX_POPONEKO
+	db 27, DEX_HANEKO
+	db 27, DEX_POPONEKO
+	db 30, DEX_POPONEKO
+	db 27, DEX_HANEKO
+	; day
+	db 28, DEX_POPPO
+	db 29, DEX_PIGEON
+	db 31, DEX_ROKON
+	db 29, DEX_ROKON
+	db 30, DEX_ROKON
+	db 28, DEX_HANEKO
+	; nite
+	db 29, DEX_HOHO
+	db 31, DEX_HOHO
+	db 32, DEX_SLEEPE
+	db 33, DEX_SLEEPE
+	db 34, DEX_SLEEPER
+	db 34, DEX_SLEEPER
+
+	db $07, $03 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 28, DEX_REDIBA
+	db 28, DEX_MANKEY
+	db 27, DEX_REDIBA
+	db 28, DEX_MANKEY
+	db 31, DEX_MANKEY
+	db 28, DEX_POPPO
+	; day
+	db 29, DEX_MANKEY
+	db 30, DEX_PIGEON
+	db 32, DEX_ROKON
+	db 30, DEX_WOLFMAN
+	db 31, DEX_WOLFMAN
+	db 29, DEX_REDIBA
+	; nite
+	db 30, DEX_WOLFMAN
+	db 33, DEX_WOLFMAN
+	db 34, DEX_SLEEPE
+	db 35, DEX_WOLFMAN
+	db 36, DEX_SLEEPER
+	db 36, DEX_WOLFMAN
+
+	db $09, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 29, DEX_REDIBA
+	db 29, DEX_MILTANK
+	db 28, DEX_REDIBA
+	db 29, DEX_MILTANK
+	db 32, DEX_MANKEY
+	db 29, DEX_REDIBA
+	; day
+	db 30, DEX_MANKEY
+	db 31, DEX_OKORIZARU
+	db 33, DEX_NYOROMO
+	db 31, DEX_NYOROZO
+	db 32, DEX_NYOROMO
+	db 30, DEX_REDIBA
+	; nite
+	db 31, DEX_WOLFMAN
+	db 34, DEX_WOLFMAN
+	db 35, DEX_WOLFMAN
+	db 36, DEX_WOLFMAN
+	db 37, DEX_WOLFMAN
+	db 37, DEX_WOLFMAN
+
+	db $09, $02 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 32, DEX_MILTANK
+	db 32, DEX_MILTANK
+	db 31, DEX_MILTANK
+	db 32, DEX_MILTANK
+	db 35, DEX_OKORIZARU
+	db 32, DEX_REDIBA
+	; day
+	db 33, DEX_MANKEY
+	db 34, DEX_OKORIZARU
+	db 36, DEX_NYOROMO
+	db 34, DEX_NYOROZO
+	db 35, DEX_NYOROZO
+	db 33, DEX_REDIBA
+	; nite
+	db 34, DEX_WOLFMAN
+	db 37, DEX_WOLFMAN
+	db 38, DEX_WOLFMAN
+	db 39, DEX_WOLFMAN
+	db 40, DEX_WARWOLF
+	db 40, DEX_WARWOLF
+
+	db $0a, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 29, DEX_KARAKARA
+	db 29, DEX_GARAGARA
+	db 28, DEX_KARAKARA
+	db 29, DEX_GARAGARA
+	db 32, DEX_SIHORN
+	db 29, DEX_KARAKARA
+	; day
+	db 30, DEX_SIHORN
+	db 31, DEX_SIHORN
+	db 33, DEX_YOROIDORI
+	db 31, DEX_YOROIDORI
+	db 32, DEX_YOROIDORI
+	db 30, DEX_KARAKARA
+	; nite
+	db 31, DEX_ARBO
+	db 34, DEX_ARBO
+	db 35, DEX_ARBOK
+	db 36, DEX_ARBOK
+	db 37, DEX_ARBO
+	db 37, DEX_ARBOK
+
+	db $0b, $01 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 28, DEX_PICHU
+	db 28, DEX_PICHU
+	db 27, DEX_PIKACHU
+	db 28, DEX_NAZONOKUSA
+	db 31, DEX_KUSAIHANA
+	db 28, DEX_PIKACHU
+	; day
+	db 29, DEX_NAZONOKUSA
+	db 30, DEX_PAINTER
+	db 32, DEX_NYARTH
+	db 32, DEX_RATTA
+	db 31, DEX_NYARTH
+	db 29, DEX_NAZONOKUSA
+	; nite
+	db 31, DEX_RATTA
+	db 33, DEX_ARBO
+	db 34, DEX_ARBOK
+	db 35, DEX_ARBOK
+	db 36, DEX_ARBO
+	db 36, DEX_ARBOK
+
+	db $01, $03 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 29, DEX_PICHU
+	db 29, DEX_PICHU
+	db 28, DEX_PIKACHU
+	db 29, DEX_NAZONOKUSA
+	db 32, DEX_KUSAIHANA
+	db 27, DEX_PIKACHU
+	; day
+	db 28, DEX_NAZONOKUSA
+	db 29, DEX_PAINTER
+	db 32, DEX_NYARTH
+	db 32, DEX_RATTA
+	db 30, DEX_NYARTH
+	db 28, DEX_NAZONOKUSA
+	; nite
+	db 30, DEX_RATTA
+	db 32, DEX_HOHO
+	db 33, DEX_ARBO
+	db 34, DEX_HOHO
+	db 35, DEX_ARBOK
+	db 35, DEX_HOHO
+
+	db $05, $05 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 25, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 20, DEX_MENOKURAGE
+	db 15, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 15, DEX_MENOKURAGE
+	; day
+	db 20, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 35, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	; nite
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 35, DEX_MENOKURAGE
+	db 40, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 45, DEX_MENOKURAGE
+
+	db $05, $06 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 25, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 20, DEX_MENOKURAGE
+	db 15, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 15, DEX_MENOKURAGE
+	; day
+	db 20, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 35, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	; nite
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 35, DEX_MENOKURAGE
+	db 40, DEX_MENOKURAGE
+	db 35, DEX_HANEEI
+	db 45, DEX_MENOKURAGE
+
+	db $09, $03 ; map group, map id
+	db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite
+	; morn
+	db 25, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 20, DEX_MENOKURAGE
+	db 15, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 15, DEX_MENOKURAGE
+	; day
+	db 20, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 35, DEX_MENOKURAGE
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	; nite
+	db 25, DEX_MENOKURAGE
+	db 30, DEX_MENOKURAGE
+	db 35, DEX_MENOKURAGE
+	db 40, DEX_MENOKURAGE
+	db 35, DEX_DOKUKURAGE
+	db 45, DEX_MENOKURAGE
+
+	db $01, $0F ; map group, map id
+	db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+	db 7, DEX_REDIBA
+	db 7, DEX_REDIBA
+	db 5, DEX_TRANSEL
+	db 5, DEX_PIKACHU
+	db 7, DEX_POPPO
+	db 5, DEX_POPPO
+	; day
+	db 6, DEX_POPPO
+	db 4, DEX_CATERPIE
+	db 6, DEX_CATERPIE
+if def(GOLD)
+	db 6, DEX_HANEKO
+else
+	db 6, DEX_MARIL
+endc
+	db 5, DEX_CATERPIE
+	db 8, DEX_REDIBA
+	; nite
+	db 4, DEX_TRANSEL
+	db 6, DEX_KORATTA
+if def(GOLD)
+	db 6, DEX_CATERPIE
+else
+	db 5, DEX_HOHO
+endc
+	db 6, DEX_REDIBA
+	db 5, DEX_TRANSEL
+	db 5, DEX_PIKACHU
+
+	db $FF
+; f:6e3e