summaryrefslogtreecommitdiff
path: root/arm9/lib/src/GX_g3b.c
diff options
context:
space:
mode:
authorMade <made111@gmx.de>2020-05-15 04:14:48 +0200
committerMade <made111@gmx.de>2020-05-15 04:14:48 +0200
commita92d77224c8ec645752a56aa35cc8a8457cd4cd3 (patch)
tree15fb509ba7a18930d8b546b6c591fd0d4fd9d92f /arm9/lib/src/GX_g3b.c
parent08e4b4f6657bac9d361a9f6948ae6d2bfe50eebf (diff)
Add ARM_FUNC to GX
Diffstat (limited to 'arm9/lib/src/GX_g3b.c')
-rw-r--r--arm9/lib/src/GX_g3b.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/arm9/lib/src/GX_g3b.c b/arm9/lib/src/GX_g3b.c
index 0efe8518..50281ec0 100644
--- a/arm9/lib/src/GX_g3b.c
+++ b/arm9/lib/src/GX_g3b.c
@@ -3,32 +3,32 @@
#include "gx.h"
-void G3BS_LoadMtx44(struct DL *displaylist, struct Mtx44 *mtx){
+ARM_FUNC void G3BS_LoadMtx44(struct DL *displaylist, struct Mtx44 *mtx){
*(u32 *)displaylist->var00 = 0x16;
MI_Copy64B(mtx, displaylist->var04);
}
-void G3B_PushMtx(struct DL *displaylist){
+ARM_FUNC void G3B_PushMtx(struct DL *displaylist){
*(u32 *)displaylist->var00 = 0x11;
displaylist->var00 = (u8 *)displaylist->var04;
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_PopMtx(struct DL *displaylist, void *mtx){
+ARM_FUNC void G3B_PopMtx(struct DL *displaylist, void *mtx){
*(u32 *)displaylist->var00 = 0x12;
*displaylist->var04 = (u32)mtx;
displaylist->var00 = (u8 *)displaylist->var04 + 0x4;
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_LoadMtx44(struct DL *displaylist, struct Mtx44 *mtx){
+ARM_FUNC void G3B_LoadMtx44(struct DL *displaylist, struct Mtx44 *mtx){
G3BS_LoadMtx44(displaylist, mtx);
displaylist->var00 = (u8 *)displaylist->var04 + sizeof(struct Mtx44);
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
//color format is RGB555, stored in the lower bits
-void G3B_Color(struct DL * displaylist, u32 vtx_col){
+ARM_FUNC void G3B_Color(struct DL * displaylist, u32 vtx_col){
*(u32 *)displaylist->var00 = 0x20;
*displaylist->var04 = vtx_col;
displaylist->var00 = (u8 *)displaylist->var04 + 0x4;
@@ -40,14 +40,14 @@ Only feed normalized Vectors
only the fractional part and the sign, which is in the first nonfraction bit
since the vector is assumed to be normalized, are used
*/
-void G3B_Normal(struct DL * displaylist, fx16 x, fx16 y, fx16 z){
+ARM_FUNC void G3B_Normal(struct DL * displaylist, fx16 x, fx16 y, fx16 z){
*(u32 *)displaylist->var00 = 0x21;
*displaylist->var04 = ((x >> 3) & 0x3FF) | (((y >> 3) & 0x3FF) << 0xA) | (((z >> 3) & 0x3FF) << 0x14) ;
displaylist->var00 = (u8 *)displaylist->var04 + 0x4;
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_Vtx(struct DL * displaylist, fx32 x, fx32 y, fx32 z){
+ARM_FUNC void G3B_Vtx(struct DL * displaylist, fx32 x, fx32 y, fx32 z){
*(u32 *)displaylist->var00 = 0x23;
displaylist->var04[0] = (u32)(u16)x | (u32)(u16)y << 0x10;
displaylist->var04[1] = (u32)(u16)z;
@@ -56,14 +56,14 @@ void G3B_Vtx(struct DL * displaylist, fx32 x, fx32 y, fx32 z){
}
//TODO: name arguments
-void G3B_PolygonAttr(struct DL *displaylist, u32 r1, u32 r2, u32 r3, u32 r4, u32 r5, u32 r6){
+ARM_FUNC void G3B_PolygonAttr(struct DL *displaylist, u32 r1, u32 r2, u32 r3, u32 r4, u32 r5, u32 r6){
*(u32 *)displaylist->var00 = 0x29;
*displaylist->var04 = r1 | r2 << 0x4 | r3 << 0x6 | r6 | r4 << 0x18 | r5 << 0x10;
displaylist->var00 = (u8 *)displaylist->var04 + 0x4;
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_MaterialColorDiffAmb(struct DL *displaylist, u32 diffuse_col, u32 ambient_col, u32 replace){
+ARM_FUNC void G3B_MaterialColorDiffAmb(struct DL *displaylist, u32 diffuse_col, u32 ambient_col, u32 replace){
*(u32 *)displaylist->var00 = 0x30;
u32 replace_vtx_color_with_diffuse;
if (replace)
@@ -75,7 +75,7 @@ void G3B_MaterialColorDiffAmb(struct DL *displaylist, u32 diffuse_col, u32 ambie
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_MaterialColorSpecEmi(struct DL *displaylist, u32 specular_col, u32 emission_col, u32 shiny_table){
+ARM_FUNC void G3B_MaterialColorSpecEmi(struct DL *displaylist, u32 specular_col, u32 emission_col, u32 shiny_table){
*(u32 *)displaylist->var00 = 0x31;
u32 enable_shininess_table;
if (shiny_table)
@@ -92,28 +92,28 @@ Only feed normalized Vectors
only the fractional part and the sign, which is in the first nonfraction bit
since the vector is assumed to be normalized, are used
*/
-void G3B_LightVector(struct DL * displaylist, u32 light_num, fx16 x, fx16 y, fx16 z){
+ARM_FUNC void G3B_LightVector(struct DL * displaylist, u32 light_num, fx16 x, fx16 y, fx16 z){
*(u32 *)displaylist->var00 = 0x32;
*displaylist->var04 = ((x >> 3) & 0x3FF) | (((y >> 3) & 0x3FF) << 0xA) | (((z >> 3) & 0x3FF) << 0x14) | light_num << 0x1E;
displaylist->var00 = (u8 *)displaylist->var04 + 0x4;
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_LightColor(struct DL * displaylist, u32 light_num, u32 col){
+ARM_FUNC void G3B_LightColor(struct DL * displaylist, u32 light_num, u32 col){
*(u32 *)displaylist->var00 = 0x33;
*displaylist->var04 = col | light_num << 0x1E;
displaylist->var00 = (u8 *)displaylist->var04 + 0x4;
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_Begin(struct DL * displaylist, u32 type){
+ARM_FUNC void G3B_Begin(struct DL * displaylist, u32 type){
*(u32 *)displaylist->var00 = 0x40;
*displaylist->var04 = type;
displaylist->var00 = (u8 *)displaylist->var04 + 0x4;
displaylist->var04 = (u32 *)displaylist->var00 + 1;
}
-void G3B_End(struct DL * displaylist){
+ARM_FUNC void G3B_End(struct DL * displaylist){
*(u32 *)displaylist->var00 = 0x41;
displaylist->var00 = (u8 *)displaylist->var04;
displaylist->var04 = (u32 *)displaylist->var00 + 1;