From 71eb0fc9d80731a26867aedf0b470f67315ab623 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 1 Nov 2019 02:17:23 +0800 Subject: battle_controller_pokedude data --- include/battle_controllers.h | 2 +- include/strings.h | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 96f57c78a..8e5e15c7b 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -260,7 +260,7 @@ void SetControllerToPlayerPartner(void); void SetControllerToSafari(void); // pokedude controller -void SetControllerToPokeDude(void); +void SetControllerToPokedude(void); // oak and old man controller void SetControllerToOakOrOldMan(void); diff --git a/include/strings.h b/include/strings.h index 80ede79ef..c55e05eaf 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 -- cgit v1.2.3 From a937f722834f24342b0b87bb9554546dec77170a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 1 Nov 2019 05:28:17 +0800 Subject: thru PokedudeHandleSetRawMonData --- include/party_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/party_menu.h b/include/party_menu.h index c07371a5d..d7c2f1248 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -88,5 +88,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 -- cgit v1.2.3 From 378e85d00ba922933aadcec240747c7e748f8de6 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 1 Nov 2019 10:22:12 +0800 Subject: thru sub_8159824 --- include/battle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 40a2eba04..0a441df1c 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); -- cgit v1.2.3 From 5fa2f4f18b11188dce2e3761fd3c2f6a40cdf2c8 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 2 Nov 2019 02:33:32 +0800 Subject: battle_controller_pokedude remaining stuff --- include/battle_controllers.h | 15 +++++---------- include/quest_log_815A008.h | 9 +++++++++ include/unk_8159F40.h | 10 ---------- 3 files changed, 14 insertions(+), 20 deletions(-) create mode 100644 include/quest_log_815A008.h delete mode 100644 include/unk_8159F40.h (limited to 'include') diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 8e5e15c7b..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 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/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/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 -- cgit v1.2.3 From 253ffec0352404ae2ffe5635a5b648d39d8d6b7e Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 8 Nov 2019 01:16:42 +0800 Subject: poison --- include/battle_anim.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 9db123f91..bbfecc1e2 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -355,6 +355,7 @@ void sub_80B2868(u8 taskId); // water.s extern const union AnimCmd *const gUnknown_83E5958[]; +extern const union AnimCmd *const gUnknown_83E5A78[]; // fire.s extern const union AnimCmd *const gUnknown_83E5D48[]; -- cgit v1.2.3 From 7e4a3697cd6587e78b07eb8899cc142cca6bb583 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 8 Nov 2019 05:03:08 +0800 Subject: fighting --- include/battle_anim.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index bbfecc1e2..849b92f57 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -245,7 +245,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 +293,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,6 +354,9 @@ void sub_80B194C(u8 taskId); void sub_80B1D3C(struct Sprite *sprite); void sub_80B2868(u8 taskId); +// fighting.c +void sub_80B1530(u8 taskId); + // water.s extern const union AnimCmd *const gUnknown_83E5958[]; extern const union AnimCmd *const gUnknown_83E5A78[]; -- cgit v1.2.3 From 94c1924ed8849ccd2bbc7c3f3f4d28400edf72d5 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 8 Nov 2019 10:30:17 +0800 Subject: ice --- include/battle_anim.h | 11 +++++++++++ include/graphics.h | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 849b92f57..17f18ccc2 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -84,6 +84,11 @@ extern struct OamData gOamData_83AC9E0; extern struct OamData gOamData_83ACA20; extern struct OamData gOamData_83ACA80; extern struct OamData gOamData_83ACAA0; +extern struct OamData gOamData_83ACBE8; +extern struct OamData gOamData_83ACAE8; +extern struct OamData gOamData_83ACB88; +extern struct OamData gOamData_83ACB48; +extern struct OamData gOamData_83ACB28; void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); @@ -357,6 +362,12 @@ void sub_80B2868(u8 taskId); // 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); + // water.s extern const union AnimCmd *const gUnknown_83E5958[]; extern const union AnimCmd *const gUnknown_83E5A78[]; diff --git a/include/graphics.h b/include/graphics.h index bc87e4d53..340b737aa 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[]; -- cgit v1.2.3 From ab9ce0e6413607d1677be1bc0e1174e5f82e48f0 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 9 Nov 2019 04:20:43 +0800 Subject: electric --- include/battle_anim.h | 73 +++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 32 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 17f18ccc2..11151bb34 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -57,38 +57,39 @@ 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 struct OamData gOamData_83ACBE8; -extern struct OamData gOamData_83ACAE8; -extern struct OamData gOamData_83ACB88; -extern struct OamData gOamData_83ACB48; -extern struct OamData gOamData_83ACB28; +extern const struct OamData gOamData_83ACA40; +extern const struct OamData gOamData_83AC9C8; +extern const struct OamData gOamData_83ACA38; +extern const struct OamData gOamData_83AC9D0; +extern const struct OamData gOamData_83AC9F8; +extern const struct OamData gOamData_83AC9D8; +extern const struct OamData gOamData_83ACB58; +extern const struct OamData gOamData_83ACAF8; +extern const struct OamData gOamData_83ACB60; +extern const struct OamData gOamData_83ACA30; +extern const struct OamData gOamData_83ACA98; +extern const struct OamData gOamData_83ACA90; +extern const struct OamData gOamData_83ACAF0; +extern const struct OamData gOamData_83ACB10; +extern const struct OamData gOamData_83ACB18; +extern const struct OamData gOamData_83ACB38; +extern const struct OamData gOamData_83ACA18; +extern const struct OamData gOamData_83ACB20; +extern const struct OamData gOamData_83ACB50; +extern const struct OamData gOamData_83ACAB8; +extern const struct OamData gOamData_83ACA00; +extern const struct OamData gOamData_83ACBC0; +extern const struct OamData gOamData_83ACB00; +extern const struct OamData gOamData_83AC9E0; +extern const struct OamData gOamData_83ACA20; +extern const struct OamData gOamData_83ACA80; +extern const struct OamData gOamData_83ACAA0; +extern const struct OamData gOamData_83ACBE8; +extern const struct OamData gOamData_83ACAE8; +extern const struct OamData gOamData_83ACB88; +extern const struct OamData gOamData_83ACB48; +extern const struct OamData gOamData_83ACB28; +extern const struct OamData gOamData_83ACAC8; void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); @@ -368,6 +369,14 @@ void AnimTask_LoadMistTiles(u8 taskId); void AnimTask_Hail1(u8 taskId); void AnimTask_GetRolloutCounter(u8 taskId); +// 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); + // water.s extern const union AnimCmd *const gUnknown_83E5958[]; extern const union AnimCmd *const gUnknown_83E5A78[]; -- cgit v1.2.3 From a4a44dd18e125974e784f5f2fcb4c1387a8de90a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 9 Nov 2019 09:05:26 +0800 Subject: fire; update constants --- include/battle_anim.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 11151bb34..547dd7e2e 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -377,13 +377,18 @@ 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[]; -// fire.s -extern const union AnimCmd *const gUnknown_83E5D48[]; - // battle_anim_utility_funcs.c void sub_80BA7F8(u8 taskId); void sub_80BA83C(u8 taskId); -- cgit v1.2.3 From 17b55f50dbcdf9797d0aecfba356bc8681dea8f5 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 9 Nov 2019 23:39:43 +0800 Subject: clean up --- include/battle_anim.h | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 547dd7e2e..6acd26baa 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -91,18 +91,19 @@ extern const struct OamData gOamData_83ACB48; extern const struct OamData gOamData_83ACB28; extern const struct OamData gOamData_83ACAC8; +// 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); @@ -141,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 -- cgit v1.2.3 From 63f8834b6bc2d6413da606d7df88a304edc3c625 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 19 Nov 2019 23:45:59 +0800 Subject: resolve review comments --- include/battle_anim.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 6acd26baa..ad1a0fed8 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -57,39 +57,39 @@ extern s32 gAnimMoveDmg; extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT]; extern u8 gUnknown_2037F24; -extern const struct OamData gOamData_83ACA40; extern const struct OamData gOamData_83AC9C8; -extern const struct OamData gOamData_83ACA38; extern const struct OamData gOamData_83AC9D0; -extern const struct OamData gOamData_83AC9F8; extern const struct OamData gOamData_83AC9D8; -extern const struct OamData gOamData_83ACB58; -extern const struct OamData gOamData_83ACAF8; -extern const struct OamData gOamData_83ACB60; +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_83ACA98; +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_83ACB38; -extern const struct OamData gOamData_83ACA18; 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_83ACAB8; -extern const struct OamData gOamData_83ACA00; +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_83ACB00; -extern const struct OamData gOamData_83AC9E0; -extern const struct OamData gOamData_83ACA20; -extern const struct OamData gOamData_83ACA80; -extern const struct OamData gOamData_83ACAA0; extern const struct OamData gOamData_83ACBE8; -extern const struct OamData gOamData_83ACAE8; -extern const struct OamData gOamData_83ACB88; -extern const struct OamData gOamData_83ACB48; -extern const struct OamData gOamData_83ACB28; -extern const struct OamData gOamData_83ACAC8; // battle_anim.s void MoveBattlerSpriteToBG(u8 battlerId, u8); -- cgit v1.2.3