diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-26 16:58:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-26 16:58:19 -0600 |
| commit | 382ff4545241f90c28ba391162f6901f6bb043ed (patch) | |
| tree | 9f96bc4c90e0f9c59bd126c4c1bb798ed1387d15 /include | |
| parent | c233dbb220b9836ef4735d0261445040e028877e (diff) | |
| parent | c9b3f3e3cb0c68a7baae53a34e080376e6d8f666 (diff) | |
Merge pull request #396 from DizzyEggg/attempt
Match some functions
Diffstat (limited to 'include')
| -rw-r--r-- | include/bg.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/bg.h b/include/bg.h index f2d4e7948..a10abaa8d 100644 --- a/include/bg.h +++ b/include/bg.h @@ -70,14 +70,14 @@ void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); -void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); +void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 unused, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, s16 palette1, s16 tileOffset); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); u16 GetBgMetricTextMode(u8 bg, u8 whichMetric); u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric); u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32 screenHeight); -void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2); +void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s32 palette2); u32 GetBgType(u8 bg); bool32 IsInvalidBg32(u8 bg); bool32 IsTileMapOutsideWram(u8 bg); diff --git a/include/pokemon.h b/include/pokemon.h index 3bf728244..5d7f7f2ae 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -446,7 +446,6 @@ extern const u8 gUnknown_08329D2A[]; extern const u8 gStatStageRatios[][2]; extern const u16 gUnknown_08329D54[]; extern const struct SpriteTemplate gUnknown_08329D98[]; -extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const s8 gNatureStatTable[][5]; void ZeroBoxMonData(struct BoxPokemon *boxMon); |