diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-31 13:58:13 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-31 13:58:13 -0400 |
| commit | cc9652a5f1340c9d0c127565adc291b3840649cd (patch) | |
| tree | 08bf4e290754c8eafdea80f4eaa7eade34211e70 /arm9/src | |
| parent | d612c41066844fc82edaaea6bc946adbcc71a3d9 (diff) | |
| parent | 1c0c1476b404ba1c457875f8f7a51d2355067413 (diff) | |
Merge branch 'pikalax_work' into doc_heap_etc
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/error_message_reset.c | 2 | ||||
| -rw-r--r-- | arm9/src/gf_gfx_loader.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 2a23d08b..07c285a4 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -1,6 +1,6 @@ #include "error_message_reset.h" #include "GX_layers.h" -#include "GXS_ioreg.h" +#include "gx.h" #include "unk_02031734.h" #include "unk_0202F150.h" #include "unk_02016B94.h" diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index 31dda0f3..769c90d9 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -1,7 +1,6 @@ #include "global.h"
#include "filesystem.h"
#include "NNS_g2d.h"
-#include "GXS_ioreg.h"
#include "gf_gfx_loader.h"
THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
|