From ab9030006220d756753b3d8eb914777872c586b2 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 2 Nov 2022 00:17:11 +0100 Subject: [PATCH] Rename `vt.h` to `terminal.h` (#1339) * `vt.h` -> `terminal.h` * `VT_` -> `T_` (as in Terminal) * `vt.h` -> `terminal.h` in includes too Pepega * Sort out tiny terminal.h include inconsistencies * Format * -> `TE_` * format * `TE_` -> back to `VT_` (parkour!) * explicit VT --- include/terminal.h | 40 +++++++++++++++++++ include/vt.h | 37 ----------------- src/boot/idle.c | 2 +- src/boot/logutils.c | 2 +- src/boot/stackcheck.c | 2 +- src/boot/viconfig.c | 2 +- src/boot/z_locale.c | 2 +- src/boot/z_std_dma.c | 2 +- src/code/__osMalloc.c | 2 +- src/code/code_800430A0.c | 2 +- src/code/code_800D31A0.c | 2 +- src/code/code_800F7260.c | 2 +- src/code/fault.c | 2 +- src/code/fault_drawer.c | 2 +- src/code/game.c | 2 +- src/code/graph.c | 2 +- src/code/irqmgr.c | 2 +- src/code/main.c | 2 +- src/code/padmgr.c | 2 +- src/code/speed_meter.c | 2 +- src/code/sys_math3d.c | 2 +- src/code/z_DLF.c | 2 +- src/code/z_actor.c | 2 +- src/code/z_bgcheck.c | 2 +- src/code/z_camera.c | 2 +- src/code/z_collision_check.c | 2 +- src/code/z_eff_shield_particle.c | 2 +- src/code/z_effect_soft_sprite.c | 2 +- src/code/z_en_a_keep.c | 1 - src/code/z_fbdemo_fade.c | 2 +- src/code/z_horse.c | 2 +- src/code/z_jpeg.c | 2 +- src/code/z_kaleido_manager.c | 2 +- src/code/z_kaleido_scope_call.c | 2 +- src/code/z_kankyo.c | 2 +- src/code/z_map_exp.c | 2 +- src/code/z_map_mark.c | 2 +- src/code/z_message_PAL.c | 2 +- src/code/z_onepointdemo.c | 2 +- src/code/z_parameter.c | 2 +- src/code/z_play.c | 2 +- src/code/z_prenmi.c | 2 +- src/code/z_quake.c | 2 +- src/code/z_room.c | 2 +- src/code/z_scene.c | 2 +- src/code/z_skelanime.c | 2 +- src/code/z_skin_matrix.c | 2 +- src/code/z_sram.c | 2 +- src/code/z_view.c | 2 +- src/code/z_vr_box.c | 2 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 2 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 2 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 2 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 2 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 2 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 2 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 2 +- .../z_bg_jya_zurerukabe.c | 2 +- .../z_bg_spot01_idohashira.c | 2 +- .../z_bg_spot16_doughnut.c | 2 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 2 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 2 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 2 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 2 +- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 2 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 2 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 2 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 2 +- src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c | 2 +- .../actors/ovl_Demo_Geff/z_demo_geff.c | 2 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 2 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 2 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 2 +- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 2 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 2 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 2 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 2 +- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 2 +- .../actors/ovl_En_Anubice/z_en_anubice.c | 2 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.c | 2 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 +- .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c | 2 +- .../actors/ovl_En_Changer/z_en_changer.c | 2 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 2 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 2 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 2 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 2 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 2 +- src/overlays/actors/ovl_En_Eg/z_en_eg.c | 2 +- .../actors/ovl_En_Encount1/z_en_encount1.c | 2 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 2 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 2 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 2 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 2 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 2 +- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 2 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 2 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 2 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 2 +- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 2 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 2 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 2 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 2 +- .../actors/ovl_En_Heishi3/z_en_heishi3.c | 2 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 2 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 2 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 +- .../actors/ovl_En_Insect/z_en_insect.c | 2 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 2 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 2 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 2 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 2 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 2 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 2 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 2 +- .../z_en_okarina_effect.c | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 2 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 2 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 2 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 2 +- src/overlays/actors/ovl_En_Rl/z_en_rl.c | 2 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 2 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 2 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 2 +- .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 2 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 2 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 2 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 2 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 2 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 2 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 2 +- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 2 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 2 +- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 2 +- .../ovl_En_Wonder_Talk/z_en_wonder_talk.c | 2 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.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_Fishing/z_fishing.c | 2 +- .../actors/ovl_Item_Shield/z_item_shield.c | 2 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 2 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 2 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 2 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 2 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 2 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 2 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 2 +- .../gamestates/ovl_file_choose/file_select.h | 1 - .../ovl_file_choose/z_file_choose.c | 1 + .../ovl_file_choose/z_file_nameset_PAL.c | 1 + src/overlays/gamestates/ovl_select/z_select.c | 2 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 2 +- 172 files changed, 208 insertions(+), 205 deletions(-) create mode 100644 include/terminal.h delete mode 100644 include/vt.h diff --git a/include/terminal.h b/include/terminal.h new file mode 100644 index 0000000000..f4ed8d6103 --- /dev/null +++ b/include/terminal.h @@ -0,0 +1,40 @@ +#ifndef TERMINAL_H +#define TERMINAL_H + +// VT_: Helper macros for printing colored text to terminals, using ANSI escape codes +// VT stands for Virtual Terminal + +// 3-bit color codes +#define VT_COLOR_BLACK 0 +#define VT_COLOR_RED 1 +#define VT_COLOR_GREEN 2 +#define VT_COLOR_YELLOW 3 +#define VT_COLOR_BLUE 4 +#define VT_COLOR_MAGENTA 5 +#define VT_COLOR_CYAN 6 +#define VT_COLOR_WHITE 7 + +#define VT_COLOR_FOREGROUND 3 +#define VT_COLOR_BACKGROUND 4 + +#define VT_COLOR_EXPAND0(type, color) #type #color +#define VT_COLOR_EXPAND1(type, color) VT_COLOR_EXPAND0(type, color) +#define VT_COLOR(type, color) VT_COLOR_EXPAND1(VT_COLOR_##type, VT_COLOR_##color) + +#define VT_ESC "\x1b" +#define VT_CSI "[" +#define VT_CUP(x, y) VT_ESC VT_CSI y ";" x "H" +#define VT_ED(n) VT_ESC VT_CSI #n "J" +#define VT_SGR(n) VT_ESC VT_CSI n "m" + +// Add more macros if necessary +#define VT_COL(back, fore) VT_SGR(VT_COLOR(BACKGROUND, back) ";" VT_COLOR(FOREGROUND, fore)) +#define VT_FGCOL(color) VT_SGR(VT_COLOR(FOREGROUND, color)) +#define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color)) +#define VT_RST VT_SGR("") +#define VT_CLS VT_ED(2) + +// ASCII BEL character, plays an alert tone +#define BEL '\a' + +#endif diff --git a/include/vt.h b/include/vt.h deleted file mode 100644 index 61b95706ad..0000000000 --- a/include/vt.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef VT_H -#define VT_H - -// 3-bit color codes -#define VT_COLOR_BLACK 0 -#define VT_COLOR_RED 1 -#define VT_COLOR_GREEN 2 -#define VT_COLOR_YELLOW 3 -#define VT_COLOR_BLUE 4 -#define VT_COLOR_MAGENTA 5 -#define VT_COLOR_CYAN 6 -#define VT_COLOR_WHITE 7 - -#define VT_COLOR_FOREGROUND 3 -#define VT_COLOR_BACKGROUND 4 - -#define VT_COLOR_EXPAND0(type, color) #type #color -#define VT_COLOR_EXPAND1(type, color) VT_COLOR_EXPAND0(type, color) -#define VT_COLOR(type, color) VT_COLOR_EXPAND1(VT_COLOR_##type, VT_COLOR_##color) - -#define VT_ESC "\x1b" -#define VT_CSI "[" -#define VT_CUP(x, y) VT_ESC VT_CSI y ";" x "H" -#define VT_ED(n) VT_ESC VT_CSI #n "J" -#define VT_SGR(n) VT_ESC VT_CSI n "m" - -// Add more macros if necessary -#define VT_COL(back, fore) VT_SGR(VT_COLOR(BACKGROUND, back) ";" VT_COLOR(FOREGROUND, fore)) -#define VT_FGCOL(color) VT_SGR(VT_COLOR(FOREGROUND, color)) -#define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color)) -#define VT_RST VT_SGR("") -#define VT_CLS VT_ED(2) - -// ASCII BEL character, plays an alert tone -#define BEL '\a' - -#endif diff --git a/src/boot/idle.c b/src/boot/idle.c index 7db2a93081..f480ce8cb4 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" OSThread gMainThread; STACK(sMainStack, 0x900); diff --git a/src/boot/logutils.c b/src/boot/logutils.c index c272d808c9..9637b26e74 100644 --- a/src/boot/logutils.c +++ b/src/boot/logutils.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" f32 LogUtils_CheckFloatRange(const char* exp, s32 line, const char* valueName, f32 value, const char* minName, f32 min, const char* maxName, f32 max) { diff --git a/src/boot/stackcheck.c b/src/boot/stackcheck.c index 13036428ad..0f98f0cc33 100644 --- a/src/boot/stackcheck.c +++ b/src/boot/stackcheck.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" StackEntry* sStackInfoListStart = NULL; StackEntry* sStackInfoListEnd = NULL; diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index 38942097f3..7266baf12a 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" // this should probably go elsewhere but right now viconfig.o is the only object between idle and z_std_dma OSPiHandle* gCartHandle = NULL; diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c index 6d29567284..6e041449c2 100644 --- a/src/boot/z_locale.c +++ b/src/boot/z_locale.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" u32 gCurrentRegion = 0; LocaleCartInfo sCartInfo; diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 7c6d77dbbf..140b966f9f 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 22cabc0b5a..6a12b5a5a8 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #define FILL_ALLOCBLOCK (1 << 0) #define FILL_FREEBLOCK (1 << 1) diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c index 1ab9b53243..5ca844a126 100644 --- a/src/code/code_800430A0.c +++ b/src/code/code_800430A0.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" /** * Update the `carriedActor`'s position based on the dynapoly actor identified by `bgId`. diff --git a/src/code/code_800D31A0.c b/src/code/code_800D31A0.c index 8e8a438c61..6bfa18d97c 100644 --- a/src/code/code_800D31A0.c +++ b/src/code/code_800D31A0.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" u32 gIsCtrlr2Valid = false; diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index 7cfdae4202..f316798a5c 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -1,6 +1,6 @@ #include "ultra64.h" #include "global.h" -#include "vt.h" +#include "terminal.h" typedef struct { /* 0x00 */ u16 sfxId; diff --git a/src/code/fault.c b/src/code/fault.c index b33a06eda9..4a302d9f3b 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -41,7 +41,7 @@ * DPad-Down disables sending fault pages over osSyncPrintf. */ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "alloca.h" void FaultDrawer_Init(void); diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c index 3409942e35..49bcdd6898 100644 --- a/src/code/fault_drawer.c +++ b/src/code/fault_drawer.c @@ -5,7 +5,7 @@ * the crash screen implemented by fault.c */ #include "global.h" -#include "vt.h" +#include "terminal.h" typedef struct { /* 0x00 */ u16* fb; diff --git a/src/code/game.c b/src/code/game.c index 663ac65b17..297bd2c6e7 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" SpeedMeter D_801664D0; struct_801664F0 D_801664F0; diff --git a/src/code/graph.c b/src/code/graph.c index ac0ffbdfeb..0deb81fb80 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index 39e17b8ed1..df1faaf1bd 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -33,7 +33,7 @@ * @see sched.c */ #include "global.h" -#include "vt.h" +#include "terminal.h" vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE; volatile OSTime sIrqMgrResetTime = 0; diff --git a/src/code/main.c b/src/code/main.c index e32ce6e6a0..bf2a75a67a 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" s32 gScreenWidth = SCREEN_WIDTH; s32 gScreenHeight = SCREEN_HEIGHT; diff --git a/src/code/padmgr.c b/src/code/padmgr.c index eb80320383..6f882477d1 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -29,7 +29,7 @@ * done while waiting for this operation to complete. */ #include "global.h" -#include "vt.h" +#include "terminal.h" #define PADMGR_LOG(controllerNo, msg) \ if (1) { \ diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 84e7cb52ee..f22680b566 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" /** * How much time the audio update on the audio thread (`func_800E4FE0`) took in total, between scheduling the last two diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 62dd7b4359..867c86443f 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, Vec3f* lineAClosestToB, Vec3f* lineBClosestToA); diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index 3b082fbd77..7034f829c0 100644 --- a/src/code/z_DLF.c +++ b/src/code/z_DLF.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { if (overlayEntry->loadedRamAddr != NULL) { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 4246a0b717..a588f4f2ee 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1,6 +1,6 @@ #include "global.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 22cc9c782e..d3223433bc 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList); void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector); diff --git a/src/code/z_camera.c b/src/code/z_camera.c index a31cfd43a1..7a9ab5d655 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "global.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags); diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 92d695c599..fd7069761f 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 29a9e677c2..90a813cae4 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" static Vtx sVertices[5] = { diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 004f4af02e..655ed040d7 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info" diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index bf96c6b8be..09fca0a94c 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,5 +1,4 @@ #include "global.h" -#include "vt.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_d_hsblock/object_d_hsblock.h" diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index 5d633d96db..7d3481076e 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" static Gfx sRCPSetupFade[] = { gsDPPipeSync(), diff --git a/src/code/z_horse.c b/src/code/z_horse.c index e1b316dffc..3b0794ec03 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "src/overlays/actors/ovl_En_Horse/z_en_horse.h" s32 func_8006CFC0(s32 sceneId) { diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 9e8925264c..988d402ae6 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #define MARKER_ESCAPE 0x00 #define MARKER_SOI 0xD8 diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index 04c401a5dd..8a11d69bbc 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #define KALEIDO_OVERLAY(name, nameString) \ { \ diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index fc01930fc2..21914fe2f7 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" void (*sKaleidoScopeUpdateFunc)(PlayState* play); void (*sKaleidoScopeDrawFunc)(PlayState* play); diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index dee1f13e94..cc6966f735 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1,6 +1,6 @@ #include "global.h" #include "ultra64.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 9820a20fd0..3becb670f2 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 32f9f57369..98d9be02a3 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "assets/textures/parameter_static/parameter_static.h" typedef struct { diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index fe574e50b3..640e4c90bf 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -1,6 +1,6 @@ #include "global.h" #include "message_data_static.h" -#include "vt.h" +#include "terminal.h" #include "assets/textures/parameter_static/parameter_static.h" s16 sTextFade = false; // original name: key_off_flag ? diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 76d353418a..55176b06e4 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -1,6 +1,6 @@ #include "global.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Sw/z_en_sw.h" static s16 sDisableAttention = false; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index a120332d50..9f1d3c5172 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/do_action_static/do_action_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index 64a7387b52..24311b6010 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1,6 +1,6 @@ #include "global.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" void* D_8012D1F0 = NULL; UNK_TYPE D_8012D1F4 = 0; // unused diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index b893cb3496..f792d2133b 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" void func_80092320(PreNMIState* this) { this->state.running = false; diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 0f50b598b4..4ac8f06e98 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -1,6 +1,6 @@ #include "global.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" typedef struct { /* 0x00 */ s16 index; diff --git a/src/code/z_room.c b/src/code/z_room.c index c43a093cfc..9746dba6b2 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 31383bd9ac..7a376f519f 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" RomFile sNaviQuestHintFiles[]; diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 1f1b6aaadb..92e2e0d834 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #define ANIM_INTERP 1 diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index bc6aa432c1..35b8411a4e 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" // clang-format off MtxF sMtxFClear = { diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 24c7e0d481..d11f2b4ca8 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" // these are the main substructs of save context. // we are going to hold off on splitting save context until later on, diff --git a/src/code/z_view.c b/src/code/z_view.c index 7205f789b8..add9775383 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" vu32 sLogOnNextViewInit = true; diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index bae4ff331e..417e23e55c 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -1,5 +1,5 @@ #include "global.h" -#include "vt.h" +#include "terminal.h" #include "z64environment.h" u32 D_8012AC90[4] = { diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index ecec3a3cba..553caaeb7f 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -7,7 +7,7 @@ #include "z_bg_bom_guard.h" #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" #include "assets/objects/object_bowl/object_bowl.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index fa7704b76a..28cae31427 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "assets/objects/object_bowl/object_bowl.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 7f96811436..8ede2882f4 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -6,7 +6,7 @@ #include "z_bg_dy_yoseizo.h" #include "assets/objects/object_dy_obj/object_dy_obj.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" #include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h" #include "assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h" diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index ce78f7ab71..1d0c0db5b2 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -6,7 +6,7 @@ #include "z_bg_ganon_otyuka.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 3b16a660cb..71395fab49 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -6,7 +6,7 @@ #include "z_bg_gate_shutter.h" #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index be218ceec6..23b9d5183c 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -7,7 +7,7 @@ #include "z_bg_heavy_block.h" #include "assets/objects/object_heavy_object/object_heavy_object.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 6b17172329..3b2e38c07f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -7,7 +7,7 @@ #include "z_bg_jya_bombiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index e576f530d4..df60eae994 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -2,7 +2,7 @@ #include "overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h" #include "overlays/actors/ovl_Mir_Ray/z_mir_ray.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 369615e531..a4d607b82b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -6,7 +6,7 @@ #include "z_bg_jya_zurerukabe.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index ce2447ddb4..b327f068d9 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -6,7 +6,7 @@ #include "z_bg_spot01_idohashira.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 23d53fe80b..36e677b042 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -6,7 +6,7 @@ #include "z_bg_spot16_doughnut.h" #include "assets/objects/object_efc_doughnut/object_efc_doughnut.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 014cb034f5..099754054c 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -1,6 +1,6 @@ #include "z_bg_spot18_basket.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 352c3e748e..f3c629cae8 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -6,7 +6,7 @@ #include "z_bg_zg.h" #include "assets/objects/object_zg/object_zg.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index d27f3fe176..793f120449 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -8,7 +8,7 @@ #include "assets/objects/object_fd2/object_fd2.h" #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 0d32177eeb..8b1e929f95 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mo/object_mo.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 054154c407..cf649244d5 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -5,7 +5,7 @@ */ #include "z_demo_6k.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_demo_6k/object_demo_6k.h" #include "assets/objects/object_gnd_magic/object_gnd_magic.h" diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 4a49d694cc..74344ffa9b 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -2,7 +2,7 @@ #include "assets/objects/object_du/object_du.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 03e90c4660..15849396ec 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -5,7 +5,7 @@ */ #include "z_demo_ec.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_zo/object_zo.h" #include "assets/objects/object_ec/object_ec.h" #include "assets/objects/object_ma2/object_ma2.h" diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 9a2793a415..67d94ed820 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1,5 +1,5 @@ #include "z_demo_effect.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_efc_crystal_light/object_efc_crystal_light.h" #include "assets/objects/object_efc_fire_ball/object_efc_fire_ball.h" diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 74b10c93c4..67c79e8750 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -5,7 +5,7 @@ */ #include "z_demo_ext.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_fhg/object_fhg.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 13808612aa..6bfc52a268 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -6,7 +6,7 @@ #include "z_demo_geff.h" #include "assets/objects/object_geff/object_geff.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 1e8454e418..566fd73219 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -6,7 +6,7 @@ #include "z_demo_gj.h" #include "assets/objects/object_gj/object_gj.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index ecc0346b0e..4412f84aa0 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -6,7 +6,7 @@ #include "z_demo_go.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 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 2ab1370ba4..3154755fc3 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1,7 +1,7 @@ #include "z_demo_gt.h" #include "assets/objects/object_gt/object_gt.h" #include "assets/objects/object_geff/object_geff.h" -#include "vt.h" +#include "terminal.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 4ae1d30a73..9277af4282 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -1,5 +1,5 @@ #include "z_demo_ik.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_ik/object_ik.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 2311ac2ba4..3ede44a0f1 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" #include "assets/objects/object_im/object_im.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 76a8cec1db..b6d716bdce 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/objects/object_sa/object_sa.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index d6f4949d81..58610fe1b0 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -5,7 +5,7 @@ */ #include "z_elf_msg.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 35df7b27c9..7311d3cb6c 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -5,7 +5,7 @@ */ #include "z_elf_msg2.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 976228c6e5..1a6d72eaf6 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -8,7 +8,7 @@ #include "assets/objects/object_anubice/object_anubice.h" #include "overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h" #include "overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 8886ab50ed..35826f06b4 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -5,7 +5,7 @@ */ #include "z_en_anubice_tag.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index e6921b4444..9f0ebddbd9 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -1,5 +1,5 @@ #include "z_en_bom_bowl_man.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" #include "assets/objects/object_bg/object_bg.h" diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index a89ebfd329..984313ca6c 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -1,5 +1,5 @@ #include "z_en_bom_bowl_pit.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index f37f411e87..38594039e7 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -5,7 +5,7 @@ */ #include "z_en_changer.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.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 d29f0e64e2..a869b2430d 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 @@ -7,7 +7,7 @@ #include "z_en_diving_game.h" #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" #include "assets/objects/object_zo/object_zo.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 6cf7b79707..6b18866eec 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -6,7 +6,7 @@ #include "z_en_dns.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index ce89300824..7586fb5cbc 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h" #include "overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 6a10b9295c..8b53ce1aac 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -8,7 +8,7 @@ #include "assets/objects/object_dns/object_dns.h" #include "overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index bede93c0a3..6c0dc8f1b3 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "assets/objects/object_hintnuts/object_hintnuts.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index bbcc66b262..e006fcf5f6 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -6,7 +6,7 @@ #include "z_en_dy_extra.h" #include "assets/objects/object_dy_obj/object_dy_obj.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index 442fe41ffe..591624ce1f 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -5,7 +5,7 @@ */ #include "z_en_eg.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index d6e0d1351e..1aac497fe9 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -1,5 +1,5 @@ #include "z_en_encount1.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Tite/z_en_tite.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index d567887e6e..6af5d6e973 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -1,7 +1,7 @@ #include "z_en_encount2.h" #include "overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 2547fe3d6e..3a39b09044 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -7,7 +7,7 @@ #include "z_en_ex_item.h" #include "overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index df8ad7a56d..bf95ffafae 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -1,5 +1,5 @@ #include "z_en_ex_ruppy.h" -#include "vt.h" +#include "terminal.h" #include "../ovl_En_Diving_Game/z_en_diving_game.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 5f939548b8..942f5bdf38 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -1,6 +1,6 @@ #include "z_en_fire_rock.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 525a97ca8f..29e3c7cdc0 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -6,7 +6,7 @@ #include "z_en_fish.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 260dde0548..2fccca7516 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1,6 +1,6 @@ #include "z_en_fr.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_fr/object_fr.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 8521bdbb58..2c627a37f0 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -5,7 +5,7 @@ */ #include "z_en_g_switch.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.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 accb7159ec..5e73614d4d 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -5,7 +5,7 @@ */ #include "z_en_ge1.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_ge1/object_ge1.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index f2f794dfd2..d288f1a58d 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -5,7 +5,7 @@ */ #include "z_en_ge2.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_gla/object_gla.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 1c65b97b1e..2e54332206 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -5,7 +5,7 @@ */ #include "z_en_girla.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index e67c8b5811..282c257e9c 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -7,7 +7,7 @@ #include "z_en_gm.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" #include "assets/objects/object_gm/object_gm.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index c9e7ef69a7..15cc1db26f 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index dfde5da72f..54a9570d50 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -7,7 +7,7 @@ #include "z_en_guest.h" #include "assets/objects/object_os_anime/object_os_anime.h" #include "assets/objects/object_boj/object_boj.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index fe56b80f99..825caad107 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -6,7 +6,7 @@ #include "z_en_heishi1.h" #include "assets/objects/object_sd/object_sd.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 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 845377a2e0..532d168665 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -4,7 +4,7 @@ * Description: Hyrulian Guards */ -#include "vt.h" +#include "terminal.h" #include "z_en_heishi2.h" #include "assets/objects/object_sd/object_sd.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 507eb2705a..fc15dc6adc 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -6,7 +6,7 @@ #include "z_en_heishi3.h" #include "assets/objects/object_sd/object_sd.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 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 895504acef..9d4b978f13 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -1,6 +1,6 @@ #include "z_en_heishi4.h" #include "assets/objects/object_sd/object_sd.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 36dacb8c1c..ca48114a8c 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -5,7 +5,7 @@ */ #include "z_en_hs.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_hs/object_hs.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) 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 604514e123..b3eb13e29e 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -5,7 +5,7 @@ */ #include "z_en_hs2.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_hs/object_hs.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index ef26782a02..36bf288296 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -7,7 +7,7 @@ #include "z_en_ik.h" #include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h" #include "assets/objects/object_ik/object_ik.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 52597a35d5..3fb7b1ca59 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -5,7 +5,7 @@ */ #include "z_en_insect.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 5b75c424f5..38a42f0af8 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_23 diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index c1e296648d..5d7e339b5e 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -5,7 +5,7 @@ */ #include "z_en_kakasi.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_ka/object_ka.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index f47884f7d0..341165afa2 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -5,7 +5,7 @@ */ #include "z_en_kakasi2.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_ka/object_ka.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index b5ce46b16f..e9dc39b28c 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -5,7 +5,7 @@ */ #include "z_en_kakasi3.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_ka/object_ka.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 5255b1384a..08db243854 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -7,7 +7,7 @@ #include "z_en_kanban.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_kanban/object_kanban.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 093e3caac7..c8369f12e6 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -9,7 +9,7 @@ #include "assets/objects/object_os_anime/object_os_anime.h" #include "assets/objects/object_km1/object_km1.h" #include "assets/objects/object_kw1/object_kw1.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index fb9a953c41..c6e67a816b 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -10,7 +10,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_kusa/object_kusa.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_23) diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 6454500d3e..3667cd6711 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -5,7 +5,7 @@ */ #include "z_en_mm2.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_mm/object_mm.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 b548d7d90a..dc28a2ee47 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -5,7 +5,7 @@ */ #include "z_en_nb.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_nb/object_nb.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index bc5f71e847..292f9cd3ac 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -7,7 +7,7 @@ #include "z_en_niw.h" #include "assets/objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_23) diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 2fb38861f6..d60f1504c0 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -6,7 +6,7 @@ #include "z_en_niw_girl.h" #include "assets/objects/object_gr/object_gr.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 c8fdec1c46..40f65f8f75 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 @@ -2,7 +2,7 @@ #include "assets/objects/object_ane/object_ane.h" #include "assets/objects/object_os_anime/object_os_anime.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 e444535a10..2b372d5daa 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 @@ -5,7 +5,7 @@ */ #include "z_en_okarina_effect.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 5fed04a295..4b113afdad 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -7,7 +7,7 @@ #include "z_en_okarina_tag.h" #include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" #include "assets/scenes/overworld/spot02/spot02_scene.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 61d9f7156f..c4e8ee72a8 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1,5 +1,5 @@ #include "z_en_ossan.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_ossan/object_ossan.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index a0630edf2e..4054f12043 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -8,7 +8,7 @@ #include "assets/objects/object_owl/object_owl.h" #include "assets/scenes/overworld/spot06/spot06_scene.h" #include "assets/scenes/overworld/spot16/spot16_scene.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 07bff50869..1e30b627b2 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -7,7 +7,7 @@ #include "z_en_reeba.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_reeba/object_reeba.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 5c83b66418..aacdd540b1 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -5,7 +5,7 @@ */ #include "z_en_rl.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_rl/object_rl.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index f6e2cab43b..4d762f8474 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -6,7 +6,7 @@ #include "z_en_rr.h" #include "assets/objects/object_rr/object_rr.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_10) 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 1554084fe3..0f322b7005 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -6,7 +6,7 @@ #include "z_en_ru1.h" #include "assets/objects/object_ru1/object_ru1.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_26) diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 45f736f0ed..f1476abd99 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -7,7 +7,7 @@ #include "z_en_ru2.h" #include "assets/objects/object_ru2/object_ru2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 884e2809b8..12444af28d 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -5,7 +5,7 @@ */ #include "z_en_sb.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_sb/object_sb.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 505ec66ec5..d25459f90a 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -4,7 +4,7 @@ * Description: Uncursed House of Skulltula People */ -#include "vt.h" +#include "terminal.h" #include "z_en_sth.h" #include "assets/objects/object_ahg/object_ahg.h" #include "assets/objects/object_boj/object_boj.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 18e905aed6..5863d8d06e 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -1,5 +1,5 @@ #include "z_en_syateki_itm.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h" #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" #include "overlays/actors/ovl_En_G_Switch/z_en_g_switch.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 1b788ff5ea..85a95a216b 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -1,5 +1,5 @@ #include "z_en_syateki_man.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" #include "assets/objects/object_ossan/object_ossan.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 66161a86e4..4b5f7c6bac 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -6,7 +6,7 @@ #include "z_en_syateki_niw.h" #include "assets/objects/object_niw/object_niw.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 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 54beb233f5..8de603e5db 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -5,7 +5,7 @@ */ #include "z_en_ta.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_ta/object_ta.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 44fa58c5b1..6655382313 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -5,7 +5,7 @@ */ #include "z_en_takara_man.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_ts/object_ts.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index bce6d1d688..625982c6bc 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -7,7 +7,7 @@ #include "z_en_tite.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" -#include "vt.h" +#include "terminal.h" #include "assets/objects/object_tite/object_tite.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 6ff65b5464..435443ac28 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -7,7 +7,7 @@ #include "z_en_tubo_trap.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index c9662d95ec..5fac8fb789 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -6,7 +6,7 @@ #include "z_en_wall_tubo.h" #include "quake.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h" #include "overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index f391631c92..a497c66d35 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -5,7 +5,7 @@ */ #include "z_en_weather_tag.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index c220f81855..edc24f4b82 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -5,7 +5,7 @@ */ #include "z_en_wf.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "assets/objects/object_wf/object_wf.h" diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index 8836f4b6c5..b4a60bdc6d 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -5,7 +5,7 @@ */ #include "z_en_wonder_item.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index 91468ee042..4265eba80a 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -5,7 +5,7 @@ */ #include "z_en_wonder_talk.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 2ea1465550..4f60dd19be 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -5,7 +5,7 @@ */ #include "z_en_wonder_talk2.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 4d9018efc5..1be73bdaed 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -12,7 +12,7 @@ #include "assets/scenes/overworld/spot17/spot17_scene.h" #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" #include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index df51d4f30c..45e80d90af 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -5,7 +5,7 @@ */ #include "z_en_yabusame_mark.h" -#include "vt.h" +#include "terminal.h" #define FLAGS 0 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 debe4fecec..dd64ac14e0 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -5,7 +5,7 @@ */ #include "z_en_zl2.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/objects/object_zl2/object_zl2.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 aa2a81d1e3..bed76a1afc 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -6,7 +6,7 @@ #include "z_en_zl3.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/objects/object_zl2/object_zl2.h" diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index ac33818ddc..01d8c1a874 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Kanban/z_en_kanban.h" #include "assets/objects/object_fish/object_fish.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index ed7a82f9c1..c6accb49a2 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -4,7 +4,7 @@ * Description: Deku Shield */ -#include "vt.h" +#include "terminal.h" #include "z_item_shield.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 8089f7e938..8fcbefe8ff 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -7,7 +7,7 @@ #include "z_obj_bean.h" #include "assets/objects/object_mamenoki/object_mamenoki.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_22 diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 6fdaac4179..2298c005de 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -5,7 +5,7 @@ */ #include "z_obj_lightswitch.h" -#include "vt.h" +#include "terminal.h" #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #include "assets/objects/object_lightswitch/object_lightswitch.h" diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index eb86489524..106b94f7e1 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -5,7 +5,7 @@ */ #include "z_obj_makekinsuta.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 4372a5f146..c65edb12df 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -6,7 +6,7 @@ #include "z_obj_makeoshihiki.h" #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_5 diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index aa76cb28ef..9eaef89051 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -6,7 +6,7 @@ #include "z_obj_switch.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "vt.h" +#include "terminal.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index d71cb0e41b..f400b1f550 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -6,7 +6,7 @@ #include "z_obj_warp2block.h" #include "assets/objects/object_timeblock/object_timeblock.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_25 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 57d9069c1c..e6c66a39de 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -5,7 +5,7 @@ */ #include "z_oceff_spot.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 0bf9d5ef03..30aaa911c9 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 9d4799f81a..ab9c89ed04 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe2.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index be339e8a08..f8efb80b50 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe3.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 8be7811092..b142f95f16 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe4.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 678bc19b44..fcde28815c 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "assets/scenes/overworld/spot06/spot06_scene.h" -#include "vt.h" +#include "terminal.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h index 8fa198d044..75a3ca68a9 100644 --- a/src/overlays/gamestates/ovl_file_choose/file_select.h +++ b/src/overlays/gamestates/ovl_file_choose/file_select.h @@ -4,7 +4,6 @@ #include "libc/stddef.h" #include "ultra64.h" #include "global.h" -#include "vt.h" #define GET_NEWF(sramCtx, slotNum, index) (sramCtx->readBuff[gSramSlotOffsets[slotNum] + offsetof(SaveContext, newf[index])]) diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 8a6639ba77..aafa2c4dd8 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -1,4 +1,5 @@ #include "file_select.h" +#include "terminal.h" #include "assets/textures/title_static/title_static.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index 5d62e2ebbd..43202108b7 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -1,4 +1,5 @@ #include "file_select.h" +#include "terminal.h" #include "assets/textures/title_static/title_static.h" #include "assets/overlays/ovl_File_Choose/ovl_file_choose.h" diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 2a7aee5eec..50626b0299 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -6,7 +6,7 @@ #include "ultra64.h" #include "global.h" -#include "vt.h" +#include "terminal.h" #include "alloca.h" void MapSelect_LoadTitle(MapSelectState* this) { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 474c3a4b4a..22b5c752f3 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -5,7 +5,7 @@ #include "assets/textures/icon_item_ger_static/icon_item_ger_static.h" #include "assets/textures/icon_item_fra_static/icon_item_fra_static.h" #include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h" -#include "vt.h" +#include "terminal.h" static void* sEquipmentFRATexs[] = { gPauseEquipment00FRATex, gPauseEquipment01Tex, gPauseEquipment02Tex, gPauseEquipment03Tex, gPauseEquipment04Tex,