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

Clean up data headers

Browse Source
This commit is contained in:
DizzyEggg 2019-04-04 23:53:06 +02:00 committed by huderlem
parent c36476af85
commit b0223f691f
68 changed files with 173 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
include/battle.h
View File

@ -62,70 +62,12 @@
#define BATTLE_BUFFER_LINK_SIZE 0x1000 #define BATTLE_BUFFER_LINK_SIZE 0x1000
struct TrainerMonNoItemDefaultMoves struct ResourceFlags
{
u16 iv;
u8 lvl;
u16 species;
};
struct TrainerMonItemDefaultMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 heldItem;
};
struct TrainerMonNoItemCustomMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 moves[4];
};
struct TrainerMonItemCustomMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 heldItem;
u16 moves[4];
};
union TrainerMonPtr
{
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
const struct TrainerMonItemCustomMoves *ItemCustomMoves;
};
struct Trainer
{
/*0x00*/ u8 partyFlags;
/*0x01*/ u8 trainerClass;
/*0x02*/ u8 encounterMusic_gender; // last bit is gender
/*0x03*/ u8 trainerPic;
/*0x04*/ u8 trainerName[12];
/*0x10*/ u16 items[4];
/*0x18*/ bool8 doubleBattle;
/*0x1C*/ u32 aiFlags;
/*0x20*/ u8 partySize;
/*0x24*/ union TrainerMonPtr party;
};
extern const struct Trainer gTrainers[];
#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F))
struct UnknownFlags
{ {
u32 flags[4]; u32 flags[4];
}; };
#define UNKNOWN_FLAG_FLASH_FIRE 1 #define RESOURCE_FLAG_FLASH_FIRE 1
struct DisableStruct struct DisableStruct
{ {
@ -282,7 +224,7 @@ struct StatsArray
struct BattleResources struct BattleResources
{ {
struct SecretBaseRecord* secretBase; struct SecretBaseRecord* secretBase;
struct UnknownFlags *flags; struct ResourceFlags *flags;
struct BattleScriptsStack* battleScriptsStack; struct BattleScriptsStack* battleScriptsStack;
struct BattleCallbacksStack* battleCallbackStack; struct BattleCallbacksStack* battleCallbackStack;
struct StatsArray* beforeLvlUp; struct StatsArray* beforeLvlUp;
@ -769,6 +711,5 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
extern u8 gMultiUsePlayerCursor; extern u8 gMultiUsePlayerCursor;
extern u8 gNumberOfMovesToChoose; extern u8 gNumberOfMovesToChoose;
extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
extern const u8 gTrainerClassNames[][13];
#endif // GUARD_BATTLE_H #endif // GUARD_BATTLE_H

60
include/data.h
View File

@ -14,6 +14,62 @@ struct MonCoords
u8 y_offset; u8 y_offset;
}; };
struct TrainerMonNoItemDefaultMoves
{
u16 iv;
u8 lvl;
u16 species;
};
struct TrainerMonItemDefaultMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 heldItem;
};
struct TrainerMonNoItemCustomMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 moves[4];
};
struct TrainerMonItemCustomMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 heldItem;
u16 moves[4];
};
union TrainerMonPtr
{
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
const struct TrainerMonItemCustomMoves *ItemCustomMoves;
};
struct Trainer
{
/*0x00*/ u8 partyFlags;
/*0x01*/ u8 trainerClass;
/*0x02*/ u8 encounterMusic_gender; // last bit is gender
/*0x03*/ u8 trainerPic;
/*0x04*/ u8 trainerName[12];
/*0x10*/ u16 items[4];
/*0x18*/ bool8 doubleBattle;
/*0x1C*/ u32 aiFlags;
/*0x20*/ u8 partySize;
/*0x24*/ union TrainerMonPtr party;
};
#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F))
extern const u16 gUnknown_082FF1D8[]; extern const u16 gUnknown_082FF1D8[];
extern const u32 gUnknown_082FF1F8[]; extern const u32 gUnknown_082FF1F8[];
@ -34,7 +90,7 @@ extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AffineAnimCmd *const gUnknown_082FF6C0[]; extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[]; extern const union AnimCmd *const gUnknown_082FF70C[];
extern const struct MonCoords gMonFrontPicCoords[]; extern const struct MonCoords gMonFrontPicCoords[];
extern const struct CompressedSpriteSheet gMonStillFrontPicTable[]; extern const struct CompressedSpriteSheet gMonStillFrontPicTable[];
extern const struct MonCoords gMonBackPicCoords[]; extern const struct MonCoords gMonBackPicCoords[];
@ -52,7 +108,7 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern const u8 gEnemyMonElevation[NUM_SPECIES]; extern const u8 gEnemyMonElevation[NUM_SPECIES];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[]; extern const union AnimCmd *const *const gMonFrontAnimsPtrTable[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct Trainer gTrainers[]; extern const struct Trainer gTrainers[];

4
include/field_effect.h
View File

@ -1,9 +1,7 @@
#ifndef GUARD_FIELD_EFFECTS_H #ifndef GUARD_FIELD_EFFECTS_H
#define GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[2];
extern const struct SpritePalette gNewGameBirchObjectPaletteInfo; extern const struct SpritePalette gNewGameBirchObjectPaletteInfo;
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[2];
extern const struct SpriteTemplate gNewGameBirchObjectTemplate; extern const struct SpriteTemplate gNewGameBirchObjectTemplate;
extern const struct OamData gNewGameBirchOamAttributes; extern const struct OamData gNewGameBirchOamAttributes;
@ -53,4 +51,4 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);
void StartEscapeRopeFieldEffect(void); void StartEscapeRopeFieldEffect(void);
#endif //GUARD_FIELD_EFFECTS_H #endif // GUARD_FIELD_EFFECTS_H

3
include/field_specials.h
View File

@ -1,6 +1,9 @@
#ifndef GUARD_FIELD_SPECIALS_H #ifndef GUARD_FIELD_SPECIALS_H
#define GUARD_FIELD_SPECIALS_H #define GUARD_FIELD_SPECIALS_H
extern bool8 gBikeCyclingChallenge;
extern u8 gBikeCollisions;
u8 GetLeadMonIndex(void); u8 GetLeadMonIndex(void);
u8 sub_813B260(void); u8 sub_813B260(void);
u16 get_unknown_box_id(void); u16 get_unknown_box_id(void);

