summaryrefslogtreecommitdiff
path: root/arm9/lib/src/GX_load2d.c
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-05-26 01:54:32 +0100
committerGitHub <noreply@github.com>2020-05-26 01:54:32 +0100
commit227da51c377f621f542ffdb52ef56bfb807f29ab (patch)
tree31ec68ffd57f0d43df60f6885636cc12de782306 /arm9/lib/src/GX_load2d.c
parent895b0ad8b9c09a0b6b1de59de76ed4a258076f87 (diff)
parent0985659425ab1a9035d85512e330cdc247b24e6b (diff)
Merge pull request #109 from red031000/master
OS_protectionUnit.c + warning fixes
Diffstat (limited to 'arm9/lib/src/GX_load2d.c')
-rw-r--r--arm9/lib/src/GX_load2d.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c
index 2f7c0242..92669bce 100644
--- a/arm9/lib/src/GX_load2d.c
+++ b/arm9/lib/src/GX_load2d.c
@@ -135,7 +135,7 @@ ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){
}
ARM_FUNC void GX_BeginLoadBGExtPltt(){
- sBGExtPltt = GX_ResetBankForBGExtPltt();
+ sBGExtPltt = (s32)GX_ResetBankForBGExtPltt();
switch (sBGExtPltt)
{
case 0: //needed to match
@@ -169,7 +169,7 @@ ARM_FUNC void GX_EndLoadBGExtPltt(){
}
ARM_FUNC void GX_BeginLoadOBJExtPltt(){
- sOBJExtPltt = GX_ResetBankForOBJExtPltt();
+ sOBJExtPltt = (s32)GX_ResetBankForOBJExtPltt();
switch (sOBJExtPltt)
{
case 0: //needed to match
@@ -195,7 +195,7 @@ ARM_FUNC void GX_EndLoadOBJExtPltt(){
}
ARM_FUNC void GXS_BeginLoadBGExtPltt(){
- sSubBGExtPltt = FUN_020C6034();
+ sSubBGExtPltt = (s32)FUN_020C6034();
}
ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){
@@ -209,7 +209,7 @@ ARM_FUNC void GXS_EndLoadBGExtPltt(){
}
ARM_FUNC void GXS_BeginLoadOBJExtPltt(){
- sSubOBJExtPltt = GX_ResetBankForSubOBJ();
+ sSubOBJExtPltt = (s32)GX_ResetBankForSubOBJ();
}
ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){