Convert tilesets.s to C

This commit is contained in:
GriffinR
2022-10-08 00:12:36 -04:00
parent b41b3614ad
commit 5dfc494c00
16 changed files with 2414 additions and 2800 deletions
+4 -4
View File
@@ -68,11 +68,11 @@ struct Tileset
{
/*0x00*/ bool8 isCompressed;
/*0x01*/ bool8 isSecondary;
/*0x04*/ void *tiles;
/*0x08*/ void *palettes;
/*0x0c*/ void *metatiles;
/*0x04*/ const u32 *tiles;
/*0x08*/ const u16 (*palettes)[16];
/*0x0c*/ const u16 *metatiles;
/*0x10*/ TilesetCB callback;
/*0x14*/ u32 *metatileAttributes;
/*0x14*/ const u32 *metatileAttributes;
};
struct MapLayout
+7
View File
@@ -6,4 +6,11 @@ void InitSecondaryTilesetAnimation(void);
void UpdateTilesetAnimations(void);
void TransferTilesetAnimsBuffer(void);
void InitTilesetAnim_General(void);
void InitTilesetAnim_CeladonCity(void);
void InitTilesetAnim_VermilionGym(void);
void InitTilesetAnim_CeladonGym(void);
void InitTilesetAnim_SilphCo(void);
void InitTilesetAnim_MtEmber(void);
#endif // GUARD_TILESET_ANIMS_H
+13
View File
@@ -0,0 +1,13 @@
#ifndef GUARD_TILESETS_H
#define GUARD_TILESETS_H
extern const u32 gTilesetTiles_General[];
extern const u16 gTilesetPalettes_General[][16];
extern const u32 gTilesetTiles_GenericBuilding1[];
extern const u16 gTilesetPalettes_GenericBuilding1[][16];
extern const u32 gTilesetTiles_DepartmentStore[];
extern const u16 gTilesetPalettes_DepartmentStore[][16];
#endif // GUARD_TILESETS_H