diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 02:25:01 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 02:25:01 +0100 |
| commit | d2e0d49392945e419c67b65c49942252e83dfabe (patch) | |
| tree | 5f7dcebdf142b637764b3cf0587fa47c52cd0ec0 /src | |
| parent | 6d2302637dbc7dfd597c7f95de780b1a21079f15 (diff) | |
done testing
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/battle_interface.c | 65 |
1 files changed, 43 insertions, 22 deletions
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index 7d32ff0b1..6f6dc9de6 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -29,12 +29,47 @@ struct UnknownStruct7 u8 filler0[0x180]; }; -// struct TileData4bpp -// { -// u8 data[32]; -// }; +TileData4bpp *const gUnknown_0820A8B4[10] = +{ + &OBJ_VRAM0_TEMP[ 2], + &OBJ_VRAM0_TEMP[ 3], + &OBJ_VRAM0_TEMP[ 4], + &OBJ_VRAM0_TEMP[ 5], + &OBJ_VRAM0_TEMP[ 6], + &OBJ_VRAM0_TEMP[ 7], + &OBJ_VRAM0_TEMP[64], + &OBJ_VRAM0_TEMP[65], + &OBJ_VRAM0_TEMP[66], + &OBJ_VRAM0_TEMP[67], +}; + +TileData4bpp *const gUnknown_0820A8DC[10] = +{ + &OBJ_VRAM0_TEMP[ 1], + &OBJ_VRAM0_TEMP[ 2], + &OBJ_VRAM0_TEMP[ 3], + &OBJ_VRAM0_TEMP[ 4], + &OBJ_VRAM0_TEMP[ 5], + &OBJ_VRAM0_TEMP[ 6], + &OBJ_VRAM0_TEMP[ 7], + &OBJ_VRAM0_TEMP[32], + &OBJ_VRAM0_TEMP[33], + &OBJ_VRAM0_TEMP[34], +}; -typedef u8 TileData4bpp[32]; +TileData4bpp *const gUnknown_0820A904[10] = +{ + &OBJ_VRAM0_TEMP[ 2], + &OBJ_VRAM0_TEMP[ 3], + &OBJ_VRAM0_TEMP[ 4], + &OBJ_VRAM0_TEMP[ 5], + &OBJ_VRAM0_TEMP[ 6], + &OBJ_VRAM0_TEMP[ 7], + &OBJ_VRAM0_TEMP[32], + &OBJ_VRAM0_TEMP[33], + &OBJ_VRAM0_TEMP[34], + &OBJ_VRAM0_TEMP[35], +}; extern u8 gDisplayedStringBattle[]; extern u8 gNoOfAllBanks; @@ -66,9 +101,9 @@ extern void *const gUnknown_0820A854[]; extern void *const gUnknown_0820A85C[]; extern TileData4bpp *const gUnknown_0820A87C[]; extern TileData4bpp *const gUnknown_0820A894[]; -extern TileData4bpp *const gUnknown_0820A8B4[]; -extern TileData4bpp *const gUnknown_0820A8DC[]; -extern TileData4bpp *const gUnknown_0820A904[]; +// extern TileData4bpp *const gUnknown_0820A8B4[]; +// extern TileData4bpp *const gUnknown_0820A8DC[]; +// extern TileData4bpp *const gUnknown_0820A904[]; extern const u8 gUnknown_0820A81C[]; extern const u8 gUnknown_0820A864[]; extern const u8 gUnknown_0820A89C[]; @@ -101,20 +136,6 @@ static void sub_8045D58(u8, u8); static u8 sub_804602C(int, int, int, int *, u8 *, u8); static void sub_8046128(struct BattleInterfaceStruct1 *a, int *b, u16 *c); -// TileData4bpp *const gUnknown_0820A904[10] = -// { -// &OBJ_VRAM0_TEST[2], // 0x40 -// &OBJ_VRAM0_TEST[3], // 0x60 -// &OBJ_VRAM0_TEST[4], // 0x80 -// &OBJ_VRAM0_TEST[5], // 0xA0 -// &OBJ_VRAM0_TEST[6], // 0xC0 -// &OBJ_VRAM0_TEST[7], // 0xE0 -// &OBJ_VRAM0_TEST[32], // 0x400 -// &OBJ_VRAM0_TEST[33], // 0x420 -// &OBJ_VRAM0_TEST[34], // 0x440 -// &OBJ_VRAM0_TEST[35], // 0x460 -// }; - static int do_nothing(s16 unused1, s16 unused2, int unused3) { return 9; |