diff options
| author | yenatch <yenatch@gmail.com> | 2014-01-27 17:09:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-01-27 17:09:09 -0500 |
| commit | c49dd99a986b58a9a19f6e53c6e132aa5c18c1de (patch) | |
| tree | c52f97df411d435f433f82ecb9a21ea8cd79e8a0 | |
| parent | 2b961ceaf41c88edf4625d66aa35acf1dada825e (diff) | |
Split wram.asm from poke{red,blue}.o into wram.o
wram.asm still defines some constants. They're moved into constants/wram_constants.asm.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | constants.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 7 | ||||
| -rw-r--r-- | pokeblue.asm | 1 | ||||
| -rw-r--r-- | pokered.asm | 1 | ||||
| -rw-r--r-- | wram.asm | 17 |
6 files changed, 18 insertions, 12 deletions
@@ -9,11 +9,13 @@ TEXTQUEUE := RED_OBJS := \ pokered.o \ audio_red.o \ +wram.o \ text.o BLUE_OBJS := \ pokeblue.o \ audio_blue.o \ +wram.o \ text.o OBJS := $(RED_OBJS) $(BLUE_OBJS) diff --git a/constants.asm b/constants.asm index 2d5b3d9b..3496aa6a 100644 --- a/constants.asm +++ b/constants.asm @@ -9,6 +9,8 @@ INCLUDE "hram.asm" INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/oam_constants.asm" +INCLUDE "constants/wram_constants.asm" + INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokedex_constants.asm" INCLUDE "constants/trainer_constants.asm" diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm new file mode 100644 index 00000000..111ae584 --- /dev/null +++ b/constants/wram_constants.asm @@ -0,0 +1,7 @@ + +SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) + +; Overload enemy party data +W_WATERRATE EQU $d8a4 +W_WATERMONS EQU $d8a5 + diff --git a/pokeblue.asm b/pokeblue.asm index 10dcf979..3fcef980 100644 --- a/pokeblue.asm +++ b/pokeblue.asm @@ -1,3 +1,2 @@ INCLUDE "blue.asm" -INCLUDE "wram.asm" INCLUDE "main.asm" diff --git a/pokered.asm b/pokered.asm index 827b6019..ff8de04f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1,3 +1,2 @@ INCLUDE "red.asm" -INCLUDE "wram.asm" INCLUDE "main.asm" @@ -1,4 +1,6 @@ +INCLUDE "constants/wram_constants.asm" + SECTION "WRAM Bank 0", WRAM0 @@ -189,7 +191,7 @@ SECTION "Stat Modifiers", WRAM0[$cd1a] ; value can range from 1 - 13 ($1 to $D) ; 7 is normal -wPlayerMonStatMods: +wPlayerMonStatMods:: wPlayerMonAttackMod:: ; cd1a ds 1 wPlayerMonDefenseMod:: ; cd1b @@ -214,7 +216,7 @@ wEngagedTrainerSet:: ; cd2e ; value can range from 1 - 13 ($1 to $D) ; 7 is normal -wEnemyMonStatMods: +wEnemyMonStatMods:: wEnemyMonAttackMod:: ; cd2e ds 1 wEnemyMonDefenseMod:: ; cd2f @@ -643,8 +645,6 @@ W_FBMODE:: ; d09e SECTION "Sprite Buffers", SRAM -SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) - S_SPRITEBUFFER0:: ; a000 ds SPRITEBUFFERSIZE S_SPRITEBUFFER1:: ; a188 @@ -903,11 +903,11 @@ SECTION "Pokedex", WRAMX[$d2f7], BANK[1] wPokedexOwned:: ; d2f7 ds (150 / 8) + 1 -wPokedexOwnedEnd: +wPokedexOwnedEnd:: wPokedexSeen:: ; d30a ds (150 / 8) + 1 -wPokedexSeenEnd: +wPokedexSeenEnd:: wNumBagItems:: ; d31d @@ -1342,11 +1342,8 @@ wEnemyPartyMons:: ; d89d ds 6 ds 1 ; end -; Overload enemy party data -W_WATERRATE EQU $d8a4 -W_WATERMONS EQU $d8a5 -wEnemyMons: +wEnemyMons:: wEnemyMon1:: ; d8a4 wEnemyMon1Species:: ; d8a4 |