summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-08-12 15:16:23 -0500
committerBryan Bishop <kanzure@gmail.com>2013-08-12 15:16:23 -0500
commit1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch)
tree0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /wram.asm
parentb676c24aefc3213d844fba9572dcb327be16a4d9 (diff)
parent8d75f962e45694555b10ac78a3e78e3f53682db0 (diff)
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm11
1 files changed, 10 insertions, 1 deletions
diff --git a/wram.asm b/wram.asm
index 928ed33a4..f40e8d551 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1079,6 +1079,10 @@ CurPartyLevel: ; d143
ds 1
+SECTION "UsedSprites",WRAMX[$d154],BANK[1]
+UsedSprites: ; d154
+ ds 32
+
SECTION "connections",WRAMX[$d1a9],BANK[1]
MapConnections:
@@ -1655,6 +1659,11 @@ OBJECT_LENGTH EQU $10
ds OBJECT_LENGTH * NUM_OBJECTS
+SECTION "VariableSprites",WRAMX[$d82e],BANK[1]
+VariableSprites: ; d82e
+ ds $10
+
+
SECTION "Status",WRAMX[$d841],BANK[1]
TimeOfDayPal: ; d841
ds 1
@@ -1982,7 +1991,7 @@ BreedMon1Nick: ; def6
BreedMon1OT: ; df01
ds 11
BreedMon1Stats:
-Breedmon1Species: ; df0c
+BreedMon1Species: ; df0c
ds 1
ds 31