summaryrefslogtreecommitdiff
path: root/include/variables.h
diff options
context:
space:
mode:
authorRozelette <Rozelette@users.noreply.github.com>2021-03-27 14:29:30 -0500
committerGitHub <noreply@github.com>2021-03-27 14:29:30 -0500
commitfee7a49abc84fbe91116f969a90570cff15decde (patch)
tree972de249287b0f1d11f04aeb33d28d4e7140f75e /include/variables.h
parent012e3c21aeb43437d53a90c2fbd8dfe525d95915 (diff)
z_lights fully matched (#80)
* z_lights OK * Documentation * Fixup for z_collision_check * Improve function types of bind functions * Fixup for types
Diffstat (limited to 'include/variables.h')
-rw-r--r--include/variables.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/variables.h b/include/variables.h
index 42efca03f..80977e89f 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -432,14 +432,14 @@ extern UNK_PTR D_801AE8F0;
// extern UNK_TYPE4 D_801AEC70;
// extern UNK_TYPE4 D_801AEC74;
// extern UNK_TYPE4 D_801AEC78;
-extern ColorRGBA8 D_801AEC80;
+extern Color_RGBA8 D_801AEC80;
extern s801AEC84 D_801AEC84[13];
extern f32 actorMovementScale;
extern f32 D_801AECF0;
extern f32 D_801AECF4;
// extern UNK_TYPE1 D_801AED48;
// extern UNK_TYPE4 D_801AED58;
-extern ColorRGBA8 actorDefaultHitColor;
+extern Color_RGBA8 actorDefaultHitColor;
// extern UNK_TYPE1 D_801AED8C;
// extern UNK_TYPE4 D_801AED98;
// extern UNK_TYPE4 D_801AEDA4;
@@ -1033,8 +1033,8 @@ extern actor_init_var_func actorInitVarFuncs[11];
// extern UNK_TYPE2 D_801BEA20;
// extern UNK_TYPE1 D_801BEA30;
// extern UNK_TYPE1 D_801BEA70;
-extern light_map_positional_func lightPositionalMapFuncs[3];
-extern light_map_directional_func lightDirectionalMapFuncs[3];
+//extern LightsPosBindFunc posBindFuncs[3];
+//extern LightsBindFunc dirBindFuncs[3];
// extern UNK_TYPE4 D_801BEAD4;
// extern UNK_TYPE4 D_801BEAD8;
// extern UNK_TYPE1 D_801BEAE0;
@@ -4017,7 +4017,7 @@ extern f32 D_801F4E70;
// extern UNK_TYPE1 D_801F4F66;
// extern UNK_TYPE1 D_801F4F68;
// extern UNK_TYPE1 D_801F4F6A;
-extern LightsList lightsList;
+extern LightsBuffer sLightsBuffer;
extern Arena mainHeap;
// extern UNK_TYPE1 D_801F5130;
// extern UNK_TYPE1 D_801F5270;
@@ -4090,7 +4090,7 @@ extern Input D_801F6C18;
// extern UNK_TYPE1 D_801F6D0C;
extern UNK_TYPE4 D_801F6D10;
// extern UNK_TYPE1 D_801F6D18;
-extern ColorRGBA8 D_801F6D30;
+extern Color_RGBA8 D_801F6D30;
// extern UNK_TYPE1 D_801F6D38;
// extern UNK_TYPE4 D_801F6D4C;
// extern UNK_TYPE1 D_801F6D50;