Split hSpriteIndexOrTextID into hSpriteIndex and hTextID (#462)

Also identify `wPPUpCountAndMaxPP`
pret · Sep 19, 2024 · 3444289 · 3444289
1 parent d1c6682
commit 3444289
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 10 deletions.
diff --git a/pokeblue.map b/pokeblue.map
@@ -18812,6 +18812,7 @@ WRAM0 bank #0:
 	         $cd6d = wBattleMenuCurrentPP
 	         $cd6d = wEvoDataBuffer
 	         $cd71 = wStatusScreenCurrentPP
+	         $cd73 = wPPUpCountAndMaxPP
 	         $cd78 = wNormalMaxPPList
 	         $cd81 = wSerialOtherGameboyRandomNumberListBlock
 	         $cd81 = wTileMapBackup2
@@ -20264,9 +20265,9 @@ HRAM bank #0:
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndexOrTextID
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
+	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed

diff --git a/pokeblue.sym b/pokeblue.sym
@@ -18478,6 +18478,7 @@
 00:cd6d wBattleMenuCurrentPP
 00:cd6d wEvoDataBuffer
 00:cd71 wStatusScreenCurrentPP
+00:cd73 wPPUpCountAndMaxPP
 00:cd78 wNormalMaxPPList
 00:cd81 wSerialOtherGameboyRandomNumberListBlock
 00:cd81 wTileMapBackup2
@@ -19920,9 +19921,9 @@
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndexOrTextID
 00:ff8c hMapWidth
 00:ff8c hSpriteIndex
+00:ff8c hTextID
 00:ff8c hSlidingRegionSize
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed

diff --git a/pokeblue_debug.map b/pokeblue_debug.map
@@ -18822,6 +18822,7 @@ WRAM0 bank #0:
 	         $cd6d = wBattleMenuCurrentPP
 	         $cd6d = wEvoDataBuffer
 	         $cd71 = wStatusScreenCurrentPP
+	         $cd73 = wPPUpCountAndMaxPP
 	         $cd78 = wNormalMaxPPList
 	         $cd81 = wSerialOtherGameboyRandomNumberListBlock
 	         $cd81 = wTileMapBackup2
@@ -20274,9 +20275,9 @@ HRAM bank #0:
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndexOrTextID
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
+	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed

diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
@@ -18488,6 +18488,7 @@
 00:cd6d wBattleMenuCurrentPP
 00:cd6d wEvoDataBuffer
 00:cd71 wStatusScreenCurrentPP
+00:cd73 wPPUpCountAndMaxPP
 00:cd78 wNormalMaxPPList
 00:cd81 wSerialOtherGameboyRandomNumberListBlock
 00:cd81 wTileMapBackup2
@@ -19930,9 +19931,9 @@
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndexOrTextID
 00:ff8c hMapWidth
 00:ff8c hSpriteIndex
+00:ff8c hTextID
 00:ff8c hSlidingRegionSize
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed

diff --git a/pokeblue_vc.map b/pokeblue_vc.map
@@ -18864,6 +18864,7 @@ WRAM0 bank #0:
 	         $cd6d = wBattleMenuCurrentPP
 	         $cd6d = wEvoDataBuffer
 	         $cd71 = wStatusScreenCurrentPP
+	         $cd73 = wPPUpCountAndMaxPP
 	         $cd78 = wNormalMaxPPList
 	         $cd81 = wSerialOtherGameboyRandomNumberListBlock
 	         $cd81 = wTileMapBackup2
@@ -20316,9 +20317,9 @@ HRAM bank #0:
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndexOrTextID
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
+	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed

diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
@@ -18530,6 +18530,7 @@
 00:cd6d wBattleMenuCurrentPP
 00:cd6d wEvoDataBuffer
 00:cd71 wStatusScreenCurrentPP
+00:cd73 wPPUpCountAndMaxPP
 00:cd78 wNormalMaxPPList
 00:cd81 wSerialOtherGameboyRandomNumberListBlock
 00:cd81 wTileMapBackup2
@@ -19972,9 +19973,9 @@
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndexOrTextID
 00:ff8c hMapWidth
 00:ff8c hSpriteIndex
+00:ff8c hTextID
 00:ff8c hSlidingRegionSize
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed

diff --git a/pokered.map b/pokered.map
@@ -18812,6 +18812,7 @@ WRAM0 bank #0:
 	         $cd6d = wBattleMenuCurrentPP
 	         $cd6d = wEvoDataBuffer
 	         $cd71 = wStatusScreenCurrentPP
+	         $cd73 = wPPUpCountAndMaxPP
 	         $cd78 = wNormalMaxPPList
 	         $cd81 = wSerialOtherGameboyRandomNumberListBlock
 	         $cd81 = wTileMapBackup2
@@ -20264,9 +20265,9 @@ HRAM bank #0:
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndexOrTextID
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
+	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed

diff --git a/pokered.sym b/pokered.sym
@@ -18478,6 +18478,7 @@
 00:cd6d wBattleMenuCurrentPP
 00:cd6d wEvoDataBuffer
 00:cd71 wStatusScreenCurrentPP
+00:cd73 wPPUpCountAndMaxPP
 00:cd78 wNormalMaxPPList
 00:cd81 wSerialOtherGameboyRandomNumberListBlock
 00:cd81 wTileMapBackup2
@@ -19920,9 +19921,9 @@
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndexOrTextID
 00:ff8c hMapWidth
 00:ff8c hSpriteIndex
+00:ff8c hTextID
 00:ff8c hSlidingRegionSize
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed

diff --git a/pokered_vc.map b/pokered_vc.map
@@ -18867,6 +18867,7 @@ WRAM0 bank #0:
 	         $cd6d = wBattleMenuCurrentPP
 	         $cd6d = wEvoDataBuffer
 	         $cd71 = wStatusScreenCurrentPP
+	         $cd73 = wPPUpCountAndMaxPP
 	         $cd78 = wNormalMaxPPList
 	         $cd81 = wSerialOtherGameboyRandomNumberListBlock
 	         $cd81 = wTileMapBackup2
@@ -20319,9 +20320,9 @@ HRAM bank #0:
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndexOrTextID
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteIndex
+	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed

diff --git a/pokered_vc.sym b/pokered_vc.sym
@@ -18533,6 +18533,7 @@
 00:cd6d wBattleMenuCurrentPP
 00:cd6d wEvoDataBuffer
 00:cd71 wStatusScreenCurrentPP
+00:cd73 wPPUpCountAndMaxPP
 00:cd78 wNormalMaxPPList
 00:cd81 wSerialOtherGameboyRandomNumberListBlock
 00:cd81 wTileMapBackup2
@@ -19975,9 +19976,9 @@
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndexOrTextID
 00:ff8c hMapWidth
 00:ff8c hSpriteIndex
+00:ff8c hTextID
 00:ff8c hSlidingRegionSize
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed