From 2a9b44647b4cb8664fddba2c687ed95273e1cbae Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 28 Apr 2025 10:12:56 -0400 Subject: [PATCH] z64 - f --- include/{z64face_reaction.h => face_reaction.h} | 4 ++-- include/{z64font.h => font.h} | 4 ++-- include/{z64frame_advance.h => frame_advance.h} | 4 ++-- include/z64message.h | 2 +- include/z64play.h | 2 +- src/code/z_collision_check.c | 2 +- src/code/z_effect.c | 2 +- src/code/z_effect_soft_sprite.c | 2 +- src/code/z_face_reaction.c | 2 +- src/code/z_frame_advance.c | 2 +- src/code/z_kanfont.c | 2 +- src/code/z_kankyo.c | 2 +- src/code/z_play.c | 2 +- src/code/z_scene_table.c | 2 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 2 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 2 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 2 +- .../actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c | 2 +- src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c | 2 +- src/overlays/actors/ovl_En_Du/z_en_du.c | 2 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 2 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 2 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 2 +- src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c | 2 +- src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c | 2 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 2 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 2 +- src/overlays/actors/ovl_En_In/z_en_in.c | 2 +- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 2 +- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 2 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 2 +- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 2 +- src/overlays/actors/ovl_En_Md/z_en_md.c | 2 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 2 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 2 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 2 +- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 2 +- src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 2 +- .../actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 2 +- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 2 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 2 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 2 +- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 2 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 2 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 2 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 2 +- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 2 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 2 +- 52 files changed, 55 insertions(+), 55 deletions(-) rename include/{z64face_reaction.h => face_reaction.h} (98%) rename include/{z64font.h => font.h} (97%) rename include/{z64frame_advance.h => frame_advance.h} (87%) diff --git a/include/z64face_reaction.h b/include/face_reaction.h similarity index 98% rename from include/z64face_reaction.h rename to include/face_reaction.h index 274340ebcb..7dc89f864e 100644 --- a/include/z64face_reaction.h +++ b/include/face_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" diff --git a/include/z64font.h b/include/font.h similarity index 97% rename from include/z64font.h rename to include/font.h index 72f97fddd6..b379d32e16 100644 --- a/include/z64font.h +++ b/include/font.h @@ -1,5 +1,5 @@ -#ifndef Z64FONT_H -#define Z64FONT_H +#ifndef FONT_H +#define FONT_H #include "ultra64.h" diff --git a/include/z64frame_advance.h b/include/frame_advance.h similarity index 87% rename from include/z64frame_advance.h rename to include/frame_advance.h index edefb0b47d..0736b09d56 100644 --- a/include/z64frame_advance.h +++ b/include/frame_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" diff --git a/include/z64message.h b/include/z64message.h index 3dfa196d97..912e4e9a24 100644 --- 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; diff --git a/include/z64play.h b/include/z64play.h index cb4995983c..4170a51b41 100644 --- 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" diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 60a19d4c81..843b97755a 100644 --- 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" diff --git a/src/code/z_effect.c b/src/code/z_effect.c index a56fb67673..fe9047dd65 100644 --- 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; diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index eaa1471dba..368b32c302 100644 --- 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" diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c index ea6313a762..b94e6e0cbd 100644 --- 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] = { diff --git a/src/code/z_frame_advance.c b/src/code/z_frame_advance.c index 6ca410a759..05d839539a 100644 --- 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" diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 74f200c54f..5eca249332 100644 --- 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" /** diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 226d40d2b1..5a0c16215f 100644 --- 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" diff --git a/src/code/z_play.c b/src/code/z_play.c index 30e4a2b29a..c4bc15253a 100644 --- 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" diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 5e096a262e..bca584ba5d 100644 --- 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" diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index d314fa2f01..81049195af 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 8bfcc38fac..8cc0d80692 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 8b74a6063e..2c4b934458 100644 --- 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" diff --git 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 index f469d5626f..f570a83447 100644 --- 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" diff --git 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 index 97b98e422b..5cbaa8289f 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index e89e6ee7b7..3fe6b1d1c0 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 24818477d7..809a112a6b 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index c47c8271e5..089043cad6 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 7f4d85f2a8..86deafd0d0 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index c071d40c53..241a8789d8 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index b90c778114..6c57fb6b9d 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 71005a3afb..6906ea60ac 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index ffb2f78ed6..40d5731a36 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 7aba5d0998..72227af9ea 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 2ba0af36ef..2d342e9768 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 7caa735739..60ab01971a 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index e99d35b07c..d13e3e7d02 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index a1933346c2..85c9a47dfc 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 296f4d42af..5226b076c6 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index f035f2d331..fcf0c43b98 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 75969dd224..686ef6192d 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 18ebac054a..0d4c436054 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 7360dd7f18..3f460e0c60 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index e0d2edddf3..c77c657b8f 100644 --- 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" diff --git 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 index 2d00504577..793ed13db6 100644 --- 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" diff --git 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 index e67bfcc98f..2fba2f61b3 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index fb30127af2..a5158b57b1 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index fb834576fb..bc880cb4fc 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 396e12f6a6..ca45a74499 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 95ef442344..3b0f678117 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 9a2b9b42cd..c94c1cc38d 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 1fc830181b..fbe90db220 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 4f697c29b8..e75013ea41 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 2ac84162c6..83c678caf6 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 0d03f72301..4aa017db6e 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index c0d5d5d048..33bd76f699 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 0890c87c1f..197864b5c2 100644 --- 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" diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 95a9f6e07c..949e9de8f4 100644 --- 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"