2
include/pokemon_summary_screen.h
View File

@ -4,7 +4,9 @@
#include "main.h" #include "main.h"
extern u8 gLastViewedMonIndex; extern u8 gLastViewedMonIndex;
extern const u8 *const gMoveDescriptionPointers[]; extern const u8 *const gMoveDescriptionPointers[];
extern const u8 *const gNatureNamePointers[];
void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
void sub_81C4F98(u8, void(*)(void)); void sub_81C4F98(u8, void(*)(void));

2
src/apprentice.c
View File

@ -2,7 +2,7 @@
#include "apprentice.h" #include "apprentice.h"
#include "battle.h" #include "battle.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "data2.h" #include "data.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"

3
src/battle_ai_script_commands.c
View File

@ -4,6 +4,7 @@
#include "battle_ai_script_commands.h" #include "battle_ai_script_commands.h"
#include "battle_factory.h" #include "battle_factory.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "data.h"
#include "item.h" #include "item.h"
#include "pokemon.h" #include "pokemon.h"
#include "random.h" #include "random.h"
@ -2217,7 +2218,7 @@ static void BattleAICmd_if_flash_fired(void)
{ {
u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
if (gBattleResources->flags->flags[battlerId] & UNKNOWN_FLAG_FLASH_FIRE) if (gBattleResources->flags->flags[battlerId] & RESOURCE_FLAG_FLASH_FIRE)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
else else
gAIScriptPtr += 6; gAIScriptPtr += 6;

4
src/battle_anim_effects_3.c
View File

@ -4,7 +4,7 @@
#include "battle_anim.h" #include "battle_anim.h"
#include "bg.h" #include "bg.h"
#include "contest.h" #include "contest.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "dma3.h" #include "dma3.h"
#include "gpu_regs.h" #include "gpu_regs.h"
@ -25,8 +25,6 @@
#include "constants/weather.h" #include "constants/weather.h"
extern const struct SpriteTemplate gUnknown_08593114; extern const struct SpriteTemplate gUnknown_08593114;
extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
void sub_815A0D4(struct Sprite *); void sub_815A0D4(struct Sprite *);
void sub_815A1B0(struct Sprite *); void sub_815A1B0(struct Sprite *);

7
src/battle_anim_mons.c
View File

@ -3,7 +3,7 @@
#include "battle_anim.h" #include "battle_anim.h"
#include "bg.h" #include "bg.h"
#include "contest.h" #include "contest.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "dma3.h" #include "dma3.h"
#include "gpu_regs.h" #include "gpu_regs.h"
@ -27,11 +27,6 @@
#define IS_DOUBLE_BATTLE() ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) #define IS_DOUBLE_BATTLE() ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
extern const struct OamData gUnknown_0852497C; extern const struct OamData gUnknown_0852497C;
extern const struct MonCoords gMonFrontPicCoords[];
extern const struct MonCoords gMonBackPicCoords[];
extern const u8 gEnemyMonElevation[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const union AffineAnimCmd *gUnknown_082FF6C0[];
static void sub_80A6FB4(struct Sprite *sprite); static void sub_80A6FB4(struct Sprite *sprite);
static void sub_80A7144(struct Sprite *sprite); static void sub_80A7144(struct Sprite *sprite);

4
src/battle_controller_link_opponent.c
View File

@ -9,7 +9,7 @@
#include "battle_tower.h" #include "battle_tower.h"
#include "battle_tv.h" #include "battle_tv.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
#include "m4a.h" #include "m4a.h"
@ -31,8 +31,6 @@
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
// this file's functions // this file's functions
static void LinkOpponentHandleGetMonData(void); static void LinkOpponentHandleGetMonData(void);
static void LinkOpponentHandleGetRawMonData(void); static void LinkOpponentHandleGetRawMonData(void);

5
src/battle_controller_link_partner.c
View File

@ -9,7 +9,7 @@
#include "battle_tower.h" #include "battle_tower.h"
#include "battle_tv.h" #include "battle_tv.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
#include "m4a.h" #include "m4a.h"
@ -29,9 +29,6 @@
#include "constants/trainers.h" #include "constants/trainers.h"
#include "recorded_battle.h" #include "recorded_battle.h"
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
// this file's functions // this file's functions
static void LinkPartnerHandleGetMonData(void); static void LinkPartnerHandleGetMonData(void);
static void LinkPartnerHandleGetRawMonData(void); static void LinkPartnerHandleGetRawMonData(void);

4
src/battle_controller_opponent.c
View File

@ -10,7 +10,7 @@
#include "battle_tower.h" #include "battle_tower.h"
#include "battle_tv.h" #include "battle_tv.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "frontier_util.h" #include "frontier_util.h"
#include "item.h" #include "item.h"
#include "link.h" #include "link.h"
@ -36,8 +36,6 @@
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
// this file's functions // this file's functions
static void OpponentHandleGetMonData(void); static void OpponentHandleGetMonData(void);
static void OpponentHandleGetRawMonData(void); static void OpponentHandleGetRawMonData(void);

5
src/battle_controller_player.c
View File

@ -9,7 +9,7 @@
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_tv.h" #include "battle_tv.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "item.h" #include "item.h"
#include "item_menu.h" #include "item_menu.h"
#include "link.h" #include "link.h"
@ -36,9 +36,6 @@
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
// this file's functions // this file's functions
static void PlayerHandleGetMonData(void); static void PlayerHandleGetMonData(void);
static void PlayerHandleSetMonData(void); static void PlayerHandleSetMonData(void);

5
src/battle_controller_player_partner.c
View File

@ -8,7 +8,7 @@
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "item_use.h" #include "item_use.h"
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
@ -27,9 +27,6 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainers.h" #include "constants/trainers.h"
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
// this file's functions // this file's functions
static void PlayerPartnerHandleGetMonData(void); static void PlayerPartnerHandleGetMonData(void);
static void PlayerPartnerHandleGetRawMonData(void); static void PlayerPartnerHandleGetRawMonData(void);

4
src/battle_controller_recorded_opponent.c
View File

@ -9,7 +9,7 @@
#include "battle_tower.h" #include "battle_tower.h"
#include "battle_tv.h" #include "battle_tv.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "item_use.h" #include "item_use.h"
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
@ -31,8 +31,6 @@
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
// this file's functions // this file's functions
static void RecordedOpponentHandleGetMonData(void); static void RecordedOpponentHandleGetMonData(void);
static void RecordedOpponentHandleGetRawMonData(void); static void RecordedOpponentHandleGetRawMonData(void);

5
src/battle_controller_recorded_player.c
View File

@ -6,7 +6,7 @@
#include "battle_message.h" #include "battle_message.h"
#include "battle_interface.h" #include "battle_interface.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "item_use.h" #include "item_use.h"
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
@ -27,9 +27,6 @@
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
// this file's functions // this file's functions
static void RecordedPlayerHandleGetMonData(void); static void RecordedPlayerHandleGetMonData(void);
static void RecordedPlayerHandleGetRawMonData(void); static void RecordedPlayerHandleGetRawMonData(void);

4
src/battle_controller_safari.c
View File

@ -5,7 +5,7 @@
#include "battle_interface.h" #include "battle_interface.h"
#include "battle_message.h" #include "battle_message.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "item_menu.h" #include "item_menu.h"
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
@ -23,8 +23,6 @@
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/songs.h" #include "constants/songs.h"
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
// this file's functions // this file's functions
static void SafariHandleGetMonData(void); static void SafariHandleGetMonData(void);
static void SafariHandleGetRawMonData(void); static void SafariHandleGetRawMonData(void);

4
src/battle_controller_wally.c
View File

@ -7,7 +7,7 @@
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_tv.h" #include "battle_tv.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "item.h" #include "item.h"
#include "item_menu.h" #include "item_menu.h"
#include "link.h" #include "link.h"
@ -31,8 +31,6 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainers.h" #include "constants/trainers.h"
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
// this file's functions // this file's functions
static void WallyHandleGetMonData(void); static void WallyHandleGetMonData(void);
static void WallyHandleGetRawMonData(void); static void WallyHandleGetRawMonData(void);

5
src/battle_dome.c
View File

@ -24,7 +24,7 @@
#include "menu.h" #include "menu.h"
#include "sound.h" #include "sound.h"
#include "pokemon_icon.h" #include "pokemon_icon.h"
#include "data2.h" #include "data.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "trainer_pokemon_sprites.h" #include "trainer_pokemon_sprites.h"
#include "scanline_effect.h" #include "scanline_effect.h"
@ -59,9 +59,6 @@ struct UnkStruct_860DD10
u16 src; u16 src;
}; };
// text
extern const u8 gTrainerClassNames[][13];
// This file's functions. // This file's functions.
static u8 GetDomeTrainerMonIvs(u16 trainerId); static u8 GetDomeTrainerMonIvs(u16 trainerId);
static void SwapDomeTrainers(int id1, int id2, u16 *statsArray); static void SwapDomeTrainers(int id1, int id2, u16 *statsArray);

2
src/battle_factory_screen.c
View File

@ -17,7 +17,7 @@
#include "string_util.h" #include "string_util.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "window.h" #include "window.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "pokemon_summary_screen.h" #include "pokemon_summary_screen.h"
#include "sound.h" #include "sound.h"

12
src/battle_gfx_sfx_util.c
View File

@ -19,7 +19,7 @@
#include "m4a.h" #include "m4a.h"
#include "constants/species.h" #include "constants/species.h"
#include "decompress.h" #include "decompress.h"
#include "data2.h" #include "data.h"
#include "palette.h" #include "palette.h"
#include "contest.h" #include "contest.h"
#include "constants/songs.h" #include "constants/songs.h"
@ -32,16 +32,8 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const u8 gUnknown_0831C604[]; extern const u8 gUnknown_0831C604[];
extern const u8 * const gBattleAnims_General[]; extern const u8 * const gBattleAnims_General[];
extern const u8 * const gBattleAnims_Special[]; extern const u8 * const gBattleAnims_Special[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct CompressedSpriteSheet gMonBackPicTable[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern const union AnimCmd* const * const gMonAnimationsSpriteAnimsPtrTable[];
extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow; extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow; extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
extern const u8 gEnemyMonElevation[];
// this file's functions // this file's functions
static u8 sub_805D4A8(u16 move); static u8 sub_805D4A8(u16 move);
@ -932,7 +924,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform
if (targetSpecies == SPECIES_CASTFORM) if (targetSpecies == SPECIES_CASTFORM)
{ {
gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies]; gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonFrontAnimsPtrTable[targetSpecies];
LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]); LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[battlerDef] * 16, paletteOffset, 32); LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[battlerDef] * 16, paletteOffset, 32);
} }

