z64 - f

2025-05-09 18:43:45 +00:00 · 2025-04-28 10:12:56 -04:00 · 2025-04-28 10:12:56 -04:00 · 2a9b44647b
commit 2a9b44647b
parent 9a39fb2f84
52 changed files with 55 additions and 55 deletions
--- a/include/z64face_reaction.h
+++ b/include/z64face_reaction.h
@ -1,5 +1,5 @@
-#ifndef Z64FACE_REACTION_H
-#define Z64FACE_REACTION_H
+#ifndef FACE_REACTION_H
+#define FACE_REACTION_H

 #include "ultra64.h"

--- a/include/z64font.h
+++ b/include/z64font.h
@ -1,5 +1,5 @@
-#ifndef Z64FONT_H
-#define Z64FONT_H
+#ifndef FONT_H
+#define FONT_H

 #include "ultra64.h"

--- a/include/z64frame_advance.h
+++ b/include/z64frame_advance.h
@ -1,5 +1,5 @@
-#ifndef Z64FRAME_ADVANCE_H
-#define Z64FRAME_ADVANCE_H
+#ifndef FRAME_ADVANCE_H
+#define FRAME_ADVANCE_H

 #include "ultra64.h"

--- a/include/z64message.h
+++ b/include/z64message.h
@ -3,7 +3,7 @@

 #include "z64view.h"
 #include "versions.h"
-#include "z64font.h"
+#include "font.h"

 struct OcarinaStaff;
 struct Actor;
--- a/include/z64play.h
+++ b/include/z64play.h
@ -10,7 +10,7 @@
 #include "camera.h"
 #include "cutscene.h"
 #include "environment.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64game.h"
 #include "z64game_over.h"
 #include "z64interface.h"
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@ -9,7 +9,7 @@
 #include "versions.h"
 #include "collision_check.h"
 #include "effect.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "zelda_arena.h"
 #include "z64play.h"

--- a/src/code/z_effect.c
+++ b/src/code/z_effect.c
@ -2,7 +2,7 @@
 #include "printf.h"
 #include "translation.h"
 #include "effect.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64play.h"

 EffectContext sEffectContext;
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@ -5,7 +5,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "zelda_arena.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "effect.h"
 #include "z64play.h"

--- a/src/code/z_face_reaction.c
+++ b/src/code/z_face_reaction.c
@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64player.h"

 u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = {
--- a/src/code/z_frame_advance.c
+++ b/src/code/z_frame_advance.c
@ -1,4 +1,4 @@
-#include "z64frame_advance.h"
+#include "frame_advance.h"

 #include "stdbool.h"

--- a/src/code/z_kanfont.c
+++ b/src/code/z_kanfont.c
@ -5,7 +5,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "dma.h"
-#include "z64font.h"
+#include "font.h"
 #include "z64message.h"

 /**
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@ -26,7 +26,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "cutscene.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "environment.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@ -40,7 +40,7 @@
 #include "cutscene_flags.h"
 #include "debug_display.h"
 #include "effect.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/code/z_scene_table.c
+++ b/src/code/z_scene_table.c
@ -11,7 +11,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
+++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
@ -16,7 +16,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "effect.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64play.h"
 #include "z64save.h"

--- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@ -13,7 +13,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64save.h"

--- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c
+++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c
@ -8,7 +8,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
+++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
@ -15,7 +15,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
+++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
@ -20,7 +20,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "effect.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.c
@ -8,7 +8,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@ -12,7 +12,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64horse.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@ -15,7 +15,7 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
@ -17,7 +17,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
+++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
@ -4,7 +4,7 @@
 #include "gfx_setupdl.h"
 #include "printf.h"
 #include "terminal.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
+++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
@ -12,7 +12,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"

 #include "assets/objects/object_hs/object_hs.h"
--- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@ -16,7 +16,7 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@ -15,7 +15,7 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@ -15,7 +15,7 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@ -13,7 +13,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
@ -8,7 +8,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/src/overlays/actors/ovl_En_Md/z_en_md.c
@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@ -11,7 +11,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c
+++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c
@ -10,7 +10,7 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "printf.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64save.h"

--- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c
+++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c
@ -10,7 +10,7 @@
 #include "gfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64save.h"

--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@ -21,7 +21,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@ -12,7 +12,7 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
@ -14,7 +14,7 @@
 #include "audio.h"
 #include "cutscene_flags.h"
 #include "debug_display.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64play.h"
 #include "z64save.h"

--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@ -23,7 +23,7 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@ -7,7 +7,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@ -14,7 +14,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "debug_display.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64ocarina.h"
 #include "effect.h"
 #include "z64play.h"
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
@ -7,7 +7,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@ -22,7 +22,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c
+++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c
@ -8,7 +8,7 @@

 #include "gfx.h"
 #include "sys_matrix.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"

 #include "assets/objects/object_mu/object_mu.h"
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@ -17,7 +17,7 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64save.h"

--- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@ -11,7 +11,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@ -18,7 +18,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
+++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
@ -25,7 +25,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@ -17,7 +17,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64face_reaction.h"
+#include "face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"