thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split wram.asm from poke{red,blue}.o into wram.o

Browse source 
wram.asm still defines some constants. They're moved into constants/wram_constants.asm.
This commit is contained in:
yenatch 2014-01-27 17:09:09 -05:00
parent 2b961ceaf4
commit c49dd99a98
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -9,11 +9,13 @@ TEXTQUEUE :=
RED_OBJS := \ RED_OBJS := \
pokered.o \ pokered.o \
audio_red.o \ audio_red.o \
wram.o \
text.o text.o
BLUE_OBJS := \ BLUE_OBJS := \
pokeblue.o \ pokeblue.o \
audio_blue.o \ audio_blue.o \
wram.o \
text.o text.o
OBJS := $(RED_OBJS) $(BLUE_OBJS) OBJS := $(RED_OBJS) $(BLUE_OBJS)

2
constants.asm
View file

@ -9,6 +9,8 @@ INCLUDE "hram.asm"
INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/hardware_constants.asm"
INCLUDE "constants/oam_constants.asm" INCLUDE "constants/oam_constants.asm"
INCLUDE "constants/wram_constants.asm"
INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokemon_constants.asm"
INCLUDE "constants/pokedex_constants.asm" INCLUDE "constants/pokedex_constants.asm"
INCLUDE "constants/trainer_constants.asm" INCLUDE "constants/trainer_constants.asm"

7
constants/wram_constants.asm Normal file
View file

@ -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

1
pokeblue.asm
View file

@ -1,3 +1,2 @@
INCLUDE "blue.asm" INCLUDE "blue.asm"
INCLUDE "wram.asm"
INCLUDE "main.asm" INCLUDE "main.asm"

1
pokered.asm
View file

@ -1,3 +1,2 @@
INCLUDE "red.asm" INCLUDE "red.asm"
INCLUDE "wram.asm"
INCLUDE "main.asm" INCLUDE "main.asm"

17
wram.asm
View file

@ -1,4 +1,6 @@
INCLUDE "constants/wram_constants.asm"
SECTION "WRAM Bank 0", WRAM0 SECTION "WRAM Bank 0", WRAM0
@ -189,7 +191,7 @@ SECTION "Stat Modifiers", WRAM0[$cd1a]
; value can range from 1 - 13 ($1 to $D) ; value can range from 1 - 13 ($1 to $D)
; 7 is normal ; 7 is normal
wPlayerMonStatMods: wPlayerMonStatMods::
wPlayerMonAttackMod:: ; cd1a wPlayerMonAttackMod:: ; cd1a
ds 1 ds 1
wPlayerMonDefenseMod:: ; cd1b wPlayerMonDefenseMod:: ; cd1b
@ -214,7 +216,7 @@ wEngagedTrainerSet:: ; cd2e
; value can range from 1 - 13 ($1 to $D) ; value can range from 1 - 13 ($1 to $D)
; 7 is normal ; 7 is normal
wEnemyMonStatMods: wEnemyMonStatMods::
wEnemyMonAttackMod:: ; cd2e wEnemyMonAttackMod:: ; cd2e
ds 1 ds 1
wEnemyMonDefenseMod:: ; cd2f wEnemyMonDefenseMod:: ; cd2f
@ -643,8 +645,6 @@ W_FBMODE:: ; d09e
SECTION "Sprite Buffers", SRAM SECTION "Sprite Buffers", SRAM
SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
S_SPRITEBUFFER0:: ; a000 S_SPRITEBUFFER0:: ; a000
ds SPRITEBUFFERSIZE ds SPRITEBUFFERSIZE
S_SPRITEBUFFER1:: ; a188 S_SPRITEBUFFER1:: ; a188
@ -903,11 +903,11 @@ SECTION "Pokedex", WRAMX[$d2f7], BANK[1]
wPokedexOwned:: ; d2f7 wPokedexOwned:: ; d2f7
ds (150 / 8) + 1 ds (150 / 8) + 1
wPokedexOwnedEnd: wPokedexOwnedEnd::
wPokedexSeen:: ; d30a wPokedexSeen:: ; d30a
ds (150 / 8) + 1 ds (150 / 8) + 1
wPokedexSeenEnd: wPokedexSeenEnd::
wNumBagItems:: ; d31d wNumBagItems:: ; d31d
@ -1342,11 +1342,8 @@ wEnemyPartyMons:: ; d89d
ds 6 ds 6
ds 1 ; end ds 1 ; end
; Overload enemy party data
W_WATERRATE EQU $d8a4
W_WATERMONS EQU $d8a5
wEnemyMons: wEnemyMons::
wEnemyMon1:: ; d8a4 wEnemyMon1:: ; d8a4
wEnemyMon1Species:: ; d8a4 wEnemyMon1Species:: ; d8a4