diff options
Diffstat (limited to 'include')
36 files changed, 52 insertions, 119 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 35039ea30..55a7b7f77 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -151,13 +151,13 @@ s8 BattleAnimAdjustPanning2(s8 pan); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); bool8 IsBattlerSpriteVisible(u8 battlerId); s16 KeepPanInRange(s16 a, s32 oldPan); -void sub_80730C0(u16, u16 *, s32, u8); +void RelocateBattleBgPal(u16 paletteNum, u16 *dest, s32 offset, u8 largeScreen); // battle_intro.c void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); s32 GetAnimBgAttribute(u8 bgId, u8 attributeId); void HandleIntroSlide(u8 terrain); -void sub_80BC41C(u8 taskId); +void BattleIntroSlideEnd(u8 taskId); void CopyBattlerSpriteToBg(s32 bgId, u8 x, u8 y, u8 battlerPosition, u8 palno, u8 *tilesDest, u16 *tilemapDest, u16 tilesOffset); // battle_anim_effects_1.c @@ -188,22 +188,22 @@ void AnimItemSteal(struct Sprite *); void AnimTrickBag(struct Sprite *); void AnimFlyingParticle(struct Sprite *); void AnimNeedleArmSpike(struct Sprite *); -void sub_80A43F8(struct Sprite *); +void AnimSlidingHit(struct Sprite *); void AnimWhipHit(struct Sprite *); -void sub_80A4494(struct Sprite *); +void AnimFlickeringPunch(struct Sprite *); void AnimCuttingSlice(struct Sprite *); void AnimAirCutterSlice(struct Sprite *); -void sub_80A481C(struct Sprite *); +void AnimCirclingMusicNote(struct Sprite *); void AnimProtect(struct Sprite *); void AnimMilkBottle(struct Sprite *); void AnimGrantingStars(struct Sprite *); void AnimSparkingStars(struct Sprite *); -void sub_80A4E40(struct Sprite *); +void AnimBubbleBurst(struct Sprite *); void AnimSleepLetterZ(struct Sprite *); void AnimLockOnTarget(struct Sprite *); void AnimLockOnMoveTarget(struct Sprite *); void AnimBowMon(struct Sprite *); -void sub_80A5590(struct Sprite *); +void AnimTipMon(struct Sprite *); void AnimSlashSlice(struct Sprite *); void AnimFalseSwipeSlice(struct Sprite *); void AnimFalseSwipePositionedSlice(struct Sprite *); @@ -228,15 +228,15 @@ void AnimTask_ShrinkTargetCopy(u8 taskId); // battle_anim_effects_2.c extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[]; -void sub_80A6E48(struct Sprite *); -void sub_80A6E98(struct Sprite *); -void sub_80A6F8C(struct Sprite *); -void sub_80A7020(struct Sprite *); +void AnimCirclingFinger(struct Sprite *); +void AnimBouncingMusicNote(struct Sprite *); +void AnimVibrateBattlerBack(struct Sprite *); +void AnimMovingClamp(struct Sprite *); void Anim_KinesisZapEnergy(struct Sprite *); void Anim_SwordsDanceBlade(struct Sprite *); void AnimSonicBoomProjectile(struct Sprite *); void AnimAirWaveProjectile(struct Sprite *); -void sub_80A79E8(struct Sprite *); +void AnimVoidLines(struct Sprite *); void AnimCoinThrow(struct Sprite *); void AnimFallingCoin(struct Sprite *); void AnimBulletSeed(struct Sprite *); @@ -309,7 +309,7 @@ void AnimHelpingHandClap(struct Sprite *); void AnimForesightMagnifyingGlass(struct Sprite *); void AnimMeteorMashStar(struct Sprite *); void AnimBlockX(struct Sprite *); -void sub_80E3E84(struct Sprite *); +void AnimUnusedItemBagSteal(struct Sprite *); void AnimParticuleBurst(struct Sprite *); void AnimKnockOffStrike(struct Sprite *); void AnimRecycle(struct Sprite *); @@ -584,15 +584,14 @@ void AnimTask_BlendParticle(u8 taskId); void AnimTask_HardwarePaletteFade(u8 taskId); void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId); void AnimTask_SetUpCurseBackground(u8 taskId); -void sub_80BB088(u8 taskId); -void sub_80BB660(u8 taskId); +void InitStatsChangeAnimation(u8 taskId); void AnimTask_BlendNonAttackerPalettes(u8 taskId); void AnimTask_StartSlidingBg(u8 taskId); void AnimTask_GetAttackerSide(u8 taskId); void AnimTask_GetTargetSide(u8 taskId); void AnimTask_GetTargetIsAttackerPartner(u8 taskId); void AnimTask_SetAllNonAttackersInvisiblity(u8 taskId); -void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette); +void StartMonScrollingBgMask(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette); void AnimTask_GetBattleTerrain(u8 taskId); void AnimTask_AllocBackupPalBuffer(u8 taskId); void AnimTask_FreeBackupPalBuffer(u8 taskId); diff --git a/include/battle_bg.h b/include/battle_bg.h index 518c566dc..63cc22d04 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -10,7 +10,7 @@ void DrawBattleEntryBackground(void); void InitLinkBattleVsScreen(u8 taskId); void LoadBattleMenuWindowGfx(void); void LoadBattleTextboxAndBackground(void); -void sub_800F324(void); +void BattleInitBgsAndWindows(void); void DrawMainBattleBackground(void); #endif // GUARD_BATTLE_BG_H diff --git a/include/battle_tower.h b/include/battle_tower.h index be07320c9..16164eccf 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -27,7 +27,6 @@ struct BattleTowerPokemonTemplate extern const u16 gBattleTowerBannedSpecies[]; -u16 sub_8164FCC(u8, u8); void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *); void ValidateEReaderTrainer(void); u8 GetBattleTowerTrainerFrontSpriteId(void); diff --git a/include/battle_util.h b/include/battle_util.h index d3bd76a01..edec94444 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -58,12 +58,12 @@ void PressurePPLoseOnUsingImprison(u8 attacker); void PressurePPLoseOnUsingPerishSong(u8 attacker); void MarkAllBattlersForControllerExec(void); void MarkBattlerForControllerExec(u8 battlerId); -void sub_8017298(u8 arg0); +void MarkBattlerReceivedLinkData(u8 battlerId); void CancelMultiTurnMoves(u8 battler); bool8 WasUnableToUseMove(u8 battler); void PrepareStringBattle(u16 stringId, u8 battler); void ResetSentPokesToOpponentValue(void); -void sub_8017434(u8 battler); +void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler); void UpdateSentPokesToOpponentValue(u8 battler); void BattleScriptPush(const u8 *bsPtr); void BattleScriptPushCursor(void); diff --git a/include/constants/flags.h b/include/constants/flags.h index 9e76dd4de..3234d5385 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1000,22 +1000,22 @@ #define FLAG_0x3D5 0x3D5 #define FLAG_0x3D6 0x3D6 #define FLAG_0x3D7 0x3D7 -#define FLAG_MYSTERY_EVENT_DONE 0x3D8 -#define FLAG_0x3D9 0x3D9 -#define FLAG_0x3DA 0x3DA -#define FLAG_0x3DB 0x3DB -#define FLAG_0x3DC 0x3DC -#define FLAG_0x3DD 0x3DD -#define FLAG_0x3DE 0x3DE -#define FLAG_0x3DF 0x3DF -#define FLAG_0x3E0 0x3E0 -#define FLAG_0x3E1 0x3E1 -#define FLAG_0x3E2 0x3E2 -#define FLAG_0x3E3 0x3E3 -#define FLAG_0x3E4 0x3E4 -#define FLAG_0x3E5 0x3E5 -#define FLAG_0x3E6 0x3E6 -#define FLAG_0x3E7 0x3E7 +#define FLAG_MYSTERY_GIFT_DONE 0x3D8 +#define FLAG_MYSTERY_GIFT_1 0x3D9 +#define FLAG_MYSTERY_GIFT_2 0x3DA +#define FLAG_MYSTERY_GIFT_3 0x3DB +#define FLAG_MYSTERY_GIFT_4 0x3DC +#define FLAG_MYSTERY_GIFT_5 0x3DD +#define FLAG_MYSTERY_GIFT_6 0x3DE +#define FLAG_MYSTERY_GIFT_7 0x3DF +#define FLAG_MYSTERY_GIFT_8 0x3E0 +#define FLAG_MYSTERY_GIFT_9 0x3E1 +#define FLAG_MYSTERY_GIFT_10 0x3E2 +#define FLAG_MYSTERY_GIFT_11 0x3E3 +#define FLAG_MYSTERY_GIFT_12 0x3E4 +#define FLAG_MYSTERY_GIFT_13 0x3E5 +#define FLAG_MYSTERY_GIFT_14 0x3E6 +#define FLAG_MYSTERY_GIFT_15 0x3E7 #define FLAG_HIDDEN_ITEMS_START 1000 // 0x3E8 #define FLAG_HIDDEN_ITEM(map, item) (FLAG_HIDDEN_ITEMS_START + HIDDEN_ITEM_##map##_##item) diff --git a/include/constants/vars.h b/include/constants/vars.h index 70efab478..bb301609d 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -123,7 +123,7 @@ #define VAR_LINK_WIN_BRAG_STATE 0x404B #define VAR_POKELOT_RND2 0x404C #define VAR_QL_ENTRANCE 0x404D -#define VAR_0x404E 0x404E +#define VAR_NATIONAL_DEX 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F // Map Scene diff --git a/include/daycare.h b/include/daycare.h index 01751641e..0ee1e93b1 100644 --- a/include/daycare.h +++ b/include/daycare.h @@ -25,10 +25,8 @@ void ShowDaycareLevelMenu(void); void ChooseSendDaycareMon(void); void ScriptHatchMon(void); -bool8 sub_8071614(void); void EggHatch(void); u8 GetEggStepsToSubtract(void); -u16 sub_80722E0(void); bool8 ShouldEggHatch(void); #endif // GUARD_DAYCARE_H diff --git a/include/egg_hatch.h b/include/egg_hatch.h index 9945284e1..48dc5e066 100644 --- a/include/egg_hatch.h +++ b/include/egg_hatch.h @@ -4,9 +4,7 @@ #include "global.h" void ScriptHatchMon(void); -bool8 sub_8071614(void); void EggHatch(void); u8 GetEggStepsToSubtract(void); -u16 sub_80722E0(void); #endif // GUARD_EGG_HATCH_H diff --git a/include/event_data.h b/include/event_data.h index 794a99097..fcad84b6a 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -35,8 +35,6 @@ bool32 IsMysteryEventEnabled(void); void DisableMysteryGift(void); void EnableMysteryGift(void); bool32 IsMysteryGiftEnabled(void); -void sub_809D4D8(void); -void sub_809D570(void); void DisableResetRTC(void); void EnableResetRTC(void); bool32 CanResetRTC(void); diff --git a/include/event_object_lock.h b/include/event_object_lock.h index 4de3174ed..b7beeb070 100644 --- a/include/event_object_lock.h +++ b/include/event_object_lock.h @@ -7,8 +7,6 @@ bool8 NativeScript_WaitPlayerStopMoving(void); void ScriptFreezeObjectEvents(void); bool8 NativeScript_WaitPlayerAndTargetNPCStopMoving(void); void LockSelectedObjectEvent(void); -void sub_8098630(void); -bool8 sub_8098734(void); void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void); bool8 walkrun_is_standing_still(void); void UnionRoom_UnlockPlayerAndChatPartner(void); diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 71a2d7c9d..852af21df 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -59,12 +59,10 @@ struct PairedPalettes // Exported ROM declarations -void sub_808D438(void); u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8); bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); u8 GetObjectEventIdByXY(s16, s16); void SetObjectEventDirection(struct ObjectEvent *, u8); -u8 sub_808D4F4(void); void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup); u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup); void LoadPlayerObjectReflectionPalette(u16, u8); @@ -72,7 +70,6 @@ void LoadSpecialObjectReflectionPalette(u16, u8); void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); void ReloadMapObjectsWithOffset(s16 x, s16 y); -void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void GetMapCoordsFromSpritePos(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); void SetSpritePosToOffsetMapCoords(s16 *, s16 *, s16, s16); @@ -96,10 +93,8 @@ void FreeAndReserveObjectSpritePalettes(void); void SetObjectPositionByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void UnfixObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup); void SetObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority); -void sub_808E75C(s16, s16); void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup); void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16); -void sub_808EB08(struct ObjectEvent *, s16, s16); void TryOverrideObjectEventTemplateCoords(u8, u8, u8); void UpdateObjectEventCurrentMovement(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *)); u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8); @@ -135,20 +130,18 @@ u8 GetFaceDirectionMovementAction(u32); u8 GetFaceDirectionFastMovementAction(u32); void CameraObjectSetFollowedObjectId(u8 objectId); void UnfreezeObjectEvents(void); -void sub_8069058(u8, u8); u8 GetSlideMovementAction(u32); u8 GetJumpInPlaceMovementAction(u32); u8 GetJumpMovementAction(u32); u8 GetJump2MovementAction(u32); bool8 NpcTakeStep(struct Sprite *sprite); void SetJumpSpriteData(struct Sprite *, u8, u8, u8); -u8 sub_8068D3C(struct Sprite *); -u8 sub_8068DC4(struct Sprite *); +u8 DoJumpSpriteMovement(struct Sprite *); +u8 DoJumpSpecialSpriteMovement(struct Sprite *); void TurnObjectEvent(u8, u8); const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId); u8 GetFirstInactiveObjectEventId(void); u8 GetCollisionFlagsAtCoords(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction); -u8 sub_8063FB0(u8 direction); void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent); void CancelPlayerForcedMovement(void); void FreezeObjectEvents(void); @@ -160,7 +153,7 @@ void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible); bool32 RfuUnionObjectIsInvisible(u8 objectEventId); void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); bool32 RfuUnionObjectIsWarping(u8 objectEventId); -u8 sub_80641C0(u32 direction); +u8 GetJumpSpecialMovementAction(u32 direction); void EnableObjectGroundEffectsByXY(s16 x, s16 y); void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y); u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority); @@ -203,9 +196,8 @@ extern const u16 gUnknown_8398648[]; extern const u16 gUnknown_8398688[]; extern const u8 gReflectionEffectPaletteMap[]; u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z); -u8 sub_8063F58(u32 direction); u8 sub_8063FDC(u32 direction); -u8 sub_8064008(u32 direction); +u8 GetRideWaterCurrentMovementAction(u32 direction); u8 GetPlayerRunMovementAction(u32 direction); u8 GetPlayerRunSlowMovementAction(u32 direction); u8 GetWalkSlowMovementAction(u32 direction); diff --git a/include/field_camera.h b/include/field_camera.h index 025b85132..e48d1c8a7 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -37,6 +37,6 @@ void CameraUpdate(void); void FieldUpdateBgTilemapScroll(void); void ResetCameraUpdateInfo(void); u32 InitCameraUpdateCallback(u8 trackedSpriteId); -void sub_805ACF0(void); +void CameraUpdateNoObjectRefresh(void); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/field_effect.h b/include/field_effect.h index 48143b0d3..a4246655b 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -10,7 +10,6 @@ extern bool8 (*gFieldCallback2)(void); u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); -void sub_80B69DC(void); void CreateTeleportFieldEffectTask(void); void FieldEffectActiveListRemove(u8 id); void StartEscapeRopeFieldEffect(void); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 689f6d87b..35c46dd78 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -14,17 +14,17 @@ // Exported ROM declarations u8 CreateWarpArrowSprite(void); -void sub_80DC44C(u8, u8); -void sub_80DC478(u8, u8); +void SetSurfBlob_BobState(u8, u8); +void SetSurfBlob_DontSyncAnim(u8, u8); void StartAshFieldEffect(s16, s16, u16, s16); -void sub_80DCBB8(struct ObjectEvent *); -bool8 sub_80DCBE0(struct ObjectEvent *); +void StartRevealDisguise(struct ObjectEvent *); +bool8 UpdateRevealDisguise(struct ObjectEvent *); void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8); u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); -void sub_80DC4A4(u8 spriteId, u8 value, s16 data1); +void SetSurfBlob_PlayerOffset(u8 spriteId, u8 hasOffset, s16 offset); void UpdateJumpImpactEffect(struct Sprite * sprite); void UpdateShadowFieldEffect(struct Sprite * sprite); void UpdateBubblesFieldEffect(struct Sprite * sprite); diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 0decdd9ff..7bfdbb6e8 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -18,7 +18,7 @@ void FadeInFromBlack(void); void FadeTransition_FadeInOnReturnToStartMenu(void); void WarpFadeInScreen(void); -void sub_807DCE4(void); +void FieldCB_ContinueScriptUnionRoom(void); bool32 FieldFadeTransitionBackgroundEffectIsFinished(void); void palette_bg_faded_fill_black(void); diff --git a/include/field_message_box.h b/include/field_message_box.h index b822fb8f7..54f0b0fd5 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -4,11 +4,10 @@ #include "global.h" bool8 ShowFieldMessage(const u8 *message); -bool8 sub_8098238(const u8 *message); bool8 ShowFieldAutoScrollMessage(const u8 *message); void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); bool8 textbox_any_visible(void); -void sub_8069348(void); +void InitFieldMessageBox(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 6e9917154..c7d2d6012 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -47,7 +47,7 @@ void PlayerGoSpeed1(u8 direction); void PlayerGoSpeed2(u8 direction); void sub_805C134(u8 direction); void PlayerRideWaterCurrent(u8 direction); -void sub_805C164(u8 direction); +void PlayerGoSpeed4(u8 direction); void PlayerRun(u8 direction); void PlayerRunSlow(u8 direction); void PlayerOnBikeCollide(u8 direction); diff --git a/include/field_screen.h b/include/field_screen.h index a11aa0041..11578ef7f 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -9,8 +9,6 @@ // Exported ROM declarations void pal_fill_black(void); -bool8 sub_80ABDFC(void); -void sub_80AF168(void); void UpdateWeatherPerDay(u16 days); #endif //GUARD_FIELD_SCREEN_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index bf27cb49c..e6736298a 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -3,9 +3,7 @@ #include "global.h" -void sub_80AF79C(void); void AnimateFlash(u8); -void sub_80B0244(void); void FieldCB_SafariZoneRanOutOfBalls(void); void DoOutwardBarnDoorWipe(void); void Task_BarnDoorWipe(u8 taskId); diff --git a/include/field_weather.h b/include/field_weather.h index 334bc0863..7bb7b2677 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -115,7 +115,6 @@ void FadeScreen(u8 mode, s8 delay); void SetSav1Weather(u32); u8 GetSav1Weather(void); -void sub_80AEDBC(void); void DoCurrentWeather(void); void SetSav1WeatherFromCurrMapHeader(void); diff --git a/include/global.h b/include/global.h index d6d57910d..597e7ce57 100644 --- a/include/global.h +++ b/include/global.h @@ -165,7 +165,7 @@ struct Time struct Pokedex { /*0x00*/ u8 order; - /*0x01*/ u8 unknown1; + /*0x01*/ u8 mode; /*0x02*/ u8 nationalMagic; // must equal 0xDA in order to have National mode /*0x03*/ u8 unknown2; // set to 0xB9 when national dex is first enabled /*0x04*/ u32 unownPersonality; // set when you first see Unown diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h index fd8aed909..c0801dbf2 100644 --- a/include/hall_of_fame.h +++ b/include/hall_of_fame.h @@ -6,7 +6,6 @@ void CB2_DoHallOfFameScreen(void); void CB2_DoHallOfFameScreenDontSaveData(void); void CB2_DoHallOfFamePC(void); -void sub_8175280(void); void CB2_InitHofPC(void); void HallOfFamePCBeginFade(void); void ReturnFromHallOfFamePC(void); diff --git a/include/item_menu.h b/include/item_menu.h index fe593ff02..3ba3de4a9 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -24,8 +24,6 @@ extern struct BagStruct gBagMenuState; extern u16 gSpecialVar_ItemId; // Exported ROM declarations -void sub_81AAC50(void); -void sub_81AAC70(void); void CB2_SetUpReshowBattleScreenAfterMenu(void); void ResetBagCursorPositions(void); void InitPokedudeBag(u8); diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h index fd66a9375..ef3bda923 100644 --- a/include/item_menu_icons.h +++ b/include/item_menu_icons.h @@ -20,8 +20,8 @@ u8 AddItemIconObjectWithCustomObjectTemplate(const struct SpriteTemplate * origT void sub_80989A0(u16 itemId, u8 idx); void ItemMenuIcons_MoveInsertIndicatorBar(s16 x, u16 y); void ItemMenuIcons_ToggleInsertIndicatorBarVisibility(bool8 invisible); -void sub_8098528(u8); -void sub_8098580(void); +void SetBagVisualPocketId(u8); +void ShakeBagSprite(void); const void * GetItemIconGfxPtr(u16 itemId, u8 ptrId); void CreateBagOrSatchelSprite(u8 animNum); diff --git a/include/link.h b/include/link.h index 7747bd7a9..e009c2724 100644 --- a/include/link.h +++ b/include/link.h @@ -217,8 +217,6 @@ void Task_DestroySelf(u8); void OpenLink(void); void CloseLink(void); u16 LinkMain2(const u16 *); -void sub_8007B14(void); -bool32 sub_8007B24(void); void ClearLinkCallback(void); void ClearLinkCallback_2(void); u8 GetLinkPlayerCount(void); @@ -227,8 +225,6 @@ u8 GetLinkPlayerDataExchangeStatusTimed(int lower, int higher); bool8 IsLinkPlayerDataExchangeComplete(void); u32 GetLinkPlayerTrainerId(u8); void ResetLinkPlayers(void); -void sub_8007E24(void); -void sub_8007E4C(void); u8 GetMultiplayerId(void); u8 bitmask_all_link_players_but_self(void); bool8 SendBlock(u8, const void *, u16); @@ -252,32 +248,22 @@ void SerialCB(void); u8 GetLinkPlayerCount(void); bool32 InUnionRoom(void); -void sub_800E0E8(void); -bool8 sub_800A520(void); -bool8 sub_8010500(void); -void sub_800DFB4(u8, u8); void SetLinkStandbyCallback(void); void SetWirelessCommType1(void); -void sub_8009734(void); -void sub_800A620(void); void LinkRfu_DestroyIdleTask(void); -u8 sub_800ABAC(void); -u8 sub_800ABBC(void); void SetCloseLinkCallback(void); void OpenLink(void); bool8 IsLinkMaster(void); void CheckShouldAdvanceLinkState(void); void Link_StartSend5FFFwithParam(u16 a0); -void sub_80098D8(void); void CloseLink(void); bool8 IsLinkTaskFinished(void); bool32 LinkRecvQueueLengthMoreThan2(void); void ResetSerial(void); -void sub_8054A28(void); void SetWirelessCommType1(void); void LoadWirelessStatusIndicatorSpriteGfx(void); void CreateWirelessStatusIndicatorSprite(u8, u8); -void sub_8009FE8(void); +void StartSendingKeysToLink(void); void ClearLinkCallback_2(void); void Rfu_SetLinkStandbyCallback(void); void ConvertLinkPlayerName(struct LinkPlayer * linkPlayer); diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 79bff207a..5fd03151f 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -31,7 +31,6 @@ void DrawDialogueFrame(u8 windowId, bool8 transfer); void DrawStdWindowFrame(u8 windowId, bool8 copyNow); void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrame(u8 windowId, bool8 copyNow); -void sub_80F6C14(void); void sub_80F771C(bool8 copyToVram); void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram); void sub_80F7768(u8 windowId, bool8 copyToVram); diff --git a/include/overworld.h b/include/overworld.h index d97aa40dc..c61099174 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -122,7 +122,6 @@ void SetCurrentMapLayout(u16 mapLayoutId); void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); void ResetInitialPlayerAvatarState(void); -void sub_8055D40(u16 mapLayoutId); void CleanupOverworldWindowsAndTilemaps(void); u32 ComputeWhiteOutMoneyLoss(void); diff --git a/include/player_pc.h b/include/player_pc.h index 43c91ec95..ad4268b82 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -23,7 +23,6 @@ extern struct PlayerPCItemPageStruct gPlayerPcMenuManager; // Exported ROM declarations -void sub_816B060(u8 taskId); void NewGameInitPCItems(void); void Mailbox_ReturnToMailListAfterDeposit(void); diff --git a/include/pokeball.h b/include/pokeball.h index 9ba5656af..8ce25929a 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -28,8 +28,6 @@ extern const struct SpriteTemplate gBallSpriteTemplates[]; u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); -u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h); -void sub_8076918(u8 bank); void DoHitAnimHealthboxEffect(u8 bank); void LoadBallGfx(u8 ballId); void FreeBallGfx(u8 ballId); diff --git a/include/pokedex.h b/include/pokedex.h index 12f03e87d..8c2281702 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -42,7 +42,6 @@ bool16 HasAllMons(void); u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); u16 GetNationalPokedexCount(u8); -u16 sub_80C0844(u8); u16 GetKantoPokedexCount(u8); bool16 HasAllHoennMons(void); bool16 HasAllKantoMons(void); diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index b24f4e785..32dd49545 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -9,11 +9,6 @@ extern const u8 gMonIconPaletteIndices[]; const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo); const u8 *GetMonIconTiles(u16 iconSpecies, bool32 extra); const u16 *GetValidMonIconPalettePtr(u16 speciesId); -u16 sub_80D2E84(u16 speciesId); -void sub_80D2F68(u16 iconId); -u8 sub_80D2D78(u16 iconId, SpriteCallback callback, u16 x, u16 y, u16 a4, u8 a5); -void sub_80D2FF0(u16 iconId); -void sub_80D2EF8(struct Sprite * sprite); void LoadMonIconPalettes(void); void FreeMonIconPalettes(void); u16 MailSpeciesToIconSpecies(u16); diff --git a/include/pokenav.h b/include/pokenav.h index ad95873b1..caa88b795 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -3,6 +3,4 @@ #include "global.h" -bool8 sub_81D5C18(void); - #endif //GUARD_POKENAV_H diff --git a/include/script.h b/include/script.h index ba1de4f1c..acb2d55e3 100644 --- a/include/script.h +++ b/include/script.h @@ -59,9 +59,6 @@ u32 CalculateRamScriptChecksum(void); void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); const u8 *GetRamScript(u8 objectId, const u8 *script); -bool32 sub_80991F8(void); -u8 *sub_8099244(void); -void sub_80992A0(u8 *script, u16 scriptSize); bool32 ValidateRamScript(void); void MEventSetRamScript(u8 * script, u16 scriptSize); u8 * sub_8069E48(void); diff --git a/include/sprite.h b/include/sprite.h index ab1818e1f..50f5013d2 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -275,7 +275,6 @@ void FreeSpriteTiles(struct Sprite *sprite); void FreeSpritePalette(struct Sprite *sprite); void FreeSpriteOamMatrix(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 StartSpriteAnim(struct Sprite *sprite, u8 animNum); void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum); @@ -316,7 +315,6 @@ void CopyFromSprites(u8 *dest); u8 SpriteTileAllocBitmapOp(u16 bit, u8 op); void ClearSpriteCopyRequests(void); void ResetAffineAnimData(void); -void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3); void FreeSpriteTilesIfNotUsingSheet(struct Sprite *sprite); s16 AllocSpriteTiles(u16 tileCount); void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod); diff --git a/include/string_util.h b/include/string_util.h index 45adac78d..dd2423eed 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -34,7 +34,6 @@ u8 *StringCopyN_Multibyte(u8 *dest, const u8 *src, u32 n); u32 StringLength_Multibyte(const u8 *str); u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color); bool32 IsStringJapanese(u8 *str); -bool32 sub_800924C(u8 *str, s32 n); u8 GetExtCtrlCodeLength(u8 code); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); void ConvertInternationalString(u8 *s, u8 language); diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h index fe4fc2510..412941005 100644 --- a/include/trainer_pokemon_sprites.h +++ b/include/trainer_pokemon_sprites.h @@ -5,12 +5,6 @@ u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId); bool16 ResetAllPicSprites(void); -u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); -u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); -u16 sub_818D820(u16 spriteId); -u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); -u16 sub_818D8F0(u16 spriteId); -u8 sub_818D97C(u8 a0, u8 a1); u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); u16 FreeAndDestroyMonPicSprite(u16); u16 FreeAndDestroyTrainerPicSprite(u16); |