From 5bf13c7f48fe91c7902ce50250bc1a5a2398a2ae Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 23 Jul 2021 01:11:15 +0100 Subject: separate out libs to libc, libnns and NitroSDK --- arm9/modules/06/include/module_06.h | 28 +++++------ arm9/modules/19/src/module_19.c | 94 ++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 61 deletions(-) (limited to 'arm9/modules') diff --git a/arm9/modules/06/include/module_06.h b/arm9/modules/06/include/module_06.h index d9915f00..3942b1ce 100644 --- a/arm9/modules/06/include/module_06.h +++ b/arm9/modules/06/include/module_06.h @@ -1,14 +1,14 @@ -#ifndef POKEDIAMOND_MODULE_06_H -#define POKEDIAMOND_MODULE_06_H - -enum MartType -{ - MART_ITEMS = 0, - MART_GOODS, - MART_SEALS, - MART_DECORATIONS = MART_GOODS, -}; - -void MOD06_0223D3D0(struct UnkStruct_0204639C *, struct UnkSavStruct80 *, const u16 *, enum MartType, u32); - -#endif //POKEDIAMOND_MODULE_06_H +#ifndef POKEDIAMOND_MODULE_06_H +#define POKEDIAMOND_MODULE_06_H + +enum MartType +{ + MART_ITEMS = 0, + MART_GOODS, + MART_SEALS, + MART_DECORATIONS = MART_GOODS, +}; + +void MOD06_0223D3D0(struct UnkStruct_0204639C *, struct UnkSavStruct80 *, const u16 *, enum MartType, u32); + +#endif //POKEDIAMOND_MODULE_06_H diff --git a/arm9/modules/19/src/module_19.c b/arm9/modules/19/src/module_19.c index 1fc6197e..b8426d9f 100644 --- a/arm9/modules/19/src/module_19.c +++ b/arm9/modules/19/src/module_19.c @@ -1,47 +1,47 @@ -#include "global.h" -#include "heap.h" -#include "gx.h" -#include "gf_gfx_loader.h" -#include "bg_window.h" -#include "graphic/poketch.naix" - -const struct BgTemplate MOD19_02252508 = { - .x = 0, - .y = 0, - .bufferSize = 0x800, - .baseTile = 0x000, - .size = GF_BG_SCR_SIZE_256x256, - .colorMode = GF_BG_CLR_4BPP, - .screenBase = 12, - .charBase = 0, - .priority = 0, - .areaOver = 0, - .mosaic = 0 -}; - -THUMB_FUNC void MOD19_02252440(struct BgConfig * bgConfig) -{ - CreateHeap(3, 8, 0x18000); - GXS_SetGraphicsMode(GX_BGMODE_0); - GX_SetBankForSubBG(0x80); - GX_SetBankForSubOBJ(0x100); - GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K); - InitBgFromTemplate(bgConfig, GF_BG_LYR_SUB_0, &MOD19_02252508, GF_BG_TYPE_TEXT); - GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8); - GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8); - GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_BG_LYR_SUB_0, 0x00, 0x20, 8); - GXS_SetVisibleWnd(GX_WNDMASK_NONE); - GXS_SetVisiblePlane(GX_PLANEMASK_BG0); -} - -THUMB_FUNC void MOD19_022524F4(struct BgConfig * bgConfig) -{ - FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0); - DestroyHeap(8); -} - -THUMB_FUNC BOOL MOD19_02252504(struct BgConfig * bgConfig) -{ -#pragma unused(bgConfig) - return TRUE; -} +#include "global.h" +#include "heap.h" +#include "gx.h" +#include "gf_gfx_loader.h" +#include "bg_window.h" +#include "graphic/poketch.naix" + +const struct BgTemplate MOD19_02252508 = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0x000, + .size = GF_BG_SCR_SIZE_256x256, + .colorMode = GF_BG_CLR_4BPP, + .screenBase = 12, + .charBase = 0, + .priority = 0, + .areaOver = 0, + .mosaic = 0 +}; + +THUMB_FUNC void MOD19_02252440(struct BgConfig * bgConfig) +{ + CreateHeap(3, 8, 0x18000); + GXS_SetGraphicsMode(GX_BGMODE_0); + GX_SetBankForSubBG(0x80); + GX_SetBankForSubOBJ(0x100); + GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K); + InitBgFromTemplate(bgConfig, GF_BG_LYR_SUB_0, &MOD19_02252508, GF_BG_TYPE_TEXT); + GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8); + GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8); + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_BG_LYR_SUB_0, 0x00, 0x20, 8); + GXS_SetVisibleWnd(GX_WNDMASK_NONE); + GXS_SetVisiblePlane(GX_PLANEMASK_BG0); +} + +THUMB_FUNC void MOD19_022524F4(struct BgConfig * bgConfig) +{ + FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0); + DestroyHeap(8); +} + +THUMB_FUNC BOOL MOD19_02252504(struct BgConfig * bgConfig) +{ +#pragma unused(bgConfig) + return TRUE; +} -- cgit v1.2.3