Skip to content

Commit

Permalink
dbsprite is the wrong macro for WriteOAMBlock data (#472)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rangi42
Rangi42 committed Sep 29, 2024
1 parent 5a337a4 commit 67e8be0
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 110 deletions.
22 changes: 11 additions & 11 deletions pokeblue.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3281,7 +3281,7 @@ ROMX bank #3:
$7044 = InitCutAnimOAM.loop
$704c = LoadCutGrassAnimationTilePattern
$7055 = WriteCutOrBoulderDustAnimationOAMBlock
$7060 = CutOrBoulderDustAnimationTilesAndAttributes
$7060 = WriteCutOrBoulderDustAnimationOAMBlock.OAMBlock
$7068 = GetCutOrBoulderDustAnimationOffsets
$7084 = GetCutOrBoulderDustAnimationOffsets.next
$708f = CutAnimationOffsets
Expand Down Expand Up @@ -3844,7 +3844,7 @@ ROMX bank #5:
$7c7a = EmotionBubble.next
$7c7d = EmotionBubble.loop
$7caf = EmotionBubblesPointerTable
$7cb5 = EmotionBubblesOAM
$7cb5 = EmotionBubblesOAMBlock
$7cbd = EmotionBubbles
$7cbd = ShockEmote
$7cfd = QuestionEmote
Expand Down Expand Up @@ -4386,7 +4386,7 @@ ROMX bank #6:
$66f0 = LoadHoppingShadowOAM
$6708 = LedgeHoppingShadow
$6710 = LedgeHoppingShadowEnd
$6710 = LedgeHoppingShadowOAM
$6710 = LedgeHoppingShadowOAMBlock
EMPTY: $6718-$7fff ($18e8 bytes)
TOTAL EMPTY: $18e8 bytes

Expand Down Expand Up @@ -7812,7 +7812,7 @@ ROMX bank #16:
$52e7 = Trade_AnimateBallEnteringLinkCable.moveBallInsideLinkCableLoop
$5300 = Trade_AnimateBallEnteringLinkCable.cycleLinkCableBulgeTile
$5318 = Trade_AnimateBallEnteringLinkCable.ballSpriteReachedEdgeOfScreen
$532e = Trade_BallInsideLinkCableOAM
$532e = Trade_BallInsideLinkCableOAMBlock
$5336 = Trade_ShowEnemyMon
$5376 = Trade_AnimLeftToRight
$53c6 = Trade_AnimRightToLeft
Expand All @@ -7837,13 +7837,13 @@ ROMX bank #16:
$5536 = Trade_AnimMonMoveVertical.movingLeft
$553f = Trade_AnimMonMoveVertical.doAnim
$5549 = Trade_AnimMonMoveVertical.loop
$5558 = Trade_WriteCircleOAM
$555e = Trade_WriteCircleOAM.loop
$5574 = Trade_CircleOAMPointers
$5584 = Trade_CircleOAM0
$558c = Trade_CircleOAM1
$5594 = Trade_CircleOAM2
$559c = Trade_CircleOAM3
$5558 = Trade_WriteCircleOAMBlock
$555e = Trade_WriteCircleOAMBlock.loop
$5574 = Trade_CircleOAMBlocks
$5584 = Trade_CircleOAMBlocks.OAMBlock0
$558c = Trade_CircleOAMBlocks.OAMBlock1
$5594 = Trade_CircleOAMBlocks.OAMBlock2
$559c = Trade_CircleOAMBlocks.OAMBlock3
$55a4 = Trade_LoadMonSprite
$55c8 = Trade_ShowClearedWindow
$55df = Trade_SlideTextBoxOffScreen
Expand Down
22 changes: 11 additions & 11 deletions pokeblue.sym
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3237,7 +3237,7 @@
03:7044 InitCutAnimOAM.loop
03:704c LoadCutGrassAnimationTilePattern
03:7055 WriteCutOrBoulderDustAnimationOAMBlock
03:7060 CutOrBoulderDustAnimationTilesAndAttributes
03:7060 WriteCutOrBoulderDustAnimationOAMBlock.OAMBlock
03:7068 GetCutOrBoulderDustAnimationOffsets
03:7084 GetCutOrBoulderDustAnimationOffsets.next
03:708f CutAnimationOffsets
Expand Down Expand Up @@ -3787,7 +3787,7 @@
05:7c7a EmotionBubble.next
05:7c7d EmotionBubble.loop
05:7caf EmotionBubblesPointerTable
05:7cb5 EmotionBubblesOAM
05:7cb5 EmotionBubblesOAMBlock
05:7cbd EmotionBubbles
05:7cbd ShockEmote
05:7cfd QuestionEmote
Expand Down Expand Up @@ -4321,7 +4321,7 @@
06:66f0 LoadHoppingShadowOAM
06:6708 LedgeHoppingShadow
06:6710 LedgeHoppingShadowEnd
06:6710 LedgeHoppingShadowOAM
06:6710 LedgeHoppingShadowOAMBlock
07:4000 CinnabarIsland_h
07:4022 CinnabarIsland_Object
07:4069 CinnabarIsland_Blocks
Expand Down Expand Up @@ -7683,7 +7683,7 @@
10:52e7 Trade_AnimateBallEnteringLinkCable.moveBallInsideLinkCableLoop
10:5300 Trade_AnimateBallEnteringLinkCable.cycleLinkCableBulgeTile
10:5318 Trade_AnimateBallEnteringLinkCable.ballSpriteReachedEdgeOfScreen
10:532e Trade_BallInsideLinkCableOAM
10:532e Trade_BallInsideLinkCableOAMBlock
10:5336 Trade_ShowEnemyMon
10:5376 Trade_AnimLeftToRight
10:53c6 Trade_AnimRightToLeft
Expand All @@ -7708,13 +7708,13 @@
10:5536 Trade_AnimMonMoveVertical.movingLeft
10:553f Trade_AnimMonMoveVertical.doAnim
10:5549 Trade_AnimMonMoveVertical.loop
10:5558 Trade_WriteCircleOAM
10:555e Trade_WriteCircleOAM.loop
10:5574 Trade_CircleOAMPointers
10:5584 Trade_CircleOAM0
10:558c Trade_CircleOAM1
10:5594 Trade_CircleOAM2
10:559c Trade_CircleOAM3
10:5558 Trade_WriteCircleOAMBlock
10:555e Trade_WriteCircleOAMBlock.loop
10:5574 Trade_CircleOAMBlocks
10:5584 Trade_CircleOAMBlocks.OAMBlock0
10:558c Trade_CircleOAMBlocks.OAMBlock1
10:5594 Trade_CircleOAMBlocks.OAMBlock2
10:559c Trade_CircleOAMBlocks.OAMBlock3
10:55a4 Trade_LoadMonSprite
10:55c8 Trade_ShowClearedWindow
10:55df Trade_SlideTextBoxOffScreen
Expand Down
22 changes: 11 additions & 11 deletions pokeblue_debug.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3291,7 +3291,7 @@ ROMX bank #3:
$7044 = InitCutAnimOAM.loop
$704c = LoadCutGrassAnimationTilePattern
$7055 = WriteCutOrBoulderDustAnimationOAMBlock
$7060 = CutOrBoulderDustAnimationTilesAndAttributes
$7060 = WriteCutOrBoulderDustAnimationOAMBlock.OAMBlock
$7068 = GetCutOrBoulderDustAnimationOffsets
$7084 = GetCutOrBoulderDustAnimationOffsets.next
$708f = CutAnimationOffsets
Expand Down Expand Up @@ -3854,7 +3854,7 @@ ROMX bank #5:
$7c7a = EmotionBubble.next
$7c7d = EmotionBubble.loop
$7caf = EmotionBubblesPointerTable
$7cb5 = EmotionBubblesOAM
$7cb5 = EmotionBubblesOAMBlock
$7cbd = EmotionBubbles
$7cbd = ShockEmote
$7cfd = QuestionEmote
Expand Down Expand Up @@ -4396,7 +4396,7 @@ ROMX bank #6:
$66f8 = LoadHoppingShadowOAM
$6710 = LedgeHoppingShadow
$6718 = LedgeHoppingShadowEnd
$6718 = LedgeHoppingShadowOAM
$6718 = LedgeHoppingShadowOAMBlock
EMPTY: $6720-$7fff ($18e0 bytes)
TOTAL EMPTY: $18e0 bytes

Expand Down Expand Up @@ -7822,7 +7822,7 @@ ROMX bank #16:
$52e7 = Trade_AnimateBallEnteringLinkCable.moveBallInsideLinkCableLoop
$5300 = Trade_AnimateBallEnteringLinkCable.cycleLinkCableBulgeTile
$5318 = Trade_AnimateBallEnteringLinkCable.ballSpriteReachedEdgeOfScreen
$532e = Trade_BallInsideLinkCableOAM
$532e = Trade_BallInsideLinkCableOAMBlock
$5336 = Trade_ShowEnemyMon
$5376 = Trade_AnimLeftToRight
$53c6 = Trade_AnimRightToLeft
Expand All @@ -7847,13 +7847,13 @@ ROMX bank #16:
$5536 = Trade_AnimMonMoveVertical.movingLeft
$553f = Trade_AnimMonMoveVertical.doAnim
$5549 = Trade_AnimMonMoveVertical.loop
$5558 = Trade_WriteCircleOAM
$555e = Trade_WriteCircleOAM.loop
$5574 = Trade_CircleOAMPointers
$5584 = Trade_CircleOAM0
$558c = Trade_CircleOAM1
$5594 = Trade_CircleOAM2
$559c = Trade_CircleOAM3
$5558 = Trade_WriteCircleOAMBlock
$555e = Trade_WriteCircleOAMBlock.loop
$5574 = Trade_CircleOAMBlocks
$5584 = Trade_CircleOAMBlocks.OAMBlock0
$558c = Trade_CircleOAMBlocks.OAMBlock1
$5594 = Trade_CircleOAMBlocks.OAMBlock2
$559c = Trade_CircleOAMBlocks.OAMBlock3
$55a4 = Trade_LoadMonSprite
$55c8 = Trade_ShowClearedWindow
$55df = Trade_SlideTextBoxOffScreen
Expand Down
22 changes: 11 additions & 11 deletions pokeblue_debug.sym
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3247,7 +3247,7 @@
03:7044 InitCutAnimOAM.loop
03:704c LoadCutGrassAnimationTilePattern
03:7055 WriteCutOrBoulderDustAnimationOAMBlock
03:7060 CutOrBoulderDustAnimationTilesAndAttributes
03:7060 WriteCutOrBoulderDustAnimationOAMBlock.OAMBlock
03:7068 GetCutOrBoulderDustAnimationOffsets
03:7084 GetCutOrBoulderDustAnimationOffsets.next
03:708f CutAnimationOffsets
Expand Down Expand Up @@ -3797,7 +3797,7 @@
05:7c7a EmotionBubble.next
05:7c7d EmotionBubble.loop
05:7caf EmotionBubblesPointerTable
05:7cb5 EmotionBubblesOAM
05:7cb5 EmotionBubblesOAMBlock
05:7cbd EmotionBubbles
05:7cbd ShockEmote
05:7cfd QuestionEmote
Expand Down Expand Up @@ -4331,7 +4331,7 @@
06:66f8 LoadHoppingShadowOAM
06:6710 LedgeHoppingShadow
06:6718 LedgeHoppingShadowEnd
06:6718 LedgeHoppingShadowOAM
06:6718 LedgeHoppingShadowOAMBlock
07:4000 CinnabarIsland_h
07:4022 CinnabarIsland_Object
07:4069 CinnabarIsland_Blocks
Expand Down Expand Up @@ -7693,7 +7693,7 @@
10:52e7 Trade_AnimateBallEnteringLinkCable.moveBallInsideLinkCableLoop
10:5300 Trade_AnimateBallEnteringLinkCable.cycleLinkCableBulgeTile
10:5318 Trade_AnimateBallEnteringLinkCable.ballSpriteReachedEdgeOfScreen
10:532e Trade_BallInsideLinkCableOAM
10:532e Trade_BallInsideLinkCableOAMBlock
10:5336 Trade_ShowEnemyMon
10:5376 Trade_AnimLeftToRight
10:53c6 Trade_AnimRightToLeft
Expand All @@ -7718,13 +7718,13 @@
10:5536 Trade_AnimMonMoveVertical.movingLeft
10:553f Trade_AnimMonMoveVertical.doAnim
10:5549 Trade_AnimMonMoveVertical.loop
10:5558 Trade_WriteCircleOAM
10:555e Trade_WriteCircleOAM.loop
10:5574 Trade_CircleOAMPointers
10:5584 Trade_CircleOAM0
10:558c Trade_CircleOAM1
10:5594 Trade_CircleOAM2
10:559c Trade_CircleOAM3
10:5558 Trade_WriteCircleOAMBlock
10:555e Trade_WriteCircleOAMBlock.loop
10:5574 Trade_CircleOAMBlocks
10:5584 Trade_CircleOAMBlocks.OAMBlock0
10:558c Trade_CircleOAMBlocks.OAMBlock1
10:5594 Trade_CircleOAMBlocks.OAMBlock2
10:559c Trade_CircleOAMBlocks.OAMBlock3
10:55a4 Trade_LoadMonSprite
10:55c8 Trade_ShowClearedWindow
10:55df Trade_SlideTextBoxOffScreen
Expand Down
22 changes: 11 additions & 11 deletions pokeblue_vc.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3297,7 +3297,7 @@ ROMX bank #3:
$7044 = InitCutAnimOAM.loop
$704c = LoadCutGrassAnimationTilePattern
$7055 = WriteCutOrBoulderDustAnimationOAMBlock
$7060 = CutOrBoulderDustAnimationTilesAndAttributes
$7060 = WriteCutOrBoulderDustAnimationOAMBlock.OAMBlock
$7068 = GetCutOrBoulderDustAnimationOffsets
$7084 = GetCutOrBoulderDustAnimationOffsets.next
$708f = CutAnimationOffsets
Expand Down Expand Up @@ -3860,7 +3860,7 @@ ROMX bank #5:
$7c7a = EmotionBubble.next
$7c7d = EmotionBubble.loop
$7caf = EmotionBubblesPointerTable
$7cb5 = EmotionBubblesOAM
$7cb5 = EmotionBubblesOAMBlock
$7cbd = EmotionBubbles
$7cbd = ShockEmote
$7cfd = QuestionEmote
Expand Down Expand Up @@ -4402,7 +4402,7 @@ ROMX bank #6:
$66f0 = LoadHoppingShadowOAM
$6708 = LedgeHoppingShadow
$6710 = LedgeHoppingShadowEnd
$6710 = LedgeHoppingShadowOAM
$6710 = LedgeHoppingShadowOAMBlock
EMPTY: $6718-$7fff ($18e8 bytes)
TOTAL EMPTY: $18e8 bytes

Expand Down Expand Up @@ -7839,7 +7839,7 @@ ROMX bank #16:
$52e7 = Trade_AnimateBallEnteringLinkCable.moveBallInsideLinkCableLoop
$5300 = Trade_AnimateBallEnteringLinkCable.cycleLinkCableBulgeTile
$5318 = Trade_AnimateBallEnteringLinkCable.ballSpriteReachedEdgeOfScreen
$532e = Trade_BallInsideLinkCableOAM
$532e = Trade_BallInsideLinkCableOAMBlock
$5336 = Trade_ShowEnemyMon
$5376 = Trade_AnimLeftToRight
$53c6 = Trade_AnimRightToLeft
Expand All @@ -7864,13 +7864,13 @@ ROMX bank #16:
$5536 = Trade_AnimMonMoveVertical.movingLeft
$553f = Trade_AnimMonMoveVertical.doAnim
$5549 = Trade_AnimMonMoveVertical.loop
$5558 = Trade_WriteCircleOAM
$555e = Trade_WriteCircleOAM.loop
$5574 = Trade_CircleOAMPointers
$5584 = Trade_CircleOAM0
$558c = Trade_CircleOAM1
$5594 = Trade_CircleOAM2
$559c = Trade_CircleOAM3
$5558 = Trade_WriteCircleOAMBlock
$555e = Trade_WriteCircleOAMBlock.loop
$5574 = Trade_CircleOAMBlocks
$5584 = Trade_CircleOAMBlocks.OAMBlock0
$558c = Trade_CircleOAMBlocks.OAMBlock1
$5594 = Trade_CircleOAMBlocks.OAMBlock2
$559c = Trade_CircleOAMBlocks.OAMBlock3
$55a4 = Trade_LoadMonSprite
$55c8 = Trade_ShowClearedWindow
$55df = Trade_SlideTextBoxOffScreen
Expand Down
22 changes: 11 additions & 11 deletions pokeblue_vc.sym
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3253,7 +3253,7 @@
03:7044 InitCutAnimOAM.loop
03:704c LoadCutGrassAnimationTilePattern
03:7055 WriteCutOrBoulderDustAnimationOAMBlock
03:7060 CutOrBoulderDustAnimationTilesAndAttributes
03:7060 WriteCutOrBoulderDustAnimationOAMBlock.OAMBlock
03:7068 GetCutOrBoulderDustAnimationOffsets
03:7084 GetCutOrBoulderDustAnimationOffsets.next
03:708f CutAnimationOffsets
Expand Down Expand Up @@ -3803,7 +3803,7 @@
05:7c7a EmotionBubble.next
05:7c7d EmotionBubble.loop
05:7caf EmotionBubblesPointerTable
05:7cb5 EmotionBubblesOAM
05:7cb5 EmotionBubblesOAMBlock
05:7cbd EmotionBubbles
05:7cbd ShockEmote
05:7cfd QuestionEmote
Expand Down Expand Up @@ -4337,7 +4337,7 @@
06:66f0 LoadHoppingShadowOAM
06:6708 LedgeHoppingShadow
06:6710 LedgeHoppingShadowEnd
06:6710 LedgeHoppingShadowOAM
06:6710 LedgeHoppingShadowOAMBlock
07:4000 CinnabarIsland_h
07:4022 CinnabarIsland_Object
07:4069 CinnabarIsland_Blocks
Expand Down Expand Up @@ -7710,7 +7710,7 @@
10:52e7 Trade_AnimateBallEnteringLinkCable.moveBallInsideLinkCableLoop
10:5300 Trade_AnimateBallEnteringLinkCable.cycleLinkCableBulgeTile
10:5318 Trade_AnimateBallEnteringLinkCable.ballSpriteReachedEdgeOfScreen
10:532e Trade_BallInsideLinkCableOAM
10:532e Trade_BallInsideLinkCableOAMBlock
10:5336 Trade_ShowEnemyMon
10:5376 Trade_AnimLeftToRight
10:53c6 Trade_AnimRightToLeft
Expand All @@ -7735,13 +7735,13 @@
10:5536 Trade_AnimMonMoveVertical.movingLeft
10:553f Trade_AnimMonMoveVertical.doAnim
10:5549 Trade_AnimMonMoveVertical.loop
10:5558 Trade_WriteCircleOAM
10:555e Trade_WriteCircleOAM.loop
10:5574 Trade_CircleOAMPointers
10:5584 Trade_CircleOAM0
10:558c Trade_CircleOAM1
10:5594 Trade_CircleOAM2
10:559c Trade_CircleOAM3
10:5558 Trade_WriteCircleOAMBlock
10:555e Trade_WriteCircleOAMBlock.loop
10:5574 Trade_CircleOAMBlocks
10:5584 Trade_CircleOAMBlocks.OAMBlock0
10:558c Trade_CircleOAMBlocks.OAMBlock1
10:5594 Trade_CircleOAMBlocks.OAMBlock2
10:559c Trade_CircleOAMBlocks.OAMBlock3
10:55a4 Trade_LoadMonSprite
10:55c8 Trade_ShowClearedWindow
10:55df Trade_SlideTextBoxOffScreen
Expand Down
22 changes: 11 additions & 11 deletions pokered.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3281,7 +3281,7 @@ ROMX bank #3:
$7044 = InitCutAnimOAM.loop
$704c = LoadCutGrassAnimationTilePattern
$7055 = WriteCutOrBoulderDustAnimationOAMBlock
$7060 = CutOrBoulderDustAnimationTilesAndAttributes
$7060 = WriteCutOrBoulderDustAnimationOAMBlock.OAMBlock
$7068 = GetCutOrBoulderDustAnimationOffsets
$7084 = GetCutOrBoulderDustAnimationOffsets.next
$708f = CutAnimationOffsets
Expand Down Expand Up @@ -3844,7 +3844,7 @@ ROMX bank #5:
$7c7a = EmotionBubble.next
$7c7d = EmotionBubble.loop
$7caf = EmotionBubblesPointerTable
$7cb5 = EmotionBubblesOAM
$7cb5 = EmotionBubblesOAMBlock
$7cbd = EmotionBubbles
$7cbd = ShockEmote
$7cfd = QuestionEmote
Expand Down Expand Up @@ -4386,7 +4386,7 @@ ROMX bank #6:
$66f0 = LoadHoppingShadowOAM
$6708 = LedgeHoppingShadow
$6710 = LedgeHoppingShadowEnd
$6710 = LedgeHoppingShadowOAM
$6710 = LedgeHoppingShadowOAMBlock
EMPTY: $6718-$7fff ($18e8 bytes)
TOTAL EMPTY: $18e8 bytes

Expand Down Expand Up @@ -7812,7 +7812,7 @@ ROMX bank #16:
$52e7 = Trade_AnimateBallEnteringLinkCable.moveBallInsideLinkCableLoop
$5300 = Trade_AnimateBallEnteringLinkCable.cycleLinkCableBulgeTile
$5318 = Trade_AnimateBallEnteringLinkCable.ballSpriteReachedEdgeOfScreen
$532e = Trade_BallInsideLinkCableOAM
$532e = Trade_BallInsideLinkCableOAMBlock
$5336 = Trade_ShowEnemyMon
$5376 = Trade_AnimLeftToRight
$53c6 = Trade_AnimRightToLeft
Expand All @@ -7837,13 +7837,13 @@ ROMX bank #16:
$5536 = Trade_AnimMonMoveVertical.movingLeft
$553f = Trade_AnimMonMoveVertical.doAnim
$5549 = Trade_AnimMonMoveVertical.loop
$5558 = Trade_WriteCircleOAM
$555e = Trade_WriteCircleOAM.loop
$5574 = Trade_CircleOAMPointers
$5584 = Trade_CircleOAM0
$558c = Trade_CircleOAM1
$5594 = Trade_CircleOAM2
$559c = Trade_CircleOAM3
$5558 = Trade_WriteCircleOAMBlock
$555e = Trade_WriteCircleOAMBlock.loop
$5574 = Trade_CircleOAMBlocks
$5584 = Trade_CircleOAMBlocks.OAMBlock0
$558c = Trade_CircleOAMBlocks.OAMBlock1
$5594 = Trade_CircleOAMBlocks.OAMBlock2
$559c = Trade_CircleOAMBlocks.OAMBlock3
$55a4 = Trade_LoadMonSprite
$55c8 = Trade_ShowClearedWindow
$55df = Trade_SlideTextBoxOffScreen
Expand Down
Loading

0 comments on commit 67e8be0

Please sign in to comment.