Merge remote-tracking branch 'origin/master'

4 files changed, 658 insertions, 62 deletions

diff --git a/data/data2.s b/data/data2.s
index 4d1123f7a..207e9840b 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -764,8 +764,8 @@ gUnknown_081ECACC:: @ 81ECACC
 @ 81ECAFC
 	.include "data/graphics/trainers/back_pic_palette_table.s"
 
-gUnknown_081ECB14:: @ 81ECB14
-	.incbin "baserom.gba", 0x001ecb14, 0x19C
+@ 81ECB14
+	.include "data/enemy_mon_elevation.s"
 
 @ 81ECCB0
 	.include "data/trainer_parties.s"
@@ -987,9 +987,8 @@ gSpriteAffineAnimTable_81F971C:: @ 81F971C
 @ 81F9870
 	.include "data/text/type_names.s"
 
-	.align 2
-gUnknown_081F98F0:: @ 81F98F0
-	.incbin "baserom.gba", 0x001f98f0, 0xdc
+@ 81F98F0
+	.include "data/trainer_money.s"
 
 @ 81F99CC
 	.include "data/text/ability_descriptions.s"
@@ -1335,14 +1334,93 @@ gUnknown_081FA73C:: @ 81FA73C
 	.4byte sub_802BF48
 	.4byte sub_802BF54
 
-gUnknown_081FAB1C:: @ 81FAB1C
-	.incbin "baserom.gba", 0x001fab1c, 0x34
-
-gUnknown_081FAB50:: @ 81FAB50
-	.incbin "baserom.gba", 0x001fab50, 0xc
+	.align 2
+gAccuracyStageRatios:: @ 81FAB1C
+	.byte  33, 100, 0, 0 @ -6
+	.byte  36, 100, 0, 0 @ -5
+	.byte  43, 100, 0, 0 @ -4
+	.byte  50, 100, 0, 0 @ -3
+	.byte  60, 100, 0, 0 @ -2
+	.byte  75, 100, 0, 0 @ -1
+	.byte   1,   1, 0, 0 @  0
+	.byte 133, 100, 0, 0 @ +1
+	.byte 166, 100, 0, 0 @ +2
+	.byte   2,   1, 0, 0 @ +3
+	.byte 233, 100, 0, 0 @ +4
+	.byte 133,  50, 0, 0 @ +5
+	.byte   3,   1, 0, 0 @ +6
+
+@ The chance is 1/N for each stage.
+	.align 1
+gCriticalHitChance:: @ 81FAB50
+	.2byte 16 @ +0
+	.2byte  8 @ +1
+	.2byte  4 @ +2
+	.2byte  3 @ +3
+	.2byte  2 @ +4
 
+	.align 2
 gUnknown_081FAB5C:: @ 81FAB5C
-	.incbin "baserom.gba", 0x001fab5c, 0xf0
+	.4byte 0x00000000
+	.4byte 0x00000007
+	.4byte 0x00000008
+	.4byte 0x00000010
+	.4byte 0x00000020
+	.4byte 0x00000040
+	.4byte 0x00000080
+	.4byte 0x00000007
+	.4byte 0x00000008
+	.4byte 0x00000000
+	.4byte 0x00000070
+	.4byte 0x00000000
+	.4byte 0x00001000
+	.4byte 0x0000E000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00400000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x04000000
+	.4byte 0x08000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000C00
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
+	.4byte 0x00000000
 
 	.align 2
 gUnknown_081FAC4C:: @ 81FAC4C
@@ -1386,13 +1464,20 @@ gUnknown_081FAC4C:: @ 81FAC4C
 	.4byte BattleScript_1D963E
 	.4byte BattleScript_1D96C8
 
-	.incbin "baserom.gba", 0x001face8, 0x7
+@ unreferenced bit masks
+	.byte 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F
 
-gUnknown_081FACEF:: @ 81FACEF
-	.incbin "baserom.gba", 0x001facef, 0x7
+gLevelUpStatBoxStats:: @ 81FACEF
+	.byte 0x3A @ HP
+	.byte 0x3E @ Sp. Attack
+	.byte 0x3B @ Attack
+	.byte 0x3F @ Sp. Defense
+	.byte 0x3C @ Defense
+	.byte 0x3D @ Speed
 
-gUnknown_081FACF6:: @ 81FACF6
-	.incbin "baserom.gba", 0x001facf6, 0x8
+	.align 1
+gProtectSuccessRates:: @ 81FACF6
+	.2byte 0xFFFF, 0x7FFF, 0x3FFF, 0x1FFF
 
 	.align 1
 gUnknown_081FACFE:: @ 81FACFE
@@ -1463,11 +1548,25 @@ gPickupItems:: @ 81FAD5E
 	.2byte ITEM_PP_UP, 99
 	.2byte ITEM_KINGS_ROCK, 1
 