5
src/battle_interface.c
View File

@ -23,7 +23,8 @@
#include "battle_anim.h" #include "battle_anim.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "data2.h" #include "data.h"
#include "pokemon_summary_screen.h"
struct TestingBar struct TestingBar
{ {
@ -157,8 +158,6 @@ enum
HEALTHBOX_GFX_117, //unknown_D1300C HEALTHBOX_GFX_117, //unknown_D1300C
}; };
extern const u8 *const gNatureNamePointers[];
// strings // strings
extern const u8 gText_Slash[]; extern const u8 gText_Slash[];
extern const u8 gText_HighlightDarkGrey[]; extern const u8 gText_HighlightDarkGrey[];

2
src/battle_main.c
View File

@ -13,7 +13,7 @@
#include "battle_tower.h" #include "battle_tower.h"
#include "berry.h" #include "berry.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "dma3.h" #include "dma3.h"
#include "event_data.h" #include "event_data.h"

3
src/battle_message.c
View File

@ -5,7 +5,7 @@
#include "battle_message.h" #include "battle_message.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "data2.h" #include "data.h"
#include "event_data.h" #include "event_data.h"
#include "frontier_util.h" #include "frontier_util.h"
#include "international_string_util.h" #include "international_string_util.h"
@ -38,7 +38,6 @@ struct BattleWindowText
u8 shadowColor; u8 shadowColor;
}; };
extern const u8 gTrainerClassNames[][13];
extern const u16 gUnknown_08D85620[]; extern const u16 gUnknown_08D85620[];
// this file's functions // this file's functions

