Identify unnamed functions in map_sprites.asm (#126)

Also fix a label name
pret · Jan 24, 2025 · dbef4b3 · dbef4b3
1 parent 30dc2e6
commit dbef4b3
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 48 deletions.
diff --git a/pokeyellow.map b/pokeyellow.map
@@ -3816,7 +3816,7 @@ ROMX bank #5:
 	         $405c = InitOutsideMapSprites.skipLoadingSpriteSet
 	         $4061 = LoadSpriteSetFromMapHeader
 	         $4075 = LoadSpriteSetFromMapHeader.storeVRAMSlotsLoop
-	         $408a = LoadSpriteSetFromMapHeader.isFourTileSprite
+	         $408a = LoadSpriteSetFromMapHeader.isNotFourTileSprite
 	         $4092 = LoadSpriteSetFromMapHeader.continue
 	         $409b = CheckIfPictureIDAlreadyLoaded
 	         $409b = CheckIfPictureIDAlreadyLoaded.loop
@@ -3836,13 +3836,13 @@ ROMX bank #5:
 	         $4108 = GetSpriteVRAMAddress
 	         $4118 = SpriteVRAMAddresses
 	         $412e = ReadSpriteSheetData
-	         $4150 = Func_14150
-	         $415f = Func_14150.loop
-	         $416f = Func_14150.spriteUnused
-	         $4179 = Func_14179
-	         $4181 = Func_14179.findSpriteImageBaseOffsetLoop
-	         $418d = Func_14179.foundSpritePictureID
-	         $4190 = Func_14179.done
+	         $4150 = LoadMapSpritesImageBaseOffset
+	         $415f = LoadMapSpritesImageBaseOffset.loop
+	         $416f = LoadMapSpritesImageBaseOffset.spriteUnused
+	         $4179 = GetSpriteImageBaseOffset
+	         $4181 = GetSpriteImageBaseOffset.findSpriteImageBaseOffsetLoop
+	         $418d = GetSpriteImageBaseOffset.foundSpritePictureID
+	         $4190 = GetSpriteImageBaseOffset.done
 	         $4193 = GetSplitMapSpriteSetID
 	         $41af = GetSplitMapSpriteSetID.noCarry
 	         $41b6 = GetSplitMapSpriteSetID.northSouthDivide

diff --git a/pokeyellow.sym b/pokeyellow.sym
@@ -3760,7 +3760,7 @@
 05:405c InitOutsideMapSprites.skipLoadingSpriteSet
 05:4061 LoadSpriteSetFromMapHeader
 05:4075 LoadSpriteSetFromMapHeader.storeVRAMSlotsLoop
-05:408a LoadSpriteSetFromMapHeader.isFourTileSprite
+05:408a LoadSpriteSetFromMapHeader.isNotFourTileSprite
 05:4092 LoadSpriteSetFromMapHeader.continue
 05:409b CheckIfPictureIDAlreadyLoaded
 05:409b CheckIfPictureIDAlreadyLoaded.loop
@@ -3780,13 +3780,13 @@
 05:4108 GetSpriteVRAMAddress
 05:4118 SpriteVRAMAddresses
 05:412e ReadSpriteSheetData
-05:4150 Func_14150
-05:415f Func_14150.loop
-05:416f Func_14150.spriteUnused
-05:4179 Func_14179
-05:4181 Func_14179.findSpriteImageBaseOffsetLoop
-05:418d Func_14179.foundSpritePictureID
-05:4190 Func_14179.done
+05:4150 LoadMapSpritesImageBaseOffset
+05:415f LoadMapSpritesImageBaseOffset.loop
+05:416f LoadMapSpritesImageBaseOffset.spriteUnused
+05:4179 GetSpriteImageBaseOffset
+05:4181 GetSpriteImageBaseOffset.findSpriteImageBaseOffsetLoop
+05:418d GetSpriteImageBaseOffset.foundSpritePictureID
+05:4190 GetSpriteImageBaseOffset.done
 05:4193 GetSplitMapSpriteSetID
 05:41af GetSplitMapSpriteSetID.noCarry
 05:41b6 GetSplitMapSpriteSetID.northSouthDivide

diff --git a/pokeyellow_debug.map b/pokeyellow_debug.map
@@ -3823,7 +3823,7 @@ ROMX bank #5:
 	         $405c = InitOutsideMapSprites.skipLoadingSpriteSet
 	         $4061 = LoadSpriteSetFromMapHeader
 	         $4075 = LoadSpriteSetFromMapHeader.storeVRAMSlotsLoop
-	         $408a = LoadSpriteSetFromMapHeader.isFourTileSprite
+	         $408a = LoadSpriteSetFromMapHeader.isNotFourTileSprite
 	         $4092 = LoadSpriteSetFromMapHeader.continue
 	         $409b = CheckIfPictureIDAlreadyLoaded
 	         $409b = CheckIfPictureIDAlreadyLoaded.loop
@@ -3843,13 +3843,13 @@ ROMX bank #5:
 	         $4108 = GetSpriteVRAMAddress
 	         $4118 = SpriteVRAMAddresses
 	         $412e = ReadSpriteSheetData
-	         $4150 = Func_14150
-	         $415f = Func_14150.loop
-	         $416f = Func_14150.spriteUnused
-	         $4179 = Func_14179
-	         $4181 = Func_14179.findSpriteImageBaseOffsetLoop
-	         $418d = Func_14179.foundSpritePictureID
-	         $4190 = Func_14179.done
+	         $4150 = LoadMapSpritesImageBaseOffset
+	         $415f = LoadMapSpritesImageBaseOffset.loop
+	         $416f = LoadMapSpritesImageBaseOffset.spriteUnused
+	         $4179 = GetSpriteImageBaseOffset
+	         $4181 = GetSpriteImageBaseOffset.findSpriteImageBaseOffsetLoop
+	         $418d = GetSpriteImageBaseOffset.foundSpritePictureID
+	         $4190 = GetSpriteImageBaseOffset.done
 	         $4193 = GetSplitMapSpriteSetID
 	         $41af = GetSplitMapSpriteSetID.noCarry
 	         $41b6 = GetSplitMapSpriteSetID.northSouthDivide

diff --git a/pokeyellow_debug.sym b/pokeyellow_debug.sym
@@ -3767,7 +3767,7 @@
 05:405c InitOutsideMapSprites.skipLoadingSpriteSet
 05:4061 LoadSpriteSetFromMapHeader
 05:4075 LoadSpriteSetFromMapHeader.storeVRAMSlotsLoop
-05:408a LoadSpriteSetFromMapHeader.isFourTileSprite
+05:408a LoadSpriteSetFromMapHeader.isNotFourTileSprite
 05:4092 LoadSpriteSetFromMapHeader.continue
 05:409b CheckIfPictureIDAlreadyLoaded
 05:409b CheckIfPictureIDAlreadyLoaded.loop
@@ -3787,13 +3787,13 @@
 05:4108 GetSpriteVRAMAddress
 05:4118 SpriteVRAMAddresses
 05:412e ReadSpriteSheetData
-05:4150 Func_14150
-05:415f Func_14150.loop
-05:416f Func_14150.spriteUnused
-05:4179 Func_14179
-05:4181 Func_14179.findSpriteImageBaseOffsetLoop
-05:418d Func_14179.foundSpritePictureID
-05:4190 Func_14179.done
+05:4150 LoadMapSpritesImageBaseOffset
+05:415f LoadMapSpritesImageBaseOffset.loop
+05:416f LoadMapSpritesImageBaseOffset.spriteUnused
+05:4179 GetSpriteImageBaseOffset
+05:4181 GetSpriteImageBaseOffset.findSpriteImageBaseOffsetLoop
+05:418d GetSpriteImageBaseOffset.foundSpritePictureID
+05:4190 GetSpriteImageBaseOffset.done
 05:4193 GetSplitMapSpriteSetID
 05:41af GetSplitMapSpriteSetID.noCarry
 05:41b6 GetSplitMapSpriteSetID.northSouthDivide

diff --git a/pokeyellow_vc.map b/pokeyellow_vc.map
@@ -3830,7 +3830,7 @@ ROMX bank #5:
 	         $405c = InitOutsideMapSprites.skipLoadingSpriteSet
 	         $4061 = LoadSpriteSetFromMapHeader
 	         $4075 = LoadSpriteSetFromMapHeader.storeVRAMSlotsLoop
-	         $408a = LoadSpriteSetFromMapHeader.isFourTileSprite
+	         $408a = LoadSpriteSetFromMapHeader.isNotFourTileSprite
 	         $4092 = LoadSpriteSetFromMapHeader.continue
 	         $409b = CheckIfPictureIDAlreadyLoaded
 	         $409b = CheckIfPictureIDAlreadyLoaded.loop
@@ -3850,13 +3850,13 @@ ROMX bank #5:
 	         $4108 = GetSpriteVRAMAddress
 	         $4118 = SpriteVRAMAddresses
 	         $412e = ReadSpriteSheetData
-	         $4150 = Func_14150
-	         $415f = Func_14150.loop
-	         $416f = Func_14150.spriteUnused
-	         $4179 = Func_14179
-	         $4181 = Func_14179.findSpriteImageBaseOffsetLoop
-	         $418d = Func_14179.foundSpritePictureID
-	         $4190 = Func_14179.done
+	         $4150 = LoadMapSpritesImageBaseOffset
+	         $415f = LoadMapSpritesImageBaseOffset.loop
+	         $416f = LoadMapSpritesImageBaseOffset.spriteUnused
+	         $4179 = GetSpriteImageBaseOffset
+	         $4181 = GetSpriteImageBaseOffset.findSpriteImageBaseOffsetLoop
+	         $418d = GetSpriteImageBaseOffset.foundSpritePictureID
+	         $4190 = GetSpriteImageBaseOffset.done
 	         $4193 = GetSplitMapSpriteSetID
 	         $41af = GetSplitMapSpriteSetID.noCarry
 	         $41b6 = GetSplitMapSpriteSetID.northSouthDivide

diff --git a/pokeyellow_vc.sym b/pokeyellow_vc.sym
@@ -3774,7 +3774,7 @@
 05:405c InitOutsideMapSprites.skipLoadingSpriteSet
 05:4061 LoadSpriteSetFromMapHeader
 05:4075 LoadSpriteSetFromMapHeader.storeVRAMSlotsLoop
-05:408a LoadSpriteSetFromMapHeader.isFourTileSprite
+05:408a LoadSpriteSetFromMapHeader.isNotFourTileSprite
 05:4092 LoadSpriteSetFromMapHeader.continue
 05:409b CheckIfPictureIDAlreadyLoaded
 05:409b CheckIfPictureIDAlreadyLoaded.loop
@@ -3794,13 +3794,13 @@
 05:4108 GetSpriteVRAMAddress
 05:4118 SpriteVRAMAddresses
 05:412e ReadSpriteSheetData
-05:4150 Func_14150
-05:415f Func_14150.loop
-05:416f Func_14150.spriteUnused
-05:4179 Func_14179
-05:4181 Func_14179.findSpriteImageBaseOffsetLoop
-05:418d Func_14179.foundSpritePictureID
-05:4190 Func_14179.done
+05:4150 LoadMapSpritesImageBaseOffset
+05:415f LoadMapSpritesImageBaseOffset.loop
+05:416f LoadMapSpritesImageBaseOffset.spriteUnused
+05:4179 GetSpriteImageBaseOffset
+05:4181 GetSpriteImageBaseOffset.findSpriteImageBaseOffsetLoop
+05:418d GetSpriteImageBaseOffset.foundSpritePictureID
+05:4190 GetSpriteImageBaseOffset.done
 05:4193 GetSplitMapSpriteSetID
 05:41af GetSplitMapSpriteSetID.noCarry
 05:41b6 GetSplitMapSpriteSetID.northSouthDivide