dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SpriteCallbackDummy2 -> SpriteCallbackDummy_2

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-27 14:45:55 -04:00
parent 36791b994b
commit a81c1539e5
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_main.h
+1 -1
View File
@@ -71,7 +71,7 @@ void SpriteCB_VsLetterInit(struct Sprite *sprite);
void CB2_InitEndLinkBattle(void); void CB2_InitEndLinkBattle(void);
u32 GetBattleBgAttribute(u8 arrayId, u8 caseId); u32 GetBattleBgAttribute(u8 arrayId, u8 caseId);
void SpriteCB_EnemyMon(struct Sprite *sprite); void SpriteCB_EnemyMon(struct Sprite *sprite);
void SpriteCallbackDummy2(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite);
void SpriteCB_FaintOpponentMon(struct Sprite *sprite); void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite); void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite);
void SpriteCb_HideAsMoveTarget(struct Sprite *sprite); void SpriteCb_HideAsMoveTarget(struct Sprite *sprite);
src/battle_main.c
+4 -4
View File
@@ -1870,13 +1870,13 @@ static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite)
{ {
StartHealthboxSlideIn(sprite->sBattler); StartHealthboxSlideIn(sprite->sBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]);
sprite->callback = SpriteCallbackDummy2; sprite->callback = SpriteCallbackDummy_2;
StartSpriteAnimIfDifferent(sprite, 0); StartSpriteAnimIfDifferent(sprite, 0);
BeginNormalPaletteFade(0x20000, 0, 10, 0, RGB(8, 8, 8)); BeginNormalPaletteFade(0x20000, 0, 10, 0, RGB(8, 8, 8));
} }
} }
void SpriteCallbackDummy2(struct Sprite *sprite) void SpriteCallbackDummy_2(struct Sprite *sprite)
{ {
} }
@@ -1900,7 +1900,7 @@ static void SpriteCB_Unused_8011E28_Step(struct Sprite *sprite)
if (sprite->data[3] == 0) if (sprite->data[3] == 0)
{ {
sprite->invisible = FALSE; sprite->invisible = FALSE;
sprite->callback = SpriteCallbackDummy2; sprite->callback = SpriteCallbackDummy_2;
gUnknown_2022AE8[0] = 0; gUnknown_2022AE8[0] = 0;
} }
} }
@@ -1991,7 +1991,7 @@ void SpriteCb_HideAsMoveTarget(struct Sprite *sprite)
{ {
sprite->invisible = sprite->data[4]; sprite->invisible = sprite->data[4];
sprite->data[4] = FALSE; sprite->data[4] = FALSE;
sprite->callback = SpriteCallbackDummy2; sprite->callback = SpriteCallbackDummy_2;
} }
void SpriteCB_AllyMon(struct Sprite *sprite) void SpriteCB_AllyMon(struct Sprite *sprite)
src/evolution_scene.c
+5 -5
View File
@@ -263,7 +263,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
sEvoStructPtr->preEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); sEvoStructPtr->preEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[id].callback = SpriteCallbackDummy2; gSprites[id].callback = SpriteCallbackDummy_2;
gSprites[id].oam.paletteNum = 1; gSprites[id].oam.paletteNum = 1;
gSprites[id].invisible = TRUE; gSprites[id].invisible = TRUE;
@@ -277,7 +277,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3); SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[id].callback = SpriteCallbackDummy2; gSprites[id].callback = SpriteCallbackDummy_2;
gSprites[id].oam.paletteNum = 2; gSprites[id].oam.paletteNum = 2;
gSprites[id].invisible = TRUE; gSprites[id].invisible = TRUE;
@@ -357,7 +357,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[id].callback = SpriteCallbackDummy2; gSprites[id].callback = SpriteCallbackDummy_2;
gSprites[id].oam.paletteNum = 2; gSprites[id].oam.paletteNum = 2;
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP);
@@ -434,7 +434,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[id].callback = SpriteCallbackDummy2; gSprites[id].callback = SpriteCallbackDummy_2;
gSprites[id].oam.paletteNum = 2; gSprites[id].oam.paletteNum = 2;
gMain.state++; gMain.state++;
LinkTradeDrawWindow(); LinkTradeDrawWindow();
@@ -493,7 +493,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[id].callback = SpriteCallbackDummy2; gSprites[id].callback = SpriteCallbackDummy_2;
gSprites[id].oam.paletteNum = 2; gSprites[id].oam.paletteNum = 2;
gSprites[id].invisible = TRUE; gSprites[id].invisible = TRUE;