diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gf_gfx_loader.h | 4 | ||||
| -rw-r--r-- | include/script.h | 2 | ||||
| -rw-r--r-- | include/text_02054590.h | 4 | ||||
| -rw-r--r-- | include/unk_02016B94.h | 160 | 
4 files changed, 85 insertions, 85 deletions
| diff --git a/include/gf_gfx_loader.h b/include/gf_gfx_loader.h index b95075dc..3f23d1ff 100644 --- a/include/gf_gfx_loader.h +++ b/include/gf_gfx_loader.h @@ -3,8 +3,8 @@  #include "unk_02016B94.h"
 -u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
 -void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
 +u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
 +void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
  void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 baseAddr, u32 szByte, u32 heap_id);
  void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 srcOffset, u32 baseAddr, u32 szByte, u32 heap_id);
  u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 whichRoutine, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id);
 diff --git a/include/script.h b/include/script.h index 01bba305..2f5e6540 100644 --- a/include/script.h +++ b/include/script.h @@ -28,7 +28,7 @@ struct UnkStruct_02046444  struct UnkSavStruct80
  {
      u8 padding[0x8];
 -    struct UnkStruct_02016B94_2 *unk08;
 +    struct BgConfig *unk08;
      struct SaveBlock2 *saveBlock2; //0xC
      struct UnkStruct_0204639C *unk10;
      u8 padding2[0x8];
 diff --git a/include/text_02054590.h b/include/text_02054590.h index 77170e70..eaffb2a0 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -8,13 +8,13 @@  void FUN_02054590(u32 param0, u32 param1); -void FUN_020545B8(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2); +void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2);  void FUN_02054608(struct Window *param0, struct Options *options);  void FUN_0205464C(struct Window *param0);  u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3);  u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5);  u8 FUN_020546C8(u32 param0); -void FUN_020546E0(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2, u32 param3); +void FUN_020546E0(struct BgConfig *param0, struct Window *param1, u32 param2, u32 param3);  void FUN_02054744(struct Window *param0, u32 param1, u32 param2);  #endif // POKEDIAMOND_UNK_02054590_H diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h index 788c8ddc..d28a3f1e 100644 --- a/include/unk_02016B94.h +++ b/include/unk_02016B94.h @@ -31,7 +31,7 @@ struct UnkStruct_02016B94_1      u32 unk18;  }; -struct UnkStruct_02016B94_2_sub +struct Bg  {      void *unk08;      u32 unk0c; @@ -43,7 +43,7 @@ struct UnkStruct_02016B94_2_sub      u8 mode;      u8 unk1d;      u8 unk1e; -    u8 unk1f; +    u8 tileSize;      u16 unk20;      u16 unk22; // probably padding      fx32 unk24; @@ -52,12 +52,12 @@ struct UnkStruct_02016B94_2_sub      fx32 unk30;  }; -struct UnkStruct_02016B94_2 +struct BgConfig  {      u32 heap_id;      u16 unk04;      u16 unk06; -    struct UnkStruct_02016B94_2_sub unk08[8]; +    struct Bg bgs[8];  };  struct UnkStruct_02016B94_3 @@ -67,20 +67,20 @@ struct UnkStruct_02016B94_3      u16 unk06;  }; -struct UnkStruct_02016B94_4 +struct WindowTemplate  { -    u8 unk0; -    u8 unk1; -    u8 unk2; -    u8 unk3; -    u8 unk4; -    u8 unk5; -    u16 unk6; +    u8 bgId; +    u8 tilemapLeft; +    u8 tilemapTop; +    u8 width; +    u8 height; +    u8 paletteNum; +    u16 baseTile;  };  struct Window  { -    struct UnkStruct_02016B94_2 *unk00; +    struct BgConfig *bgConfig;      u8 bgId;      u8 tilemapLeft;      u8 tilemapTop; @@ -92,61 +92,61 @@ struct Window      void *pixelBuffer;  }; -struct UnkStruct_02016B94_2 *FUN_02016B94(u32 heap_id); +struct BgConfig *FUN_02016B94(u32 heap_id);  u32 FUN_02016BB8(u32 *param0);  void FUN_02016BBC(const struct GraphicsModes *modes);  void FUN_02016BF4(const struct GraphicsModes *param0, u32 param1);  void FUN_02016C18( -    struct UnkStruct_02016B94_2 *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3); -void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3); +    struct BgConfig *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3); +void FUN_020170F4(struct BgConfig *param0, u8 param1, u32 param2, u8 param3);  u8 FUN_020177DC(u8 param0, u32 param1);  void FUN_02017850(u32 param0, u8 *param1, u8 *param2); -void FUN_020178A0(struct UnkStruct_02016B94_2 *param0, u32 param1); +void FUN_020178A0(struct BgConfig *param0, u32 param1);  void FUN_020178BC(u32 param0, u16 param1);  void FUN_0201797C(u32 param0, GX_LayerToggle toggle); -void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 val); -fx32 FUN_02017B48(struct UnkStruct_02016B94_2 *param0, u32 param1); -fx32 FUN_02017B54(struct UnkStruct_02016B94_2 *param0, u32 param1); -void FUN_02017B60(struct UnkStruct_02016B94_2 *param0, +void FUN_020179E0(struct BgConfig *param0, u32 param1, u32 param2, fx32 val); +fx32 FUN_02017B48(struct BgConfig *param0, u32 param1); +fx32 FUN_02017B54(struct BgConfig *param0, u32 param1); +void FUN_02017B60(struct BgConfig *param0,      u32 param1,      u32 param2,      fx32 param3,      struct Mtx22 *param4,      fx32 param5,      fx32 param6); -void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val); -void FUN_02017BD0(struct UnkStruct_02016B94_2 *param0, +void FUN_02017B8C(struct Bg *param0, u32 param1, fx32 val); +void FUN_02017BD0(struct BgConfig *param0,      u32 param1,      struct Mtx22 *param2,      fx32 param3,      fx32 param4); -void FUN_02017C6C(struct UnkStruct_02016B94_2 *param0, u32 param1); +void FUN_02017C6C(struct BgConfig *param0, u32 param1);  void FUN_02017C98(const void *param0, void *param1, u32 param2); -void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1); +void FUN_02017CD0(struct BgConfig *param0, u32 param1);  void FUN_02017CE8( -    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4); +    struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4);  void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size); -void FUN_02017DFC(struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u32 param3); +void FUN_02017DFC(struct BgConfig *param0, u32 param1, void *param2, u32 param3);  void FUN_02017E14( -    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4); +    struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4);  void FUN_02017E40( -    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4); +    struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4);  void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size);  void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id);  void FUN_02017F48( -    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +    struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4);  void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size);  void FUN_02017FE4(u32 param0, u32 param1);  u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2);  u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3); -void FUN_02018148(struct UnkStruct_02016B94_2 *param0, +void FUN_02018148(struct BgConfig *param0,      u32 param1,      void *param2,      u8 param3,      u8 param4,      u8 param5,      u8 param6); -void FUN_02018170(struct UnkStruct_02016B94_2 *param0, +void FUN_02018170(struct BgConfig *param0,      u32 param1,      u8 param2,      u8 param3, @@ -157,7 +157,7 @@ void FUN_02018170(struct UnkStruct_02016B94_2 *param0,      u8 param8,      u8 param9,      u8 param10); -void FUN_020181EC(struct UnkStruct_02016B94_2 *param0, +void FUN_020181EC(struct BgConfig *param0,      u32 param1,      u8 param2,      u8 param3, @@ -168,7 +168,7 @@ void FUN_020181EC(struct UnkStruct_02016B94_2 *param0,      u8 param8,      u8 param9,      u8 param10); -void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0, +void FUN_02018268(struct Bg *param0,      u8 param1,      u8 param2,      u8 param3, @@ -179,7 +179,7 @@ void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0,      u8 param8,      u8 param9,      u8 param10); -void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0, +void FUN_020183DC(struct Bg *param0,      u8 param1,      u8 param2,      u8 param3, @@ -190,7 +190,7 @@ void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0,      u8 param8,      u8 param9,      u8 param10); -void FUN_02018540(struct UnkStruct_02016B94_2 *param0, +void FUN_02018540(struct BgConfig *param0,      u32 param1,      u16 param2,      u8 param3, @@ -198,7 +198,7 @@ void FUN_02018540(struct UnkStruct_02016B94_2 *param0,      u8 param5,      u8 param6,      u8 param7); -void FUN_02018590(struct UnkStruct_02016B94_2_sub *param0, +void FUN_02018590(struct Bg *param0,      u16 param1,      u8 param2,      u8 param3, @@ -206,23 +206,23 @@ void FUN_02018590(struct UnkStruct_02016B94_2_sub *param0,      u8 param5,      u8 param6);  void FUN_02018640( -    struct UnkStruct_02016B94_2_sub *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); -void FUN_020186B4(struct UnkStruct_02016B94_2 *param0, +    struct Bg *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); +void FUN_020186B4(struct BgConfig *param0,      u32 param1,      u8 param2,      u8 param3,      u8 param4,      u8 param5,      u8 param6); -void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1); -void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2); -void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2); +void FUN_02018744(struct BgConfig *param0, u32 param1); +void FUN_02018768(struct BgConfig *param0, u32 param1, u16 param2); +void FUN_0201878C(struct BgConfig *param0, u32 param1, u16 param2);  void *FUN_020187B0(u32 param0);  void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3);  u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2]; -void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u8 param1); -u16 FUN_02018878(struct UnkStruct_02016B94_2 *param0, u32 param1); -u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1); +void *FUN_0201886C(struct BgConfig *param0, u8 param1); +u16 FUN_02018878(struct BgConfig *param0, u32 param1); +u8 FUN_02018884(struct BgConfig *param0, u32 param1);  void BlitBitmapRect4Bit(struct UnkStruct_02016B94_3 *param0,      struct UnkStruct_02016B94_3 *param1,      u16 param2, @@ -245,28 +245,28 @@ void FUN_02018E88(      struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);  void FUN_02018F4C(      struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -void *AllocWindows(u32 heap_id, s32 size); -void InitWindow(struct Window *param0); -BOOL FUN_02019048(struct Window *param0); -void FUN_02019064(struct UnkStruct_02016B94_2 *param0, -    struct Window *param1, -    u8 param2, -    u8 param3, -    u8 param4, -    u8 param5, -    u8 param6, -    u8 param7, -    u16 param8); -void FUN_020190EC(struct UnkStruct_02016B94_2 *param0, -    struct Window *param1, -    u8 param2, -    u8 param3, -    u16 param4, -    u8 param5); -void FUN_02019150(struct UnkStruct_02016B94_2 *param0, -    struct Window *param1, -    const struct UnkStruct_02016B94_4 *param2); -void FUN_02019178(struct Window *window); +struct Window *AllocWindows(u32 heap_id, s32 size); +void InitWindow(struct Window *window); +BOOL WindowIsInUse(struct Window *window); +void AddWindowParameterized(struct BgConfig *param0, +                            struct Window *window, +                            u8 bgId, +                            u8 tilemapLeft, +                            u8 tilemapTop, +                            u8 width, +                            u8 height, +                            u8 paletteNum, +                            u16 baseTile); +void AddTextWindowTopLeftCorner(struct BgConfig *param0, +                                struct Window *window, +                                u8 width, +                                u8 height, +                                u16 baseTile, +                                u8 paletteNum); +void AddWindow(struct BgConfig *bgConfig, +               struct Window *window, +               const struct WindowTemplate *template); +void RemoveWindow(struct Window *window);  void WindowArray_dtor(struct Window *windows, int count);  void CopyWindowToVram(struct Window *window);  void FUN_02019220(struct Window *window); @@ -277,9 +277,9 @@ void PutWindowTilemap_TextMode(struct Window *param0);  void PutWindowTilemap_AffineMode(struct Window *param0);  void FUN_020193B4(struct Window *param0);  void FUN_02019444(struct Window *param0); -void FUN_0201949C(struct Window *window); +void CopyWindowToVram_TextMode(struct Window *window);  void FUN_020194C8(struct Window *window); -void FUN_020194E0(struct Window *window); +void CopyWindowToVram_AffineMode(struct Window *window);  void FUN_0201951C(struct Window *window);  void FUN_02019548(struct Window *window);  void FUN_02019570(struct Window *window); @@ -326,16 +326,16 @@ void FUN_0201AB20(struct Window *window, u8 param1);  void FUN_0201AB24(struct Window *window, u8 param1);  u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path);  u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path); -void FUN_0201AB60(struct UnkStruct_02016B94_2 *param0); -void FUN_0201AB78(struct UnkStruct_02016B94_2 *param0); -void FUN_0201AC68(struct UnkStruct_02016B94_2 *param0, u32 param1); -void FUN_0201AC78(struct UnkStruct_02016B94_2 *param0); -void FUN_0201AEE4(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3); -void FUN_0201AF08(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u16 param3); -void FUN_0201AF2C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, u16 val); -void FUN_0201AF50(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3); -void FUN_0201AF74(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val); -u32 FUN_0201AFBC(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4); -void FUN_0201B118(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 *param2); +void FUN_0201AB60(struct BgConfig *param0); +void FUN_0201AB78(struct BgConfig *param0); +void FUN_0201AC68(struct BgConfig *param0, u32 param1); +void FUN_0201AC78(struct BgConfig *param0); +void FUN_0201AEE4(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3); +void FUN_0201AF08(struct BgConfig *param0, u32 param1, u32 param2, u16 param3); +void FUN_0201AF2C(struct Bg *param0, u32 param1, u16 val); +void FUN_0201AF50(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3); +void FUN_0201AF74(struct Bg *param0, u32 param1, fx32 val); +u32 FUN_0201AFBC(struct BgConfig *param0, u8 param1, u8 param2, u8 param3, u16 *param4); +void FUN_0201B118(struct BgConfig *param0, u8 param1, u8 *param2);  #endif // POKEDIAMOND_UNK_02016B94_H | 
