dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1796 from GriffinRichards/tilesets-c

Browse Source 
Convert tilesets.s to C
This commit is contained in:
GriffinR
2022-10-10 12:47:47 -04:00
committed by GitHub
parent 6db489e2d5 65d3944a93
commit bd023b1c6c
15 changed files with 2723 additions and 3155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/global.fieldmap.h
View File

@@ -39,10 +39,10 @@ struct Tileset
{
/*0x00*/ bool8 isCompressed;
/*0x01*/ bool8 isSecondary;
/*0x04*/ void *tiles;
/*0x08*/ void *palettes;
/*0x0c*/ u16 *metatiles;
/*0x10*/ u16 *metatileAttributes;
/*0x04*/ const u32 *tiles;
/*0x08*/ const u16 (*palettes)[16];
/*0x0c*/ const u16 *metatiles;
/*0x10*/ const u16 *metatileAttributes;
/*0x14*/ TilesetCB callback;
};

26
include/tileset_anims.h
View File

@@ -6,4 +6,30 @@ void InitSecondaryTilesetAnimation(void);
void UpdateTilesetAnimations(void);
void TransferTilesetAnimsBuffer(void);
void InitTilesetAnim_General(void);
void InitTilesetAnim_Petalburg(void);
void InitTilesetAnim_Rustboro(void);
void InitTilesetAnim_Dewford(void);
void InitTilesetAnim_Slateport(void);
void InitTilesetAnim_Mauville(void);
void InitTilesetAnim_Lavaridge(void);
void InitTilesetAnim_Fallarbor(void);
void InitTilesetAnim_Fortree(void);
void InitTilesetAnim_Lilycove(void);
void InitTilesetAnim_Mossdeep(void);
void InitTilesetAnim_EverGrande(void);
void InitTilesetAnim_Pacifidlog(void);
void InitTilesetAnim_Sootopolis(void);
void InitTilesetAnim_BattleFrontierOutsideWest(void);
void InitTilesetAnim_BattleFrontierOutsideEast(void);
void InitTilesetAnim_Building(void);
void InitTilesetAnim_Cave(void);
void InitTilesetAnim_BikeShop(void);
void InitTilesetAnim_Underwater(void);
void InitTilesetAnim_SootopolisGym(void);
void InitTilesetAnim_MauvilleGym(void);
void InitTilesetAnim_EliteFour(void);
void InitTilesetAnim_BattleDome(void);
void InitTilesetAnim_BattlePyramid(void);
#endif // GUARD_TILESET_ANIMS_H

11
include/tilesets.h
View File

@@ -1,13 +1,10 @@
#ifndef GUARD_tilesets_H
#define GUARD_tilesets_H
// Exported type declarations
extern const u32 gTilesetTiles_General[];
extern const u16 gTilesetPalettes_General[][16];
// Exported RAM declarations
// Exported ROM declarations
extern struct Tileset *gTilesetPointer_SecretBase;
extern struct Tileset *gTilesetPointer_SecretBaseRedCave;
extern const struct Tileset * const gTilesetPointer_SecretBase;
extern const struct Tileset * const gTilesetPointer_SecretBaseRedCave;
#endif //GUARD_tilesets_H