2
src/battle_tower.c
View File

@ -18,7 +18,7 @@
#include "trainer_see.h" #include "trainer_see.h"
#include "new_game.h" #include "new_game.h"
#include "string_util.h" #include "string_util.h"
#include "data2.h" #include "data.h"
#include "link.h" #include "link.h"
#include "field_message_box.h" #include "field_message_box.h"
#include "tv.h" #include "tv.h"

4
src/battle_util.c
View File

@ -2041,7 +2041,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
case ABILITY_FLASH_FIRE: case ABILITY_FLASH_FIRE:
if (moveType == TYPE_FIRE && !(gBattleMons[battler].status1 & STATUS1_FREEZE)) if (moveType == TYPE_FIRE && !(gBattleMons[battler].status1 & STATUS1_FREEZE))
{ {
if (!(gBattleResources->flags->flags[battler] & UNKNOWN_FLAG_FLASH_FIRE)) if (!(gBattleResources->flags->flags[battler] & RESOURCE_FLAG_FLASH_FIRE))
{ {
gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleCommunication[MULTISTRING_CHOOSER] = 0;
if (gProtectStructs[gBattlerAttacker].notFirstStrike) if (gProtectStructs[gBattlerAttacker].notFirstStrike)
@ -2049,7 +2049,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
else else
gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss; gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
gBattleResources->flags->flags[battler] |= UNKNOWN_FLAG_FLASH_FIRE; gBattleResources->flags->flags[battler] |= RESOURCE_FLAG_FLASH_FIRE;
effect = 2; effect = 2;
} }
else else

5
src/bike.c
View File

@ -3,7 +3,7 @@
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "global.fieldmap.h" #include "field_specials.h"
#include "metatile_behavior.h" #include "metatile_behavior.h"
#include "overworld.h" #include "overworld.h"
#include "sound.h" #include "sound.h"
@ -11,9 +11,6 @@
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/songs.h" #include "constants/songs.h"
extern bool8 gBikeCyclingChallenge;
extern u8 gBikeCollisions;
// this file's functions // this file's functions
static void MovePlayerOnMachBike(u8, u16, u16); static void MovePlayerOnMachBike(u8, u16, u16);
static u8 GetMachBikeTransition(u8 *); static u8 GetMachBikeTransition(u8 *);

2
src/cable_club.c
View File

@ -4,7 +4,7 @@
#include "battle_records.h" #include "battle_records.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "cable_club.h" #include "cable_club.h"
#include "data2.h" #include "data.h"
#include "event_data.h" #include "event_data.h"
#include "field_message_box.h" #include "field_message_box.h"
#include "field_specials.h" #include "field_specials.h"

6
src/contest.c
View File

@ -11,7 +11,7 @@
#include "battle.h" #include "battle.h"
#include "battle_anim.h" #include "battle_anim.h"
#include "contest.h" #include "contest.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "graphics.h" #include "graphics.h"
#include "link.h" #include "link.h"
@ -41,7 +41,7 @@
#include "contest_link_80FC4F4.h" #include "contest_link_80FC4F4.h"
#include "script_pokemon_util_80F87D8.h" #include "script_pokemon_util_80F87D8.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "data2.h" #include "data.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "contest_ai.h" #include "contest_ai.h"
@ -242,8 +242,6 @@ extern const u8 gText_Contest_Fear[];
extern const u8 gText_BDot[]; extern const u8 gText_BDot[];
extern const u8 gText_CDot[]; extern const u8 gText_CDot[];
extern const u8 *const gUnknown_08587E10[]; extern const u8 *const gUnknown_08587E10[];
extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const struct SpriteTemplate gSpriteTemplate_8587AD0; extern const struct SpriteTemplate gSpriteTemplate_8587AD0;
extern const struct SpriteTemplate gSpriteTemplate_8587B18[]; extern const struct SpriteTemplate gSpriteTemplate_8587B18[];
extern void (*const gContestEffectFuncs[])(void); extern void (*const gContestEffectFuncs[])(void);

2
src/contest_link_80F57C4.c
View File

@ -6,6 +6,7 @@
#include "contest.h" #include "contest.h"
#include "contest_link_80F57C4.h" #include "contest_link_80F57C4.h"
#include "contest_link_80FC4F4.h" #include "contest_link_80FC4F4.h"
#include "data.h"
#include "decompress.h" #include "decompress.h"
#include "dma3.h" #include "dma3.h"
#include "event_data.h" #include "event_data.h"
@ -86,7 +87,6 @@ struct ContestLink80F57C4
EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL; EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL;
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct BgTemplate gUnknown_0858D888[4]; extern const struct BgTemplate gUnknown_0858D888[4];
extern const struct WindowTemplate gUnknown_0858D898[]; extern const struct WindowTemplate gUnknown_0858D898[];
extern const struct CompressedSpriteSheet gUnknown_0858D878[]; extern const struct CompressedSpriteSheet gUnknown_0858D878[];

5
src/contest_painting.c
View File

@ -1,11 +1,12 @@
#include "global.h" #include "global.h"
#include "alloc.h" #include "alloc.h"
#include "battle.h" #include "battle.h"
#include "battle_gfx_sfx_util.h"
#include "bg.h" #include "bg.h"
#include "contest.h" #include "contest.h"
#include "contest_painting.h" #include "contest_painting.h"
#include "contest_painting_effects.h" #include "contest_painting_effects.h"
#include "battle_gfx_sfx_util.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "international_string_util.h" #include "international_string_util.h"
@ -44,8 +45,6 @@ static void VBlankCB_ContestPainting(void);
static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]); static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]);
extern const u8 gUnknown_0827EA0C[]; extern const u8 gUnknown_0827EA0C[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct CompressedSpriteSheet gMonBackPicTable[];
extern const u8 gContestCoolness[]; extern const u8 gContestCoolness[];
extern const u8 gContestBeauty[]; extern const u8 gContestBeauty[];
extern const u8 gContestCuteness[]; extern const u8 gContestCuteness[];

2
src/data.c
View File

@ -284,7 +284,7 @@ static const union AnimCmd gUnknown_082FF704[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gPlayerMonSpriteAnimsTable[] = const union AnimCmd *const gUnknown_082FF70C[] =
{ {
gUnknown_082FF6EC, gUnknown_082FF6EC,
gUnknown_082FF6F4, gUnknown_082FF6F4,

2
src/data/pokemon_graphics/footprint_table.h
View File

@ -1,4 +1,4 @@
const u8 *const gMonFootprintTable[NUM_SPECIES] = const u8 *const gMonFootprintTable[] =
{ {
[SPECIES_NONE] = gMonFootprint_Bulbasaur, [SPECIES_NONE] = gMonFootprint_Bulbasaur,
[SPECIES_BULBASAUR] = gMonFootprint_Bulbasaur, [SPECIES_BULBASAUR] = gMonFootprint_Bulbasaur,

2
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -6948,7 +6948,7 @@ static const union AnimCmd *const sAnims_UNOWN_QMARK[] ={
#define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name #define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name
#define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims
const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[] = const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
{ {
ANIM_CMD(NONE), ANIM_CMD(NONE),
ANIM_CMD(BULBASAUR), ANIM_CMD(BULBASAUR),

10
src/decompress.c
View File

@ -1,15 +1,13 @@
#include "global.h" #include "global.h"
#include "decompress.h"
#include "constants/species.h"
#include "text.h"
#include "alloc.h" #include "alloc.h"
#include "data.h"
#include "decompress.h"
#include "pokemon.h" #include "pokemon.h"
#include "text.h"
#include "constants/species.h"
EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0}; EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0};
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct CompressedSpriteSheet gMonBackPicTable[];
static void DuplicateDeoxysTiles(void *pointer, s32 species); static void DuplicateDeoxysTiles(void *pointer, s32 species);
void LZDecompressWram(const u32 *src, void *dest) void LZDecompressWram(const u32 *src, void *dest)

2
src/easy_chat.c
View File

@ -2,7 +2,7 @@
#include "alloc.h" #include "alloc.h"
#include "bard_music.h" #include "bard_music.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "dewford_trend.h" #include "dewford_trend.h"
#include "dynamic_placeholder_text_util.h" #include "dynamic_placeholder_text_util.h"

2
src/egg_hatch.c
View File

@ -33,6 +33,7 @@
#include "naming_screen.h" #include "naming_screen.h"
#include "pokemon_storage_system.h" #include "pokemon_storage_system.h"
#include "field_screen_effect.h" #include "field_screen_effect.h"
#include "data.h"
#include "battle.h" // to get rid of later #include "battle.h" // to get rid of later
struct EggHatchData struct EggHatchData
@ -52,7 +53,6 @@ struct EggHatchData
u8 textColor[3]; u8 textColor[3];
}; };
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_HatchedFromEgg[];
extern const u8 gText_NickHatchPrompt[]; extern const u8 gText_NickHatchPrompt[];

4
src/evolution_scene.c
View File

@ -3,7 +3,7 @@
#include "battle.h" #include "battle.h"
#include "battle_message.h" #include "battle_message.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "evolution_scene.h" #include "evolution_scene.h"
#include "evolution_graphics.h" #include "evolution_graphics.h"
@ -52,8 +52,6 @@ void (*gCB2_AfterEvolution)(void);
#define sEvoCursorPos gBattleCommunication[1] // when learning a new move #define sEvoCursorPos gBattleCommunication[1] // when learning a new move
#define sEvoGraphicsTaskID gBattleCommunication[2] #define sEvoGraphicsTaskID gBattleCommunication[2]
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
// this file's functions // this file's functions
static void Task_EvolutionScene(u8 taskID); static void Task_EvolutionScene(u8 taskID);
static void Task_TradeEvolutionScene(u8 taskID); static void Task_TradeEvolutionScene(u8 taskID);

6
src/field_effect.c
View File

@ -33,8 +33,6 @@
#define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
extern struct CompressedSpritePalette gMonPaletteTable[]; // GF made a mistake and did not extern it as const.
EWRAM_DATA s32 gFieldEffectArguments[8] = {0}; EWRAM_DATA s32 gFieldEffectArguments[8] = {0};
// Static type declarations // Static type declarations
@ -237,7 +235,9 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId);
static IWRAM_DATA u8 sActiveList[32]; static IWRAM_DATA u8 sActiveList[32];
// External declarations // External declarations
extern struct CompressedSpritePalette gMonPaletteTable[]; // GF made a mistake and did not extern it as const.
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern u8 *gFieldEffectScriptPointers[]; extern u8 *gFieldEffectScriptPointers[];
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];

30
src/field_specials.c
View File

@ -3,7 +3,7 @@
#include "battle.h" #include "battle.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "cable_club.h" #include "cable_club.h"
#include "data2.h" #include "data.h"
#include "decoration.h" #include "decoration.h"
#include "diploma.h" #include "diploma.h"
#include "event_data.h" #include "event_data.h"
@ -59,20 +59,20 @@
EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
EWRAM_DATA u8 gBikeCollisions = 0; EWRAM_DATA u8 gBikeCollisions = 0;
EWRAM_DATA u32 gBikeCyclingTimer = 0; static EWRAM_DATA u32 gBikeCyclingTimer = 0;
EWRAM_DATA u8 gUnknown_0203AB5C = 0; static EWRAM_DATA u8 gUnknown_0203AB5C = 0;
EWRAM_DATA u8 gUnknown_0203AB5D = 0; static EWRAM_DATA u8 gUnknown_0203AB5D = 0;
EWRAM_DATA u8 gUnknown_0203AB5E = 0; static EWRAM_DATA u8 gUnknown_0203AB5E = 0;
EWRAM_DATA u16 gUnknown_0203AB60 = 0; static EWRAM_DATA u16 gUnknown_0203AB60 = 0;
EWRAM_DATA u16 gUnknown_0203AB62 = 0; static EWRAM_DATA u16 gUnknown_0203AB62 = 0;
EWRAM_DATA struct ListMenuItem *gUnknown_0203AB64 = NULL; static EWRAM_DATA struct ListMenuItem *gUnknown_0203AB64 = NULL;
EWRAM_DATA u16 gUnknown_0203AB68 = 0; static EWRAM_DATA u16 gUnknown_0203AB68 = 0;
EWRAM_DATA u16 gUnknown_0203AB6A = 0; static EWRAM_DATA u16 gUnknown_0203AB6A = 0;
EWRAM_DATA u8 gUnknown_0203AB6C = 0; static EWRAM_DATA u8 gUnknown_0203AB6C = 0;
EWRAM_DATA u8 gUnknown_0203AB6D = 0; static EWRAM_DATA u8 gUnknown_0203AB6D = 0;
EWRAM_DATA u8 gUnknown_0203AB6E = 0; static EWRAM_DATA u8 gUnknown_0203AB6E = 0;
EWRAM_DATA u8 gUnknown_0203AB6F = 0; static EWRAM_DATA u8 gUnknown_0203AB6F = 0;
EWRAM_DATA u32 gUnknown_0203AB70 = 0; static EWRAM_DATA u32 gUnknown_0203AB70 = 0;
struct ListMenuTemplate gUnknown_030061D0; struct ListMenuTemplate gUnknown_030061D0;

2
src/frontier_util.c
View File

@ -21,7 +21,7 @@
#include "apprentice.h" #include "apprentice.h"
#include "pokedex.h" #include "pokedex.h"
#include "recorded_battle.h" #include "recorded_battle.h"
#include "data2.h" #include "data.h"
#include "record_mixing.h" #include "record_mixing.h"
#include "strings.h" #include "strings.h"
#include "alloc.h" #include "alloc.h"

2
src/hall_of_fame.c
View File

@ -32,7 +32,7 @@
#include "menu.h" #include "menu.h"
#include "fldeff_misc.h" #include "fldeff_misc.h"
#include "trainer_pokemon_sprites.h" #include "trainer_pokemon_sprites.h"
#include "data2.h" #include "data.h"
#include "rom_81520A8.h" #include "rom_81520A8.h"
#include "constants/rgb.h" #include "constants/rgb.h"

2
src/item_menu.c
View File

@ -8,7 +8,7 @@
#include "bg.h" #include "bg.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"

2
src/item_use.c
View File

@ -7,7 +7,7 @@
#include "berry_powder.h" #include "berry_powder.h"
#include "bike.h" #include "bike.h"
#include "coins.h" #include "coins.h"
#include "data2.h" #include "data.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "fieldmap.h" #include "fieldmap.h"

2
src/match_call.c
View File

@ -3,7 +3,7 @@
#include "battle.h" #include "battle.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"

2
src/menu_specialized.c
View File

@ -2,7 +2,7 @@
#include "alloc.h" #include "alloc.h"
#include "battle_main.h" #include "battle_main.h"
#include "contest_effect.h" #include "contest_effect.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"

2
src/move_relearner.c
View File

@ -3,7 +3,7 @@
#include "battle.h" #include "battle.h"
#include "bg.h" #include "bg.h"
#include "contest_effect.h" #include "contest_effect.h"
#include "data2.h" #include "data.h"
#include "event_data.h" #include "event_data.h"
#include "field_screen_effect.h" #include "field_screen_effect.h"
#include "gpu_regs.h" #include "gpu_regs.h"

2
src/naming_screen.c
View File

@ -21,7 +21,7 @@
#include "trig.h" #include "trig.h"
#include "field_effect.h" #include "field_effect.h"
#include "pokemon_icon.h" #include "pokemon_icon.h"
#include "data2.h" #include "data.h"
#include "strings.h" #include "strings.h"
#include "menu.h" #include "menu.h"
#include "text_window.h" #include "text_window.h"

2
src/party_menu.c
View File

@ -10,7 +10,7 @@
#include "battle_pyramid_bag.h" #include "battle_pyramid_bag.h"
#include "bg.h" #include "bg.h"
#include "contest.h" #include "contest.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "easy_chat.h" #include "easy_chat.h"
#include "event_data.h" #include "event_data.h"

9
src/pokeblock_feed.c
View File

@ -1,13 +1,14 @@
#include "global.h" #include "global.h"
#include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere #include "alloc.h"
#include "battle.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"
#include "item_menu.h"
#include "main.h" #include "main.h"
#include "alloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "m4a.h" #include "m4a.h"
@ -49,10 +50,8 @@ struct PokeblockFeedStruct
u8 unused; u8 unused;
}; };
extern u16 gSpecialVar_ItemId;
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const u16 gUnknown_0860F074[]; extern const u16 gUnknown_0860F074[];
// this file's functions // this file's functions

2
src/pokedex.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "battle_main.h" #include "battle_main.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
#include "gpu_regs.h" #include "gpu_regs.h"

36
src/pokemon.c
View File

@ -9,6 +9,7 @@
#include "battle_pyramid.h" #include "battle_pyramid.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "data.h"
#include "event_data.h" #include "event_data.h"
#include "evolution_scene.h" #include "evolution_scene.h"
#include "field_specials.h" #include "field_specials.h"
@ -51,29 +52,6 @@ struct SpeciesItem
u16 item; u16 item;
}; };
extern const struct SpriteFrameImage gUnknown_082FF3A8[];
extern const struct SpriteFrameImage gUnknown_082FF3C8[];
extern const struct SpriteFrameImage gUnknown_082FF3E8[];
extern const struct SpriteFrameImage gUnknown_082FF408[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Brendan[];
extern const struct SpriteFrameImage gTrainerBackPicTable_May[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[];
extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Wally[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Steven[];
extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *gPlayerMonSpriteAnimsTable[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[];
extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
extern const struct CompressedSpritePalette gMonPaletteTable[];
extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
extern const u8 gTrainerClassNames[][13];
// this file's functions // this file's functions
static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon); static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType); static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType);
@ -3315,7 +3293,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
} }
// flash fire triggered // flash fire triggered
if ((gBattleResources->flags->flags[battlerIdAtk] & UNKNOWN_FLAG_FLASH_FIRE) && type == TYPE_FIRE) if ((gBattleResources->flags->flags[battlerIdAtk] & RESOURCE_FLAG_FLASH_FIRE) && type == TYPE_FIRE)
damage = (15 * damage) / 10; damage = (15 * damage) / 10;
} }
@ -3448,11 +3426,11 @@ void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition)
gMultiuseSpriteTemplate.paletteTag = species; gMultiuseSpriteTemplate.paletteTag = species;
if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT) if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
gMultiuseSpriteTemplate.anims = gPlayerMonSpriteAnimsTable; gMultiuseSpriteTemplate.anims = gUnknown_082FF70C;
else if (species > 500) else if (species > SPECIES_SHINY_TAG)
gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species - 500]; gMultiuseSpriteTemplate.anims = gMonFrontAnimsPtrTable[species - SPECIES_SHINY_TAG];
else else
gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; gMultiuseSpriteTemplate.anims = gMonFrontAnimsPtrTable[species];
} }
void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition) void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
@ -6819,7 +6797,7 @@ static void sub_806F1FC(struct Unknown_806F160_Struct* structPtr)
structPtr->frameImages[i * structPtr->field_0_0 + j].data = &structPtr->byteArrays[i][j * 0x800]; structPtr->frameImages[i * structPtr->field_0_0 + j].data = &structPtr->byteArrays[i][j * 0x800];
} }
structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->field_0_0]; structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->field_0_0];
structPtr->templates[i].anims = gPlayerMonSpriteAnimsTable; structPtr->templates[i].anims = gUnknown_082FF70C;
structPtr->templates[i].paletteTag = i; structPtr->templates[i].paletteTag = i;
} }
} }

