ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead sub references

Browse Source
This commit is contained in:
GriffinR 2021-11-17 15:47:47 -05:00
parent eb95ac0b9c
commit c1970a4bc8
8 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asm/macros/battle_ai_script.inc
View File

@ -251,11 +251,11 @@
.4byte \param1 .4byte \param1
.endm .endm
.macro nullsub_2A .macro nop_2A
.byte 0x2a .byte 0x2a
.endm .endm
.macro nullsub_2B .macro nop_2B
.byte 0x2b .byte 0x2b
.endm .endm
@ -287,11 +287,11 @@
.4byte \param1 .4byte \param1
.endm .endm
.macro nullsub_32 .macro nop_32
.byte 0x32 .byte 0x32
.endm .endm
.macro nullsub_33 .macro nop_33
.byte 0x33 .byte 0x33
.endm .endm
@ -467,27 +467,27 @@
.byte \battler .byte \battler
.endm .endm
.macro nullsub_52 .macro nop_52
.byte 0x52 .byte 0x52
.endm .endm
.macro nullsub_53 .macro nop_53
.byte 0x53 .byte 0x53
.endm .endm
.macro nullsub_54 .macro nop_54
.byte 0x54 .byte 0x54
.endm .endm
.macro nullsub_55 .macro nop_55
.byte 0x55 .byte 0x55
.endm .endm
.macro nullsub_56 .macro nop_56
.byte 0x56 .byte 0x56
.endm .endm
.macro nullsub_57 .macro nop_57
.byte 0x57 .byte 0x57
.endm .endm

1
gflib/sprite.h
View File

@ -281,7 +281,6 @@ void FreeSpriteTiles(struct Sprite *sprite);
void FreeSpritePalette(struct Sprite *sprite); void FreeSpritePalette(struct Sprite *sprite);
void FreeSpriteOamMatrix(struct Sprite *sprite); void FreeSpriteOamMatrix(struct Sprite *sprite);
void DestroySpriteAndFreeResources(struct Sprite *sprite); void DestroySpriteAndFreeResources(struct Sprite *sprite);
void sub_800142C(u32 a1, u32 a2, u16 *a3, u16 a4, u32 a5);
void AnimateSprite(struct Sprite *sprite); void AnimateSprite(struct Sprite *sprite);
void SetSpriteMatrixAnchor(struct Sprite* sprite, s16 x, s16 y); void SetSpriteMatrixAnchor(struct Sprite* sprite, s16 x, s16 y);
void StartSpriteAnim(struct Sprite *sprite, u8 animNum); void StartSpriteAnim(struct Sprite *sprite, u8 animNum);

2
include/battle_anim.h
View File

