Identify the unnamed HRAM variables and one WRAM label (#438)

pret · Nov 20, 2023 · 54f3a49 · 54f3a49
1 parent 22d1c96
commit 54f3a49
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 70 deletions.
diff --git a/pokeblue.map b/pokeblue.map
@@ -19440,7 +19440,7 @@ WRAM0 bank #0:
 	         $d5a4 = wPlayerCoins
 	         $d5a6 = wMissableObjectFlags
 	         $d5c6 = wMissableObjectFlagsEnd
-	         $d5cd = wd5cd
+	         $d5cd = wSpriteImageIndexBackup
 	         $d5ce = wMissableObjectList
 	         $d5f0 = wOaksLabCurScript
 	         $d5f0 = wGameProgressFlags
@@ -20268,13 +20268,13 @@ HRAM bank #0:
 	         $ff8e = hLoadSpriteTemp2
 	         $ff8e = hFourTileSpriteCount
 	         $ff8f = hSpriteOffset2
-	         $ff8f = hFF8F
+	         $ff8f = hCollidingSpriteOffset
 	         $ff90 = hOAMBufferOffset
-	         $ff90 = hFF90
+	         $ff90 = hCollidingSpriteTempYValue
+	         $ff91 = hCollidingSpriteTempXValue
 	         $ff91 = hSpriteScreenX
-	         $ff91 = hFF91
+	         $ff92 = hCollidingSpriteAdjustedDistance
 	         $ff92 = hSpriteScreenY
-	         $ff92 = hFF92
 	         $ff93 = hTilePlayerStandingOn
 	         $ff94 = hSpritePriority
 	         $ff95 = hPastLeadingZeros
@@ -20354,9 +20354,9 @@ HRAM bank #0:
 	         $ffd8 = hMovingBGTilesCounter1
 	         $ffda = hCurrentSpriteOffset
 	         $ffdb = hOaksAideResult
-	         $ffdb = hFFDB
 	         $ffdb = hVendingMachineItem
 	         $ffdb = hPlayerFacing
+	         $ffdb = hInteractedWithBookshelf
 	         $ffdb = hMissableObjectIndex
 	         $ffdb = hDexRatingNumMonsSeen
 	         $ffdb = hGymGateIndex
@@ -20367,7 +20367,6 @@ HRAM bank #0:
 	         $ffdb = hItemToRemoveID
 	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hVendingMachinePrice
-	         $ffdc = hFFDC
 	         $ffdc = hDexRatingNumMonsOwned
 	         $ffdc = hOaksAideRewardItem
 	         $ffdc = hPlayerYCoord

diff --git a/pokeblue.sym b/pokeblue.sym
@@ -19111,7 +19111,7 @@
 00:d5a4 wPlayerCoins
 00:d5a6 wMissableObjectFlags
 00:d5c6 wMissableObjectFlagsEnd
-00:d5cd wd5cd
+00:d5cd wSpriteImageIndexBackup
 00:d5ce wMissableObjectList
 00:d5f0 wOaksLabCurScript
 00:d5f0 wGameProgressFlags
@@ -19931,13 +19931,13 @@
 00:ff8e hLoadSpriteTemp2
 00:ff8e hFourTileSpriteCount
 00:ff8f hSpriteOffset2
-00:ff8f hFF8F
+00:ff8f hCollidingSpriteOffset
 00:ff90 hOAMBufferOffset
-00:ff90 hFF90
+00:ff90 hCollidingSpriteTempYValue
+00:ff91 hCollidingSpriteTempXValue
 00:ff91 hSpriteScreenX
-00:ff91 hFF91
+00:ff92 hCollidingSpriteAdjustedDistance
 00:ff92 hSpriteScreenY
-00:ff92 hFF92
 00:ff93 hTilePlayerStandingOn
 00:ff94 hSpritePriority
 00:ff95 hPastLeadingZeros
@@ -20017,9 +20017,9 @@
 00:ffd8 hMovingBGTilesCounter1
 00:ffda hCurrentSpriteOffset
 00:ffdb hOaksAideResult
-00:ffdb hFFDB
 00:ffdb hVendingMachineItem
 00:ffdb hPlayerFacing
+00:ffdb hInteractedWithBookshelf
 00:ffdb hMissableObjectIndex
 00:ffdb hDexRatingNumMonsSeen
 00:ffdb hGymGateIndex
@@ -20030,7 +20030,6 @@
 00:ffdb hItemToRemoveID
 00:ffdc hItemToRemoveIndex
 00:ffdc hVendingMachinePrice
-00:ffdc hFFDC
 00:ffdc hDexRatingNumMonsOwned
 00:ffdc hOaksAideRewardItem
 00:ffdc hPlayerYCoord

diff --git a/pokeblue_debug.map b/pokeblue_debug.map
@@ -19450,7 +19450,7 @@ WRAM0 bank #0:
 	         $d5a4 = wPlayerCoins
 	         $d5a6 = wMissableObjectFlags
 	         $d5c6 = wMissableObjectFlagsEnd
-	         $d5cd = wd5cd
+	         $d5cd = wSpriteImageIndexBackup
 	         $d5ce = wMissableObjectList
 	         $d5f0 = wOaksLabCurScript
 	         $d5f0 = wGameProgressFlags
@@ -20278,13 +20278,13 @@ HRAM bank #0:
 	         $ff8e = hLoadSpriteTemp2
 	         $ff8e = hFourTileSpriteCount
 	         $ff8f = hSpriteOffset2
-	         $ff8f = hFF8F
+	         $ff8f = hCollidingSpriteOffset
 	         $ff90 = hOAMBufferOffset
-	         $ff90 = hFF90
+	         $ff90 = hCollidingSpriteTempYValue
+	         $ff91 = hCollidingSpriteTempXValue
 	         $ff91 = hSpriteScreenX
-	         $ff91 = hFF91
+	         $ff92 = hCollidingSpriteAdjustedDistance
 	         $ff92 = hSpriteScreenY
-	         $ff92 = hFF92
 	         $ff93 = hTilePlayerStandingOn
 	         $ff94 = hSpritePriority
 	         $ff95 = hPastLeadingZeros
@@ -20364,9 +20364,9 @@ HRAM bank #0:
 	         $ffd8 = hMovingBGTilesCounter1
 	         $ffda = hCurrentSpriteOffset
 	         $ffdb = hOaksAideResult
-	         $ffdb = hFFDB
 	         $ffdb = hVendingMachineItem
 	         $ffdb = hPlayerFacing
+	         $ffdb = hInteractedWithBookshelf
 	         $ffdb = hMissableObjectIndex
 	         $ffdb = hDexRatingNumMonsSeen
 	         $ffdb = hGymGateIndex
@@ -20377,7 +20377,6 @@ HRAM bank #0:
 	         $ffdb = hItemToRemoveID
 	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hVendingMachinePrice
-	         $ffdc = hFFDC
 	         $ffdc = hDexRatingNumMonsOwned
 	         $ffdc = hOaksAideRewardItem
 	         $ffdc = hPlayerYCoord

diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
@@ -19121,7 +19121,7 @@
 00:d5a4 wPlayerCoins
 00:d5a6 wMissableObjectFlags
 00:d5c6 wMissableObjectFlagsEnd
-00:d5cd wd5cd
+00:d5cd wSpriteImageIndexBackup
 00:d5ce wMissableObjectList
 00:d5f0 wOaksLabCurScript
 00:d5f0 wGameProgressFlags
@@ -19941,13 +19941,13 @@
 00:ff8e hLoadSpriteTemp2
 00:ff8e hFourTileSpriteCount
 00:ff8f hSpriteOffset2
-00:ff8f hFF8F
+00:ff8f hCollidingSpriteOffset
 00:ff90 hOAMBufferOffset
-00:ff90 hFF90
+00:ff90 hCollidingSpriteTempYValue
+00:ff91 hCollidingSpriteTempXValue
 00:ff91 hSpriteScreenX
-00:ff91 hFF91
+00:ff92 hCollidingSpriteAdjustedDistance
 00:ff92 hSpriteScreenY
-00:ff92 hFF92
 00:ff93 hTilePlayerStandingOn
 00:ff94 hSpritePriority
 00:ff95 hPastLeadingZeros
@@ -20027,9 +20027,9 @@
 00:ffd8 hMovingBGTilesCounter1
 00:ffda hCurrentSpriteOffset
 00:ffdb hOaksAideResult
-00:ffdb hFFDB
 00:ffdb hVendingMachineItem
 00:ffdb hPlayerFacing
+00:ffdb hInteractedWithBookshelf
 00:ffdb hMissableObjectIndex
 00:ffdb hDexRatingNumMonsSeen
 00:ffdb hGymGateIndex
@@ -20040,7 +20040,6 @@
 00:ffdb hItemToRemoveID
 00:ffdc hItemToRemoveIndex
 00:ffdc hVendingMachinePrice
-00:ffdc hFFDC
 00:ffdc hDexRatingNumMonsOwned
 00:ffdc hOaksAideRewardItem
 00:ffdc hPlayerYCoord

diff --git a/pokeblue_vc.map b/pokeblue_vc.map
@@ -19492,7 +19492,7 @@ WRAM0 bank #0:
 	         $d5a4 = wPlayerCoins
 	         $d5a6 = wMissableObjectFlags
 	         $d5c6 = wMissableObjectFlagsEnd
-	         $d5cd = wd5cd
+	         $d5cd = wSpriteImageIndexBackup
 	         $d5ce = wMissableObjectList
 	         $d5f0 = wOaksLabCurScript
 	         $d5f0 = wGameProgressFlags
@@ -20320,13 +20320,13 @@ HRAM bank #0:
 	         $ff8e = hLoadSpriteTemp2
 	         $ff8e = hFourTileSpriteCount
 	         $ff8f = hSpriteOffset2
-	         $ff8f = hFF8F
+	         $ff8f = hCollidingSpriteOffset
 	         $ff90 = hOAMBufferOffset
-	         $ff90 = hFF90
+	         $ff90 = hCollidingSpriteTempYValue
+	         $ff91 = hCollidingSpriteTempXValue
 	         $ff91 = hSpriteScreenX
-	         $ff91 = hFF91
+	         $ff92 = hCollidingSpriteAdjustedDistance
 	         $ff92 = hSpriteScreenY
-	         $ff92 = hFF92
 	         $ff93 = hTilePlayerStandingOn
 	         $ff94 = hSpritePriority
 	         $ff95 = hPastLeadingZeros
@@ -20406,9 +20406,9 @@ HRAM bank #0:
 	         $ffd8 = hMovingBGTilesCounter1
 	         $ffda = hCurrentSpriteOffset
 	         $ffdb = hOaksAideResult
-	         $ffdb = hFFDB
 	         $ffdb = hVendingMachineItem
 	         $ffdb = hPlayerFacing
+	         $ffdb = hInteractedWithBookshelf
 	         $ffdb = hMissableObjectIndex
 	         $ffdb = hDexRatingNumMonsSeen
 	         $ffdb = hGymGateIndex
@@ -20419,7 +20419,6 @@ HRAM bank #0:
 	         $ffdb = hItemToRemoveID
 	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hVendingMachinePrice
-	         $ffdc = hFFDC
 	         $ffdc = hDexRatingNumMonsOwned
 	         $ffdc = hOaksAideRewardItem
 	         $ffdc = hPlayerYCoord

diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
@@ -19163,7 +19163,7 @@
 00:d5a4 wPlayerCoins
 00:d5a6 wMissableObjectFlags
 00:d5c6 wMissableObjectFlagsEnd
-00:d5cd wd5cd
+00:d5cd wSpriteImageIndexBackup
 00:d5ce wMissableObjectList
 00:d5f0 wOaksLabCurScript
 00:d5f0 wGameProgressFlags
@@ -19983,13 +19983,13 @@
 00:ff8e hLoadSpriteTemp2
 00:ff8e hFourTileSpriteCount
 00:ff8f hSpriteOffset2
-00:ff8f hFF8F
+00:ff8f hCollidingSpriteOffset
 00:ff90 hOAMBufferOffset
-00:ff90 hFF90
+00:ff90 hCollidingSpriteTempYValue
+00:ff91 hCollidingSpriteTempXValue
 00:ff91 hSpriteScreenX
-00:ff91 hFF91
+00:ff92 hCollidingSpriteAdjustedDistance
 00:ff92 hSpriteScreenY
-00:ff92 hFF92
 00:ff93 hTilePlayerStandingOn
 00:ff94 hSpritePriority
 00:ff95 hPastLeadingZeros
@@ -20069,9 +20069,9 @@
 00:ffd8 hMovingBGTilesCounter1
 00:ffda hCurrentSpriteOffset
 00:ffdb hOaksAideResult
-00:ffdb hFFDB
 00:ffdb hVendingMachineItem
 00:ffdb hPlayerFacing
+00:ffdb hInteractedWithBookshelf
 00:ffdb hMissableObjectIndex
 00:ffdb hDexRatingNumMonsSeen
 00:ffdb hGymGateIndex
@@ -20082,7 +20082,6 @@
 00:ffdb hItemToRemoveID
 00:ffdc hItemToRemoveIndex
 00:ffdc hVendingMachinePrice
-00:ffdc hFFDC
 00:ffdc hDexRatingNumMonsOwned
 00:ffdc hOaksAideRewardItem
 00:ffdc hPlayerYCoord

diff --git a/pokered.map b/pokered.map
@@ -19440,7 +19440,7 @@ WRAM0 bank #0:
 	         $d5a4 = wPlayerCoins
 	         $d5a6 = wMissableObjectFlags
 	         $d5c6 = wMissableObjectFlagsEnd
-	         $d5cd = wd5cd
+	         $d5cd = wSpriteImageIndexBackup
 	         $d5ce = wMissableObjectList
 	         $d5f0 = wOaksLabCurScript
 	         $d5f0 = wGameProgressFlags
@@ -20268,13 +20268,13 @@ HRAM bank #0:
 	         $ff8e = hLoadSpriteTemp2
 	         $ff8e = hFourTileSpriteCount
 	         $ff8f = hSpriteOffset2
-	         $ff8f = hFF8F
+	         $ff8f = hCollidingSpriteOffset
 	         $ff90 = hOAMBufferOffset
-	         $ff90 = hFF90
+	         $ff90 = hCollidingSpriteTempYValue
+	         $ff91 = hCollidingSpriteTempXValue
 	         $ff91 = hSpriteScreenX
-	         $ff91 = hFF91
+	         $ff92 = hCollidingSpriteAdjustedDistance
 	         $ff92 = hSpriteScreenY
-	         $ff92 = hFF92
 	         $ff93 = hTilePlayerStandingOn
 	         $ff94 = hSpritePriority
 	         $ff95 = hPastLeadingZeros
@@ -20354,9 +20354,9 @@ HRAM bank #0:
 	         $ffd8 = hMovingBGTilesCounter1
 	         $ffda = hCurrentSpriteOffset
 	         $ffdb = hOaksAideResult
-	         $ffdb = hFFDB
 	         $ffdb = hVendingMachineItem
 	         $ffdb = hPlayerFacing
+	         $ffdb = hInteractedWithBookshelf
 	         $ffdb = hMissableObjectIndex
 	         $ffdb = hDexRatingNumMonsSeen
 	         $ffdb = hGymGateIndex
@@ -20367,7 +20367,6 @@ HRAM bank #0:
 	         $ffdb = hItemToRemoveID
 	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hVendingMachinePrice
-	         $ffdc = hFFDC
 	         $ffdc = hDexRatingNumMonsOwned
 	         $ffdc = hOaksAideRewardItem
 	         $ffdc = hPlayerYCoord

diff --git a/pokered.sym b/pokered.sym
@@ -19111,7 +19111,7 @@
 00:d5a4 wPlayerCoins
 00:d5a6 wMissableObjectFlags
 00:d5c6 wMissableObjectFlagsEnd
-00:d5cd wd5cd
+00:d5cd wSpriteImageIndexBackup
 00:d5ce wMissableObjectList
 00:d5f0 wOaksLabCurScript
 00:d5f0 wGameProgressFlags
@@ -19931,13 +19931,13 @@
 00:ff8e hLoadSpriteTemp2
 00:ff8e hFourTileSpriteCount
 00:ff8f hSpriteOffset2
-00:ff8f hFF8F
+00:ff8f hCollidingSpriteOffset
 00:ff90 hOAMBufferOffset
-00:ff90 hFF90
+00:ff90 hCollidingSpriteTempYValue
+00:ff91 hCollidingSpriteTempXValue
 00:ff91 hSpriteScreenX
-00:ff91 hFF91
+00:ff92 hCollidingSpriteAdjustedDistance
 00:ff92 hSpriteScreenY
-00:ff92 hFF92
 00:ff93 hTilePlayerStandingOn
 00:ff94 hSpritePriority
 00:ff95 hPastLeadingZeros
@@ -20017,9 +20017,9 @@
 00:ffd8 hMovingBGTilesCounter1
 00:ffda hCurrentSpriteOffset
 00:ffdb hOaksAideResult
-00:ffdb hFFDB
 00:ffdb hVendingMachineItem
 00:ffdb hPlayerFacing
+00:ffdb hInteractedWithBookshelf
 00:ffdb hMissableObjectIndex
 00:ffdb hDexRatingNumMonsSeen
 00:ffdb hGymGateIndex
@@ -20030,7 +20030,6 @@
 00:ffdb hItemToRemoveID
 00:ffdc hItemToRemoveIndex
 00:ffdc hVendingMachinePrice
-00:ffdc hFFDC
 00:ffdc hDexRatingNumMonsOwned
 00:ffdc hOaksAideRewardItem
 00:ffdc hPlayerYCoord