From 67e8be05d6897c5d8d8c69edbea89fafb0c4365b Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sun, 29 Sep 2024 22:55:36 +0000 Subject: [PATCH] `dbsprite` is the wrong macro for `WriteOAMBlock` data (#472) --- pokeblue.map | 22 +++++++++++----------- pokeblue.sym | 22 +++++++++++----------- pokeblue_debug.map | 22 +++++++++++----------- pokeblue_debug.sym | 22 +++++++++++----------- pokeblue_vc.map | 22 +++++++++++----------- pokeblue_vc.sym | 22 +++++++++++----------- pokered.map | 22 +++++++++++----------- pokered.sym | 22 +++++++++++----------- pokered_vc.map | 22 +++++++++++----------- pokered_vc.sym | 22 +++++++++++----------- 10 files changed, 110 insertions(+), 110 deletions(-) diff --git a/pokeblue.map b/pokeblue.map index 2c364c5f1a..90f2525dac 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokeblue.sym b/pokeblue.sym index 9c6435b88c..89bc5b5204 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokeblue_debug.map b/pokeblue_debug.map index 8f130cc565..7e9f365d48 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index e38c84eafd..5964f3a9fc 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 78865654ac..9df7458ef8 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index dd396fd3a8..eca3897da1 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokered.map b/pokered.map index 7b909bf5f7..872975abcd 100644 --- a/pokered.map +++ b/pokered.map @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokered.sym b/pokered.sym index 7ce5ce3226..ffac4a26d7 100644 --- a/pokered.sym +++ b/pokered.sym @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pokered_vc.map b/pokered_vc.map index 02a49bada1..8cd132e321 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -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 @@ -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 @@ -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 @@ -7841,7 +7841,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 @@ -7866,13 +7866,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 diff --git a/pokered_vc.sym b/pokered_vc.sym index 98940c32c9..fc5a938e1a 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -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 @@ -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 @@ -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 @@ -7712,7 +7712,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 @@ -7737,13 +7737,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