diff options
author | Made <made111@gmx.de> | 2020-05-15 04:14:48 +0200 |
---|---|---|
committer | Made <made111@gmx.de> | 2020-05-15 04:14:48 +0200 |
commit | a92d77224c8ec645752a56aa35cc8a8457cd4cd3 (patch) | |
tree | 15fb509ba7a18930d8b546b6c591fd0d4fd9d92f /arm9/lib/src/GX_bgcnt.c | |
parent | 08e4b4f6657bac9d361a9f6948ae6d2bfe50eebf (diff) |
Add ARM_FUNC to GX
Diffstat (limited to 'arm9/lib/src/GX_bgcnt.c')
-rw-r--r-- | arm9/lib/src/GX_bgcnt.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/arm9/lib/src/GX_bgcnt.c b/arm9/lib/src/GX_bgcnt.c index 918f4d32..1eeffab6 100644 --- a/arm9/lib/src/GX_bgcnt.c +++ b/arm9/lib/src/GX_bgcnt.c @@ -2,25 +2,25 @@ #include "main.h" #include "gx.h" -void *G2_GetBG0ScrPtr(){ +ARM_FUNC void *G2_GetBG0ScrPtr(){ u32 temp = (((READREG16(HW_REG_BG0CNT_A) & 0x1F00) >> 0x8) << 0xB); return (void *)(0x6000000 + (((READREG32(HW_REG_DISPCNT_A) & 0x38000000) >> 0x1B) << 0x10) + temp); } -void *G2S_GetBG0ScrPtr(){ +ARM_FUNC void *G2S_GetBG0ScrPtr(){ return (void *)(0x6200000 + (((READREG16(HW_REG_BG0CNT_B) & 0x1F00) >> 0x8) << 0xB)); } -void *G2_GetBG1ScrPtr(){ +ARM_FUNC void *G2_GetBG1ScrPtr(){ u32 temp = (((READREG16(HW_REG_BG1CNT_A) & 0x1F00) >> 0x8) << 0xB); return (void *)(0x6000000 + (((READREG32(HW_REG_DISPCNT_A) & 0x38000000) >> 0x1B) << 0x10) + temp); } -void *G2S_GetBG1ScrPtr(){ +ARM_FUNC void *G2S_GetBG1ScrPtr(){ return (void *)(0x6200000 + (((READREG16(HW_REG_BG1CNT_B) & 0x1F00) >> 0x8) << 0xB)); } -void *G2_GetBG2ScrPtr(){ +ARM_FUNC void *G2_GetBG2ScrPtr(){ u32 temp12 = (READREG32(HW_REG_DISPCNT_A) & 0x7); u32 temp3 = READREG16(HW_REG_BG2CNT_A); u32 temp2 = (((READREG32(HW_REG_DISPCNT_A) & 0x38000000) >> 0x1B) << 0x10); @@ -45,7 +45,7 @@ void *G2_GetBG2ScrPtr(){ } } -void *G2S_GetBG2ScrPtr(){ +ARM_FUNC void *G2S_GetBG2ScrPtr(){ u32 temp12 = (READREG32(HW_REG_DISPCNT_B) & 0x7); u32 temp3 = READREG16(HW_REG_BG2CNT_B); u32 temp1 = ((temp3 & 0x1F00) >> 0x8); @@ -69,7 +69,7 @@ void *G2S_GetBG2ScrPtr(){ } } -void *G2_GetBG3ScrPtr(){ +ARM_FUNC void *G2_GetBG3ScrPtr(){ u32 temp12 = (READREG32(HW_REG_DISPCNT_A) & 0x7); u32 temp3 = READREG16(HW_REG_BG3CNT_A); u32 temp2 = (((READREG32(HW_REG_DISPCNT_A) & 0x38000000) >> 0x1B) << 0x10); @@ -94,7 +94,7 @@ void *G2_GetBG3ScrPtr(){ } } -void *G2S_GetBG3ScrPtr(){ +ARM_FUNC void *G2S_GetBG3ScrPtr(){ u32 temp12 = (READREG32(HW_REG_DISPCNT_B) & 0x7); u32 temp3 = READREG16(HW_REG_BG3CNT_B); u32 temp1 = ((temp3 & 0x1F00) >> 0x8); @@ -118,25 +118,25 @@ void *G2S_GetBG3ScrPtr(){ } } -void *G2_GetBG0CharPtr(){ +ARM_FUNC void *G2_GetBG0CharPtr(){ u32 temp = (((READREG16(HW_REG_BG0CNT_A) & 0x3C) >> 0x2) << 0xE); return (void *)(0x6000000 + (((READREG32(HW_REG_DISPCNT_A) & 0x7000000) >> 0x18) << 0x10) + temp); } -void *G2S_GetBG0CharPtr(){ +ARM_FUNC void *G2S_GetBG0CharPtr(){ return (void *)(0x6200000 + (((READREG16(HW_REG_BG0CNT_B) & 0x3C) >> 0x2) << 0xE)); } -void *G2_GetBG1CharPtr(){ +ARM_FUNC void *G2_GetBG1CharPtr(){ u32 temp = (((READREG16(HW_REG_BG1CNT_A) & 0x3C) >> 0x2) << 0xE); return (void *)(0x6000000 + (((READREG32(HW_REG_DISPCNT_A) & 0x7000000) >> 0x18) << 0x10) + temp); } -void *G2S_GetBG1CharPtr(){ +ARM_FUNC void *G2S_GetBG1CharPtr(){ return (void *)(0x6200000 + (((READREG16(HW_REG_BG1CNT_B) & 0x3C) >> 0x2) << 0xE)); } -void *G2_GetBG2CharPtr(){ +ARM_FUNC void *G2_GetBG2CharPtr(){ s32 temp1 = (READREG32(HW_REG_DISPCNT_A) & 0x7); u32 temp = READREG16(HW_REG_BG2CNT_A); if (temp1 < 5 || !(temp & 0x80)) @@ -151,7 +151,7 @@ void *G2_GetBG2CharPtr(){ } } -void *G2S_GetBG2CharPtr(){ +ARM_FUNC void *G2S_GetBG2CharPtr(){ s32 temp1 = (READREG32(HW_REG_DISPCNT_B) & 0x7); u32 temp = READREG16(HW_REG_BG2CNT_B); if (temp1 < 5 || !(temp & 0x80)) @@ -165,7 +165,7 @@ void *G2S_GetBG2CharPtr(){ } } -void *G2_GetBG3CharPtr(){ +ARM_FUNC void *G2_GetBG3CharPtr(){ s32 temp1 = (READREG32(HW_REG_DISPCNT_A) & 0x7); u32 temp = READREG16(HW_REG_BG3CNT_A); if (temp1 < 3 || (temp1 < 6 && !(temp & 0x80))) @@ -180,7 +180,7 @@ void *G2_GetBG3CharPtr(){ } } -void *G2S_GetBG3CharPtr(){ +ARM_FUNC void *G2S_GetBG3CharPtr(){ s32 temp1 = (READREG32(HW_REG_DISPCNT_B) & 0x7); u32 temp = READREG16(HW_REG_BG3CNT_B); if (temp1 < 3 || (temp1 < 6 && !(temp & 0x80))) |