-gUnknown_081FAD86:: @ 81FAD86
-	.incbin "baserom.gba", 0x001fad86, 0xa
+gTerrainToType:: @ 81FAD86
+	.byte TYPE_GRASS  @ tall grass
+	.byte TYPE_GRASS  @ long grass
+	.byte TYPE_GROUND @ sand
+	.byte TYPE_WATER  @ underwater
+	.byte TYPE_WATER  @ water
+	.byte TYPE_WATER  @ pond water
+	.byte TYPE_ROCK   @ rock
+	.byte TYPE_ROCK   @ cave
+	.byte TYPE_NORMAL @ building
+	.byte TYPE_NORMAL @ plain
+
+gBallCatchBonuses:: @ 81FAD90
+	.byte 20 @ Ultra Ball
+	.byte 15 @ Great Ball
+	.byte 10 @ Poké Ball
+	.byte 15 @ Safari Ball
 
-gUnknown_081FAD90:: @ 81FAD90
-	.incbin "baserom.gba", 0x001fad90, 0x8
+	.string "ターン$" @ "turn"
 
 	.align 2
 gUnknown_081FAD98:: @ 81FAD98
@@ -1685,7 +1784,8 @@ gUnknown_081FAF5C:: @ 81FAF5C
 	.4byte sub_8035FA4
 	.4byte nullsub_46
 
-	.incbin "baserom.gba", 0x001fb040, 0x8
+@ unreferenced unknown values
+	.byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
 
 	.align 2
 gUnknown_081FB048:: @ 81FB048
@@ -1933,8 +2033,26 @@ gBitTable:: @ 820872C
 gSpriteTemplate_82087AC:: @ 82087AC
 	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+@ sprite dimensions
+	.align 2
 gUnknown_082087C4:: @ 82087C4
-	.incbin "baserom.gba", 0x002087c4, 0x18
+	@ square
+	.byte 1, 1
+	.byte 2, 2
+	.byte 4, 4
+	.byte 8, 8
+
+	@ horizontal rectangle
+	.byte 2, 1
+	.byte 4, 1
+	.byte 4, 2
+	.byte 8, 4
+
+	@ vertical rectangle
+	.byte 1, 2
+	.byte 1, 4
+	.byte 2, 4
+	.byte 4, 8
 
 @ 82087DC
 	.include "data/crc16_table.s"
@@ -2051,8 +2169,28 @@ gSpriteAnimTable_820A408:: @ 820A408
 gSpriteTemplate_820A418:: @ 820A418
 	spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, sub_80435A4
 
-gUnknown_0820A430:: @ 820A430
-	.incbin "baserom.gba", 0x0020a430, 0x4c
+@ The values are Q8.8 fixed-point numbers.
+	.align 1
+gEggShardVelocities:: @ 820A430
+	.2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
+	.2byte 0xFB00, 0xFD00 @ (-5, -3)
+	.2byte 0x0380, 0xFD00 @ (3.5, -3)
+	.2byte 0xFC00, 0xFC40 @ (-4, -3.75)
+	.2byte 0x0200, 0xFE80 @ (2, -1.5)
+	.2byte 0xFF80, 0xF940 @ (-0.5, -6.75)
+	.2byte 0x0500, 0xFDC0 @ (5, -2.25)
+	.2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
+	.2byte 0x0480, 0xFE80 @ (4.5, -1.5)
+	.2byte 0xFF00, 0xF940 @ (-1, -6.75)
+	.2byte 0x0400, 0xFDC0 @ (4, -2.25)
+	.2byte 0xFC80, 0xFC40 @ (-3.5, -3.75)
+	.2byte 0x0100, 0xFE80 @ (1, -1.5)
+	.2byte 0xFC7C, 0xF940 @ (-3.515625, -6.75)
+	.2byte 0x0480, 0xFDC0 @ (4.5, -2.25)
+	.2byte 0xFF80, 0xF880 @ (-0.5, -7.5)
+	.2byte 0x0100, 0xFB80 @ (1, -4.5)
+	.2byte 0xFD80, 0xFDC0 @ (-2.5, -2.25)
+	.2byte 0x0280, 0xF880 @ (2.5, -7.5)
 
 	.align 2
 gUnknown_0820A47C:: @ 820A47C
@@ -2215,8 +2353,8 @@ gSubspriteTables_820A6E4:: @ 820A6E4
 gSubspriteTables_820A6EC:: @ 820A6EC
 	.4byte 6, gSubspriteTable_820A6B4
 
-@ unreferenced; possibly tiles
-	.incbin "baserom.gba", 0x0020a6f4, 0x60
+@ unused dakuten/handakuten tiles
+	.incbin "graphics/unused/dakuten.4bpp"
 
 	.align 2
 gUnknown_0820A754:: @ 820A754
@@ -2502,20 +2640,28 @@ gSpriteTemplate_820AAB4:: @ 820AAB4
 	spr_template 55011, 55011, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
 
 	.align 2
-	.incbin "baserom.gba", 0x0020abd4, 0x1c
+	.byte 0x90, 0x08, 0x00, 0x00
+	.byte 0xC0, 0x3A, 0x00, 0x00
+	.byte 0x1C, 0x00, 0x00, 0x00
+	.byte 0x30, 0x05, 0x00, 0x00
+	.byte 0x24, 0x00, 0x00, 0x00
+	.byte 0x64, 0x00, 0x00, 0x00
+	.byte 0xD8, 0x04, 0x00, 0x00
 
