From 8602ff770030d84d2d18cccd961c07f195dc0a17 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 15 Jan 2018 01:11:47 +0100 Subject: continue testing --- include/gba/defines.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/gba/defines.h b/include/gba/defines.h index 7fd429d9e..f415fc504 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -35,6 +35,7 @@ // text-mode BG #define OBJ_VRAM0 (void *)(VRAM + 0x10000) +#define OBJ_VRAM0_TEST (TileData4bpp *)(VRAM + 0x10000) #define OBJ_VRAM0_SIZE 0x8000 // bitmap-mode BG -- cgit v1.2.3 From d2e0d49392945e419c67b65c49942252e83dfabe Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 15 Jan 2018 02:25:01 +0100 Subject: done testing --- include/gba/defines.h | 2 +- include/global.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/gba/defines.h b/include/gba/defines.h index f415fc504..8508c288f 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -35,7 +35,7 @@ // text-mode BG #define OBJ_VRAM0 (void *)(VRAM + 0x10000) -#define OBJ_VRAM0_TEST (TileData4bpp *)(VRAM + 0x10000) +#define OBJ_VRAM0_TEMP ((TileData4bpp *)(VRAM + 0x10000)) #define OBJ_VRAM0_SIZE 0x8000 // bitmap-mode BG diff --git a/include/global.h b/include/global.h index d0af4a4d1..48b6b1127 100644 --- a/include/global.h +++ b/include/global.h @@ -845,4 +845,7 @@ extern struct HallOfFame gHallOfFame; extern struct SaveBlock2 gSaveBlock2; extern u8 ewram[]; +// used for OBJ_VRAM0 pointers +typedef u8 TileData4bpp[32]; + #endif // GUARD_GLOBAL_H -- cgit v1.2.3 From 8dda2620e78d2c84b36246aa30146694d929392f Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 15 Jan 2018 22:58:06 +0100 Subject: A bit of cleanup --- include/graphics.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 76a45f6f6..01a193ab3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3337,4 +3337,9 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; +extern const u8 gBattleGfx_BallStatusBar[]; +extern const u8 gUnknown_08D1212C[]; +extern const u8 gUnknown_08D1214C[]; +extern const u8 Tiles_D129AC[]; + #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From af35c8e429c09197eb46346696792ad89bf0c7d3 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 15 Jan 2018 23:22:16 +0100 Subject: Done decompiling battle_interfaces.s --- include/graphics.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 01a193ab3..f99da32e5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3337,9 +3337,16 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; +// data/graphics.s +extern const u8 gBattleWindowLargeGfx[]; +extern const u8 gBattleWindowSmallGfx[]; +extern const u8 gBattleWindowSmall2Gfx[]; +extern const u8 gBattleWindowSmall3Gfx[]; +extern const u8 gBattleWindowLarge2Gfx[]; +extern const u8 gBlankGfxCompressed[]; extern const u8 gBattleGfx_BallStatusBar[]; -extern const u8 gUnknown_08D1212C[]; -extern const u8 gUnknown_08D1214C[]; +extern const u16 gUnknown_08D1212C[]; +extern const u16 gUnknown_08D1214C[]; extern const u8 Tiles_D129AC[]; #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From 35f04db27cd4d5689c6498ba80eaeb695f973ebc Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Tue, 16 Jan 2018 02:24:40 +0100 Subject: Continuing testing with OBJ_VRAM0, all replaced with OBJ_VRAM0_TEMP now --- include/text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.h b/include/text.h index f0d039d45..a7a62fcf7 100644 --- a/include/text.h +++ b/include/text.h @@ -91,7 +91,7 @@ struct WindowTemplate u8 tilemapTop; u8 width; u8 height; - u8 *tileData; + u8 *tileData; // to TileData4bpp *? u16 *tilemap; u32 maybeUnused; }; -- cgit v1.2.3 From 37396ce835e702248b9e8fa1bbaec07b8b64ab4f Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Fri, 19 Jan 2018 17:18:14 +0100 Subject: switching over to a different branch for testing with tile stuff --- include/gba/defines.h | 1 - include/global.h | 3 --- include/text.h | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'include') diff --git a/include/gba/defines.h b/include/gba/defines.h index 8508c288f..7fd429d9e 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -35,7 +35,6 @@ // text-mode BG #define OBJ_VRAM0 (void *)(VRAM + 0x10000) -#define OBJ_VRAM0_TEMP ((TileData4bpp *)(VRAM + 0x10000)) #define OBJ_VRAM0_SIZE 0x8000 // bitmap-mode BG diff --git a/include/global.h b/include/global.h index 48b6b1127..d0af4a4d1 100644 --- a/include/global.h +++ b/include/global.h @@ -845,7 +845,4 @@ extern struct HallOfFame gHallOfFame; extern struct SaveBlock2 gSaveBlock2; extern u8 ewram[]; -// used for OBJ_VRAM0 pointers -typedef u8 TileData4bpp[32]; - #endif // GUARD_GLOBAL_H diff --git a/include/text.h b/include/text.h index a7a62fcf7..f0d039d45 100644 --- a/include/text.h +++ b/include/text.h @@ -91,7 +91,7 @@ struct WindowTemplate u8 tilemapTop; u8 width; u8 height; - u8 *tileData; // to TileData4bpp *? + u8 *tileData; u16 *tilemap; u32 maybeUnused; }; -- cgit v1.2.3