diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-09 23:54:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 23:54:57 -0500 |
| commit | ef935f6f4a59a2b37c4ff870ade96853621210ae (patch) | |
| tree | 2d4d38532c737126a718986bfaa1c52e485769b7 /include | |
| parent | 1c82571fa04ecad7d4a805e5fbec4691643ac655 (diff) | |
| parent | e65677c944b786c8f94adc8c962b7ee180bfe548 (diff) | |
Merge pull request #1544 from GriffinRichards/romheadergf
Split headers from crt0.s
Diffstat (limited to 'include')
| -rw-r--r-- | include/crt0.h | 5 | ||||
| -rw-r--r-- | include/item.h | 1 | ||||
| -rw-r--r-- | include/pokeball.h | 2 | ||||
| -rw-r--r-- | include/pokemon_icon.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/crt0.h b/include/crt0.h index 3121eeaed..a4a5c7f79 100644 --- a/include/crt0.h +++ b/include/crt0.h @@ -1,11 +1,6 @@ #ifndef GUARD_CRT0_H #define GUARD_CRT0_H -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations extern u32 IntrMain[]; #endif //GUARD_CRT0_H diff --git a/include/item.h b/include/item.h index 87ff57bc7..ceca83bd5 100644 --- a/include/item.h +++ b/include/item.h @@ -29,6 +29,7 @@ struct BagPocket u8 capacity; }; +extern const struct Item gItems[]; extern struct BagPocket gBagPockets[]; void ApplyNewEncryptionKeyToBagItems(u32 newKey); diff --git a/include/pokeball.h b/include/pokeball.h index d88e80173..297788db1 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -26,6 +26,8 @@ enum { BALL_AFFINE_ANIM_4 }; +extern const struct CompressedSpriteSheet gBallSpriteSheets[]; +extern const struct CompressedSpritePalette gBallSpritePalettes[]; extern const struct SpriteTemplate gBallSpriteTemplates[]; #define POKEBALL_PLAYER_SENDOUT 0xFF diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 4731da90e..9b917c3bf 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -2,6 +2,8 @@ #define GUARD_POKEMON_ICON_H extern const u8 gMonIconPaletteIndices[]; +extern const u8 *const gMonIconTable[]; +extern const struct SpritePalette gMonIconPaletteTable[]; const u8 *GetMonIconTiles(u16 species, bool32); void TryLoadAllMonIconPalettesAtOffset(u16 offset); |