summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-30 22:04:08 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-30 22:05:50 -0500
commit5facf8377aeda68cb3fca389cb1784cf9c2d406b (patch)
tree5327b1d17ee65f0452c7df779f5a0158607f8c11 /constants
parent38065a744de1065cc021a4cafe22476f8425448d (diff)
No more wram_constants.asm
unfortunately, this means manually declaring the wEnemyMon1 party struct
Diffstat (limited to 'constants')
-rw-r--r--constants/misc_constants.asm2
-rw-r--r--constants/wram_constants.asm10
2 files changed, 2 insertions, 10 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index c9240ad7..de777c5d 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -38,6 +38,8 @@ SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8
BG_MAP_WIDTH EQU 32
BG_MAP_HEIGHT EQU 32
+SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
+
NPC_MOVEMENT_DOWN EQU $00
NPC_MOVEMENT_UP EQU $40
NPC_MOVEMENT_LEFT EQU $80
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
deleted file mode 100644
index b6939a3e..00000000
--- a/constants/wram_constants.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-
-SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
-
-; Overload wGrassMons
-wSerialEnemyDataBlock EQU $d893 ; wGrassMons + 11
-
-; Overload enemy party data
-W_WATERRATE EQU $d8a4 ; wEnemyMon1Species
-W_WATERMONS EQU $d8a5 ; wEnemyMon1Species + 1
-