-gUnknown_0820ABF0:: @ 820ABF0
-	.incbin "baserom.gba", 0x0020abf0, 0x1fe
+	.align 1
+gTradeMovesBoxTilemap:: @ 820ABF0
+	.incbin "graphics/trade/moves_box_map.bin"
 
-gUnknown_0820ADEE:: @ 820ADEE
-	.incbin "baserom.gba", 0x0020adee, 0x1fe
+	.align 1
+gTradePartyBoxTilemap:: @ 820ADEE
+	.incbin "graphics/trade/party_box_map.bin"
 
 	.align 2
-gUnknown_0820AFEC:: @ 820AFEC
+gTradeStripesBG2Tilemap:: @ 820AFEC
 	.incbin "graphics/trade/stripes_bg2_map.bin"
 
 	.align 2
-gUnknown_0820B7EC:: @ 820B7EC
+gTradeStripesBG3Tilemap:: @ 820B7EC
 	.incbin "graphics/trade/stripes_bg3_map.bin"
 
 	.align 2
diff --git a/data/enemy_mon_elevation.s b/data/enemy_mon_elevation.s
new file mode 100644
index 000000000..7e13f20d5
--- /dev/null
+++ b/data/enemy_mon_elevation.s
@@ -0,0 +1,415 @@
+@ This determines how much higher above the usual position the enemy Pokémon
+@ is during battle. Species that float or fly have nonzero values.
+gEnemyMonElevation:: @ 81ECB14
+	.byte  0 @ 0
+	.byte  0 @ SPECIES_BULBASAUR
+	.byte  0 @ SPECIES_IVYSAUR
+	.byte  0 @ SPECIES_VENUSAUR
+	.byte  0 @ SPECIES_CHARMANDER
+	.byte  0 @ SPECIES_CHARMELEON
+	.byte  0 @ SPECIES_CHARIZARD
+	.byte  0 @ SPECIES_SQUIRTLE
+	.byte  0 @ SPECIES_WARTORTLE
+	.byte  0 @ SPECIES_BLASTOISE
+	.byte  0 @ SPECIES_CATERPIE
+	.byte  0 @ SPECIES_METAPOD
+	.byte  8 @ SPECIES_BUTTERFREE
+	.byte  0 @ SPECIES_WEEDLE
+	.byte  0 @ SPECIES_KAKUNA
+	.byte  8 @ SPECIES_BEEDRILL
+	.byte 16 @ SPECIES_PIDGEY
+	.byte  0 @ SPECIES_PIDGEOTTO
+	.byte  4 @ SPECIES_PIDGEOT
+	.byte  0 @ SPECIES_RATTATA
+	.byte  0 @ SPECIES_RATICATE
+	.byte  0 @ SPECIES_SPEAROW
+	.byte  4 @ SPECIES_FEAROW
+	.byte  0 @ SPECIES_EKANS
+	.byte  0 @ SPECIES_ARBOK
+	.byte  0 @ SPECIES_PIKACHU
+	.byte  0 @ SPECIES_RAICHU
+	.byte  0 @ SPECIES_SANDSHREW
+	.byte  0 @ SPECIES_SANDSLASH
+	.byte  0 @ SPECIES_NIDORAN_F
+	.byte  0 @ SPECIES_NIDORINA
+	.byte  0 @ SPECIES_NIDOQUEEN
+	.byte  0 @ SPECIES_NIDORAN_M
+	.byte  0 @ SPECIES_NIDORINO
+	.byte  0 @ SPECIES_NIDOKING
+	.byte  0 @ SPECIES_CLEFAIRY
+	.byte  0 @ SPECIES_CLEFABLE
+	.byte  0 @ SPECIES_VULPIX
+	.byte  0 @ SPECIES_NINETALES
+	.byte  0 @ SPECIES_JIGGLYPUFF
+	.byte  0 @ SPECIES_WIGGLYTUFF
+	.byte  8 @ SPECIES_ZUBAT
+	.byte  8 @ SPECIES_GOLBAT
+	.byte  0 @ SPECIES_ODDISH
+	.byte  0 @ SPECIES_GLOOM
+	.byte  0 @ SPECIES_VILEPLUME
+	.byte  0 @ SPECIES_PARAS
+	.byte  0 @ SPECIES_PARASECT
+	.byte  0 @ SPECIES_VENONAT
+	.byte  8 @ SPECIES_VENOMOTH
+	.byte  0 @ SPECIES_DIGLETT
+	.byte  0 @ SPECIES_DUGTRIO
+	.byte  0 @ SPECIES_MEOWTH
+	.byte  0 @ SPECIES_PERSIAN
+	.byte  0 @ SPECIES_PSYDUCK
+	.byte  0 @ SPECIES_GOLDUCK
+	.byte  0 @ SPECIES_MANKEY
+	.byte  0 @ SPECIES_PRIMEAPE
+	.byte  0 @ SPECIES_GROWLITHE
+	.byte  0 @ SPECIES_ARCANINE
+	.byte  0 @ SPECIES_POLIWAG
+	.byte  0 @ SPECIES_POLIWHIRL
+	.byte  0 @ SPECIES_POLIWRATH
+	.byte  0 @ SPECIES_ABRA
+	.byte  0 @ SPECIES_KADABRA
+	.byte  0 @ SPECIES_ALAKAZAM
+	.byte  0 @ SPECIES_MACHOP
+	.byte  0 @ SPECIES_MACHOKE
+	.byte  0 @ SPECIES_MACHAMP
+	.byte  0 @ SPECIES_BELLSPROUT
+	.byte  0 @ SPECIES_WEEPINBELL
+	.byte  0 @ SPECIES_VICTREEBEL
+	.byte  0 @ SPECIES_TENTACOOL
+	.byte  0 @ SPECIES_TENTACRUEL
+	.byte 16 @ SPECIES_GEODUDE
+	.byte  0 @ SPECIES_GRAVELER
+	.byte  0 @ SPECIES_GOLEM
+	.byte  0 @ SPECIES_PONYTA
+	.byte  0 @ SPECIES_RAPIDASH
+	.byte  0 @ SPECIES_SLOWPOKE
+	.byte  0 @ SPECIES_SLOWBRO
+	.byte 16 @ SPECIES_MAGNEMITE
+	.byte  8 @ SPECIES_MAGNETON
+	.byte  0 @ SPECIES_FARFETCHD
+	.byte  0 @ SPECIES_DODUO
+	.byte  0 @ SPECIES_DODRIO
+	.byte  0 @ SPECIES_SEEL
+	.byte  0 @ SPECIES_DEWGONG
+	.byte  0 @ SPECIES_GRIMER
+	.byte  0 @ SPECIES_MUK
+	.byte  0 @ SPECIES_SHELLDER
+	.byte  0 @ SPECIES_CLOYSTER
+	.byte  4 @ SPECIES_GASTLY
+	.byte  4 @ SPECIES_HAUNTER
+	.byte  0 @ SPECIES_GENGAR
+	.byte  0 @ SPECIES_ONIX
+	.byte  0 @ SPECIES_DROWZEE
+	.byte  0 @ SPECIES_HYPNO
+	.byte  0 @ SPECIES_KRABBY
+	.byte  0 @ SPECIES_KINGLER
+	.byte 10 @ SPECIES_VOLTORB
+	.byte 12 @ SPECIES_ELECTRODE
+	.byte  0 @ SPECIES_EXEGGCUTE
+	.byte  0 @ SPECIES_EXEGGUTOR
+	.byte  0 @ SPECIES_CUBONE
+	.byte  0 @ SPECIES_MAROWAK
+	.byte  0 @ SPECIES_HITMONLEE
+	.byte  0 @ SPECIES_HITMONCHAN
+	.byte  0 @ SPECIES_LICKITUNG
+	.byte  8 @ SPECIES_KOFFING
+	.byte  6 @ SPECIES_WEEZING
+	.byte  0 @ SPECIES_RHYHORN
+	.byte  0 @ SPECIES_RHYDON
+	.byte  0 @ SPECIES_CHANSEY
+	.byte  0 @ SPECIES_TANGELA
+	.byte  0 @ SPECIES_KANGASKHAN
+	.byte  0 @ SPECIES_HORSEA
+	.byte  0 @ SPECIES_SEADRA
+	.byte  0 @ SPECIES_GOLDEEN
+	.byte  0 @ SPECIES_SEAKING
+	.byte  0 @ SPECIES_STARYU
+	.byte  0 @ SPECIES_STARMIE
+	.byte  0 @ SPECIES_MR_MIME
+	.byte  0 @ SPECIES_SCYTHER
+	.byte  0 @ SPECIES_JYNX
+	.byte  0 @ SPECIES_ELECTABUZZ
+	.byte  0 @ SPECIES_MAGMAR
+	.byte  0 @ SPECIES_PINSIR
+	.byte  0 @ SPECIES_TAUROS
+	.byte  0 @ SPECIES_MAGIKARP
+	.byte  0 @ SPECIES_GYARADOS
+	.byte  0 @ SPECIES_LAPRAS
+	.byte  0 @ SPECIES_DITTO
+	.byte  0 @ SPECIES_EEVEE
+	.byte  0 @ SPECIES_VAPOREON
+	.byte  0 @ SPECIES_JOLTEON
+	.byte  0 @ SPECIES_FLAREON
+	.byte  0 @ SPECIES_PORYGON
+	.byte  0 @ SPECIES_OMANYTE
+	.byte  0 @ SPECIES_OMASTAR
+	.byte  0 @ SPECIES_KABUTO
+	.byte  0 @ SPECIES_KABUTOPS
+	.byte  6 @ SPECIES_AERODACTYL
+	.byte  0 @ SPECIES_SNORLAX
+	.byte  6 @ SPECIES_ARTICUNO
+	.byte  8 @ SPECIES_ZAPDOS
+	.byte  5 @ SPECIES_MOLTRES
+	.byte  0 @ SPECIES_DRATINI
+	.byte  0 @ SPECIES_DRAGONAIR
+	.byte  3 @ SPECIES_DRAGONITE
+	.byte  0 @ SPECIES_MEWTWO
+	.byte  8 @ SPECIES_MEW
+	.byte  0 @ SPECIES_CHIKORITA
+	.byte  0 @ SPECIES_BAYLEEF
+	.byte  0 @ SPECIES_MEGANIUM
+	.byte  0 @ SPECIES_CYNDAQUIL
+	.byte  0 @ SPECIES_QUILAVA
+	.byte  0 @ SPECIES_TYPHLOSION
+	.byte  0 @ SPECIES_TOTODILE
+	.byte  0 @ SPECIES_CROCONAW
+	.byte  0 @ SPECIES_FERALIGATR
+	.byte  0 @ SPECIES_SENTRET
+	.byte  0 @ SPECIES_FURRET
+	.byte  0 @ SPECIES_HOOTHOOT
+	.byte  0 @ SPECIES_NOCTOWL
+	.byte  0 @ SPECIES_LEDYBA
+	.byte  8 @ SPECIES_LEDIAN
+	.byte  0 @ SPECIES_SPINARAK
+	.byte  0 @ SPECIES_ARIADOS
+	.byte  6 @ SPECIES_CROBAT
+	.byte  0 @ SPECIES_CHINCHOU
+	.byte  0 @ SPECIES_LANTURN
+	.byte  0 @ SPECIES_PICHU
+	.byte  0 @ SPECIES_CLEFFA
+	.byte  0 @ SPECIES_IGGLYBUFF
+	.byte  0 @ SPECIES_TOGEPI
+	.byte  0 @ SPECIES_TOGETIC
+	.byte  0 @ SPECIES_NATU
+	.byte  0 @ SPECIES_XATU
+	.byte  0 @ SPECIES_MAREEP
+	.byte  0 @ SPECIES_FLAAFFY
+	.byte  0 @ SPECIES_AMPHAROS
+	.byte  0 @ SPECIES_BELLOSSOM
+	.byte  0 @ SPECIES_MARILL
+	.byte  0 @ SPECIES_AZUMARILL
+	.byte  0 @ SPECIES_SUDOWOODO
+	.byte  0 @ SPECIES_POLITOED
+	.byte 11 @ SPECIES_HOPPIP
+	.byte 12 @ SPECIES_SKIPLOOM
+	.byte  6 @ SPECIES_JUMPLUFF
+	.byte  0 @ SPECIES_AIPOM
+	.byte  0 @ SPECIES_SUNKERN
+	.byte  0 @ SPECIES_SUNFLORA
+	.byte  8 @ SPECIES_YANMA
+	.byte  0 @ SPECIES_WOOPER
+	.byte  0 @ SPECIES_QUAGSIRE
+	.byte  0 @ SPECIES_ESPEON
+	.byte  0 @ SPECIES_UMBREON
+	.byte  0 @ SPECIES_MURKROW
+	.byte  0 @ SPECIES_SLOWKING
+	.byte  8 @ SPECIES_MISDREAVUS
+	.byte  5 @ SPECIES_UNOWN
+	.byte  0 @ SPECIES_WOBBUFFET
+	.byte  0 @ SPECIES_GIRAFARIG
+	.byte  0 @ SPECIES_PINECO
+	.byte  0 @ SPECIES_FORRETRESS
+	.byte  0 @ SPECIES_DUNSPARCE
+	.byte  6 @ SPECIES_GLIGAR
+	.byte  0 @ SPECIES_STEELIX
+	.byte  0 @ SPECIES_SNUBBULL
+	.byte  0 @ SPECIES_GRANBULL
+	.byte  0 @ SPECIES_QWILFISH
+	.byte  0 @ SPECIES_SCIZOR
+	.byte  0 @ SPECIES_SHUCKLE
+	.byte  0 @ SPECIES_HERACROSS
+	.byte  0 @ SPECIES_SNEASEL
+	.byte  0 @ SPECIES_TEDDIURSA
+	.byte  0 @ SPECIES_URSARING
+	.byte  0 @ SPECIES_SLUGMA
+	.byte  0 @ SPECIES_MAGCARGO
+	.byte  0 @ SPECIES_SWINUB
+	.byte  0 @ SPECIES_PILOSWINE
+	.byte  0 @ SPECIES_CORSOLA
+	.byte  0 @ SPECIES_REMORAID
+	.byte  0 @ SPECIES_OCTILLERY
+	.byte  0 @ SPECIES_DELIBIRD
+	.byte  0 @ SPECIES_MANTINE
+	.byte  0 @ SPECIES_SKARMORY
+	.byte  0 @ SPECIES_HOUNDOUR
+	.byte  0 @ SPECIES_HOUNDOOM
+	.byte  0 @ SPECIES_KINGDRA
+	.byte  0 @ SPECIES_PHANPY
+	.byte  0 @ SPECIES_DONPHAN
+	.byte  0 @ SPECIES_PORYGON2
+	.byte  0 @ SPECIES_STANTLER
+	.byte  0 @ SPECIES_SMEARGLE
+	.byte  0 @ SPECIES_TYROGUE
+	.byte  0 @ SPECIES_HITMONTOP
+	.byte  0 @ SPECIES_SMOOCHUM
+	.byte  0 @ SPECIES_ELEKID
+	.byte  0 @ SPECIES_MAGBY
+	.byte  0 @ SPECIES_MILTANK
+	.byte  0 @ SPECIES_BLISSEY
+	.byte  0 @ SPECIES_RAIKOU
+	.byte  0 @ SPECIES_ENTEI
+	.byte  0 @ SPECIES_SUICUNE
+	.byte  0 @ SPECIES_LARVITAR
+	.byte  0 @ SPECIES_PUPITAR
+	.byte  0 @ SPECIES_TYRANITAR
+	.byte  3 @ SPECIES_LUGIA
+	.byte  6 @ SPECIES_HO_OH
+	.byte 15 @ SPECIES_CELEBI
+	.byte  0 @ 252
+	.byte  0 @ 253
+	.byte  0 @ 254
+	.byte  0 @ 255
+	.byte  0 @ 256
+	.byte  0 @ 257
+	.byte  0 @ 258
+	.byte  0 @ 259
+	.byte  0 @ 260
+	.byte  0 @ 261
+	.byte  0 @ 262
+	.byte  0 @ 263
+	.byte  0 @ 264
+	.byte  0 @ 265
+	.byte  0 @ 266
+	.byte  0 @ 267
+	.byte  0 @ 268
+	.byte  0 @ 269
+	.byte  0 @ 270
+	.byte  0 @ 271
+	.byte  0 @ 272
+	.byte  0 @ 273
+	.byte  0 @ 274
+	.byte  0 @ 275
+	.byte  0 @ 276
+	.byte  0 @ SPECIES_TREECKO
+	.byte  0 @ SPECIES_GROVYLE
+	.byte  0 @ SPECIES_SCEPTILE
+	.byte  0 @ SPECIES_TORCHIC
+	.byte  0 @ SPECIES_COMBUSKEN
+	.byte  0 @ SPECIES_BLAZIKEN
+	.byte  0 @ SPECIES_MUDKIP
+	.byte  0 @ SPECIES_MARSHTOMP
+	.byte  0 @ SPECIES_SWAMPERT
+	.byte  0 @ SPECIES_POOCHYENA
+	.byte  0 @ SPECIES_MIGHTYENA
+	.byte  0 @ SPECIES_ZIGZAGOON
+	.byte  0 @ SPECIES_LINOONE
+	.byte  0 @ SPECIES_WURMPLE
+	.byte  0 @ SPECIES_SILCOON
+	.byte  8 @ SPECIES_BEAUTIFLY
+	.byte  0 @ SPECIES_CASCOON
+	.byte 10 @ SPECIES_DUSTOX
+	.byte  0 @ SPECIES_LOTAD
+	.byte  0 @ SPECIES_LOMBRE
+	.byte  0 @ SPECIES_LUDICOLO
+	.byte  0 @ SPECIES_SEEDOT
+	.byte  0 @ SPECIES_NUZLEAF
+	.byte  0 @ SPECIES_SHIFTRY
+	.byte  0 @ SPECIES_NINCADA
+	.byte 10 @ SPECIES_NINJASK
+	.byte  8 @ SPECIES_SHEDINJA
+	.byte  0 @ SPECIES_TAILLOW
+	.byte  0 @ SPECIES_SWELLOW
+	.byte  0 @ SPECIES_SHROOMISH
+	.byte  0 @ SPECIES_BRELOOM
+	.byte  0 @ SPECIES_SPINDA
+	.byte 16 @ SPECIES_WINGULL
+	.byte  8 @ SPECIES_PELIPPER
+	.byte  0 @ SPECIES_SURSKIT
+	.byte 10 @ SPECIES_MASQUERAIN
+	.byte  0 @ SPECIES_WAILMER
+	.byte  0 @ SPECIES_WAILORD
+	.byte  0 @ SPECIES_SKITTY
+	.byte  0 @ SPECIES_DELCATTY
+	.byte  0 @ SPECIES_KECLEON
+	.byte  4 @ SPECIES_BALTOY
+	.byte  4 @ SPECIES_CLAYDOL
+	.byte  0 @ SPECIES_NOSEPASS
+	.byte  0 @ SPECIES_TORKOAL
+	.byte  0 @ SPECIES_SABLEYE
+	.byte  0 @ SPECIES_BARBOACH
+	.byte  0 @ SPECIES_WHISCASH
+	.byte  0 @ SPECIES_LUVDISC
+	.byte  0 @ SPECIES_CORPHISH
+	.byte  0 @ SPECIES_CRAWDAUNT
+	.byte  0 @ SPECIES_FEEBAS
+	.byte  0 @ SPECIES_MILOTIC
+	.byte  0 @ SPECIES_CARVANHA
+	.byte  0 @ SPECIES_SHARPEDO
+	.byte  0 @ SPECIES_TRAPINCH
+	.byte  0 @ SPECIES_VIBRAVA
+	.byte  3 @ SPECIES_FLYGON
+	.byte  0 @ SPECIES_MAKUHITA
+	.byte  0 @ SPECIES_HARIYAMA
+	.byte  0 @ SPECIES_ELECTRIKE
+	.byte  0 @ SPECIES_MANECTRIC
+	.byte  0 @ SPECIES_NUMEL
+	.byte  0 @ SPECIES_CAMERUPT
+	.byte  0 @ SPECIES_SPHEAL
+	.byte  0 @ SPECIES_SEALEO
+	.byte  0 @ SPECIES_WALREIN
+	.byte  0 @ SPECIES_CACNEA
+	.byte  0 @ SPECIES_CACTURNE
+	.byte  0 @ SPECIES_SNORUNT
+	.byte 12 @ SPECIES_GLALIE
+	.byte 13 @ SPECIES_LUNATONE
+	.byte  4 @ SPECIES_SOLROCK
+	.byte  0 @ SPECIES_AZURILL
+	.byte  0 @ SPECIES_SPOINK
+	.byte  0 @ SPECIES_GRUMPIG
+	.byte  0 @ SPECIES_PLUSLE
+	.byte  0 @ SPECIES_MINUN
+	.byte  0 @ SPECIES_MAWILE
+	.byte  0 @ SPECIES_MEDITITE
+	.byte  0 @ SPECIES_MEDICHAM
+	.byte 12 @ SPECIES_SWABLU
+	.byte  8 @ SPECIES_ALTARIA
+	.byte  0 @ SPECIES_WYNAUT
+	.byte  4 @ SPECIES_DUSKULL
+	.byte  0 @ SPECIES_DUSCLOPS
+	.byte  0 @ SPECIES_ROSELIA
+	.byte  0 @ SPECIES_SLAKOTH
+	.byte  0 @ SPECIES_VIGOROTH
+	.byte  0 @ SPECIES_SLAKING
+	.byte  0 @ SPECIES_GULPIN
+	.byte  0 @ SPECIES_SWALOT
+	.byte  0 @ SPECIES_TROPIUS
+	.byte  0 @ SPECIES_WHISMUR
+	.byte  0 @ SPECIES_LOUDRED
+	.byte  0 @ SPECIES_EXPLOUD
+	.byte  0 @ SPECIES_CLAMPERL
+	.byte  0 @ SPECIES_HUNTAIL
+	.byte  0 @ SPECIES_GOREBYSS
+	.byte  0 @ SPECIES_ABSOL
+	.byte 12 @ SPECIES_SHUPPET
+	.byte  8 @ SPECIES_BANETTE
+	.byte  0 @ SPECIES_SEVIPER
+	.byte  0 @ SPECIES_ZANGOOSE
+	.byte  0 @ SPECIES_RELICANTH
+	.byte  0 @ SPECIES_ARON
+	.byte  0 @ SPECIES_LAIRON
+	.byte  0 @ SPECIES_AGGRON
+	.byte 16 @ SPECIES_CASTFORM
+	.byte  0 @ SPECIES_VOLBEAT
+	.byte  0 @ SPECIES_ILLUMISE
+	.byte  0 @ SPECIES_LILEEP
+	.byte  0 @ SPECIES_CRADILY
+	.byte  0 @ SPECIES_ANORITH
+	.byte  0 @ SPECIES_ARMALDO
+	.byte  0 @ SPECIES_RALTS
+	.byte  0 @ SPECIES_KIRLIA
+	.byte  0 @ SPECIES_GARDEVOIR
+	.byte  0 @ SPECIES_BAGON
+	.byte  0 @ SPECIES_SHELGON
+	.byte  0 @ SPECIES_SALAMENCE
+	.byte  8 @ SPECIES_BELDUM
+	.byte  0 @ SPECIES_METANG
+	.byte  0 @ SPECIES_METAGROSS
+	.byte  0 @ SPECIES_REGIROCK
+	.byte  0 @ SPECIES_REGICE
+	.byte  0 @ SPECIES_REGISTEEL
+	.byte  0 @ SPECIES_KYOGRE
+	.byte  0 @ SPECIES_GROUDON
+	.byte  6 @ SPECIES_RAYQUAZA
+	.byte  6 @ SPECIES_LATIAS
+	.byte  6 @ SPECIES_LATIOS
+	.byte 12 @ SPECIES_JIRACHI
+	.byte  4 @ SPECIES_DEOXYS
+	.byte 12 @ SPECIES_CHIMECHO
diff --git a/data/sound_data.s b/data/sound_data.s
index 8d09c072f..cc9c7fbc3 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,35 +1,12 @@
 	.section .rodata
 