2
src/pokemon_size_record.c
View File

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "data.h"
#include "event_data.h" #include "event_data.h"
#include "pokedex.h" #include "pokedex.h"
#include "pokemon.h" #include "pokemon.h"
@ -45,7 +46,6 @@ static const u8 sGiftRibbonsMonDataIds[] =
extern const u8 gText_DecimalPoint[]; extern const u8 gText_DecimalPoint[];
extern const u8 gText_Marco[]; extern const u8 gText_Marco[];
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
#define CM_PER_INCH 2.54 #define CM_PER_INCH 2.54

4
src/pokemon_storage_system.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "alloc.h" #include "alloc.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "dma3.h" #include "dma3.h"
#include "dynamic_placeholder_text_util.h" #include "dynamic_placeholder_text_util.h"
@ -463,8 +463,6 @@ EWRAM_DATA static u8 sMovingMonOrigBoxId = 0;
EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0; EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0;
EWRAM_DATA static bool8 sCanOnlyMove = 0; EWRAM_DATA static bool8 sCanOnlyMove = 0;
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
// This file's functions. // This file's functions.
static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr); static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr);
static void Cb2_EnterPSS(u8 boxOption); static void Cb2_EnterPSS(u8 boxOption);

3
src/pokemon_summary_screen.c
View File

