summaryrefslogtreecommitdiff
path: root/src/code/z_draw.c
diff options
context:
space:
mode:
authorRoman971 <32455037+Roman971@users.noreply.github.com>2020-04-16 23:36:12 +0200
committerGitHub <noreply@github.com>2020-04-16 17:36:12 -0400
commit262f6c507ca59c75df52e23f93c701705ee22798 (patch)
tree179e55b3d59e02d624615b0d4d88867600cca9ed /src/code/z_draw.c
parent9ac1f8130ddbfdf394e11710021150f6c192fdcd (diff)
Decompile z_play.c and Match/Document some of z_view.c (#74)
* Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
Diffstat (limited to 'src/code/z_draw.c')
-rw-r--r--src/code/z_draw.c106
1 files changed, 53 insertions, 53 deletions
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index ce07d2b36..fc23c0f91 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -2,32 +2,32 @@
#include <global.h>
// "Get Item" Model Draw Functions
-static void func_800694E4(GlobalContext* globalCtx, s16 drawId);
-static void func_800695C0(GlobalContext* globalCtx, s16 drawId);
-static void func_8006969C(GlobalContext* globalCtx, s16 drawId);
-static void func_80069880(GlobalContext* globalCtx, s16 drawId);
-static void func_80069AC8(GlobalContext* globalCtx, s16 drawId);
-static void func_80069CF0(GlobalContext* globalCtx, s16 drawId);
-static void func_80069EB0(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A060(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A158(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A73C(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A88C(GlobalContext* globalCtx, s16 drawId);
-static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId);
-static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId);
-static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId);
-static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId);
-static void func_8006AE40(GlobalContext* globalCtx, s16 drawId);
-static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId);
-static void func_8006B124(GlobalContext* globalCtx, s16 drawId);
-static void func_8006B24C(GlobalContext* globalCtx, s16 drawId);
-static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId);
-static void func_8006B54C(GlobalContext* globalCtx, s16 drawId);
-static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId);
-static void func_8006B870(GlobalContext* globalCtx, s16 drawId);
+void func_800694E4(GlobalContext* globalCtx, s16 drawId);
+void func_800695C0(GlobalContext* globalCtx, s16 drawId);
+void func_8006969C(GlobalContext* globalCtx, s16 drawId);
+void func_80069880(GlobalContext* globalCtx, s16 drawId);
+void func_80069AC8(GlobalContext* globalCtx, s16 drawId);
+void func_80069CF0(GlobalContext* globalCtx, s16 drawId);
+void func_80069EB0(GlobalContext* globalCtx, s16 drawId);
+void func_8006A060(GlobalContext* globalCtx, s16 drawId);
+void func_8006A158(GlobalContext* globalCtx, s16 drawId);
+void func_8006A2A0(GlobalContext* globalCtx, s16 drawId);
+void func_8006A4B0(GlobalContext* globalCtx, s16 drawId);
+void func_8006A5F0(GlobalContext* globalCtx, s16 drawId);
+void func_8006A73C(GlobalContext* globalCtx, s16 drawId);
+void func_8006A88C(GlobalContext* globalCtx, s16 drawId);
+void func_8006A9CC(GlobalContext* globalCtx, s16 drawId);
+void func_8006AAA8(GlobalContext* globalCtx, s16 drawId);
+void func_8006ABEC(GlobalContext* globalCtx, s16 drawId);
+void func_8006ACE4(GlobalContext* globalCtx, s16 drawId);
+void func_8006AE40(GlobalContext* globalCtx, s16 drawId);
+void func_8006AF9C(GlobalContext* globalCtx, s16 drawId);
+void func_8006B124(GlobalContext* globalCtx, s16 drawId);
+void func_8006B24C(GlobalContext* globalCtx, s16 drawId);
+void func_8006B3C0(GlobalContext* globalCtx, s16 drawId);
+void func_8006B54C(GlobalContext* globalCtx, s16 drawId);
+void func_8006B6E4(GlobalContext* globalCtx, s16 drawId);
+void func_8006B870(GlobalContext* globalCtx, s16 drawId);
typedef struct {
/* 0x00 */ void (*drawFunc)(GlobalContext*, s16);
@@ -35,7 +35,7 @@ typedef struct {
} DrawItemTableEntry; // size = 0x24
// TODO: use symbols for these dlists once objects are in C
-static DrawItemTableEntry sDrawItemTable[] = {
+DrawItemTableEntry sDrawItemTable[] = {
{ func_8006AAA8, { 0x06000670, 0x06000750 } },
{ func_8006A9CC, { 0x06000800 } },
{ func_8006ABEC, { 0x06000A80, 0x06000AE0 } },
@@ -167,7 +167,7 @@ void func_800694A0(GlobalContext* globalCtx, s16 drawId) {
// All remaining functions in this file are draw functions referenced in the table and called by the function above
-static void func_800694E4(GlobalContext* globalCtx, s16 drawId) {
+void func_800694E4(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -181,7 +181,7 @@ static void func_800694E4(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 565);
}
-static void func_800695C0(GlobalContext* globalCtx, s16 drawId) {
+void func_800695C0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -195,7 +195,7 @@ static void func_800695C0(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 581);
}
-static void func_8006969C(GlobalContext* globalCtx, s16 drawId) {
+void func_8006969C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -222,7 +222,7 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 621);
}
-static void func_80069880(GlobalContext* globalCtx, s16 drawId) {
+void func_80069880(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -252,7 +252,7 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 663);
}
-static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) {
+void func_80069AC8(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -281,7 +281,7 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 704);
}
-static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) {
+void func_80069CF0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -305,7 +305,7 @@ static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 735);
}
-static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) {
+void func_80069EB0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -328,7 +328,7 @@ static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 765);
}
-static void func_8006A060(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A060(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -343,7 +343,7 @@ static void func_8006A060(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 783);
}
-static void func_8006A158(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A158(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -362,7 +362,7 @@ static void func_8006A158(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 827);
}
-static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -389,7 +389,7 @@ static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 861);
}
-static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -407,7 +407,7 @@ static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 883);
}
-static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -425,7 +425,7 @@ static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 906);
}
-static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A73C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -443,7 +443,7 @@ static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 929);
}
-static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A88C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -461,7 +461,7 @@ static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 952);
}
-static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) {
+void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -475,7 +475,7 @@ static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 968);
}
-static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) {
+void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -494,7 +494,7 @@ static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 991);
}
-static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) {
+void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -507,7 +507,7 @@ static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1008);
}
-static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) {
+void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -527,7 +527,7 @@ static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1032);
}
-static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) {
+void func_8006AE40(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -547,7 +547,7 @@ static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1056);
}
-static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) {
+void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -567,7 +567,7 @@ static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1081);
}
-static void func_8006B124(GlobalContext* globalCtx, s16 drawId) {
+void func_8006B124(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -584,7 +584,7 @@ static void func_8006B124(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1100);
}
-static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) {
+void func_8006B24C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -605,7 +605,7 @@ static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1126);
}
-static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) {
+void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -628,7 +628,7 @@ static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1154);
}
-static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) {
+void func_8006B54C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -649,7 +649,7 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1181);
}
-static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) {
+void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
@@ -671,7 +671,7 @@ static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1207);
}
-static void func_8006B870(GlobalContext* globalCtx, s16 drawId) {
+void func_8006B870(GlobalContext* globalCtx, s16 drawId) {
u32 pad;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];