Game-Decompilation/mzm
1
0
Fork 0
mirror of https://github.com/YohannDR/mzm.git synced 2024-11-23 04:59:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tilemap and clipdata for Chozodia 11 (#23)

Browse Source 
* Fix Chozodia 11 clip and bg2

* Fix tileset 78 tilemap
This commit is contained in:
biosp4rk 2024-08-31 04:28:04 -07:00 committed by GitHub
parent faf9966763
commit fbaa31835a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,4 +15,5 @@
include/**/*.s
tools/*.txt
tools/c_extractor
.vscode

3
database.txt
View File

@ -2389,7 +2389,8 @@ rooms/chozodia/Chozodia_10_Clipdata.gfx;122;0x72fd4a;1
rooms/chozodia/Chozodia_10_Bg2.gfx;178;0x72fdc4;1
rooms/chozodia/Chozodia_10_Bg1.gfx;465;0x72fe76;1
rooms/chozodia/Chozodia_11_Clipdata.gfx;109;0x73005a;1
rooms/chozodia/Chozodia_11_Clipdata.gfx;95;0x73005a;1
rooms/chozodia/Chozodia_11_Bg2_Unused.gfx;14;0x7300b9;1
rooms/chozodia/Chozodia_11_Bg1.gfx;221;0x7300c7;1
rooms/chozodia/Chozodia_12_Clipdata.gfx;276;0x7301be;1

3
include/data/rooms/chozodia_rooms_data.h
View File

@ -79,7 +79,8 @@ extern const u8 sChozodia_10_Bg1[465];
extern const u8 sChozodia_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)];
extern const u8 sChozodia_7_Scrolls[SCROLL_DATA_SIZE(1)];
extern const u8 sChozodia_11_Clipdata[109];
extern const u8 sChozodia_11_Clipdata[95];
extern const u8 sChozodia_11_Bg2_Unused[14];
extern const u8 sChozodia_11_Bg1[221];
extern const u8 sChozodia_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)];

4
src/data/rooms/chozodia/Chozodia_11.c
View File

@ -13,7 +13,9 @@ const u8 sChozodia_7_Scrolls[SCROLL_DATA_SIZE(1)] = {
UCHAR_MAX, // Breakeable block Y bound extension
};
const u8 sChozodia_11_Clipdata[109] = INCBIN_U8("data/rooms/chozodia/Chozodia_11_Clipdata.gfx");
const u8 sChozodia_11_Clipdata[95] = INCBIN_U8("data/rooms/chozodia/Chozodia_11_Clipdata.gfx");
const u8 sChozodia_11_Bg2_Unused[14] = INCBIN_U8("data/rooms/chozodia/Chozodia_11_Bg2_Unused.gfx");
const u8 sChozodia_11_Bg1[221] = INCBIN_U8("data/rooms/chozodia/Chozodia_11_Bg1.gfx");

2
src/data/rooms_data.c
View File

@ -658,7 +658,7 @@ const struct TilesetEntry sTilesetEntries[79] = {
.pTileGraphics = sTileset_78_Gfx,
.pPalette = sTileset_42_Pal,
.pBackgroundGraphics = sTileset_42_Bg_Gfx,
.pTilemap = (const u8*)0x85e0d24,
.pTilemap = sTileset_78_Tilemap,
.animatedTileset = 0,
.animatedPalette = 16
}