@ -9,7 +9,7 @@
#include "bg.h" #include "bg.h"
#include "contest.h" #include "contest.h"
#include "contest_effect.h" #include "contest_effect.h"
#include "data2.h" #include "data.h"
#include "daycare.h" #include "daycare.h"
#include "decompress.h" #include "decompress.h"
#include "dynamic_placeholder_text_util.h" #include "dynamic_placeholder_text_util.h"
@ -164,7 +164,6 @@ static EWRAM_DATA struct PokemonSummaryScreenData
EWRAM_DATA u8 gLastViewedMonIndex = 0; EWRAM_DATA u8 gLastViewedMonIndex = 0;
static EWRAM_DATA u8 sUnknown_0203CF21 = 0; static EWRAM_DATA u8 sUnknown_0203CF21 = 0;
ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0; ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0;
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
struct UnkStruct_61CC04 struct UnkStruct_61CC04
{ {

3
src/pokenav_match_call.c
View File

@ -1,13 +1,12 @@
#include "global.h" #include "global.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "data.h"
#include "event_data.h" #include "event_data.h"
#include "string_util.h" #include "string_util.h"
#include "battle.h" #include "battle.h"
#include "gym_leader_rematch.h" #include "gym_leader_rematch.h"
#include "match_call.h" #include "match_call.h"
extern const u8 gTrainerClassNames[][13];
// Static type declarations // Static type declarations
typedef struct MatchCallTextDataStruct { typedef struct MatchCallTextDataStruct {

8
src/reshow_battle_screen.c
View File

@ -15,9 +15,7 @@
#include "constants/trainers.h" #include "constants/trainers.h"
#include "battle_interface.h" #include "battle_interface.h"
#include "battle_anim.h" #include "battle_anim.h"
#include "data2.h" #include "data.h"
extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
// this file's functions // this file's functions
static void CB2_ReshowBattleScreenAfterMenu(void); static void CB2_ReshowBattleScreenAfterMenu(void);
@ -233,7 +231,7 @@ static void CreateBattlerSprite(u8 battler)
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]);
if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM) if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM)
gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM]; gSprites[gBattlerSpriteIds[battler]].anims = gMonFrontAnimsPtrTable[SPECIES_CASTFORM];
} }
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT)
{ {
@ -269,7 +267,7 @@ static void CreateBattlerSprite(u8 battler)
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]);
if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM) if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM)
gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM]; gSprites[gBattlerSpriteIds[battler]].anims = gMonFrontAnimsPtrTable[SPECIES_CASTFORM];
} }
gSprites[gBattlerSpriteIds[battler]].invisible = gBattleSpritesDataPtr->battlerData[battler].invisible; gSprites[gBattlerSpriteIds[battler]].invisible = gBattleSpritesDataPtr->battlerData[battler].invisible;

