diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
| commit | 8c8a5a07c5e6b1a2d0d0592a30be31ccd140fc1e (patch) | |
| tree | c23120a706d012bd19c4c2584af5009fd2016ecf /arm9/lib/src/GX_load3d.c | |
| parent | e643eddc0def8e4851a4195e8ed4de06c847f52d (diff) | |
| parent | 227da51c377f621f542ffdb52ef56bfb807f29ab (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/GX_load3d.c')
| -rw-r--r-- | arm9/lib/src/GX_load3d.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm9/lib/src/GX_load3d.c b/arm9/lib/src/GX_load3d.c index efab53ae..df057a44 100644 --- a/arm9/lib/src/GX_load3d.c +++ b/arm9/lib/src/GX_load3d.c @@ -52,10 +52,10 @@ static u32 sClrImgLCDCBlk = 0; ARM_FUNC void GX_BeginLoadTex(){ u32 temp = GX_ResetBankForTex(); - sTex = temp; - sTexLCDCBlk1 = sTexStartAddrTable[temp].blk1 << 0xC; - sTexLCDCBlk2 = sTexStartAddrTable[temp].blk2 << 0xC; - sSzTexBlk1 = sTexStartAddrTable[temp].szBlk1 << 0xC; + sTex = (s32)temp; + sTexLCDCBlk1 = (u32)(sTexStartAddrTable[temp].blk1 << 0xC); + sTexLCDCBlk2 = (u32)(sTexStartAddrTable[temp].blk2 << 0xC); + sSzTexBlk1 = (u32)(sTexStartAddrTable[temp].szBlk1 << 0xC); } ARM_FUNC void GX_LoadTex(void *src, u32 offset, u32 size){ @@ -97,9 +97,9 @@ ARM_FUNC void GX_EndLoadTex(){ } ARM_FUNC void GX_BeginLoadTexPltt(){ - s32 temp = GX_ResetBankForTexPltt(); + s32 temp = (s32)GX_ResetBankForTexPltt(); sTexPltt = temp; - sTexPlttLCDCBlk = sTexPlttStartAddrTable[temp >> 4] << 0xC; + sTexPlttLCDCBlk = (u32)(sTexPlttStartAddrTable[temp >> 4] << 0xC); } ARM_FUNC void GX_LoadTexPltt(void *src, u32 offset, u32 size){ @@ -114,8 +114,8 @@ ARM_FUNC void GX_EndLoadTexPltt(){ } ARM_FUNC void GX_BeginLoadClearImage(){ - s32 temp = GX_ResetBankForClearImage(); - sClrImg = temp; + u32 temp = GX_ResetBankForClearImage(); + sClrImg = (s32)temp; switch (temp) { case 2: |