@ -112,7 +112,6 @@ void GetBattleAnimBg1Data(struct BattleAnimBgData*);
void GetBattleAnimBgData(struct BattleAnimBgData*, u32 arg1); void GetBattleAnimBgData(struct BattleAnimBgData*, u32 arg1);
u8 GetBattlerSpriteSubpriority(u8 battlerId); u8 GetBattlerSpriteSubpriority(u8 battlerId);
bool8 TranslateAnimHorizontalArc(struct Sprite *sprite); bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
void sub_80A6630(struct Sprite *sprite);
void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite); void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite);
void ResetSpriteRotScale(u8 spriteId); void ResetSpriteRotScale(u8 spriteId);
void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
@ -129,7 +128,6 @@ void AnimLoadCompressedBgTilemapHandleContest(struct BattleAnimBgData*, const vo
void AnimLoadCompressedBgGfx(u32, const u32*, u32); void AnimLoadCompressedBgGfx(u32, const u32*, u32);
void UpdateAnimBg3ScreenSize(bool8); void UpdateAnimBg3ScreenSize(bool8);
void TranslateSpriteInGrowingCircle(struct Sprite *); void TranslateSpriteInGrowingCircle(struct Sprite *);
void sub_80A653C(struct Sprite *);
void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
void PrepareEruptAnimTaskData(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); void PrepareEruptAnimTaskData(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7);
u8 UpdateEruptAnimTask(struct Task *task); u8 UpdateEruptAnimTask(struct Task *task);

6
include/field_control_avatar.h
View File

@ -25,15 +25,9 @@ struct FieldInput
void FieldClearPlayerInput(struct FieldInput *pStruct); void FieldClearPlayerInput(struct FieldInput *pStruct);
void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
int ProcessPlayerFieldInput(struct FieldInput *pStruct); int ProcessPlayerFieldInput(struct FieldInput *pStruct);
u8 *sub_80682A8(struct MapPosition *, u8, u8);
void overworld_poison_timer_set(void); void overworld_poison_timer_set(void);
void RestartWildEncounterImmunitySteps(void); void RestartWildEncounterImmunitySteps(void);
u8 *sub_8068E24(struct MapPosition *);
const u8 *GetObjectEventScriptPointerPlayerFacing(void); const u8 *GetObjectEventScriptPointerPlayerFacing(void);
bool8 sub_8068870(u16 a);
bool8 sub_8068894(void);
bool8 sub_8068A64(struct MapPosition *, u16);
u8 sub_8068F18(void);
bool8 TryDoDiveWarp(struct MapPosition *position, u16 b); bool8 TryDoDiveWarp(struct MapPosition *position, u16 b);
int SetCableClubWarp(void); int SetCableClubWarp(void);
u8 TrySetDiveWarp(void); u8 TrySetDiveWarp(void);

1
include/field_screen_effect.h
View File

@ -39,7 +39,6 @@ void DoSpinEnterWarp(void);
void DoSpinExitWarp(void); void DoSpinExitWarp(void);
void DoOrbEffect(void); void DoOrbEffect(void);
void FadeOutOrbEffect(void); void FadeOutOrbEffect(void);
void sub_80B05B4(void);
void WriteFlashScanlineEffectBuffer(u8 flashLevel); void WriteFlashScanlineEffectBuffer(u8 flashLevel);
bool8 IsPlayerStandingStill(void); bool8 IsPlayerStandingStill(void);

1
include/field_special_scene.h
View File

@ -9,7 +9,6 @@ void Task_Truck3(u8 taskId);
void Task_HandleTruckSequence(u8 taskId); void Task_HandleTruckSequence(u8 taskId);
void ExecuteTruckSequence(void); void ExecuteTruckSequence(void);
void EndTruckSequence(u8); void EndTruckSequence(u8);
void sub_80C791C(void);
void FieldCB_ShowPortholeView(void); void FieldCB_ShowPortholeView(void);
#endif // GUARD_FIELD_SPECIAL_SCENE_H #endif // GUARD_FIELD_SPECIAL_SCENE_H

2
include/mauville_old_man.h
View File

@ -6,9 +6,7 @@ extern struct BardSong gBardSong;
void SetMauvilleOldMan(void); void SetMauvilleOldMan(void);
u8 GetCurrentMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void);
void SetMauvilleOldManObjEventGfx(void); void SetMauvilleOldManObjEventGfx(void);
u8 sub_81201C8(void);
void SanitizeMauvilleOldManForRuby(OldMan *dest); void SanitizeMauvilleOldManForRuby(OldMan *dest);
void sub_8120670(void);
void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 r1, u32 r6); void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 r1, u32 r6);
void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 unused, u32 a2); void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 unused, u32 a2);
void ResetMauvilleOldManFlag(void); void ResetMauvilleOldManFlag(void);

2
src/pokeball.c
View File

@ -1138,7 +1138,7 @@ static void SpriteCB_TradePokeball(struct Sprite *sprite)
sprite->callback = SpriteCB_TradePokeballSendOff; sprite->callback = SpriteCB_TradePokeballSendOff;
#ifdef BUGFIX #ifdef BUGFIX
// FIX: If this is used on a sprite that has previously had an affine animation, it will not // FIX: If this is used on a sprite that has previously had an affine animation, it will not
// play the shrink anim properly due to being paused. Works together with the fix to `sub_817F77C`. // play the shrink anim properly due to being paused. Works together with the fix to ResetSpriteAfterAnim.
gSprites[monSpriteId].affineAnimPaused = FALSE; gSprites[monSpriteId].affineAnimPaused = FALSE;
#endif // BUGFIX #endif // BUGFIX
StartSpriteAffineAnim(&gSprites[monSpriteId], BATTLER_AFFINE_RETURN); StartSpriteAffineAnim(&gSprites[monSpriteId], BATTLER_AFFINE_RETURN);