-gUnknown_0842FC88:: @ 842FC88
-	.incbin "baserom.gba", 0x0042FC88, 0x22908
+	.include "asm/macros/m4a.s"
 
-gUnknown_08452590:: @ 8452590
-	.incbin "baserom.gba", 0x00452590, 0x600
+	.include "sound/voice_groups.s"
 
-gUnknown_08452B90:: @ 8452B90
-	.incbin "baserom.gba", 0x00452b90, 0x600
+	.incbin "baserom.gba", 0x455224, 0x238
 
-gUnknown_08453190:: @ 8453190
-	.incbin "baserom.gba", 0x00453190, 0x600
+	.include "sound/music_player_table.s"
+	.include "sound/song_table.s"
 
-gUnknown_08453790:: @ 8453790
-	.incbin "baserom.gba", 0x00453790, 0x30
-
-gUnknown_084537C0:: @ 84537C0
-	.incbin "baserom.gba", 0x004537c0, 0x600
-
-gUnknown_08453DC0:: @ 8453DC0
-	.incbin "baserom.gba", 0x00453dc0, 0x600
-
-gUnknown_084543C0:: @ 84543C0
-	.incbin "baserom.gba", 0x004543c0, 0x600
-
-gUnknown_084549C0:: @ 84549C0
-	.incbin "baserom.gba", 0x004549c0, 0xa9c
-
-gMPlayTable:: @ 845545C
-	.incbin "baserom.gba", 0x0045545c, 0x30
-
-gSongTable:: @ 845548C
-	.incbin "baserom.gba", 0x0045548c, 0xEA0 @ pointer tables
-	.incbin "baserom.gba", 0x0045632C, 0x25A3FC
+	.incbin "baserom.gba", 0x456330, 0x655FF0 - 0x456330
diff --git a/data/trainer_money.s b/data/trainer_money.s
new file mode 100644
index 000000000..95da92fea
--- /dev/null
+++ b/data/trainer_money.s
@@ -0,0 +1,58 @@
+@ This is a factor in how much money you get for beating a trainer.
+	.align 2
+gTrainerMoney:: @ 81F98F0
+	.byte         TRAINER_CLASS_NAME_TEAM_AQUA,  5, 0, 0
+	.byte        TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0
+	.byte       TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0
+	.byte        TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0
+	.byte       TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0
+	.byte       TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0
+	.byte           TRAINER_CLASS_NAME_TUBER_F,  1, 0, 0
+	.byte           TRAINER_CLASS_NAME_TUBER_M,  1, 0, 0
+	.byte       TRAINER_CLASS_NAME_SIS_AND_BRO,  3, 0, 0
+	.byte      TRAINER_CLASS_NAME_COOL_TRAINER, 12, 0, 0
+	.byte        TRAINER_CLASS_NAME_HEX_MANIAC,  6, 0, 0
+	.byte              TRAINER_CLASS_NAME_LADY, 50, 0, 0
+	.byte            TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0
+	.byte          TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0
+	.byte        TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0
+	.byte         TRAINER_CLASS_NAME_SWIMMER_M,  2, 0, 0
+	.byte        TRAINER_CLASS_NAME_BLACK_BELT,  8, 0, 0
+	.byte         TRAINER_CLASS_NAME_GUITARIST,  8, 0, 0
+	.byte           TRAINER_CLASS_NAME_KINDLER,  8, 0, 0
+	.byte            TRAINER_CLASS_NAME_CAMPER,  4, 0, 0
+	.byte        TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0
+	.byte        TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0
+	.byte           TRAINER_CLASS_NAME_PSYCHIC,  6, 0, 0
+	.byte         TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0
+	.byte        TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0
+	.byte            TRAINER_CLASS_NAME_LEADER, 25, 0, 0
+	.byte        TRAINER_CLASS_NAME_SCHOOL_KID,  5, 0, 0
+	.byte         TRAINER_CLASS_NAME_SR_AND_JR,  4, 0, 0
+	.byte           TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0
+	.byte            TRAINER_CLASS_NAME_EXPERT, 10, 0, 0
+	.byte         TRAINER_CLASS_NAME_YOUNGSTER,  4, 0, 0
+	.byte          TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0
+	.byte         TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0
+	.byte        TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0
+	.byte      TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0
+	.byte       TRAINER_CLASS_NAME_BIRD_KEEPER,  8, 0, 0
+	.byte         TRAINER_CLASS_NAME_NINJA_BOY,  3, 0, 0
+	.byte       TRAINER_CLASS_NAME_BATTLE_GIRL,  6, 0, 0
+	.byte      TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0
+	.byte         TRAINER_CLASS_NAME_SWIMMER_F,  2, 0, 0
+	.byte         TRAINER_CLASS_NAME_PICNICKER,  4, 0, 0
+	.byte             TRAINER_CLASS_NAME_TWINS,  3, 0, 0
+	.byte            TRAINER_CLASS_NAME_SAILOR,  8, 0, 0
+	.byte         TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0
+	.byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 15, 0, 0
+	.byte   TRAINER_CLASS_NAME_POKEMON_BREEDER, 10, 0, 0
+	.byte    TRAINER_CLASS_NAME_POKEMON_RANGER, 12, 0, 0
+	.byte        TRAINER_CLASS_NAME_TEAM_MAGMA,  5, 0, 0
+	.byte       TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0
+	.byte      TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0
+	.byte              TRAINER_CLASS_NAME_LASS,  4, 0, 0
+	.byte       TRAINER_CLASS_NAME_BUG_CATCHER,  4, 0, 0
+	.byte             TRAINER_CLASS_NAME_HIKER, 10, 0, 0
+	.byte      TRAINER_CLASS_NAME_YOUNG_COUPLE,  8, 0, 0
+	.byte                                   -1,  5, 0, 0