summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlampharos <Blampharos@users.noreply.github.com>2018-01-22 11:32:52 +0100
committerBlampharos <Blampharos@users.noreply.github.com>2018-01-22 11:32:52 +0100
commitf9745abae0277c1000f4816abc38f9b69828aea2 (patch)
tree123547ad904d395dffd2ec9e1b92fb47f2b5fda5
parenta94ea1c69ea360c9ac3f8acd2881be65719ffeea (diff)
Begin decompiling battle_1.c
Enemy backsprite data (palettes, coords, sprites) and foe elevation data are converted in this commit
-rw-r--r--data/btl_attrs.s12
-rw-r--r--data/enemy_mon_elevation.inc415
-rw-r--r--data/graphics/trainers/back_pic_coords.inc5
-rw-r--r--data/graphics/trainers/back_pic_palette_table.inc5
-rw-r--r--data/graphics/trainers/back_pic_table.inc5
-rw-r--r--ld_script.txt1
-rw-r--r--src/battle/battle_1.c446
7 files changed, 447 insertions, 442 deletions
diff --git a/data/btl_attrs.s b/data/btl_attrs.s
index 1bd5ed6e5..ebd898993 100644
--- a/data/btl_attrs.s
+++ b/data/btl_attrs.s
@@ -8,18 +8,6 @@
.section .rodata
-@ 81ECAD8
- .include "data/graphics/trainers/back_pic_coords.inc"
-
-@ 81ECAE4
- .include "data/graphics/trainers/back_pic_table.inc"
-
-@ 81ECAFC
- .include "data/graphics/trainers/back_pic_palette_table.inc"
-
-@ 81ECB14
- .include "data/enemy_mon_elevation.inc"
-
@ 81ECCB0
.include "data/trainer_parties.inc"
diff --git a/data/enemy_mon_elevation.inc b/data/enemy_mon_elevation.inc
deleted file mode 100644
index 7e13f20d5..000000000
--- a/data/enemy_mon_elevation.inc
+++ /dev/null
@@ -1,415 +0,0 @@
-@ 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/graphics/trainers/back_pic_coords.inc b/data/graphics/trainers/back_pic_coords.inc
deleted file mode 100644
index e1c0b0e60..000000000
--- a/data/graphics/trainers/back_pic_coords.inc
+++ /dev/null
@@ -1,5 +0,0 @@
- .align 2
-gTrainerBackPicCoords:: @ 81ECAD8
- .byte 8, 4, 0, 0
- .byte 8, 4, 0, 0
- .byte 8, 4, 0, 0
diff --git a/data/graphics/trainers/back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc
deleted file mode 100644
index 143becca4..000000000
--- a/data/graphics/trainers/back_pic_palette_table.inc
+++ /dev/null
@@ -1,5 +0,0 @@
- .align 2
-gTrainerBackPicPaletteTable:: @ 81ECAFC
- obj_pal gTrainerPalette_Brendan, 0
- obj_pal gTrainerPalette_May, 1
- obj_pal gTrainerPalette_Wally, 2
diff --git a/data/graphics/trainers/back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc
deleted file mode 100644
index c4c243c87..000000000
--- a/data/graphics/trainers/back_pic_table.inc
+++ /dev/null
@@ -1,5 +0,0 @@
- .align 2
-gTrainerBackPicTable:: @ 81ECAE4
- obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
- obj_tiles gTrainerBackPic_May, 0x2000, 1
- obj_tiles gTrainerBackPic_Wally, 0x2000, 2
diff --git a/ld_script.txt b/ld_script.txt
index 5dcdf948d..ce6765a3f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -483,6 +483,7 @@ SECTIONS {
src/engine/rtc.o(.rodata);
src/engine/main_menu.o(.rodata);
data/mon_attrs.o(.rodata);
+ src/battle/battle_1.o(.rodata);
data/btl_attrs.o(.rodata);
src/battle/battle_4.o(.rodata);
src/battle/battle_controller_player.o(.rodata);
diff --git a/src/battle/battle_1.c b/src/battle/battle_1.c
new file mode 100644
index 000000000..3e73c2ee4
--- /dev/null
+++ b/src/battle/battle_1.c
@@ -0,0 +1,446 @@
+#include "global.h"
+#include "data2.h"
+#include "constants/species.h"
+
+const struct MonCoords gTrainerBackPicCoords[] = {
+ {8, 4},
+ {8, 4},
+ {8, 4},
+};
+
+extern const u8 gTrainerBackPic_Brendan[];
+extern const u8 gTrainerBackPic_May[];
+extern const u8 gTrainerBackPic_Wally[];
+
+const struct CompressedSpriteSheet gTrainerBackPicTable[] = {
+ {gTrainerBackPic_Brendan, 0x2000, 0},
+ {gTrainerBackPic_May, 0x2000, 1},
+ {gTrainerBackPic_Wally, 0x2000, 2}
+};
+
+extern const u8 gTrainerPalette_Brendan[];
+extern const u8 gTrainerPalette_May[];
+extern const u8 gTrainerPalette_Wally[];
+
+const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = {
+ {gTrainerPalette_Brendan, 0},
+ {gTrainerPalette_May, 1},
+ {gTrainerPalette_Wally, 2}
+};
+
+// This determines how much higher above the usual position the enemy Pokémon
+// is during battle. Species that float or fly have nonzero values.
+const u8 gEnemyMonElevation[] = {
+ [0] = 0,
+ [SPECIES_BULBASAUR] = 0,
+ [SPECIES_IVYSAUR] = 0,
+ [SPECIES_VENUSAUR] = 0,
+ [SPECIES_CHARMANDER] = 0,
+ [SPECIES_CHARMELEON] = 0,
+ [SPECIES_CHARIZARD] = 0,
+ [SPECIES_SQUIRTLE] = 0,
+ [SPECIES_WARTORTLE] = 0,
+ [SPECIES_BLASTOISE] = 0,
+ [SPECIES_CATERPIE] = 0,
+ [SPECIES_METAPOD] = 0,
+ [SPECIES_BUTTERFREE] = 8,
+ [SPECIES_WEEDLE] = 0,
+ [SPECIES_KAKUNA] = 0,
+ [SPECIES_BEEDRILL] = 8,
+ [SPECIES_PIDGEY] = 16,
+ [SPECIES_PIDGEOTTO] = 0,
+ [SPECIES_PIDGEOT] = 4,
+ [SPECIES_RATTATA] = 0,
+ [SPECIES_RATICATE] = 0,
+ [SPECIES_SPEAROW] = 0,
+ [SPECIES_FEAROW] = 4,
+ [SPECIES_EKANS] = 0,
+ [SPECIES_ARBOK] = 0,
+ [SPECIES_PIKACHU] = 0,
+ [SPECIES_RAICHU] = 0,
+ [SPECIES_SANDSHREW] = 0,
+ [SPECIES_SANDSLASH] = 0,
+ [SPECIES_NIDORAN_F] = 0,
+ [SPECIES_NIDORINA] = 0,
+ [SPECIES_NIDOQUEEN] = 0,
+ [SPECIES_NIDORAN_M] = 0,
+ [SPECIES_NIDORINO] = 0,
+ [SPECIES_NIDOKING] = 0,
+ [SPECIES_CLEFAIRY] = 0,
+ [SPECIES_CLEFABLE] = 0,
+ [SPECIES_VULPIX] = 0,
+ [SPECIES_NINETALES] = 0,
+ [SPECIES_JIGGLYPUFF] = 0,
+ [SPECIES_WIGGLYTUFF] = 0,
+ [SPECIES_ZUBAT] = 8,
+ [SPECIES_GOLBAT] = 8,
+ [SPECIES_ODDISH] = 0,
+ [SPECIES_GLOOM] = 0,
+ [SPECIES_VILEPLUME] = 0,
+ [SPECIES_PARAS] = 0,
+ [SPECIES_PARASECT] = 0,
+ [SPECIES_VENONAT] = 0,
+ [SPECIES_VENOMOTH] = 8,
+ [SPECIES_DIGLETT] = 0,
+ [SPECIES_DUGTRIO] = 0,
+ [SPECIES_MEOWTH] = 0,
+ [SPECIES_PERSIAN] = 0,
+ [SPECIES_PSYDUCK] = 0,
+ [SPECIES_GOLDUCK] = 0,
+ [SPECIES_MANKEY] = 0,
+ [SPECIES_PRIMEAPE] = 0,
+ [SPECIES_GROWLITHE] = 0,
+ [SPECIES_ARCANINE] = 0,
+ [SPECIES_POLIWAG] = 0,
+ [SPECIES_POLIWHIRL] = 0,
+ [SPECIES_POLIWRATH] = 0,
+ [SPECIES_ABRA] = 0,
+ [SPECIES_KADABRA] = 0,
+ [SPECIES_ALAKAZAM] = 0,
+ [SPECIES_MACHOP] = 0,
+ [SPECIES_MACHOKE] = 0,
+ [SPECIES_MACHAMP] = 0,
+ [SPECIES_BELLSPROUT] = 0,
+ [SPECIES_WEEPINBELL] = 0,
+ [SPECIES_VICTREEBEL] = 0,
+ [SPECIES_TENTACOOL] = 0,
+ [SPECIES_TENTACRUEL] = 0,
+ [SPECIES_GEODUDE] = 16,
+ [SPECIES_GRAVELER] = 0,
+ [SPECIES_GOLEM] = 0,
+ [SPECIES_PONYTA] = 0,
+ [SPECIES_RAPIDASH] = 0,
+ [SPECIES_SLOWPOKE] = 0,
+ [SPECIES_SLOWBRO] = 0,
+ [SPECIES_MAGNEMITE] = 16,
+ [SPECIES_MAGNETON] = 8,
+ [SPECIES_FARFETCHD] = 0,
+ [SPECIES_DODUO] = 0,
+ [SPECIES_DODRIO] = 0,
+ [SPECIES_SEEL] = 0,
+ [SPECIES_DEWGONG] = 0,
+ [SPECIES_GRIMER] = 0,
+ [SPECIES_MUK] = 0,
+ [SPECIES_SHELLDER] = 0,
+ [SPECIES_CLOYSTER] = 0,
+ [SPECIES_GASTLY] = 4,
+ [SPECIES_HAUNTER] = 4,
+ [SPECIES_GENGAR] = 0,
+ [SPECIES_ONIX] = 0,
+ [SPECIES_DROWZEE] = 0,
+ [SPECIES_HYPNO] = 0,
+ [SPECIES_KRABBY] = 0,
+ [SPECIES_KINGLER] = 0,
+ [SPECIES_VOLTORB] = 10,
+ [SPECIES_ELECTRODE] = 12,
+ [SPECIES_EXEGGCUTE] = 0,
+ [SPECIES_EXEGGUTOR] = 0,
+ [SPECIES_CUBONE] = 0,
+ [SPECIES_MAROWAK] = 0,
+ [SPECIES_HITMONLEE] = 0,
+ [SPECIES_HITMONCHAN] = 0,
+ [SPECIES_LICKITUNG] = 0,
+ [SPECIES_KOFFING] = 8,
+ [SPECIES_WEEZING] = 6,
+ [SPECIES_RHYHORN] = 0,
+ [SPECIES_RHYDON] = 0,
+ [SPECIES_CHANSEY] = 0,
+ [SPECIES_TANGELA] = 0,
+ [SPECIES_KANGASKHAN] = 0,
+ [SPECIES_HORSEA] = 0,
+ [SPECIES_SEADRA] = 0,
+ [SPECIES_GOLDEEN] = 0,
+ [SPECIES_SEAKING] = 0,
+ [SPECIES_STARYU] = 0,
+ [SPECIES_STARMIE] = 0,
+ [SPECIES_MR_MIME] = 0,
+ [SPECIES_SCYTHER] = 0,
+ [SPECIES_JYNX] = 0,
+ [SPECIES_ELECTABUZZ] = 0,
+ [SPECIES_MAGMAR] = 0,
+ [SPECIES_PINSIR] = 0,
+ [SPECIES_TAUROS] = 0,
+ [SPECIES_MAGIKARP] = 0,
+ [SPECIES_GYARADOS] = 0,
+ [SPECIES_LAPRAS] = 0,
+ [SPECIES_DITTO] = 0,
+ [SPECIES_EEVEE] = 0,
+ [SPECIES_VAPOREON] = 0,
+ [SPECIES_JOLTEON] = 0,
+ [SPECIES_FLAREON] = 0,
+ [SPECIES_PORYGON] = 0,
+ [SPECIES_OMANYTE] = 0,
+ [SPECIES_OMASTAR] = 0,
+ [SPECIES_KABUTO] = 0,
+ [SPECIES_KABUTOPS] = 0,
+ [SPECIES_AERODACTYL] = 6,
+ [SPECIES_SNORLAX] = 0,
+ [SPECIES_ARTICUNO] = 6,
+ [SPECIES_ZAPDOS] = 8,
+ [SPECIES_MOLTRES] = 5,
+ [SPECIES_DRATINI] = 0,
+ [SPECIES_DRAGONAIR] = 0,
+ [SPECIES_DRAGONITE] = 3,
+ [SPECIES_MEWTWO] = 0,
+ [SPECIES_MEW] = 8,
+ [SPECIES_CHIKORITA] = 0,
+ [SPECIES_BAYLEEF] = 0,
+ [SPECIES_MEGANIUM] = 0,
+ [SPECIES_CYNDAQUIL] = 0,
+ [SPECIES_QUILAVA] = 0,
+ [SPECIES_TYPHLOSION] = 0,
+ [SPECIES_TOTODILE] = 0,
+ [SPECIES_CROCONAW] = 0,
+ [SPECIES_FERALIGATR] = 0,
+ [SPECIES_SENTRET] = 0,
+ [SPECIES_FURRET] = 0,
+ [SPECIES_HOOTHOOT] = 0,
+ [SPECIES_NOCTOWL] = 0,
+ [SPECIES_LEDYBA] = 0,
+ [SPECIES_LEDIAN] = 8,
+ [SPECIES_SPINARAK] = 0,
+ [SPECIES_ARIADOS] = 0,
+ [SPECIES_CROBAT] = 6,
+ [SPECIES_CHINCHOU] = 0,
+ [SPECIES_LANTURN] = 0,
+ [SPECIES_PICHU] = 0,
+ [SPECIES_CLEFFA] = 0,
+ [SPECIES_IGGLYBUFF] = 0,
+ [SPECIES_TOGEPI] = 0,
+ [SPECIES_TOGETIC] = 0,
+ [SPECIES_NATU] = 0,
+ [SPECIES_XATU] = 0,
+ [SPECIES_MAREEP] = 0,
+ [SPECIES_FLAAFFY] = 0,
+ [SPECIES_AMPHAROS] = 0,
+ [SPECIES_BELLOSSOM] = 0,
+ [SPECIES_MARILL] = 0,
+ [SPECIES_AZUMARILL] = 0,
+ [SPECIES_SUDOWOODO] = 0,
+ [SPECIES_POLITOED] = 0,
+ [SPECIES_HOPPIP] = 11,
+ [SPECIES_SKIPLOOM] = 12,
+ [SPECIES_JUMPLUFF] = 6,
+ [SPECIES_AIPOM] = 0,
+ [SPECIES_SUNKERN] = 0,
+ [SPECIES_SUNFLORA] = 0,
+ [SPECIES_YANMA] = 8,
+ [SPECIES_WOOPER] = 0,
+ [SPECIES_QUAGSIRE] = 0,
+ [SPECIES_ESPEON] = 0,
+ [SPECIES_UMBREON] = 0,
+ [SPECIES_MURKROW] = 0,
+ [SPECIES_SLOWKING] = 0,
+ [SPECIES_MISDREAVUS] = 8,
+ [SPECIES_UNOWN] = 5,
+ [SPECIES_WOBBUFFET] = 0,
+ [SPECIES_GIRAFARIG] = 0,
+ [SPECIES_PINECO] = 0,
+ [SPECIES_FORRETRESS] = 0,
+ [SPECIES_DUNSPARCE] = 0,
+ [SPECIES_GLIGAR] = 6,
+ [SPECIES_STEELIX] = 0,
+ [SPECIES_SNUBBULL] = 0,
+ [SPECIES_GRANBULL] = 0,
+ [SPECIES_QWILFISH] = 0,
+ [SPECIES_SCIZOR] = 0,
+ [SPECIES_SHUCKLE] = 0,
+ [SPECIES_HERACROSS] = 0,
+ [SPECIES_SNEASEL] = 0,
+ [SPECIES_TEDDIURSA] = 0,
+ [SPECIES_URSARING] = 0,
+ [SPECIES_SLUGMA] = 0,
+ [SPECIES_MAGCARGO] = 0,
+ [SPECIES_SWINUB] = 0,
+ [SPECIES_PILOSWINE] = 0,
+ [SPECIES_CORSOLA] = 0,
+ [SPECIES_REMORAID] = 0,
+ [SPECIES_OCTILLERY] = 0,
+ [SPECIES_DELIBIRD] = 0,
+ [SPECIES_MANTINE] = 0,
+ [SPECIES_SKARMORY] = 0,
+ [SPECIES_HOUNDOUR] = 0,
+ [SPECIES_HOUNDOOM] = 0,
+ [SPECIES_KINGDRA] = 0,
+ [SPECIES_PHANPY] = 0,
+ [SPECIES_DONPHAN] = 0,
+ [SPECIES_PORYGON2] = 0,
+ [SPECIES_STANTLER] = 0,
+ [SPECIES_SMEARGLE] = 0,
+ [SPECIES_TYROGUE] = 0,
+ [SPECIES_HITMONTOP] = 0,
+ [SPECIES_SMOOCHUM] = 0,
+ [SPECIES_ELEKID] = 0,
+ [SPECIES_MAGBY] = 0,
+ [SPECIES_MILTANK] = 0,
+ [SPECIES_BLISSEY] = 0,
+ [SPECIES_RAIKOU] = 0,
+ [SPECIES_ENTEI] = 0,
+ [SPECIES_SUICUNE] = 0,
+ [SPECIES_LARVITAR] = 0,
+ [SPECIES_PUPITAR] = 0,
+ [SPECIES_TYRANITAR] = 0,
+ [SPECIES_LUGIA] = 3,
+ [SPECIES_HO_OH] = 6,
+ [SPECIES_CELEBI] = 15,
+ [SPECIES_OLD_UNOWN_B] = 0,
+ [SPECIES_OLD_UNOWN_C] = 0,
+ [SPECIES_OLD_UNOWN_D] = 0,
+ [SPECIES_OLD_UNOWN_E] = 0,
+ [SPECIES_OLD_UNOWN_F] = 0,
+ [SPECIES_OLD_UNOWN_G] = 0,
+ [SPECIES_OLD_UNOWN_H] = 0,
+ [SPECIES_OLD_UNOWN_I] = 0,
+ [SPECIES_OLD_UNOWN_J] = 0,
+ [SPECIES_OLD_UNOWN_K] = 0,
+ [SPECIES_OLD_UNOWN_L] = 0,
+ [SPECIES_OLD_UNOWN_M] = 0,
+ [SPECIES_OLD_UNOWN_N] = 0,
+ [SPECIES_OLD_UNOWN_O] = 0,
+ [SPECIES_OLD_UNOWN_P] = 0,
+ [SPECIES_OLD_UNOWN_Q] = 0,
+ [SPECIES_OLD_UNOWN_R] = 0,
+ [SPECIES_OLD_UNOWN_S] = 0,
+ [SPECIES_OLD_UNOWN_T] = 0,
+ [SPECIES_OLD_UNOWN_U] = 0,
+ [SPECIES_OLD_UNOWN_V] = 0,
+ [SPECIES_OLD_UNOWN_W] = 0,
+ [SPECIES_OLD_UNOWN_X] = 0,
+ [SPECIES_OLD_UNOWN_Y] = 0,
+ [SPECIES_OLD_UNOWN_Z] = 0,
+ [SPECIES_TREECKO] = 0,
+ [SPECIES_GROVYLE] = 0,
+ [SPECIES_SCEPTILE] = 0,
+ [SPECIES_TORCHIC] = 0,
+ [SPECIES_COMBUSKEN] = 0,
+ [SPECIES_BLAZIKEN] = 0,
+ [SPECIES_MUDKIP] = 0,
+ [SPECIES_MARSHTOMP] = 0,
+ [SPECIES_SWAMPERT] = 0,
+ [SPECIES_POOCHYENA] = 0,
+ [SPECIES_MIGHTYENA] = 0,
+ [SPECIES_ZIGZAGOON] = 0,
+ [SPECIES_LINOONE] = 0,
+ [SPECIES_WURMPLE] = 0,
+ [SPECIES_SILCOON] = 0,
+ [SPECIES_BEAUTIFLY] = 8,
+ [SPECIES_CASCOON] = 0,
+ [SPECIES_DUSTOX] = 10,
+ [SPECIES_LOTAD] = 0,
+ [SPECIES_LOMBRE] = 0,
+ [SPECIES_LUDICOLO] = 0,
+ [SPECIES_SEEDOT] = 0,
+ [SPECIES_NUZLEAF] = 0,
+ [SPECIES_SHIFTRY] = 0,
+ [SPECIES_NINCADA] = 0,
+ [SPECIES_NINJASK] = 10,
+ [SPECIES_SHEDINJA] = 8,
+ [SPECIES_TAILLOW] = 0,
+ [SPECIES_SWELLOW] = 0,
+ [SPECIES_SHROOMISH] = 0,
+ [SPECIES_BRELOOM] = 0,
+ [SPECIES_SPINDA] = 0,
+ [SPECIES_WINGULL] = 16,
+ [SPECIES_PELIPPER] = 8,
+ [SPECIES_SURSKIT] = 0,
+ [SPECIES_MASQUERAIN] = 10,
+ [SPECIES_WAILMER] = 0,
+ [SPECIES_WAILORD] = 0,
+ [SPECIES_SKITTY] = 0,
+ [SPECIES_DELCATTY] = 0,
+ [SPECIES_KECLEON] = 0,
+ [SPECIES_BALTOY] = 4,
+ [SPECIES_CLAYDOL] = 4,
+ [SPECIES_NOSEPASS] = 0,
+ [SPECIES_TORKOAL] = 0,
+ [SPECIES_SABLEYE] = 0,
+ [SPECIES_BARBOACH] = 0,
+ [SPECIES_WHISCASH] = 0,
+ [SPECIES_LUVDISC] = 0,
+ [SPECIES_CORPHISH] = 0,
+ [SPECIES_CRAWDAUNT] = 0,
+ [SPECIES_FEEBAS] = 0,
+ [SPECIES_MILOTIC] = 0,
+ [SPECIES_CARVANHA] = 0,
+ [SPECIES_SHARPEDO] = 0,
+ [SPECIES_TRAPINCH] = 0,
+ [SPECIES_VIBRAVA] = 0,
+ [SPECIES_FLYGON] = 3,
+ [SPECIES_MAKUHITA] = 0,
+ [SPECIES_HARIYAMA] = 0,
+ [SPECIES_ELECTRIKE] = 0,
+ [SPECIES_MANECTRIC] = 0,
+ [SPECIES_NUMEL] = 0,
+ [SPECIES_CAMERUPT] = 0,
+ [SPECIES_SPHEAL] = 0,
+ [SPECIES_SEALEO] = 0,
+ [SPECIES_WALREIN] = 0,
+ [SPECIES_CACNEA] = 0,
+ [SPECIES_CACTURNE] = 0,
+ [SPECIES_SNORUNT] = 0,
+ [SPECIES_GLALIE] = 12,
+ [SPECIES_LUNATONE] = 13,
+ [SPECIES_SOLROCK] = 4,
+ [SPECIES_AZURILL] = 0,
+ [SPECIES_SPOINK] = 0,
+ [SPECIES_GRUMPIG] = 0,
+ [SPECIES_PLUSLE] = 0,
+ [SPECIES_MINUN] = 0,
+ [SPECIES_MAWILE] = 0,
+ [SPECIES_MEDITITE] = 0,
+ [SPECIES_MEDICHAM] = 0,
+ [SPECIES_SWABLU] = 12,
+ [SPECIES_ALTARIA] = 8,
+ [SPECIES_WYNAUT] = 0,
+ [SPECIES_DUSKULL] = 4,
+ [SPECIES_DUSCLOPS] = 0,
+ [SPECIES_ROSELIA] = 0,
+ [SPECIES_SLAKOTH] = 0,
+ [SPECIES_VIGOROTH] = 0,
+ [SPECIES_SLAKING] = 0,
+ [SPECIES_GULPIN] = 0,
+ [SPECIES_SWALOT] = 0,
+ [SPECIES_TROPIUS] = 0,
+ [SPECIES_WHISMUR] = 0,
+ [SPECIES_LOUDRED] = 0,
+ [SPECIES_EXPLOUD] = 0,
+ [SPECIES_CLAMPERL] = 0,
+ [SPECIES_HUNTAIL] = 0,
+ [SPECIES_GOREBYSS] = 0,
+ [SPECIES_ABSOL] = 0,
+ [SPECIES_SHUPPET] = 12,
+ [SPECIES_BANETTE] = 8,
+ [SPECIES_SEVIPER] = 0,
+ [SPECIES_ZANGOOSE] = 0,
+ [SPECIES_RELICANTH] = 0,
+ [SPECIES_ARON] = 0,
+ [SPECIES_LAIRON] = 0,
+ [SPECIES_AGGRON] = 0,
+ [SPECIES_CASTFORM] = 16,
+ [SPECIES_VOLBEAT] = 0,
+ [SPECIES_ILLUMISE] = 0,
+ [SPECIES_LILEEP] = 0,
+ [SPECIES_CRADILY] = 0,
+ [SPECIES_ANORITH] = 0,
+ [SPECIES_ARMALDO] = 0,
+ [SPECIES_RALTS] = 0,
+ [SPECIES_KIRLIA] = 0,
+ [SPECIES_GARDEVOIR] = 0,
+ [SPECIES_BAGON] = 0,
+ [SPECIES_SHELGON] = 0,
+ [SPECIES_SALAMENCE] = 0,
+ [SPECIES_BELDUM] = 8,
+ [SPECIES_METANG] = 0,
+ [SPECIES_METAGROSS] = 0,
+ [SPECIES_REGIROCK] = 0,
+ [SPECIES_REGICE] = 0,
+ [SPECIES_REGISTEEL] = 0,
+ [SPECIES_KYOGRE] = 0,
+ [SPECIES_GROUDON] = 0,
+ [SPECIES_RAYQUAZA] = 6,
+ [SPECIES_LATIAS] = 6,
+ [SPECIES_LATIOS] = 6,
+ [SPECIES_JIRACHI] = 12,
+ [SPECIES_DEOXYS] = 4,
+ [SPECIES_CHIMECHO] = 12,
+};