summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h2
-rw-r--r--include/battle_anim.h118
-rw-r--r--include/battle_controllers.h17
-rw-r--r--include/gba/macro.h14
-rw-r--r--include/graphics.h6
-rw-r--r--include/party_menu.h1
-rw-r--r--include/quest_log_815A008.h9
-rw-r--r--include/strings.h22
-rw-r--r--include/unk_8159F40.h10
9 files changed, 117 insertions, 82 deletions
diff --git a/include/battle.h b/include/battle.h
index 122ccc894..00f7dcea9 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -664,7 +664,7 @@ extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
extern void (*gPreBattleCallback1)(void);
extern bool8 gDoingBattleAnim;
-extern void *gUnknown_3005EE0[];
+extern u8 *gUnknown_3005EE0[MAX_BATTLERS_COUNT];
extern u8 *gUnknown_2022BB8;
extern u8 *gUnknown_2022BBC;
extern void (*gBattleMainFunc)(void);
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 9db123f91..ad1a0fed8 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -57,46 +57,53 @@ extern s32 gAnimMoveDmg;
extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT];
extern u8 gUnknown_2037F24;
-extern struct OamData gOamData_83ACA40;
-extern struct OamData gOamData_83AC9C8;
-extern struct OamData gOamData_83ACA38;
-extern struct OamData gOamData_83AC9D0;
-extern struct OamData gOamData_83AC9F8;
-extern struct OamData gOamData_83AC9D8;
-extern struct OamData gOamData_83ACB58;
-extern struct OamData gOamData_83ACAF8;
-extern struct OamData gOamData_83ACB60;
-extern struct OamData gOamData_83ACA30;
-extern struct OamData gOamData_83ACA98;
-extern struct OamData gOamData_83ACA90;
-extern struct OamData gOamData_83ACAF0;
-extern struct OamData gOamData_83ACB10;
-extern struct OamData gOamData_83ACB18;
-extern struct OamData gOamData_83ACB38;
-extern struct OamData gOamData_83ACA18;
-extern struct OamData gOamData_83ACB20;
-extern struct OamData gOamData_83ACB50;
-extern struct OamData gOamData_83ACAB8;
-extern struct OamData gOamData_83ACA00;
-extern struct OamData gOamData_83ACBC0;
-extern struct OamData gOamData_83ACB00;
-extern struct OamData gOamData_83AC9E0;
-extern struct OamData gOamData_83ACA20;
-extern struct OamData gOamData_83ACA80;
-extern struct OamData gOamData_83ACAA0;
-
+extern const struct OamData gOamData_83AC9C8;
+extern const struct OamData gOamData_83AC9D0;
+extern const struct OamData gOamData_83AC9D8;
+extern const struct OamData gOamData_83AC9E0;
+extern const struct OamData gOamData_83AC9F8;
+extern const struct OamData gOamData_83ACA00;
+extern const struct OamData gOamData_83ACA18;
+extern const struct OamData gOamData_83ACA20;
+extern const struct OamData gOamData_83ACA30;
+extern const struct OamData gOamData_83ACA38;
+extern const struct OamData gOamData_83ACA40;
+extern const struct OamData gOamData_83ACA80;
+extern const struct OamData gOamData_83ACA90;
+extern const struct OamData gOamData_83ACA98;
+extern const struct OamData gOamData_83ACAA0;
+extern const struct OamData gOamData_83ACAB8;
+extern const struct OamData gOamData_83ACAC8;
+extern const struct OamData gOamData_83ACAE8;
+extern const struct OamData gOamData_83ACAF0;
+extern const struct OamData gOamData_83ACAF8;
+extern const struct OamData gOamData_83ACB00;
+extern const struct OamData gOamData_83ACB10;
+extern const struct OamData gOamData_83ACB18;
+extern const struct OamData gOamData_83ACB20;
+extern const struct OamData gOamData_83ACB28;
+extern const struct OamData gOamData_83ACB38;
+extern const struct OamData gOamData_83ACB48;
+extern const struct OamData gOamData_83ACB50;
+extern const struct OamData gOamData_83ACB58;
+extern const struct OamData gOamData_83ACB60;
+extern const struct OamData gOamData_83ACB88;
+extern const struct OamData gOamData_83ACBC0;
+extern const struct OamData gOamData_83ACBE8;
+
+// battle_anim.s
+void MoveBattlerSpriteToBG(u8 battlerId, u8);
+void sub_8073128(u8);
void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move);
void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim);
void DestroyAnimSprite(struct Sprite *sprite);
void DestroyAnimVisualTask(u8 taskId);
void DestroyAnimSoundTask(u8 taskId);
-bool8 IsAnimBankSpriteVisible(u8 bank);
-void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible);
+bool8 IsAnimBankSpriteVisible(u8 battlerId);
bool8 IsContest(void);
s8 BattleAnimAdjustPanning(s8 pan);
s8 BattleAnimAdjustPanning2(s8 pan);
-s16 sub_80A52EC(s16 a);
s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
bool8 IsBattlerSpriteVisible(u8 battlerId);
s16 KeepPanInRange(s16 a, s32 oldPan);
@@ -135,23 +142,6 @@ enum
BATTLER_COORD_ATTR_RAW_BOTTOM,
};
-u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId);
-
-bool8 IsBankSpritePresent(u8 battlerId);
-void sub_80A6C68(u8 arg0);
-u8 GetAnimBattlerSpriteId(u8 wantedBank);
-bool8 IsDoubleBattle(void);
-u8 sub_80A6D94(void);
-u8 sub_80A8364(u8);
-void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite *));
-void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
-u8 GetBattlerSpriteDefault_Y(u8 battlerId);
-u8 sub_80A82E4(u8 battlerId);
-u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
-u8 GetGhostSpriteDefault_Y(u8 battlerId);
-void MoveBattlerSpriteToBG(u8 battlerId, u8);
-void sub_8073128(u8);
-
// battle_anim_status_effects.s
#define STAT_ANIM_PLUS1 15
#define STAT_ANIM_PLUS2 39
@@ -245,7 +235,7 @@ u8 sub_8075D80(u8 a1);
void AnimSpriteOnMonPos(struct Sprite *sprite);
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
void AnimThrowProjectile(struct Sprite *sprite);
-void sub_8075F0C(struct Sprite *sprite);
+void AnimSnoreZ(struct Sprite *sprite);
s16 CloneBattlerSpriteWithBlend(u8 animBattler);
void obj_delete_but_dont_free_vram(struct Sprite *sprite);
void sub_8076048(u8 taskId);
@@ -293,6 +283,7 @@ void sub_8099BD4(u8 taskId);
// normal.c
extern const struct SpriteTemplate gUnknown_83E7C98;
+extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate;
u32 UnpackSelectedBattleAnimPalettes(s16 selector);
void sub_80B9BDC(u8 taskId);
@@ -353,12 +344,35 @@ void sub_80B194C(u8 taskId);
void sub_80B1D3C(struct Sprite *sprite);
void sub_80B2868(u8 taskId);
-// water.s
-extern const union AnimCmd *const gUnknown_83E5958[];
+// fighting.c
+void sub_80B1530(u8 taskId);
+
+// ice.c
+void AnimTask_Haze1(u8 taskId);
+void AnimTask_LoadMistTiles(u8 taskId);
+void AnimTask_Hail1(u8 taskId);
+void AnimTask_GetRolloutCounter(u8 taskId);
-// fire.s
+// electric.c
+void sub_80AE220(u8 taskId);
+void sub_80AE540(u8 taskId);
+void sub_80AE8A0(u8 taskId);
+void sub_80AEA10(u8 taskId);
+void sub_80AECE0(u8 taskId);
+void sub_80AEFA0(u8 taskId);
+
+// fire.c
extern const union AnimCmd *const gUnknown_83E5D48[];
+void sub_80ACEA4(u8 taskId);
+void sub_80ADAD8(u8 taskId);
+void AnimTask_BlendBackground(u8 taskId);
+void sub_80AD800(u8 taskId);
+
+// water.s
+extern const union AnimCmd *const gUnknown_83E5958[];
+extern const union AnimCmd *const gUnknown_83E5A78[];
+
// battle_anim_utility_funcs.c
void sub_80BA7F8(u8 taskId);
void sub_80BA83C(u8 taskId);
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 96f57c78a..06a0e2957 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -203,7 +203,7 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringId);
void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringId);
void BtlController_EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
-void BtlController_EmitChooseItem(u8 bufferId, u8* arg1);
+void BtlController_EmitChooseItem(u8 bufferId, u8 *arg1);
void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
void BtlController_EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
void BtlController_EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints);
@@ -221,7 +221,7 @@ void BtlController_EmitPlayFanfare(u8 bufferId, u16 songId);
void BtlController_EmitFaintingCry(u8 bufferId);
void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId);
void BtlController_EmitIntroTrainerBallThrow(u8 bufferId);
-void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
+void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus *hpAndStatus, u8 arg2);
void BtlController_EmitHidePartyStatusSummary(u8 bufferId);
void BtlController_EmitEndBounceEffect(u8 bufferId);
void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
@@ -246,21 +246,16 @@ void MoveSelectionCreateCursorAt(u8 cursorPos, u8 arg1);
void MoveSelectionDestroyCursorAt(u8 cursorPos);
void HandleInputChooseMove(void);
-// recorded player controller
-void SetControllerToRecordedPlayer(void);
-
// opponent controller
void SetControllerToOpponent(void);
void OpponentBufferExecCompleted(void);
-// player partner controller
-void SetControllerToPlayerPartner(void);
-
// safari controller
void SetControllerToSafari(void);
// pokedude controller
-void SetControllerToPokeDude(void);
+void SetControllerToPokedude(void);
+void InitPokedudePartyAndOpponent(void);
// oak and old man controller
void SetControllerToOakOrOldMan(void);
@@ -273,10 +268,10 @@ void sub_80E7988(void);
void sub_80EB30C(void);
void sub_80EB524(void);
-// link opponent
+// link opponent controller
void SetControllerToLinkOpponent(void);
-// link partner
+// link partner controller
void SetControllerToLinkPartner(void);
#endif // GUARD_BATTLE_CONTROLLERS_H
diff --git a/include/gba/macro.h b/include/gba/macro.h
index 01bb85b7a..e416c3577 100644
--- a/include/gba/macro.h
+++ b/include/gba/macro.h
@@ -110,12 +110,12 @@
u32 _size = size; \
while (1) \
{ \
- DmaFill##bit(dmaNum, 0, dest, (block)); \
- dest += (block); \
+ DmaFill##bit(dmaNum, 0, dest, (block)); \
+ dest += (block); \
_size -= (block); \
if (_size <= (block)) \
{ \
- DmaFill##bit(dmaNum, 0, dest, _size); \
+ DmaFill##bit(dmaNum, 0, dest, _size); \
break; \
} \
} \
@@ -123,16 +123,16 @@
#define DmaFillLarge(dmaNum, value, dest, size, block, bit) \
{ \
- void *_dest = (void *)dest; \
+ void *_dest = (void *)dest; \
u32 _size = size; \
while (1) \
{ \
- DmaFill##bit(dmaNum, value, _dest, (block)); \
+ DmaFill##bit(dmaNum, value, _dest, (block)); \
_dest += (block); \
_size -= (block); \
if (_size <= (block)) \
{ \
- DmaFill##bit(dmaNum, value, _dest, _size); \
+ DmaFill##bit(dmaNum, value, _dest, _size); \
break; \
} \
} \
@@ -162,7 +162,7 @@
#define DmaFillDefvars(dmaNum, value, dest, size, bit) \
{ \
- void *_dest = (void *)dest; \
+ void *_dest = (void *)dest; \
u32 _size = size; \
DmaFill##bit(dmaNum, value, _dest, _size); \
}
diff --git a/include/graphics.h b/include/graphics.h
index c057da386..354339235 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2915,7 +2915,6 @@ extern const u8 gBerryFixWindow_Tilemap[];
extern const u8 gBerryFixWindow_Pal[];
// item_pc
-
extern const u8 gItemPcTiles[];
extern const u32 gItemPcBgPals[];
extern const u8 gItemPcTilemap[];
@@ -3736,6 +3735,11 @@ extern const u32 gSubstituteDollGfx[];
extern const u32 gSubstituteDollTilemap[];
extern const u32 gSubstituteDollPal[];
+// ice
+extern const u8 gWeatherFog1Tiles[];
+extern const u32 gBattleAnimFogTilemap[];
+extern const u16 gUnknown_83C2CE0[];
+
// credits
extern const u32 gCreditsPokeballBgGfxTiles[];
extern const u32 gCreditsPokeballBgGfxMap[];
diff --git a/include/party_menu.h b/include/party_menu.h
index 6c81a248c..19cdda1dc 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -89,5 +89,6 @@ void CB2_PartyMenuFromStartMenu(void);
void sub_8128198(void);
void sub_8127FF4(u8 slot, u8 slot2);
void LoadHeldItemIcons(void);
+void sub_8127968(void);
#endif // GUARD_PARTY_MENU_H
diff --git a/include/quest_log_815A008.h b/include/quest_log_815A008.h
new file mode 100644
index 000000000..2577450a4
--- /dev/null
+++ b/include/quest_log_815A008.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_QUEST_LOG_815A008_H
+#define GUARD_QUEST_LOG_815A008_H
+
+#include "global.h"
+
+void sub_815A008(struct QuestLog *);
+void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *);
+
+#endif //GUARD_QUEST_LOG_815A008_H
diff --git a/include/strings.h b/include/strings.h
index 6ad76e2fa..377b6ea39 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -243,6 +243,28 @@ extern const u8 gUnknown_83FDDEB[];
extern const u8 gUnknown_83FDCD2[];
extern const u8 gUnknown_83FE6FA[];
+// battle_controller_pokedude
+extern const u8 gUnknown_81C5F69[];
+extern const u8 gUnknown_81C5FA7[];
+extern const u8 gUnknown_81C5FDC[];
+extern const u8 gUnknown_81C601C[];
+extern const u8 gUnknown_81C60FA[];
+extern const u8 gUnknown_81C615A[];
+extern const u8 gUnknown_81C6196[];
+extern const u8 gUnknown_81C61EA[];
+extern const u8 gUnknown_81C6202[];
+extern const u8 gUnknown_81C6301[];
+extern const u8 gUnknown_81C63A9[];
+extern const u8 gUnknown_81C63F9[];
+extern const u8 gUnknown_81C6446[];
+extern const u8 gUnknown_81C657A[];
+extern const u8 gUnknown_81C6637[];
+extern const u8 gUnknown_81C6645[];
+extern const u8 gUnknown_81C66CF[];
+extern const u8 gUnknown_81C6787[];
+extern const u8 gUnknown_81C684B[];
+extern const u8 gUnknown_81C686C[];
+
// credits
extern const u8 gString_Dummy[];
extern const u8 gString_PokemonFireRed_Staff[]; // FR
diff --git a/include/unk_8159F40.h b/include/unk_8159F40.h
deleted file mode 100644
index 41db36aad..000000000
--- a/include/unk_8159F40.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GUARD_UNK_8159F40_H
-#define GUARD_UNK_8159F40_H
-
-#include "global.h"
-
-void InitPokedudePartyAndOpponent(void);
-void sub_815A008(struct QuestLog *);
-void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *);
-
-#endif //GUARD_UNK_8159F40_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 23:39:29 +0000