2
src/scanline_effect.c
View File

@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "data2.h" #include "data.h"
#include "task.h" #include "task.h"
#include "trig.h" #include "trig.h"
#include "scanline_effect.h" #include "scanline_effect.h"

2
src/scrcmd.c
View File

@ -7,7 +7,7 @@
#include "contest.h" #include "contest.h"
#include "contest_link_80F57C4.h" #include "contest_link_80F57C4.h"
#include "contest_painting.h" #include "contest_painting.h"
#include "data2.h" #include "data.h"
#include "decoration.h" #include "decoration.h"
#include "decoration_inventory.h" #include "decoration_inventory.h"
#include "event_data.h" #include "event_data.h"

2
src/script_pokemon_util_80F87D8.c
View File

@ -5,6 +5,7 @@
#include "contest.h" #include "contest.h"
#include "contest_link_80F57C4.h" #include "contest_link_80F57C4.h"
#include "contest_painting.h" #include "contest_painting.h"
#include "data.h"
#include "daycare.h" #include "daycare.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
@ -35,7 +36,6 @@ extern const u16 gEventObjectPalette8[];
extern const u16 gEventObjectPalette17[]; extern const u16 gEventObjectPalette17[];
extern const u16 gEventObjectPalette33[]; extern const u16 gEventObjectPalette33[];
extern const u16 gEventObjectPalette34[]; extern const u16 gEventObjectPalette34[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 }; static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 };

