aboutsummaryrefslogtreecommitdiffstats
path: root/ram
diff options
context:
space:
mode:
Diffstat (limited to 'ram')
-rw-r--r--ram/hram.asm13
-rw-r--r--ram/wram.asm2
2 files changed, 6 insertions, 9 deletions
diff --git a/ram/hram.asm b/ram/hram.asm
index 0607a484..72e9e13a 100644
--- a/ram/hram.asm
+++ b/ram/hram.asm
@@ -85,10 +85,10 @@ hSpriteScreenX:: db
hSpriteScreenY:: db
NEXTU
-hFF8F:: db
-hFF90:: db
-hFF91:: db
-hFF92:: db
+hCollidingSpriteOffset:: db
+hCollidingSpriteTempYValue:: db
+hCollidingSpriteTempXValue:: db
+hCollidingSpriteAdjustedDistance:: db
ENDU
hTilePlayerStandingOn:: db
@@ -327,11 +327,8 @@ hItemCounter::
hSavedCoordIndex::
hMissableObjectIndex::
hGymTrashCanRandNumMask::
+hInteractedWithBookshelf::
db
-
-NEXTU
-hFFDB:: db
-hFFDC:: db
ENDU
ds 1
diff --git a/ram/wram.asm b/ram/wram.asm
index 753a9678..8c246b8a 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -1914,7 +1914,7 @@ wMissableObjectFlagsEnd::
ds 7
; temp copy of SPRITESTATEDATA1_IMAGEINDEX (used for sprite facing/anim)
-wd5cd:: db
+wSpriteImageIndexBackup:: db
; each entry consists of 2 bytes
; * the sprite ID (depending on the current map)