z64 - l

2025-07-12 19:04:38 +00:00 · 2025-04-28 10:29:07 -04:00 · 2025-04-28 10:29:07 -04:00 · 6d9889d4a9
commit 6d9889d4a9
parent f24a4f4e9c
55 changed files with 57 additions and 57 deletions
--- a/include/effect.h
+++ b/include/effect.h
@ -3,7 +3,7 @@

 #include "color.h"
 #include "romfile.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64math.h"

 struct Actor;
--- a/include/environment.h
+++ b/include/environment.h
@ -2,7 +2,7 @@
 #define ENVIRONMENT_H_

 #include "z64math.h"
-#include "z64light.h"
+#include "light.h"
 #include "dma.h"

 struct GameOverContext;
--- a/include/z64lifemeter.h
+++ b/include/z64lifemeter.h
@ -1,5 +1,5 @@
-#ifndef Z64LIFEMETER_H
-#define Z64LIFEMETER_H
+#ifndef LIFEMETER_H
+#define LIFEMETER_H

 #include "ultra64/ultratypes.h"

--- a/include/z64light.h
+++ b/include/z64light.h
@ -1,5 +1,5 @@
-#ifndef Z64LIGHT_H
-#define Z64LIGHT_H
+#ifndef LIGHT_H
+#define LIGHT_H

 #include "ultra64.h"
 #include "ultra64/gbi.h"
--- a/include/z64play.h
+++ b/include/z64play.h
@ -14,7 +14,7 @@
 #include "game.h"
 #include "game_over.h"
 #include "interface.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64message.h"
 #include "z64object.h"
 #include "z64pause.h"
--- a/include/z64scene.h
+++ b/include/z64scene.h
@ -5,7 +5,7 @@
 #include "ultra64.h"
 #include "bgcheck.h"
 #include "environment.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64math.h"
 #include "z64path.h"

--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@ -22,7 +22,7 @@
 #include "actor.h"
 #include "audio.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "horse.h"
 #include "z64play.h"
 #include "z64save.h"
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@ -4,7 +4,7 @@
 #include "segment_symbols.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64lifemeter.h"
+#include "lifemeter.h"
 #include "interface.h"
 #include "z64ocarina.h"
 #include "z64play.h"
--- a/src/code/z_eff_shield_particle.c
+++ b/src/code/z_eff_shield_particle.c
@ -6,7 +6,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64skin_matrix.h"

--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@ -3,7 +3,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64lifemeter.h"
+#include "lifemeter.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@ -3,7 +3,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"

 #include "assets/objects/gameplay_keep/gameplay_keep.h"
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@ -18,7 +18,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "audio.h"
-#include "z64lifemeter.h"
+#include "lifemeter.h"
 #include "horse.h"
 #include "z64ocarina.h"
 #include "z64play.h"
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@ -41,7 +41,7 @@
 #include "debug_display.h"
 #include "effect.h"
 #include "frame_advance.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
+++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
@ -12,7 +12,7 @@
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"

 #include "assets/objects/gameplay_keep/gameplay_keep.h"
--- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
+++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct BgPoSyokudai;

--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
@ -14,7 +14,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "cutscene_flags.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct BgSpot00Hanebasi;

--- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@ -27,7 +27,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"

--- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
+++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct BossGanondrof;

--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
@ -19,7 +19,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"

--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct Demo6K;

--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@ -10,7 +10,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct DoorWarp1;

--- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
+++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
@ -15,7 +15,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"

--- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
+++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnBdfire;

--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@ -21,7 +21,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64quest_hint.h"
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnElf;

--- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
+++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnFhgFire;

--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@ -17,7 +17,7 @@
 #include "audio.h"
 #include "debug_display.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnFr;

--- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c
+++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c
@ -16,7 +16,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Gb/z_en_gb.h
+++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnGb;

--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "item.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"

--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnIceHono;

--- a/src/overlays/actors/ovl_En_Light/z_en_light.c
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.c
@ -12,7 +12,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64save.h"

--- a/src/overlays/actors/ovl_En_Light/z_en_light.h
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnLight;

--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
@ -7,7 +7,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnMThunder;

--- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
+++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"

 #include "assets/objects/object_po_field/object_po_field.h"
--- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
+++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnPoDesert;

--- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
+++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
+++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnPoField;

--- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
+++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
@ -18,7 +18,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
+++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnPoRelay;

--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@ -19,7 +19,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"

--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnPoSisters;

--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c
@ -15,7 +15,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct EnPoh;

--- a/src/overlays/actors/ovl_Fishing/z_fishing.h
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct Fishing;

--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
@ -15,7 +15,7 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64play.h"
 #include "z64player.h"

--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct MirRay;

--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct ObjSyokudai;

--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
@ -14,7 +14,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64light.h"
+#include "light.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
@ -3,7 +3,7 @@

 #include "ultra64.h"
 #include "actor.h"
-#include "z64light.h"
+#include "light.h"

 struct OceffSpot;

--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@ -45,7 +45,7 @@
 #include "audio.h"
 #include "debug.h"
 #include "effect.h"
-#include "z64lifemeter.h"
+#include "lifemeter.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64save.h"