2
src/shop.c
View File

@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "decoration.h" #include "decoration.h"
#include "decoration_inventory.h" #include "decoration_inventory.h"

6
src/smokescreen.c
View File

@ -1,11 +1,15 @@
#include "global.h" #include "global.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "sprite.h" #include "sprite.h"
#include "util.h" #include "util.h"
static void sub_8075370(struct Sprite *); static void sub_8075370(struct Sprite *);
extern const struct CompressedSpriteSheet gUnknown_0831C620;
extern const struct CompressedSpritePalette gUnknown_0831C628;
extern const struct SpriteTemplate gUnknown_0831C688;
u8 sub_807521C(s16 x, s16 y, u8 a3) u8 sub_807521C(s16 x, s16 y, u8 a3)
{ {
u8 mainSpriteId; u8 mainSpriteId;

2
src/starter_choose.c
View File

@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
#include "bg.h" #include "bg.h"
#include "data2.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
#include "gpu_regs.h" #include "gpu_regs.h"

6
src/trade.c
View File

@ -4,7 +4,7 @@
#include "battle_interface.h" #include "battle_interface.h"
#include "bg.h" #include "bg.h"
#include "cable_club.h" #include "cable_club.h"
#include "data2.h" #include "data.h"
#include "daycare.h" #include "daycare.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
@ -1384,10 +1384,6 @@ static const u8 gUnknown_08339090[][2] =
{0, 0} {0, 0}
}; };
// external to this file
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct MonCoords gMonFrontPicCoords[];
static bool8 sub_8077170(const void *a0, u32 a1) static bool8 sub_8077170(const void *a0, u32 a1)
{ {
if (gUnknown_02022C2C == 29) if (gUnknown_02022C2C == 29)

17
src/trainer_pokemon_sprites.c
View File

@ -6,21 +6,10 @@
#include "palette.h" #include "palette.h"
#include "decompress.h" #include "decompress.h"
#include "trainer_pokemon_sprites.h" #include "trainer_pokemon_sprites.h"
#include "data2.h" #include "data.h"
#include "pokemon.h" #include "pokemon.h"
#include "constants/trainers.h" #include "constants/trainers.h"
extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES];
extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
// Static type declarations // Static type declarations
struct PicData struct PicData
@ -149,7 +138,7 @@ static void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 pale
static void AssignSpriteAnimsTable(bool8 isTrainer) static void AssignSpriteAnimsTable(bool8 isTrainer)
{ {
if (!isTrainer) if (!isTrainer)
sCreatingSpriteTemplate.anims = gPlayerMonSpriteAnimsTable; sCreatingSpriteTemplate.anims = gUnknown_082FF70C;
else else
sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0]; sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
} }
@ -270,7 +259,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
images[j].size = 0x800; images[j].size = 0x800;
} }
sCreatingSpriteTemplate.tileTag = 0xFFFF; sCreatingSpriteTemplate.tileTag = 0xFFFF;
sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; sCreatingSpriteTemplate.anims = gMonFrontAnimsPtrTable[species];
sCreatingSpriteTemplate.images = images; sCreatingSpriteTemplate.images = images;
if (flags2 == 0x01) if (flags2 == 0x01)
{ {

2
src/tv.c
View File

@ -37,7 +37,7 @@
#include "decoration.h" #include "decoration.h"
#include "secret_base.h" #include "secret_base.h"
#include "tv.h" #include "tv.h"
#include "data2.h" #include "data.h"
#include "constants/layouts.h" #include "constants/layouts.h"
#include "constants/metatile_behaviors.h" #include "constants/metatile_behaviors.h"

2
src/union_room.c
View File

@ -32,7 +32,7 @@
#include "palette.h" #include "palette.h"
#include "decompress.h" #include "decompress.h"
#include "start_menu.h" #include "start_menu.h"
#include "data2.h" #include "data.h"
#include "field_screen_effect.h" #include "field_screen_effect.h"
#include "script_pokemon_util_80F87D8.h" #include "script_pokemon_util_80F87D8.h"
#include "international_string_util.h" #include "international_string_util.h"

7
src/use_pokeblock.c
View File

@ -21,6 +21,8 @@
#include "menu.h" #include "menu.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"
#include "pokemon_summary_screen.h"
#include "item_menu.h"
struct UsePokeblockSubStruct struct UsePokeblockSubStruct
{ {
@ -83,8 +85,6 @@ struct UsePokeblockStruct
/*0x7FD0*/ struct UsePokeblockSubStruct info; /*0x7FD0*/ struct UsePokeblockSubStruct info;
}; };
extern u16 gKeyRepeatStartDelay;
extern void sub_81D21DC(u8); extern void sub_81D21DC(u8);
// this file's functions // this file's functions
@ -133,7 +133,6 @@ void sub_8168168(struct Sprite *sprite);
extern const struct BgTemplate gUnknown_085DFCCC[4]; extern const struct BgTemplate gUnknown_085DFCCC[4];
extern const struct WindowTemplate gUnknown_085DFCDC[]; extern const struct WindowTemplate gUnknown_085DFCDC[];
extern u16 gSpecialVar_ItemId;
extern const struct WindowTemplate sUsePokeblockYesNoWinTemplate[]; extern const struct WindowTemplate sUsePokeblockYesNoWinTemplate[];
extern const u8* sContestStatNames[]; extern const u8* sContestStatNames[];
extern const u32 gUnknown_085DFCB0[]; extern const u32 gUnknown_085DFCB0[];
@ -152,8 +151,6 @@ extern const u8 gUnknown_085DFCC9[];
extern const struct SpritePalette gUnknown_085DFDB8; extern const struct SpritePalette gUnknown_085DFDB8;
extern const struct SpriteTemplate gUnknown_085DFDA0; extern const struct SpriteTemplate gUnknown_085DFDA0;
extern const u8 *const gNatureNamePointers[];
// ram variables // ram variables
EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL; EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL;
EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL; EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL;