diff options
| author | garak <garakmon@gmail.com> | 2019-12-02 13:34:11 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 15:05:23 -0500 |
| commit | 36b2301fd262adc70fc89ecdd3a7a97549b5a6c9 (patch) | |
| tree | d87eb50b90952efd02d027fd04fb0d05432a1b50 /src/teachy_tv.c | |
| parent | ebd3a1371757839c260256e2d8101fc6448b2915 (diff) | |
mostly standardize to object event to prep for disassembly
Diffstat (limited to 'src/teachy_tv.c')
| -rw-r--r-- | src/teachy_tv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 2720f3204..5f1316350 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -112,11 +112,11 @@ static void TeachyTvGrassAnimationObjCallback(struct Sprite *sprite); static void TeachyTvRestorePlayerPartyCallback(void); static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId); static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u16 size); -static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset); +static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset); static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(u16 *metaTilesArray, u8 *blockBuf, u8 *tileset); static void TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(u8 *blockBuf, u8 *tileset, u8 metaTile); static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 metaTile); -static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 *palIndexArray); +static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 *palIndexArray); static const struct BgTemplate sBgTemplates[] = { @@ -1240,7 +1240,7 @@ static void TeachyTvLoadBg3Map(u16 *buffer) void * tilesetsBuffer; void * palIndicesBuffer; u16 numMapTilesRows = 0; - const struct MapData *layout = &Route1_Layout; + const struct MapLayout *layout = &Route1_Layout; u16 * blockIndicesBuffer = AllocZeroed(0x800); tilesetsBuffer = AllocZeroed(0x8000); palIndicesBuffer = Alloc(16); @@ -1307,7 +1307,7 @@ static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u1 } } -static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset) +static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset) { u16 * metaTileEntryAddr = mapEntry <= 0x27F ? &((u16*)(mStruct->primaryTileset->metatiles))[8 * mapEntry] : &((u16*)(mStruct->secondaryTileset->metatiles))[8 * (mapEntry - 0x280)]; buf1[0] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[0]) << 12) + 4 * offset; @@ -1397,7 +1397,7 @@ static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 return (0xF - i); } -static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 * palIndexArray) +static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 * palIndexArray) { u8 i; const struct Tileset * ts; |