From d62bf87542a2482f2f9930da1dad81ce2c3e7d8e Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 29 May 2025 08:26:58 +0200 Subject: [PATCH 01/42] Fix sym_info.py for older Python (#2557) --- sym_info.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sym_info.py b/sym_info.py index 55404ad7ee..afee014518 100755 --- a/sym_info.py +++ b/sym_info.py @@ -233,9 +233,9 @@ def find_symbols_by_name( def print_map_file(map_file: mapfile_parser.mapfile.MapFile, *, colors: bool): for segment in map_file: print( - f"{colorama.Fore.GREEN if colors else ""}" + f"{colorama.Fore.GREEN if colors else ''}" f"{segment.name}" - f"{colorama.Fore.RESET if colors else ""}" + f"{colorama.Fore.RESET if colors else ''}" ) for file in segment: # Ignore debug sections @@ -246,9 +246,9 @@ def print_map_file(map_file: mapfile_parser.mapfile.MapFile, *, colors: bool): ): continue print( - f"{colorama.Fore.CYAN if colors else ""}" + f"{colorama.Fore.CYAN if colors else ''}" f" {file.asStr()}" - f"{colorama.Fore.RESET if colors else ""}" + f"{colorama.Fore.RESET if colors else ''}" ) for sym in file: vram_str = f"{sym.vram:08X}" From 8a95f90b2071d74b3627ec3222d263ef9a367277 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Thu, 29 May 2025 06:17:38 -0700 Subject: [PATCH 02/42] sPlayerFaces as array of structs instead of 2d array (#2559) --- include/z64player.h | 9 ++++----- src/code/z_player_lib.c | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/z64player.h b/include/z64player.h index 368a6cf032..5093d97f8f 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -269,11 +269,10 @@ typedef enum PlayerDoorType { /* 3 */ PLAYER_DOORTYPE_FAKE } PlayerDoorType; -typedef enum PlayerFacePart { - /* 0 */ PLAYER_FACEPART_EYES, - /* 1 */ PLAYER_FACEPART_MOUTH, - /* 2 */ PLAYER_FACEPART_MAX -} PlayerFacePart; +typedef struct PlayerFaceIndices { + /* 0x0 */ u8 eyeIndex; + /* 0x1 */ u8 mouthIndex; +} PlayerFaceIndices; // size = 0x2 typedef enum PlayerEyes { /* 0 */ PLAYER_EYES_OPEN, diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 1ac27fdb6c..d0f04de1c0 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -970,7 +970,7 @@ s32 Player_GetEnvironmentalHazard(PlayState* play) { return envHazard + 1; } -u8 sPlayerFaces[PLAYER_FACE_MAX][PLAYER_FACEPART_MAX] = { +PlayerFaceIndices sPlayerFaces[PLAYER_FACE_MAX] = { // The first 6 faces defined must be default blinking faces. See relevant code in `Player_UpdateCommon`. { PLAYER_EYES_OPEN, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_NEUTRAL { PLAYER_EYES_HALF, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_NEUTRAL_BLINKING_HALF @@ -1093,7 +1093,7 @@ void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dL // If the eyes index provided by the animation is negative, use the value provided by the `face` argument instead if (eyesIndex < 0) { - eyesIndex = sPlayerFaces[face][PLAYER_FACEPART_EYES]; + eyesIndex = sPlayerFaces[face].eyeIndex; } #ifndef AVOID_UB @@ -1104,7 +1104,7 @@ void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dL // If the mouth index provided by the animation is negative, use the value provided by the `face` argument instead if (mouthIndex < 0) { - mouthIndex = sPlayerFaces[face][PLAYER_FACEPART_MOUTH]; + mouthIndex = sPlayerFaces[face].mouthIndex; } #ifndef AVOID_UB From ae0396f83bcae3a43cff03ecd8510161d4991f54 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 31 May 2025 09:48:19 +0200 Subject: [PATCH 03/42] Fix Link eyes left/right (#2558) * Fix gLinkAdultEyes Left/Right Tex names * swap PLAYER_EYES_ LEFT/RIGHT and related * comment on gLinkChildEyesLeftTex/Right appearing swapped --- .../objects/object_link_boy/object_link_boy.c | 8 ++++---- .../objects/object_link_boy/object_link_boy.h | 2 +- assets/xml/objects/object_link_boy.xml | 4 ++-- include/z64player.h | 10 +++++----- src/code/z_player_lib.c | 20 ++++++++++++------- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/assets/objects/object_link_boy/object_link_boy.c b/assets/objects/object_link_boy/object_link_boy.c index de35c03b67..276e6b2b34 100644 --- a/assets/objects/object_link_boy/object_link_boy.c +++ b/assets/objects/object_link_boy/object_link_boy.c @@ -19,14 +19,14 @@ u64 gLinkAdultEyesClosedfTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_ #include "assets/objects/object_link_boy/gLinkAdultEyesClosedfTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" }; -u64 gLinkAdultEyesLeftTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)] = { -#include "assets/objects/object_link_boy/gLinkAdultEyesLeftTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" -}; - u64 gLinkAdultEyesRightTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)] = { #include "assets/objects/object_link_boy/gLinkAdultEyesRightTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" }; +u64 gLinkAdultEyesLeftTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)] = { +#include "assets/objects/object_link_boy/gLinkAdultEyesLeftTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" +}; + u64 gLinkAdultEyesWideTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)] = { #include "assets/objects/object_link_boy/gLinkAdultEyesWideTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" }; diff --git a/assets/objects/object_link_boy/object_link_boy.h b/assets/objects/object_link_boy/object_link_boy.h index d8b77c1048..8fadf32923 100644 --- a/assets/objects/object_link_boy/object_link_boy.h +++ b/assets/objects/object_link_boy/object_link_boy.h @@ -10,8 +10,8 @@ extern u64 gLinkAdultEyesOpenTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkAdultEyesHalfTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkAdultEyesClosedfTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; -extern u64 gLinkAdultEyesLeftTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkAdultEyesRightTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; +extern u64 gLinkAdultEyesLeftTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkAdultEyesWideTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkAdultEyesDownTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkAdultEyesWincingTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)]; diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml index 83dd1dfbcc..b51e779cc8 100644 --- a/assets/xml/objects/object_link_boy.xml +++ b/assets/xml/objects/object_link_boy.xml @@ -527,8 +527,8 @@ - - + + diff --git a/include/z64player.h b/include/z64player.h index 5093d97f8f..fdc8fa1354 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -278,8 +278,8 @@ typedef enum PlayerEyes { /* 0 */ PLAYER_EYES_OPEN, /* 1 */ PLAYER_EYES_HALF, /* 2 */ PLAYER_EYES_CLOSED, - /* 3 */ PLAYER_EYES_LEFT, - /* 4 */ PLAYER_EYES_RIGHT, + /* 3 */ PLAYER_EYES_RIGHT, + /* 4 */ PLAYER_EYES_LEFT, /* 5 */ PLAYER_EYES_WIDE, /* 6 */ PLAYER_EYES_DOWN, /* 7 */ PLAYER_EYES_WINCING, @@ -301,12 +301,12 @@ typedef enum PlayerFace { /* 3 */ PLAYER_FACE_NEUTRAL_2, // same as `PLAYER_FACE_NEUTRAL` /* 4 */ PLAYER_FACE_NEUTRAL_BLINKING_HALF_2, // same as `PLAYER_FACE_NEUTRAL_BLINKING_HALF` /* 5 */ PLAYER_FACE_NEUTRAL_BLINKING_CLOSED_2, // same as `PLAYER_FACE_NEUTRAL_BLINKING_CLOSED` - /* 6 */ PLAYER_FACE_LOOK_RIGHT, // eyes looking right and mouth closed + /* 6 */ PLAYER_FACE_LOOK_LEFT, // eyes looking left and mouth closed /* 7 */ PLAYER_FACE_SURPRISED, // wide eyes and grimacing mouth /* 8 */ PLAYER_FACE_HURT, // eyes wincing in pain and mouth open /* 9 */ PLAYER_FACE_GASP, // eyes and mouth open - /* 10 */ PLAYER_FACE_LOOK_LEFT, // eyes looking left and mouth closed - /* 11 */ PLAYER_FACE_LOOK_RIGHT_2, // duplicate of `PLAYER_FACE_LOOK_RIGHT` + /* 10 */ PLAYER_FACE_LOOK_RIGHT, // eyes looking right and mouth closed + /* 11 */ PLAYER_FACE_LOOK_LEFT_2, // duplicate of `PLAYER_FACE_LOOK_LEFT` /* 12 */ PLAYER_FACE_EYES_CLOSED_MOUTH_OPEN, // eyes closed and mouth open /* 13 */ PLAYER_FACE_OPENING, // eyes and mouth both halfway open /* 14 */ PLAYER_FACE_EYES_AND_MOUTH_OPEN, // eyes and mouth open diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index d0f04de1c0..6e18ae1ccd 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -984,12 +984,12 @@ PlayerFaceIndices sPlayerFaces[PLAYER_FACE_MAX] = { { PLAYER_EYES_CLOSED, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_NEUTRAL_BLINKING_CLOSED_2 // The rest of these faces go unused. Face data encoded within animations handles all other faces. - { PLAYER_EYES_RIGHT, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_LOOK_RIGHT + { PLAYER_EYES_LEFT, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_LOOK_LEFT { PLAYER_EYES_WIDE, PLAYER_MOUTH_HALF }, // PLAYER_FACE_SURPRISED { PLAYER_EYES_WINCING, PLAYER_MOUTH_OPEN }, // PLAYER_FACE_HURT { PLAYER_EYES_OPEN, PLAYER_MOUTH_OPEN }, // PLAYER_FACE_GASP - { PLAYER_EYES_LEFT, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_LOOK_LEFT - { PLAYER_EYES_RIGHT, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_LOOK_RIGHT_2 + { PLAYER_EYES_RIGHT, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_LOOK_RIGHT + { PLAYER_EYES_LEFT, PLAYER_MOUTH_CLOSED }, // PLAYER_FACE_LOOK_LEFT_2 { PLAYER_EYES_CLOSED, PLAYER_MOUTH_OPEN }, // PLAYER_FACE_EYES_CLOSED_MOUTH_OPEN { PLAYER_EYES_HALF, PLAYER_MOUTH_HALF }, // PLAYER_FACE_OPENING { PLAYER_EYES_OPEN, PLAYER_MOUTH_OPEN }, // PLAYER_FACE_EYES_AND_MOUTH_OPEN @@ -1007,8 +1007,8 @@ void* sEyeTextures[PLAYER_EYES_MAX] = { gLinkAdultEyesOpenTex, // PLAYER_EYES_OPEN gLinkAdultEyesHalfTex, // PLAYER_EYES_HALF gLinkAdultEyesClosedfTex, // PLAYER_EYES_CLOSED - gLinkAdultEyesLeftTex, // PLAYER_EYES_LEFT gLinkAdultEyesRightTex, // PLAYER_EYES_RIGHT + gLinkAdultEyesLeftTex, // PLAYER_EYES_LEFT gLinkAdultEyesWideTex, // PLAYER_EYES_WIDE gLinkAdultEyesDownTex, // PLAYER_EYES_DOWN gLinkAdultEyesWincingTex, // PLAYER_EYES_WINCING @@ -1027,8 +1027,8 @@ void* sEyeTextures[][PLAYER_EYES_MAX] = { gLinkAdultEyesOpenTex, // PLAYER_EYES_OPEN gLinkAdultEyesHalfTex, // PLAYER_EYES_HALF gLinkAdultEyesClosedfTex, // PLAYER_EYES_CLOSED - gLinkAdultEyesLeftTex, // PLAYER_EYES_LEFT gLinkAdultEyesRightTex, // PLAYER_EYES_RIGHT + gLinkAdultEyesLeftTex, // PLAYER_EYES_LEFT gLinkAdultEyesWideTex, // PLAYER_EYES_WIDE gLinkAdultEyesDownTex, // PLAYER_EYES_DOWN gLinkAdultEyesWincingTex, // PLAYER_EYES_WINCING @@ -1037,8 +1037,14 @@ void* sEyeTextures[][PLAYER_EYES_MAX] = { gLinkChildEyesOpenTex, // PLAYER_EYES_OPEN gLinkChildEyesHalfTex, // PLAYER_EYES_HALF gLinkChildEyesClosedfTex, // PLAYER_EYES_CLOSED - gLinkChildEyesLeftTex, // PLAYER_EYES_LEFT - gLinkChildEyesRightTex, // PLAYER_EYES_RIGHT + /* + Note `PLAYER_EYES_RIGHT` corresponds to the "left" eyes texture, and vice-versa with the "right" eyes textures. + This is because on the textures Link appears to look left/right as if facing outwards the screen, + but the image is mirrored by the child Link model's UVs, reversing the direction actually looked in, + which results in-game in the correct eyes direction. + */ + gLinkChildEyesLeftTex, // PLAYER_EYES_RIGHT + gLinkChildEyesRightTex, // PLAYER_EYES_LEFT gLinkChildEyesWideTex, // PLAYER_EYES_WIDE gLinkChildEyesDownTex, // PLAYER_EYES_DOWN gLinkChildEyesWincingTex, // PLAYER_EYES_WINCING From dd6e8a87e9c9e1f96b976457bac291938516ea61 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 31 May 2025 10:09:06 +0200 Subject: [PATCH 04/42] Add Vtx[] resources in xmls for documented assets 1 (#2549) * Add Vtx[] resources in xmls for documented assets 1 * fix duplicate gTriforceVtx (the existing gTriforceVtx resource was too short) --- assets/xml/objects/gameplay_dangeon_keep.xml | 78 +++++++++++ assets/xml/objects/object_brob.xml | 15 +++ assets/xml/objects/object_d_lift.xml | 3 + assets/xml/objects/object_dog.xml | 30 +++++ .../xml/objects/object_efc_crystal_light.xml | 3 + assets/xml/objects/object_efc_fire_ball.xml | 3 + assets/xml/objects/object_efc_lgt_shower.xml | 3 + assets/xml/objects/object_fa.xml | 3 + assets/xml/objects/object_fire.xml | 3 + assets/xml/objects/object_geff.xml | 3 + assets/xml/objects/object_gi_arrow.xml | 9 ++ assets/xml/objects/object_gi_arrowcase.xml | 6 + assets/xml/objects/object_gi_bean.xml | 3 + assets/xml/objects/object_gi_bomb_1.xml | 3 + assets/xml/objects/object_gi_bomb_2.xml | 3 + assets/xml/objects/object_gi_bombpouch.xml | 6 + assets/xml/objects/object_gi_boomerang.xml | 3 + assets/xml/objects/object_gi_boots_2.xml | 6 + assets/xml/objects/object_gi_bosskey.xml | 6 + assets/xml/objects/object_gi_bottle.xml | 6 + .../xml/objects/object_gi_bottle_letter.xml | 6 + assets/xml/objects/object_gi_bow.xml | 3 + assets/xml/objects/object_gi_bracelet.xml | 3 + assets/xml/objects/object_gi_brokensword.xml | 3 + assets/xml/objects/object_gi_butterfly.xml | 6 + assets/xml/objects/object_gi_clothes.xml | 6 + assets/xml/objects/object_gi_coin.xml | 6 + assets/xml/objects/object_gi_compass.xml | 6 + assets/xml/objects/object_gi_dekupouch.xml | 9 ++ assets/xml/objects/object_gi_egg.xml | 3 + assets/xml/objects/object_gi_eye_lotion.xml | 6 + assets/xml/objects/object_gi_fire.xml | 6 + assets/xml/objects/object_gi_fish.xml | 3 + assets/xml/objects/object_gi_frog.xml | 6 + assets/xml/objects/object_gi_gerudo.xml | 3 + assets/xml/objects/object_gi_gerudomask.xml | 3 + assets/xml/objects/object_gi_ghost.xml | 9 ++ assets/xml/objects/object_gi_glasses.xml | 6 + assets/xml/objects/object_gi_gloves.xml | 6 + assets/xml/objects/object_gi_goddess.xml | 6 + assets/xml/objects/object_gi_golonmask.xml | 3 + assets/xml/objects/object_gi_grass.xml | 3 + assets/xml/objects/object_gi_hammer.xml | 3 + assets/xml/objects/object_gi_heart.xml | 3 + assets/xml/objects/object_gi_hearts.xml | 9 ++ assets/xml/objects/object_gi_hookshot.xml | 6 + assets/xml/objects/object_gi_hoverboots.xml | 3 + assets/xml/objects/object_gi_insect.xml | 6 + assets/xml/objects/object_gi_jewel.xml | 18 +++ assets/xml/objects/object_gi_key.xml | 3 + assets/xml/objects/object_gi_ki_tan_mask.xml | 6 + assets/xml/objects/object_gi_letter.xml | 6 + assets/xml/objects/object_gi_liquid.xml | 9 ++ assets/xml/objects/object_gi_longsword.xml | 3 + assets/xml/objects/object_gi_m_arrow.xml | 6 + assets/xml/objects/object_gi_magicpot.xml | 6 + assets/xml/objects/object_gi_map.xml | 6 + assets/xml/objects/object_gi_medal.xml | 21 +++ assets/xml/objects/object_gi_melody.xml | 3 + assets/xml/objects/object_gi_milk.xml | 6 + assets/xml/objects/object_gi_mushroom.xml | 3 + assets/xml/objects/object_gi_niwatori.xml | 6 + assets/xml/objects/object_gi_nuts.xml | 3 + assets/xml/objects/object_gi_ocarina.xml | 6 + assets/xml/objects/object_gi_ocarina_0.xml | 6 + assets/xml/objects/object_gi_pachinko.xml | 3 + assets/xml/objects/object_gi_powder.xml | 3 + assets/xml/objects/object_gi_prescription.xml | 6 + assets/xml/objects/object_gi_purse.xml | 12 ++ assets/xml/objects/object_gi_rabit_mask.xml | 6 + assets/xml/objects/object_gi_redead_mask.xml | 3 + assets/xml/objects/object_gi_rupy.xml | 6 + assets/xml/objects/object_gi_saw.xml | 3 + assets/xml/objects/object_gi_scale.xml | 6 + assets/xml/objects/object_gi_seed.xml | 3 + assets/xml/objects/object_gi_shield_1.xml | 3 + assets/xml/objects/object_gi_shield_2.xml | 3 + assets/xml/objects/object_gi_shield_3.xml | 6 + assets/xml/objects/object_gi_skj_mask.xml | 3 + assets/xml/objects/object_gi_soldout.xml | 3 + assets/xml/objects/object_gi_soul.xml | 9 ++ assets/xml/objects/object_gi_stick.xml | 3 + assets/xml/objects/object_gi_sutaru.xml | 6 + assets/xml/objects/object_gi_sword_1.xml | 3 + assets/xml/objects/object_gi_ticketstone.xml | 6 + assets/xml/objects/object_gi_truth_mask.xml | 6 + assets/xml/objects/object_gi_zoramask.xml | 3 + assets/xml/objects/object_god_lgt.xml | 6 + assets/xml/objects/object_gs.xml | 3 + assets/xml/objects/object_ingate.xml | 3 + assets/xml/objects/object_jya_door.xml | 6 + assets/xml/objects/object_kz.xml | 33 +++++ assets/xml/objects/object_light_ring.xml | 3 + assets/xml/objects/object_mjin.xml | 3 + assets/xml/objects/object_mjin_oka.xml | 3 + assets/xml/objects/object_ny.xml | 9 ++ assets/xml/objects/object_rr.xml | 3 + assets/xml/objects/object_rs.xml | 24 ++++ assets/xml/objects/object_shop_dungen.xml | 6 + assets/xml/objects/object_spot11_obj.xml | 6 + assets/xml/objects/object_spot17_obj.xml | 9 ++ assets/xml/objects/object_syokudai.xml | 9 ++ assets/xml/objects/object_tr.xml | 54 ++++++++ assets/xml/objects/object_triforce_spot.xml | 6 +- assets/xml/objects/object_umajump.xml | 3 + assets/xml/objects/object_wf.xml | 114 ++++++++++++++++ assets/xml/objects/object_zf.xml | 126 ++++++++++++++++++ assets/xml/objects/object_zg.xml | 3 + 108 files changed, 988 insertions(+), 2 deletions(-) diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml index 2670b752d5..4dcfa922b1 100644 --- a/assets/xml/objects/gameplay_dangeon_keep.xml +++ b/assets/xml/objects/gameplay_dangeon_keep.xml @@ -1,36 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46,7 +118,13 @@ + + + + + + diff --git a/assets/xml/objects/object_brob.xml b/assets/xml/objects/object_brob.xml index bef5bbc55f..ad8e61d3b7 100644 --- a/assets/xml/objects/object_brob.xml +++ b/assets/xml/objects/object_brob.xml @@ -1,6 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_d_lift.xml b/assets/xml/objects/object_d_lift.xml index 2912385190..8c226f30fb 100644 --- a/assets/xml/objects/object_d_lift.xml +++ b/assets/xml/objects/object_d_lift.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_dog.xml b/assets/xml/objects/object_dog.xml index ef00442b60..7b32982441 100644 --- a/assets/xml/objects/object_dog.xml +++ b/assets/xml/objects/object_dog.xml @@ -14,6 +14,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_efc_crystal_light.xml b/assets/xml/objects/object_efc_crystal_light.xml index 9215b6a394..6ff4a830ed 100644 --- a/assets/xml/objects/object_efc_crystal_light.xml +++ b/assets/xml/objects/object_efc_crystal_light.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_efc_fire_ball.xml b/assets/xml/objects/object_efc_fire_ball.xml index 2fc65b16ff..645a95f4c2 100644 --- a/assets/xml/objects/object_efc_fire_ball.xml +++ b/assets/xml/objects/object_efc_fire_ball.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_efc_lgt_shower.xml b/assets/xml/objects/object_efc_lgt_shower.xml index 67ef5ce7e0..c4e54e7748 100644 --- a/assets/xml/objects/object_efc_lgt_shower.xml +++ b/assets/xml/objects/object_efc_lgt_shower.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_fa.xml b/assets/xml/objects/object_fa.xml index 2f1bf9a5e8..5b802e67aa 100644 --- a/assets/xml/objects/object_fa.xml +++ b/assets/xml/objects/object_fa.xml @@ -10,6 +10,9 @@ + + + diff --git a/assets/xml/objects/object_fire.xml b/assets/xml/objects/object_fire.xml index 49bf620cb8..aef28a61a5 100644 --- a/assets/xml/objects/object_fire.xml +++ b/assets/xml/objects/object_fire.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_geff.xml b/assets/xml/objects/object_geff.xml index f0667743b0..6a42a89a5c 100644 --- a/assets/xml/objects/object_geff.xml +++ b/assets/xml/objects/object_geff.xml @@ -2,6 +2,9 @@ + + + diff --git a/assets/xml/objects/object_gi_arrow.xml b/assets/xml/objects/object_gi_arrow.xml index 4ce9110cc1..e041351008 100644 --- a/assets/xml/objects/object_gi_arrow.xml +++ b/assets/xml/objects/object_gi_arrow.xml @@ -1,8 +1,17 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_gi_arrowcase.xml b/assets/xml/objects/object_gi_arrowcase.xml index 990576428d..7939423ba4 100644 --- a/assets/xml/objects/object_gi_arrowcase.xml +++ b/assets/xml/objects/object_gi_arrowcase.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_bean.xml b/assets/xml/objects/object_gi_bean.xml index 2c6ce0cf12..6a2f1e7a7d 100644 --- a/assets/xml/objects/object_gi_bean.xml +++ b/assets/xml/objects/object_gi_bean.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_bomb_1.xml b/assets/xml/objects/object_gi_bomb_1.xml index 5d7dab6d86..396d09f5d9 100644 --- a/assets/xml/objects/object_gi_bomb_1.xml +++ b/assets/xml/objects/object_gi_bomb_1.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_bomb_2.xml b/assets/xml/objects/object_gi_bomb_2.xml index 01f3956803..78df129962 100644 --- a/assets/xml/objects/object_gi_bomb_2.xml +++ b/assets/xml/objects/object_gi_bomb_2.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_bombpouch.xml b/assets/xml/objects/object_gi_bombpouch.xml index 42620ec94d..7109816459 100644 --- a/assets/xml/objects/object_gi_bombpouch.xml +++ b/assets/xml/objects/object_gi_bombpouch.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_boomerang.xml b/assets/xml/objects/object_gi_boomerang.xml index fef261c489..bf20bb3429 100644 --- a/assets/xml/objects/object_gi_boomerang.xml +++ b/assets/xml/objects/object_gi_boomerang.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_boots_2.xml b/assets/xml/objects/object_gi_boots_2.xml index e172bd006c..026e9a482a 100644 --- a/assets/xml/objects/object_gi_boots_2.xml +++ b/assets/xml/objects/object_gi_boots_2.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_bosskey.xml b/assets/xml/objects/object_gi_bosskey.xml index 8e93c10d1a..cd5ae92094 100644 --- a/assets/xml/objects/object_gi_bosskey.xml +++ b/assets/xml/objects/object_gi_bosskey.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_bottle.xml b/assets/xml/objects/object_gi_bottle.xml index 0a27562954..22bece4f0b 100644 --- a/assets/xml/objects/object_gi_bottle.xml +++ b/assets/xml/objects/object_gi_bottle.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_bottle_letter.xml b/assets/xml/objects/object_gi_bottle_letter.xml index 04b08dd673..209d053f83 100644 --- a/assets/xml/objects/object_gi_bottle_letter.xml +++ b/assets/xml/objects/object_gi_bottle_letter.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_bow.xml b/assets/xml/objects/object_gi_bow.xml index 6e9101b413..ebf7a95559 100644 --- a/assets/xml/objects/object_gi_bow.xml +++ b/assets/xml/objects/object_gi_bow.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_bracelet.xml b/assets/xml/objects/object_gi_bracelet.xml index da35c003f8..c0d9c7f855 100644 --- a/assets/xml/objects/object_gi_bracelet.xml +++ b/assets/xml/objects/object_gi_bracelet.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_brokensword.xml b/assets/xml/objects/object_gi_brokensword.xml index 44cae3e100..e99b487a81 100644 --- a/assets/xml/objects/object_gi_brokensword.xml +++ b/assets/xml/objects/object_gi_brokensword.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_butterfly.xml b/assets/xml/objects/object_gi_butterfly.xml index 9882d27954..23487544e4 100644 --- a/assets/xml/objects/object_gi_butterfly.xml +++ b/assets/xml/objects/object_gi_butterfly.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_clothes.xml b/assets/xml/objects/object_gi_clothes.xml index 2a10dce11b..32550cfc8d 100644 --- a/assets/xml/objects/object_gi_clothes.xml +++ b/assets/xml/objects/object_gi_clothes.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_coin.xml b/assets/xml/objects/object_gi_coin.xml index f65993465b..e69e1dcd94 100644 --- a/assets/xml/objects/object_gi_coin.xml +++ b/assets/xml/objects/object_gi_coin.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_compass.xml b/assets/xml/objects/object_gi_compass.xml index 10c6fbb63a..748597c65f 100644 --- a/assets/xml/objects/object_gi_compass.xml +++ b/assets/xml/objects/object_gi_compass.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_dekupouch.xml b/assets/xml/objects/object_gi_dekupouch.xml index 25cde931f2..f51d885c01 100644 --- a/assets/xml/objects/object_gi_dekupouch.xml +++ b/assets/xml/objects/object_gi_dekupouch.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_gi_egg.xml b/assets/xml/objects/object_gi_egg.xml index ceae8be407..967b128a45 100644 --- a/assets/xml/objects/object_gi_egg.xml +++ b/assets/xml/objects/object_gi_egg.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_eye_lotion.xml b/assets/xml/objects/object_gi_eye_lotion.xml index 86e053cd94..46cadb117e 100644 --- a/assets/xml/objects/object_gi_eye_lotion.xml +++ b/assets/xml/objects/object_gi_eye_lotion.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_fire.xml b/assets/xml/objects/object_gi_fire.xml index 3b81815d5f..ddeafaaf48 100644 --- a/assets/xml/objects/object_gi_fire.xml +++ b/assets/xml/objects/object_gi_fire.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_fish.xml b/assets/xml/objects/object_gi_fish.xml index 75361b32da..e5def6ebbe 100644 --- a/assets/xml/objects/object_gi_fish.xml +++ b/assets/xml/objects/object_gi_fish.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_frog.xml b/assets/xml/objects/object_gi_frog.xml index 8c5d616eb4..503f08c416 100644 --- a/assets/xml/objects/object_gi_frog.xml +++ b/assets/xml/objects/object_gi_frog.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_gerudo.xml b/assets/xml/objects/object_gi_gerudo.xml index 26dc606ce0..ac80cdd2f7 100644 --- a/assets/xml/objects/object_gi_gerudo.xml +++ b/assets/xml/objects/object_gi_gerudo.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_gerudomask.xml b/assets/xml/objects/object_gi_gerudomask.xml index b53bf24af6..3b42e2ee29 100644 --- a/assets/xml/objects/object_gi_gerudomask.xml +++ b/assets/xml/objects/object_gi_gerudomask.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_gi_ghost.xml b/assets/xml/objects/object_gi_ghost.xml index e6c631c98e..30a0edf1eb 100644 --- a/assets/xml/objects/object_gi_ghost.xml +++ b/assets/xml/objects/object_gi_ghost.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_gi_glasses.xml b/assets/xml/objects/object_gi_glasses.xml index 4a9cacf086..f6cb981845 100644 --- a/assets/xml/objects/object_gi_glasses.xml +++ b/assets/xml/objects/object_gi_glasses.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_gloves.xml b/assets/xml/objects/object_gi_gloves.xml index fb273e95f4..09976d11ef 100644 --- a/assets/xml/objects/object_gi_gloves.xml +++ b/assets/xml/objects/object_gi_gloves.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_goddess.xml b/assets/xml/objects/object_gi_goddess.xml index 6339012d47..cd693a5f45 100644 --- a/assets/xml/objects/object_gi_goddess.xml +++ b/assets/xml/objects/object_gi_goddess.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_golonmask.xml b/assets/xml/objects/object_gi_golonmask.xml index 98f53f1c25..ac8d86669c 100644 --- a/assets/xml/objects/object_gi_golonmask.xml +++ b/assets/xml/objects/object_gi_golonmask.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_gi_grass.xml b/assets/xml/objects/object_gi_grass.xml index 2cc465c959..9ee7482729 100644 --- a/assets/xml/objects/object_gi_grass.xml +++ b/assets/xml/objects/object_gi_grass.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_hammer.xml b/assets/xml/objects/object_gi_hammer.xml index 49da345a93..70f0a17c20 100644 --- a/assets/xml/objects/object_gi_hammer.xml +++ b/assets/xml/objects/object_gi_hammer.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_heart.xml b/assets/xml/objects/object_gi_heart.xml index b3576efaad..0a8dfee2b1 100644 --- a/assets/xml/objects/object_gi_heart.xml +++ b/assets/xml/objects/object_gi_heart.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_hearts.xml b/assets/xml/objects/object_gi_hearts.xml index 122c898571..aaa87d00f1 100644 --- a/assets/xml/objects/object_gi_hearts.xml +++ b/assets/xml/objects/object_gi_hearts.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_gi_hookshot.xml b/assets/xml/objects/object_gi_hookshot.xml index 513194fa7d..1d43f927e5 100644 --- a/assets/xml/objects/object_gi_hookshot.xml +++ b/assets/xml/objects/object_gi_hookshot.xml @@ -1,7 +1,13 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_hoverboots.xml b/assets/xml/objects/object_gi_hoverboots.xml index 9d710662e5..5b3bf0c80f 100644 --- a/assets/xml/objects/object_gi_hoverboots.xml +++ b/assets/xml/objects/object_gi_hoverboots.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_insect.xml b/assets/xml/objects/object_gi_insect.xml index 9467605ce2..8eb59b9c1b 100644 --- a/assets/xml/objects/object_gi_insect.xml +++ b/assets/xml/objects/object_gi_insect.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_jewel.xml b/assets/xml/objects/object_gi_jewel.xml index 5dc87f53e2..012fc83514 100644 --- a/assets/xml/objects/object_gi_jewel.xml +++ b/assets/xml/objects/object_gi_jewel.xml @@ -2,14 +2,32 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gi_key.xml b/assets/xml/objects/object_gi_key.xml index e38547a32c..874cd6e698 100644 --- a/assets/xml/objects/object_gi_key.xml +++ b/assets/xml/objects/object_gi_key.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_ki_tan_mask.xml b/assets/xml/objects/object_gi_ki_tan_mask.xml index e447c8fadf..ad6763bb9c 100644 --- a/assets/xml/objects/object_gi_ki_tan_mask.xml +++ b/assets/xml/objects/object_gi_ki_tan_mask.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_letter.xml b/assets/xml/objects/object_gi_letter.xml index 167a7ff5d8..d6acdf820d 100644 --- a/assets/xml/objects/object_gi_letter.xml +++ b/assets/xml/objects/object_gi_letter.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_liquid.xml b/assets/xml/objects/object_gi_liquid.xml index b3af2b2627..27ef25b0b0 100644 --- a/assets/xml/objects/object_gi_liquid.xml +++ b/assets/xml/objects/object_gi_liquid.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_gi_longsword.xml b/assets/xml/objects/object_gi_longsword.xml index bdfffe3b16..dc7773c692 100644 --- a/assets/xml/objects/object_gi_longsword.xml +++ b/assets/xml/objects/object_gi_longsword.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_m_arrow.xml b/assets/xml/objects/object_gi_m_arrow.xml index 069a1bf1d4..a9a6cb7f3f 100644 --- a/assets/xml/objects/object_gi_m_arrow.xml +++ b/assets/xml/objects/object_gi_m_arrow.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_magicpot.xml b/assets/xml/objects/object_gi_magicpot.xml index 070de07fa0..3dc92c16a1 100644 --- a/assets/xml/objects/object_gi_magicpot.xml +++ b/assets/xml/objects/object_gi_magicpot.xml @@ -1,7 +1,13 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_map.xml b/assets/xml/objects/object_gi_map.xml index 619b0bc845..b88e6de859 100644 --- a/assets/xml/objects/object_gi_map.xml +++ b/assets/xml/objects/object_gi_map.xml @@ -1,7 +1,13 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_medal.xml b/assets/xml/objects/object_gi_medal.xml index 5676a9e316..7fafeb5d53 100644 --- a/assets/xml/objects/object_gi_medal.xml +++ b/assets/xml/objects/object_gi_medal.xml @@ -1,24 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gi_melody.xml b/assets/xml/objects/object_gi_melody.xml index e028bc9463..31dc495bd8 100644 --- a/assets/xml/objects/object_gi_melody.xml +++ b/assets/xml/objects/object_gi_melody.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_milk.xml b/assets/xml/objects/object_gi_milk.xml index 3e5cb0cb5a..a1904f7f1d 100644 --- a/assets/xml/objects/object_gi_milk.xml +++ b/assets/xml/objects/object_gi_milk.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_mushroom.xml b/assets/xml/objects/object_gi_mushroom.xml index 8ee686263c..0933f2158a 100644 --- a/assets/xml/objects/object_gi_mushroom.xml +++ b/assets/xml/objects/object_gi_mushroom.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_niwatori.xml b/assets/xml/objects/object_gi_niwatori.xml index 8af44b8708..9bea0dbbaf 100644 --- a/assets/xml/objects/object_gi_niwatori.xml +++ b/assets/xml/objects/object_gi_niwatori.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_nuts.xml b/assets/xml/objects/object_gi_nuts.xml index d1a8454dbc..590c78d7dd 100644 --- a/assets/xml/objects/object_gi_nuts.xml +++ b/assets/xml/objects/object_gi_nuts.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_ocarina.xml b/assets/xml/objects/object_gi_ocarina.xml index b8714d6e3c..4e85cc04e1 100644 --- a/assets/xml/objects/object_gi_ocarina.xml +++ b/assets/xml/objects/object_gi_ocarina.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_ocarina_0.xml b/assets/xml/objects/object_gi_ocarina_0.xml index caca8f2002..7ec13c466e 100644 --- a/assets/xml/objects/object_gi_ocarina_0.xml +++ b/assets/xml/objects/object_gi_ocarina_0.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_pachinko.xml b/assets/xml/objects/object_gi_pachinko.xml index 9967813b3d..bc8872d685 100644 --- a/assets/xml/objects/object_gi_pachinko.xml +++ b/assets/xml/objects/object_gi_pachinko.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_powder.xml b/assets/xml/objects/object_gi_powder.xml index 4e33b58208..b49593cb1d 100644 --- a/assets/xml/objects/object_gi_powder.xml +++ b/assets/xml/objects/object_gi_powder.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_prescription.xml b/assets/xml/objects/object_gi_prescription.xml index 9fa16660c7..619252fafb 100644 --- a/assets/xml/objects/object_gi_prescription.xml +++ b/assets/xml/objects/object_gi_prescription.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_purse.xml b/assets/xml/objects/object_gi_purse.xml index 3034942ff4..c896b47de0 100644 --- a/assets/xml/objects/object_gi_purse.xml +++ b/assets/xml/objects/object_gi_purse.xml @@ -1,5 +1,17 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gi_rabit_mask.xml b/assets/xml/objects/object_gi_rabit_mask.xml index a3c07e469c..64e82b888c 100644 --- a/assets/xml/objects/object_gi_rabit_mask.xml +++ b/assets/xml/objects/object_gi_rabit_mask.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_redead_mask.xml b/assets/xml/objects/object_gi_redead_mask.xml index fe601cab64..2168b23e91 100644 --- a/assets/xml/objects/object_gi_redead_mask.xml +++ b/assets/xml/objects/object_gi_redead_mask.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_rupy.xml b/assets/xml/objects/object_gi_rupy.xml index 07b18b82dd..0305ae68b8 100644 --- a/assets/xml/objects/object_gi_rupy.xml +++ b/assets/xml/objects/object_gi_rupy.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_saw.xml b/assets/xml/objects/object_gi_saw.xml index 999b818e8b..3fb4cb8d3d 100644 --- a/assets/xml/objects/object_gi_saw.xml +++ b/assets/xml/objects/object_gi_saw.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_scale.xml b/assets/xml/objects/object_gi_scale.xml index c6794b6aea..dd9200dc96 100644 --- a/assets/xml/objects/object_gi_scale.xml +++ b/assets/xml/objects/object_gi_scale.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_seed.xml b/assets/xml/objects/object_gi_seed.xml index 5d3ef9c03f..88c224f24b 100644 --- a/assets/xml/objects/object_gi_seed.xml +++ b/assets/xml/objects/object_gi_seed.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_shield_1.xml b/assets/xml/objects/object_gi_shield_1.xml index 867292a4c3..5fa12c7cc2 100644 --- a/assets/xml/objects/object_gi_shield_1.xml +++ b/assets/xml/objects/object_gi_shield_1.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_shield_2.xml b/assets/xml/objects/object_gi_shield_2.xml index 364070d101..6c1f983b19 100644 --- a/assets/xml/objects/object_gi_shield_2.xml +++ b/assets/xml/objects/object_gi_shield_2.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_shield_3.xml b/assets/xml/objects/object_gi_shield_3.xml index 974a2539a9..2ff34c2f23 100644 --- a/assets/xml/objects/object_gi_shield_3.xml +++ b/assets/xml/objects/object_gi_shield_3.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_skj_mask.xml b/assets/xml/objects/object_gi_skj_mask.xml index 6479015715..7405e66222 100644 --- a/assets/xml/objects/object_gi_skj_mask.xml +++ b/assets/xml/objects/object_gi_skj_mask.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_soldout.xml b/assets/xml/objects/object_gi_soldout.xml index ae3f4685f9..517750ee9a 100644 --- a/assets/xml/objects/object_gi_soldout.xml +++ b/assets/xml/objects/object_gi_soldout.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_gi_soul.xml b/assets/xml/objects/object_gi_soul.xml index ee9dbd9570..1487b57042 100644 --- a/assets/xml/objects/object_gi_soul.xml +++ b/assets/xml/objects/object_gi_soul.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_gi_stick.xml b/assets/xml/objects/object_gi_stick.xml index d974b7ac5d..3da363f7cf 100644 --- a/assets/xml/objects/object_gi_stick.xml +++ b/assets/xml/objects/object_gi_stick.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_sutaru.xml b/assets/xml/objects/object_gi_sutaru.xml index 343d301868..5217cf300d 100644 --- a/assets/xml/objects/object_gi_sutaru.xml +++ b/assets/xml/objects/object_gi_sutaru.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_sword_1.xml b/assets/xml/objects/object_gi_sword_1.xml index 3bc15dcaf3..fcf8550224 100644 --- a/assets/xml/objects/object_gi_sword_1.xml +++ b/assets/xml/objects/object_gi_sword_1.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_ticketstone.xml b/assets/xml/objects/object_gi_ticketstone.xml index 6cdd5ea2f0..cebc99a759 100644 --- a/assets/xml/objects/object_gi_ticketstone.xml +++ b/assets/xml/objects/object_gi_ticketstone.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_truth_mask.xml b/assets/xml/objects/object_gi_truth_mask.xml index 64bd0939c6..fbeab76d3e 100644 --- a/assets/xml/objects/object_gi_truth_mask.xml +++ b/assets/xml/objects/object_gi_truth_mask.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_zoramask.xml b/assets/xml/objects/object_gi_zoramask.xml index 096fdeedfc..06bca27371 100644 --- a/assets/xml/objects/object_gi_zoramask.xml +++ b/assets/xml/objects/object_gi_zoramask.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_god_lgt.xml b/assets/xml/objects/object_god_lgt.xml index b630605364..d8f1e92278 100644 --- a/assets/xml/objects/object_god_lgt.xml +++ b/assets/xml/objects/object_god_lgt.xml @@ -1,10 +1,16 @@ + + + + + + diff --git a/assets/xml/objects/object_gs.xml b/assets/xml/objects/object_gs.xml index 145be16653..de69d2571e 100644 --- a/assets/xml/objects/object_gs.xml +++ b/assets/xml/objects/object_gs.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_ingate.xml b/assets/xml/objects/object_ingate.xml index e6be42bebf..e68c2d091a 100644 --- a/assets/xml/objects/object_ingate.xml +++ b/assets/xml/objects/object_ingate.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_jya_door.xml b/assets/xml/objects/object_jya_door.xml index 60a7b37886..25d15dd5d0 100644 --- a/assets/xml/objects/object_jya_door.xml +++ b/assets/xml/objects/object_jya_door.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml index 1077c824ca..8c744985b8 100644 --- a/assets/xml/objects/object_kz.xml +++ b/assets/xml/objects/object_kz.xml @@ -18,6 +18,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_light_ring.xml b/assets/xml/objects/object_light_ring.xml index babe7d2aa7..877aa3408d 100644 --- a/assets/xml/objects/object_light_ring.xml +++ b/assets/xml/objects/object_light_ring.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_mjin.xml b/assets/xml/objects/object_mjin.xml index daf9b05412..2784956770 100644 --- a/assets/xml/objects/object_mjin.xml +++ b/assets/xml/objects/object_mjin.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_mjin_oka.xml b/assets/xml/objects/object_mjin_oka.xml index 0f823b9237..8da3481c73 100644 --- a/assets/xml/objects/object_mjin_oka.xml +++ b/assets/xml/objects/object_mjin_oka.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_ny.xml b/assets/xml/objects/object_ny.xml index c81d66ab56..0b94903b19 100644 --- a/assets/xml/objects/object_ny.xml +++ b/assets/xml/objects/object_ny.xml @@ -4,6 +4,15 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_rr.xml b/assets/xml/objects/object_rr.xml index 98726b14bb..4d95b2da3e 100644 --- a/assets/xml/objects/object_rr.xml +++ b/assets/xml/objects/object_rr.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rs.xml index a5f7536590..64832b127a 100644 --- a/assets/xml/objects/object_rs.xml +++ b/assets/xml/objects/object_rs.xml @@ -2,6 +2,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_shop_dungen.xml b/assets/xml/objects/object_shop_dungen.xml index 027207402c..baf9b9b44b 100644 --- a/assets/xml/objects/object_shop_dungen.xml +++ b/assets/xml/objects/object_shop_dungen.xml @@ -1,9 +1,15 @@ + + + + + + diff --git a/assets/xml/objects/object_spot11_obj.xml b/assets/xml/objects/object_spot11_obj.xml index 257298f7cc..ba1c4784fd 100644 --- a/assets/xml/objects/object_spot11_obj.xml +++ b/assets/xml/objects/object_spot11_obj.xml @@ -1,8 +1,14 @@ + + + + + + diff --git a/assets/xml/objects/object_spot17_obj.xml b/assets/xml/objects/object_spot17_obj.xml index 73a4ca5203..364ee9b9e8 100644 --- a/assets/xml/objects/object_spot17_obj.xml +++ b/assets/xml/objects/object_spot17_obj.xml @@ -2,9 +2,18 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_syokudai.xml b/assets/xml/objects/object_syokudai.xml index 6434d923a5..a34d4adc67 100644 --- a/assets/xml/objects/object_syokudai.xml +++ b/assets/xml/objects/object_syokudai.xml @@ -1,8 +1,17 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_tr.xml b/assets/xml/objects/object_tr.xml index 827b85bfe6..f365b97266 100644 --- a/assets/xml/objects/object_tr.xml +++ b/assets/xml/objects/object_tr.xml @@ -51,6 +51,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +152,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_triforce_spot.xml b/assets/xml/objects/object_triforce_spot.xml index a9d52dd963..40f936d3c3 100644 --- a/assets/xml/objects/object_triforce_spot.xml +++ b/assets/xml/objects/object_triforce_spot.xml @@ -1,9 +1,11 @@ - + + + + - diff --git a/assets/xml/objects/object_umajump.xml b/assets/xml/objects/object_umajump.xml index 2ee4ade46a..1d205b7a42 100644 --- a/assets/xml/objects/object_umajump.xml +++ b/assets/xml/objects/object_umajump.xml @@ -2,6 +2,9 @@ + + + diff --git a/assets/xml/objects/object_wf.xml b/assets/xml/objects/object_wf.xml index d5d70639d7..c97207cf0b 100644 --- a/assets/xml/objects/object_wf.xml +++ b/assets/xml/objects/object_wf.xml @@ -7,6 +7,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -25,6 +67,21 @@ + + + + + + + + + + + + + + + @@ -64,6 +121,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -90,6 +189,21 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_zf.xml b/assets/xml/objects/object_zf.xml index 74e9d45915..a537b9ff8d 100644 --- a/assets/xml/objects/object_zf.xml +++ b/assets/xml/objects/object_zf.xml @@ -11,6 +11,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -99,27 +159,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_zg.xml b/assets/xml/objects/object_zg.xml index 79005516c4..d0f301390b 100644 --- a/assets/xml/objects/object_zg.xml +++ b/assets/xml/objects/object_zg.xml @@ -2,6 +2,9 @@ + + + From fd5fbe138d29a5e0501e0728d9c2e348d7992b06 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 31 May 2025 10:26:04 +0200 Subject: [PATCH 05/42] Commit `icon_item_24_static`, `icon_item_{fra,ger,jpn,nes}_static`, `item_name_static` (#2562) * commit icon_item_24_static * commit icon_item_LANG_static for LANG in fra,ger,jpn,nes * commit item_name_static --- .../icon_item_24_static/icon_item_24_static.c | 81 + .../icon_item_24_static/icon_item_24_static.h | 29 + .../icon_item_fra_static.c | 135 ++ .../icon_item_fra_static.h | 87 + .../icon_item_ger_static.c | 131 ++ .../icon_item_ger_static.h | 86 + .../icon_item_jpn_static.c | 127 ++ .../icon_item_jpn_static.h | 85 + .../icon_item_nes_static.c | 127 ++ .../icon_item_nes_static.h | 85 + .../item_name_static/item_name_static.c | 1985 +++++++++++++++++ .../item_name_static/item_name_static.h | 513 +++++ assets/xml/textures/item_name_static.xml | 39 +- assets/xml/textures/item_name_static_pal.xml | 44 +- tools/assets/extract/write_source.txt | 6 - 15 files changed, 3514 insertions(+), 46 deletions(-) create mode 100644 assets/textures/icon_item_24_static/icon_item_24_static.c create mode 100644 assets/textures/icon_item_24_static/icon_item_24_static.h create mode 100644 assets/textures/icon_item_fra_static/icon_item_fra_static.c create mode 100644 assets/textures/icon_item_fra_static/icon_item_fra_static.h create mode 100644 assets/textures/icon_item_ger_static/icon_item_ger_static.c create mode 100644 assets/textures/icon_item_ger_static/icon_item_ger_static.h create mode 100644 assets/textures/icon_item_jpn_static/icon_item_jpn_static.c create mode 100644 assets/textures/icon_item_jpn_static/icon_item_jpn_static.h create mode 100644 assets/textures/icon_item_nes_static/icon_item_nes_static.c create mode 100644 assets/textures/icon_item_nes_static/icon_item_nes_static.h create mode 100644 assets/textures/item_name_static/item_name_static.c create mode 100644 assets/textures/item_name_static/item_name_static.h diff --git a/assets/textures/icon_item_24_static/icon_item_24_static.c b/assets/textures/icon_item_24_static/icon_item_24_static.c new file mode 100644 index 0000000000..5afa6764c0 --- /dev/null +++ b/assets/textures/icon_item_24_static/icon_item_24_static.c @@ -0,0 +1,81 @@ +#include "icon_item_24_static.h" + +u64 gQuestIconMedallionForestTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMedallionForestTex.rgba32.inc.c" +}; + +u64 gQuestIconMedallionFireTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMedallionFireTex.rgba32.inc.c" +}; + +u64 gQuestIconMedallionWaterTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMedallionWaterTex.rgba32.inc.c" +}; + +u64 gQuestIconMedallionSpiritTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMedallionSpiritTex.rgba32.inc.c" +}; + +u64 gQuestIconMedallionShadowTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMedallionShadowTex.rgba32.inc.c" +}; + +u64 gQuestIconMedallionLightTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMedallionLightTex.rgba32.inc.c" +}; + +u64 gQuestIconKokiriEmeraldTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconKokiriEmeraldTex.rgba32.inc.c" +}; + +u64 gQuestIconGoronRubyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconGoronRubyTex.rgba32.inc.c" +}; + +u64 gQuestIconZoraSapphireTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconZoraSapphireTex.rgba32.inc.c" +}; + +u64 gQuestIconStoneOfAgonyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconStoneOfAgonyTex.rgba32.inc.c" +}; + +u64 gQuestIconGerudosCardTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconGerudosCardTex.rgba32.inc.c" +}; + +u64 gQuestIconGoldSkulltulaTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconGoldSkulltulaTex.rgba32.inc.c" +}; + +u64 gQuestIconHeartContainerTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconHeartContainerTex.rgba32.inc.c" +}; + +u64 gQuestIconHeartPieceTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconHeartPieceTex.rgba32.inc.c" +}; + +u64 gQuestIconDungeonBossKeyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconDungeonBossKeyTex.rgba32.inc.c" +}; + +u64 gQuestIconDungeonCompassTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconDungeonCompassTex.rgba32.inc.c" +}; + +u64 gQuestIconDungeonMapTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconDungeonMapTex.rgba32.inc.c" +}; + +u64 gQuestIconSmallKeyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconSmallKeyTex.rgba32.inc.c" +}; + +u64 gQuestIconMagicJarSmallTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMagicJarSmallTex.rgba32.inc.c" +}; + +u64 gQuestIconMagicJarBigTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)] = { +#include "assets/textures/icon_item_24_static/gQuestIconMagicJarBigTex.rgba32.inc.c" +}; diff --git a/assets/textures/icon_item_24_static/icon_item_24_static.h b/assets/textures/icon_item_24_static/icon_item_24_static.h new file mode 100644 index 0000000000..dbfa9c40e0 --- /dev/null +++ b/assets/textures/icon_item_24_static/icon_item_24_static.h @@ -0,0 +1,29 @@ +#ifndef ICON_ITEM_24_STATIC_H +#define ICON_ITEM_24_STATIC_H + +#include "ultra64.h" +#include "tex_len.h" +#include "z64interface.h" + +extern u64 gQuestIconMedallionForestTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconMedallionFireTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconMedallionWaterTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconMedallionSpiritTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconMedallionShadowTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconMedallionLightTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconKokiriEmeraldTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconGoronRubyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconZoraSapphireTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconStoneOfAgonyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconGerudosCardTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconGoldSkulltulaTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconHeartContainerTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconHeartPieceTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconDungeonBossKeyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconDungeonCompassTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconDungeonMapTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconSmallKeyTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconMagicJarSmallTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; +extern u64 gQuestIconMagicJarBigTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; + +#endif diff --git a/assets/textures/icon_item_fra_static/icon_item_fra_static.c b/assets/textures/icon_item_fra_static/icon_item_fra_static.c new file mode 100644 index 0000000000..80dae50a8d --- /dev/null +++ b/assets/textures/icon_item_fra_static/icon_item_fra_static.c @@ -0,0 +1,135 @@ +#include "icon_item_fra_static.h" + +u64 gPauseDekuTitleFRATex[TEX_LEN(u64, gPauseDekuTitleFRATex_WIDTH, gPauseDekuTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseDekuTitleFRATex.ia8.inc.c" +}; + +u64 gPauseDodongoTitleFRATex[TEX_LEN(u64, gPauseDodongoTitleFRATex_WIDTH, gPauseDodongoTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseDodongoTitleFRATex.ia8.inc.c" +}; + +u64 gPauseJabuTitleFRATex[TEX_LEN(u64, gPauseJabuTitleFRATex_WIDTH, gPauseJabuTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseJabuTitleFRATex.ia8.inc.c" +}; + +u64 gPauseForestTitleFRATex[TEX_LEN(u64, gPauseForestTitleFRATex_WIDTH, gPauseForestTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseForestTitleFRATex.ia8.inc.c" +}; + +u64 gPauseFireTitleFRATex[TEX_LEN(u64, gPauseFireTitleFRATex_WIDTH, gPauseFireTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseFireTitleFRATex.ia8.inc.c" +}; + +u64 gPauseWaterTitleFRATex[TEX_LEN(u64, gPauseWaterTitleFRATex_WIDTH, gPauseWaterTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseWaterTitleFRATex.ia8.inc.c" +}; + +u64 gPauseSpiritTitleFRATex[TEX_LEN(u64, gPauseSpiritTitleFRATex_WIDTH, gPauseSpiritTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSpiritTitleFRATex.ia8.inc.c" +}; + +u64 gPauseShadowTitleFRATex[TEX_LEN(u64, gPauseShadowTitleFRATex_WIDTH, gPauseShadowTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseShadowTitleFRATex.ia8.inc.c" +}; + +u64 gPauseBotWTitleFRATex[TEX_LEN(u64, gPauseBotWTitleFRATex_WIDTH, gPauseBotWTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseBotWTitleFRATex.ia8.inc.c" +}; + +u64 gPauseIceCavernTitleFRATex[TEX_LEN(u64, gPauseIceCavernTitleFRATex_WIDTH, gPauseIceCavernTitleFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseIceCavernTitleFRATex.ia8.inc.c" +}; + +u64 gPauseToEquipFRATex[TEX_LEN(u64, gPauseToEquipFRATex_WIDTH, gPauseToEquipFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseToEquipFRATex.ia8.inc.c" +}; + +u64 gPauseToDecideFRATex[TEX_LEN(u64, gPauseToDecideFRATex_WIDTH, gPauseToDecideFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseToDecideFRATex.ia8.inc.c" +}; + +u64 gPauseToPlayMelodyFRATex[TEX_LEN(u64, gPauseToPlayMelodyFRATex_WIDTH, gPauseToPlayMelodyFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseToPlayMelodyFRATex.ia8.inc.c" +}; + +u64 gPauseToSelectItemFRATex[TEX_LEN(u64, gPauseToSelectItemFRATex_WIDTH, gPauseToSelectItemFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseToSelectItemFRATex.ia8.inc.c" +}; + +u64 gPauseToMapFRATex[TEX_LEN(u64, gPauseToMapFRATex_WIDTH, gPauseToMapFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseToMapFRATex.ia8.inc.c" +}; + +u64 gPauseToQuestStatusFRATex[TEX_LEN(u64, gPauseToQuestStatusFRATex_WIDTH, gPauseToQuestStatusFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseToQuestStatusFRATex.ia8.inc.c" +}; + +u64 gPauseToEquipmentFRATex[TEX_LEN(u64, gPauseToEquipmentFRATex_WIDTH, gPauseToEquipmentFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseToEquipmentFRATex.ia8.inc.c" +}; + +u64 gPauseSavePromptFRATex[TEX_LEN(u64, gPauseSavePromptFRATex_WIDTH, gPauseSavePromptFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSavePromptFRATex.ia8.inc.c" +}; + +u64 gPauseSaveConfirmationFRATex[TEX_LEN(u64, gPauseSaveConfirmationFRATex_WIDTH, gPauseSaveConfirmationFRATex_HEIGHT, + 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSaveConfirmationFRATex.ia8.inc.c" +}; + +u64 gPauseYesFRATex[TEX_LEN(u64, gPauseYesFRATex_WIDTH, gPauseYesFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseYesFRATex.ia8.inc.c" +}; + +u64 gPauseNoFRATex[TEX_LEN(u64, gPauseNoFRATex_WIDTH, gPauseNoFRATex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseNoFRATex.ia8.inc.c" +}; + +u64 gPauseCurrentPositionFRATex[TEX_LEN(u64, gPauseCurrentPositionFRATex_WIDTH, gPauseCurrentPositionFRATex_HEIGHT, + 4)] = { +#include "assets/textures/icon_item_fra_static/gPauseCurrentPositionFRATex.i4.inc.c" +}; + +u64 gPauseEquipment00FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseEquipment00FRATex.ia8.inc.c" +}; + +u64 gPauseEquipment10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseEquipment10FRATex.ia8.inc.c" +}; + +u64 gPauseEquipment20FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseEquipment20FRATex.ia8.inc.c" +}; + +u64 gPauseSelectItem00FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSelectItem00FRATex.ia8.inc.c" +}; + +u64 gPauseSelectItem10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSelectItem10FRATex.ia8.inc.c" +}; + +u64 gPauseSelectItem20FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSelectItem20FRATex.ia8.inc.c" +}; + +u64 gPauseMap10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseMap10FRATex.ia8.inc.c" +}; + +u64 gPauseQuestStatus10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseQuestStatus10FRATex.ia8.inc.c" +}; + +u64 gPauseSave00FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSave00FRATex.ia8.inc.c" +}; + +u64 gPauseSave10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSave10FRATex.ia8.inc.c" +}; + +u64 gPauseSave20FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_fra_static/gPauseSave20FRATex.ia8.inc.c" +}; diff --git a/assets/textures/icon_item_fra_static/icon_item_fra_static.h b/assets/textures/icon_item_fra_static/icon_item_fra_static.h new file mode 100644 index 0000000000..2a7152a416 --- /dev/null +++ b/assets/textures/icon_item_fra_static/icon_item_fra_static.h @@ -0,0 +1,87 @@ +#ifndef ICON_ITEM_FRA_STATIC_H +#define ICON_ITEM_FRA_STATIC_H + +#include "ultra64.h" +#include "tex_len.h" +#include "src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" + +#define gPauseDekuTitleFRATex_WIDTH 96 +#define gPauseDekuTitleFRATex_HEIGHT 16 +extern u64 gPauseDekuTitleFRATex[TEX_LEN(u64, gPauseDekuTitleFRATex_WIDTH, gPauseDekuTitleFRATex_HEIGHT, 8)]; +#define gPauseDodongoTitleFRATex_WIDTH 96 +#define gPauseDodongoTitleFRATex_HEIGHT 16 +extern u64 gPauseDodongoTitleFRATex[TEX_LEN(u64, gPauseDodongoTitleFRATex_WIDTH, gPauseDodongoTitleFRATex_HEIGHT, 8)]; +#define gPauseJabuTitleFRATex_WIDTH 96 +#define gPauseJabuTitleFRATex_HEIGHT 16 +extern u64 gPauseJabuTitleFRATex[TEX_LEN(u64, gPauseJabuTitleFRATex_WIDTH, gPauseJabuTitleFRATex_HEIGHT, 8)]; +#define gPauseForestTitleFRATex_WIDTH 96 +#define gPauseForestTitleFRATex_HEIGHT 16 +extern u64 gPauseForestTitleFRATex[TEX_LEN(u64, gPauseForestTitleFRATex_WIDTH, gPauseForestTitleFRATex_HEIGHT, 8)]; +#define gPauseFireTitleFRATex_WIDTH 96 +#define gPauseFireTitleFRATex_HEIGHT 16 +extern u64 gPauseFireTitleFRATex[TEX_LEN(u64, gPauseFireTitleFRATex_WIDTH, gPauseFireTitleFRATex_HEIGHT, 8)]; +#define gPauseWaterTitleFRATex_WIDTH 96 +#define gPauseWaterTitleFRATex_HEIGHT 16 +extern u64 gPauseWaterTitleFRATex[TEX_LEN(u64, gPauseWaterTitleFRATex_WIDTH, gPauseWaterTitleFRATex_HEIGHT, 8)]; +#define gPauseSpiritTitleFRATex_WIDTH 96 +#define gPauseSpiritTitleFRATex_HEIGHT 16 +extern u64 gPauseSpiritTitleFRATex[TEX_LEN(u64, gPauseSpiritTitleFRATex_WIDTH, gPauseSpiritTitleFRATex_HEIGHT, 8)]; +#define gPauseShadowTitleFRATex_WIDTH 96 +#define gPauseShadowTitleFRATex_HEIGHT 16 +extern u64 gPauseShadowTitleFRATex[TEX_LEN(u64, gPauseShadowTitleFRATex_WIDTH, gPauseShadowTitleFRATex_HEIGHT, 8)]; +#define gPauseBotWTitleFRATex_WIDTH 96 +#define gPauseBotWTitleFRATex_HEIGHT 16 +extern u64 gPauseBotWTitleFRATex[TEX_LEN(u64, gPauseBotWTitleFRATex_WIDTH, gPauseBotWTitleFRATex_HEIGHT, 8)]; +#define gPauseIceCavernTitleFRATex_WIDTH 96 +#define gPauseIceCavernTitleFRATex_HEIGHT 16 +extern u64 gPauseIceCavernTitleFRATex[TEX_LEN(u64, gPauseIceCavernTitleFRATex_WIDTH, gPauseIceCavernTitleFRATex_HEIGHT, 8)]; +#define gPauseToEquipFRATex_WIDTH 80 +#define gPauseToEquipFRATex_HEIGHT 16 +extern u64 gPauseToEquipFRATex[TEX_LEN(u64, gPauseToEquipFRATex_WIDTH, gPauseToEquipFRATex_HEIGHT, 8)]; +#define gPauseToDecideFRATex_WIDTH 72 +#define gPauseToDecideFRATex_HEIGHT 16 +extern u64 gPauseToDecideFRATex[TEX_LEN(u64, gPauseToDecideFRATex_WIDTH, gPauseToDecideFRATex_HEIGHT, 8)]; +#define gPauseToPlayMelodyFRATex_WIDTH 112 +#define gPauseToPlayMelodyFRATex_HEIGHT 16 +extern u64 gPauseToPlayMelodyFRATex[TEX_LEN(u64, gPauseToPlayMelodyFRATex_WIDTH, gPauseToPlayMelodyFRATex_HEIGHT, 8)]; +#define gPauseToSelectItemFRATex_WIDTH 128 +#define gPauseToSelectItemFRATex_HEIGHT 16 +extern u64 gPauseToSelectItemFRATex[TEX_LEN(u64, gPauseToSelectItemFRATex_WIDTH, gPauseToSelectItemFRATex_HEIGHT, 8)]; +#define gPauseToMapFRATex_WIDTH 128 +#define gPauseToMapFRATex_HEIGHT 16 +extern u64 gPauseToMapFRATex[TEX_LEN(u64, gPauseToMapFRATex_WIDTH, gPauseToMapFRATex_HEIGHT, 8)]; +#define gPauseToQuestStatusFRATex_WIDTH 128 +#define gPauseToQuestStatusFRATex_HEIGHT 16 +extern u64 gPauseToQuestStatusFRATex[TEX_LEN(u64, gPauseToQuestStatusFRATex_WIDTH, gPauseToQuestStatusFRATex_HEIGHT, 8)]; +#define gPauseToEquipmentFRATex_WIDTH 128 +#define gPauseToEquipmentFRATex_HEIGHT 16 +extern u64 gPauseToEquipmentFRATex[TEX_LEN(u64, gPauseToEquipmentFRATex_WIDTH, gPauseToEquipmentFRATex_HEIGHT, 8)]; +#define gPauseSavePromptFRATex_WIDTH 152 +#define gPauseSavePromptFRATex_HEIGHT 16 +extern u64 gPauseSavePromptFRATex[TEX_LEN(u64, gPauseSavePromptFRATex_WIDTH, gPauseSavePromptFRATex_HEIGHT, 8)]; +#define gPauseSaveConfirmationFRATex_WIDTH 152 +#define gPauseSaveConfirmationFRATex_HEIGHT 16 +extern u64 gPauseSaveConfirmationFRATex[TEX_LEN(u64, gPauseSaveConfirmationFRATex_WIDTH, gPauseSaveConfirmationFRATex_HEIGHT, 8)]; +#define gPauseYesFRATex_WIDTH 48 +#define gPauseYesFRATex_HEIGHT 16 +extern u64 gPauseYesFRATex[TEX_LEN(u64, gPauseYesFRATex_WIDTH, gPauseYesFRATex_HEIGHT, 8)]; +#define gPauseNoFRATex_WIDTH 48 +#define gPauseNoFRATex_HEIGHT 16 +extern u64 gPauseNoFRATex[TEX_LEN(u64, gPauseNoFRATex_WIDTH, gPauseNoFRATex_HEIGHT, 8)]; +#define gPauseCurrentPositionFRATex_WIDTH 64 +#define gPauseCurrentPositionFRATex_HEIGHT 8 +extern u64 gPauseCurrentPositionFRATex[TEX_LEN(u64, gPauseCurrentPositionFRATex_WIDTH, gPauseCurrentPositionFRATex_HEIGHT, 4)]; + +extern u64 gPauseEquipment00FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseEquipment10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseEquipment20FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem00FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem20FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseMap10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSave00FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSave10FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSave20FRATex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; + +#endif diff --git a/assets/textures/icon_item_ger_static/icon_item_ger_static.c b/assets/textures/icon_item_ger_static/icon_item_ger_static.c new file mode 100644 index 0000000000..379f7f6816 --- /dev/null +++ b/assets/textures/icon_item_ger_static/icon_item_ger_static.c @@ -0,0 +1,131 @@ +#include "icon_item_ger_static.h" + +u64 gPauseDekuTitleGERTex[TEX_LEN(u64, gPauseDekuTitleGERTex_WIDTH, gPauseDekuTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseDekuTitleGERTex.ia8.inc.c" +}; + +u64 gPauseDodongoTitleGERTex[TEX_LEN(u64, gPauseDodongoTitleGERTex_WIDTH, gPauseDodongoTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseDodongoTitleGERTex.ia8.inc.c" +}; + +u64 gPauseJabuTitleGERTex[TEX_LEN(u64, gPauseJabuTitleGERTex_WIDTH, gPauseJabuTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseJabuTitleGERTex.ia8.inc.c" +}; + +u64 gPauseForestTitleGERTex[TEX_LEN(u64, gPauseForestTitleGERTex_WIDTH, gPauseForestTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseForestTitleGERTex.ia8.inc.c" +}; + +u64 gPauseFireTitleGERTex[TEX_LEN(u64, gPauseFireTitleGERTex_WIDTH, gPauseFireTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseFireTitleGERTex.ia8.inc.c" +}; + +u64 gPauseWaterTitleGERTex[TEX_LEN(u64, gPauseWaterTitleGERTex_WIDTH, gPauseWaterTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseWaterTitleGERTex.ia8.inc.c" +}; + +u64 gPauseSpiritTitleGERTex[TEX_LEN(u64, gPauseSpiritTitleGERTex_WIDTH, gPauseSpiritTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSpiritTitleGERTex.ia8.inc.c" +}; + +u64 gPauseShadowTitleGERTex[TEX_LEN(u64, gPauseShadowTitleGERTex_WIDTH, gPauseShadowTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseShadowTitleGERTex.ia8.inc.c" +}; + +u64 gPauseBotWTitleGERTex[TEX_LEN(u64, gPauseBotWTitleGERTex_WIDTH, gPauseBotWTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseBotWTitleGERTex.ia8.inc.c" +}; + +u64 gPauseIceCavernTitleGERTex[TEX_LEN(u64, gPauseIceCavernTitleGERTex_WIDTH, gPauseIceCavernTitleGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseIceCavernTitleGERTex.ia8.inc.c" +}; + +u64 gPauseToEquipGERTex[TEX_LEN(u64, gPauseToEquipGERTex_WIDTH, gPauseToEquipGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseToEquipGERTex.ia8.inc.c" +}; + +u64 gPauseToDecideGERTex[TEX_LEN(u64, gPauseToDecideGERTex_WIDTH, gPauseToDecideGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseToDecideGERTex.ia8.inc.c" +}; + +u64 gPauseToPlayMelodyGERTex[TEX_LEN(u64, gPauseToPlayMelodyGERTex_WIDTH, gPauseToPlayMelodyGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseToPlayMelodyGERTex.ia8.inc.c" +}; + +u64 gPauseToSelectItemGERTex[TEX_LEN(u64, gPauseToSelectItemGERTex_WIDTH, gPauseToSelectItemGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseToSelectItemGERTex.ia8.inc.c" +}; + +u64 gPauseToMapGERTex[TEX_LEN(u64, gPauseToMapGERTex_WIDTH, gPauseToMapGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseToMapGERTex.ia8.inc.c" +}; + +u64 gPauseToQuestStatusGERTex[TEX_LEN(u64, gPauseToQuestStatusGERTex_WIDTH, gPauseToQuestStatusGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseToQuestStatusGERTex.ia8.inc.c" +}; + +u64 gPauseToEquipmentGERTex[TEX_LEN(u64, gPauseToEquipmentGERTex_WIDTH, gPauseToEquipmentGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseToEquipmentGERTex.ia8.inc.c" +}; + +u64 gPauseSavePromptGERTex[TEX_LEN(u64, gPauseSavePromptGERTex_WIDTH, gPauseSavePromptGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSavePromptGERTex.ia8.inc.c" +}; + +u64 gPauseSaveConfirmationGERTex[TEX_LEN(u64, gPauseSaveConfirmationGERTex_WIDTH, gPauseSaveConfirmationGERTex_HEIGHT, + 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSaveConfirmationGERTex.ia8.inc.c" +}; + +u64 gPauseYesGERTex[TEX_LEN(u64, gPauseYesGERTex_WIDTH, gPauseYesGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseYesGERTex.ia8.inc.c" +}; + +u64 gPauseNoGERTex[TEX_LEN(u64, gPauseNoGERTex_WIDTH, gPauseNoGERTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseNoGERTex.ia8.inc.c" +}; + +u64 gPauseCurrentPositionGERTex[TEX_LEN(u64, gPauseCurrentPositionGERTex_WIDTH, gPauseCurrentPositionGERTex_HEIGHT, + 4)] = { +#include "assets/textures/icon_item_ger_static/gPauseCurrentPositionGERTex.i4.inc.c" +}; + +u64 gPauseEquipment00GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseEquipment00GERTex.ia8.inc.c" +}; + +u64 gPauseEquipment10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseEquipment10GERTex.ia8.inc.c" +}; + +u64 gPauseEquipment20GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseEquipment20GERTex.ia8.inc.c" +}; + +u64 gPauseSelectItem00GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSelectItem00GERTex.ia8.inc.c" +}; + +u64 gPauseSelectItem10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSelectItem10GERTex.ia8.inc.c" +}; + +u64 gPauseSelectItem20GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSelectItem20GERTex.ia8.inc.c" +}; + +u64 gPauseMap10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseMap10GERTex.ia8.inc.c" +}; + +u64 gPauseQuestStatus10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseQuestStatus10GERTex.ia8.inc.c" +}; + +u64 gPauseSave10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSave10GERTex.ia8.inc.c" +}; + +u64 gPauseSave20GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_ger_static/gPauseSave20GERTex.ia8.inc.c" +}; diff --git a/assets/textures/icon_item_ger_static/icon_item_ger_static.h b/assets/textures/icon_item_ger_static/icon_item_ger_static.h new file mode 100644 index 0000000000..bd69237b9a --- /dev/null +++ b/assets/textures/icon_item_ger_static/icon_item_ger_static.h @@ -0,0 +1,86 @@ +#ifndef ICON_ITEM_GER_STATIC_H +#define ICON_ITEM_GER_STATIC_H + +#include "ultra64.h" +#include "tex_len.h" +#include "src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" + +#define gPauseDekuTitleGERTex_WIDTH 96 +#define gPauseDekuTitleGERTex_HEIGHT 16 +extern u64 gPauseDekuTitleGERTex[TEX_LEN(u64, gPauseDekuTitleGERTex_WIDTH, gPauseDekuTitleGERTex_HEIGHT, 8)]; +#define gPauseDodongoTitleGERTex_WIDTH 96 +#define gPauseDodongoTitleGERTex_HEIGHT 16 +extern u64 gPauseDodongoTitleGERTex[TEX_LEN(u64, gPauseDodongoTitleGERTex_WIDTH, gPauseDodongoTitleGERTex_HEIGHT, 8)]; +#define gPauseJabuTitleGERTex_WIDTH 96 +#define gPauseJabuTitleGERTex_HEIGHT 16 +extern u64 gPauseJabuTitleGERTex[TEX_LEN(u64, gPauseJabuTitleGERTex_WIDTH, gPauseJabuTitleGERTex_HEIGHT, 8)]; +#define gPauseForestTitleGERTex_WIDTH 96 +#define gPauseForestTitleGERTex_HEIGHT 16 +extern u64 gPauseForestTitleGERTex[TEX_LEN(u64, gPauseForestTitleGERTex_WIDTH, gPauseForestTitleGERTex_HEIGHT, 8)]; +#define gPauseFireTitleGERTex_WIDTH 96 +#define gPauseFireTitleGERTex_HEIGHT 16 +extern u64 gPauseFireTitleGERTex[TEX_LEN(u64, gPauseFireTitleGERTex_WIDTH, gPauseFireTitleGERTex_HEIGHT, 8)]; +#define gPauseWaterTitleGERTex_WIDTH 96 +#define gPauseWaterTitleGERTex_HEIGHT 16 +extern u64 gPauseWaterTitleGERTex[TEX_LEN(u64, gPauseWaterTitleGERTex_WIDTH, gPauseWaterTitleGERTex_HEIGHT, 8)]; +#define gPauseSpiritTitleGERTex_WIDTH 96 +#define gPauseSpiritTitleGERTex_HEIGHT 16 +extern u64 gPauseSpiritTitleGERTex[TEX_LEN(u64, gPauseSpiritTitleGERTex_WIDTH, gPauseSpiritTitleGERTex_HEIGHT, 8)]; +#define gPauseShadowTitleGERTex_WIDTH 96 +#define gPauseShadowTitleGERTex_HEIGHT 16 +extern u64 gPauseShadowTitleGERTex[TEX_LEN(u64, gPauseShadowTitleGERTex_WIDTH, gPauseShadowTitleGERTex_HEIGHT, 8)]; +#define gPauseBotWTitleGERTex_WIDTH 96 +#define gPauseBotWTitleGERTex_HEIGHT 16 +extern u64 gPauseBotWTitleGERTex[TEX_LEN(u64, gPauseBotWTitleGERTex_WIDTH, gPauseBotWTitleGERTex_HEIGHT, 8)]; +#define gPauseIceCavernTitleGERTex_WIDTH 96 +#define gPauseIceCavernTitleGERTex_HEIGHT 16 +extern u64 gPauseIceCavernTitleGERTex[TEX_LEN(u64, gPauseIceCavernTitleGERTex_WIDTH, gPauseIceCavernTitleGERTex_HEIGHT, 8)]; +#define gPauseToEquipGERTex_WIDTH 88 +#define gPauseToEquipGERTex_HEIGHT 16 +extern u64 gPauseToEquipGERTex[TEX_LEN(u64, gPauseToEquipGERTex_WIDTH, gPauseToEquipGERTex_HEIGHT, 8)]; +#define gPauseToDecideGERTex_WIDTH 88 +#define gPauseToDecideGERTex_HEIGHT 16 +extern u64 gPauseToDecideGERTex[TEX_LEN(u64, gPauseToDecideGERTex_WIDTH, gPauseToDecideGERTex_HEIGHT, 8)]; +#define gPauseToPlayMelodyGERTex_WIDTH 104 +#define gPauseToPlayMelodyGERTex_HEIGHT 16 +extern u64 gPauseToPlayMelodyGERTex[TEX_LEN(u64, gPauseToPlayMelodyGERTex_WIDTH, gPauseToPlayMelodyGERTex_HEIGHT, 8)]; +#define gPauseToSelectItemGERTex_WIDTH 128 +#define gPauseToSelectItemGERTex_HEIGHT 16 +extern u64 gPauseToSelectItemGERTex[TEX_LEN(u64, gPauseToSelectItemGERTex_WIDTH, gPauseToSelectItemGERTex_HEIGHT, 8)]; +#define gPauseToMapGERTex_WIDTH 128 +#define gPauseToMapGERTex_HEIGHT 16 +extern u64 gPauseToMapGERTex[TEX_LEN(u64, gPauseToMapGERTex_WIDTH, gPauseToMapGERTex_HEIGHT, 8)]; +#define gPauseToQuestStatusGERTex_WIDTH 128 +#define gPauseToQuestStatusGERTex_HEIGHT 16 +extern u64 gPauseToQuestStatusGERTex[TEX_LEN(u64, gPauseToQuestStatusGERTex_WIDTH, gPauseToQuestStatusGERTex_HEIGHT, 8)]; +#define gPauseToEquipmentGERTex_WIDTH 128 +#define gPauseToEquipmentGERTex_HEIGHT 16 +extern u64 gPauseToEquipmentGERTex[TEX_LEN(u64, gPauseToEquipmentGERTex_WIDTH, gPauseToEquipmentGERTex_HEIGHT, 8)]; +#define gPauseSavePromptGERTex_WIDTH 152 +#define gPauseSavePromptGERTex_HEIGHT 16 +extern u64 gPauseSavePromptGERTex[TEX_LEN(u64, gPauseSavePromptGERTex_WIDTH, gPauseSavePromptGERTex_HEIGHT, 8)]; +#define gPauseSaveConfirmationGERTex_WIDTH 152 +#define gPauseSaveConfirmationGERTex_HEIGHT 16 +extern u64 gPauseSaveConfirmationGERTex[TEX_LEN(u64, gPauseSaveConfirmationGERTex_WIDTH, gPauseSaveConfirmationGERTex_HEIGHT, 8)]; +#define gPauseYesGERTex_WIDTH 48 +#define gPauseYesGERTex_HEIGHT 16 +extern u64 gPauseYesGERTex[TEX_LEN(u64, gPauseYesGERTex_WIDTH, gPauseYesGERTex_HEIGHT, 8)]; +#define gPauseNoGERTex_WIDTH 48 +#define gPauseNoGERTex_HEIGHT 16 +extern u64 gPauseNoGERTex[TEX_LEN(u64, gPauseNoGERTex_WIDTH, gPauseNoGERTex_HEIGHT, 8)]; +#define gPauseCurrentPositionGERTex_WIDTH 64 +#define gPauseCurrentPositionGERTex_HEIGHT 8 +extern u64 gPauseCurrentPositionGERTex[TEX_LEN(u64, gPauseCurrentPositionGERTex_WIDTH, gPauseCurrentPositionGERTex_HEIGHT, 4)]; + +extern u64 gPauseEquipment00GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseEquipment10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseEquipment20GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem00GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem20GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseMap10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSave10GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSave20GERTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; + +#endif diff --git a/assets/textures/icon_item_jpn_static/icon_item_jpn_static.c b/assets/textures/icon_item_jpn_static/icon_item_jpn_static.c new file mode 100644 index 0000000000..92d56b0724 --- /dev/null +++ b/assets/textures/icon_item_jpn_static/icon_item_jpn_static.c @@ -0,0 +1,127 @@ +#include "icon_item_jpn_static.h" + +u64 gPauseDekuTitleJPNTex[TEX_LEN(u64, gPauseDekuTitleJPNTex_WIDTH, gPauseDekuTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseDekuTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseDodongoTitleJPNTex[TEX_LEN(u64, gPauseDodongoTitleJPNTex_WIDTH, gPauseDodongoTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseDodongoTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseJabuTitleJPNTex[TEX_LEN(u64, gPauseJabuTitleJPNTex_WIDTH, gPauseJabuTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseJabuTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseForestTitleJPNTex[TEX_LEN(u64, gPauseForestTitleJPNTex_WIDTH, gPauseForestTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseForestTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseFireTitleJPNTex[TEX_LEN(u64, gPauseFireTitleJPNTex_WIDTH, gPauseFireTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseFireTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseWaterTitleJPNTex[TEX_LEN(u64, gPauseWaterTitleJPNTex_WIDTH, gPauseWaterTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseWaterTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseSpiritTitleJPNTex[TEX_LEN(u64, gPauseSpiritTitleJPNTex_WIDTH, gPauseSpiritTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseSpiritTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseShadowTitleJPNTex[TEX_LEN(u64, gPauseShadowTitleJPNTex_WIDTH, gPauseShadowTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseShadowTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseBotWTitleJPNTex[TEX_LEN(u64, gPauseBotWTitleJPNTex_WIDTH, gPauseBotWTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseBotWTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseIceCavernTitleJPNTex[TEX_LEN(u64, gPauseIceCavernTitleJPNTex_WIDTH, gPauseIceCavernTitleJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseIceCavernTitleJPNTex.ia8.inc.c" +}; + +u64 gPauseToEquipJPNTex[TEX_LEN(u64, gPauseToEquipJPNTex_WIDTH, gPauseToEquipJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseToEquipJPNTex.ia8.inc.c" +}; + +u64 gPauseToDecideJPNTex[TEX_LEN(u64, gPauseToDecideJPNTex_WIDTH, gPauseToDecideJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseToDecideJPNTex.ia8.inc.c" +}; + +u64 gPauseToPlayMelodyJPNTex[TEX_LEN(u64, gPauseToPlayMelodyJPNTex_WIDTH, gPauseToPlayMelodyJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseToPlayMelodyJPNTex.ia8.inc.c" +}; + +u64 gPauseToSelectItemJPNTex[TEX_LEN(u64, gPauseToSelectItemJPNTex_WIDTH, gPauseToSelectItemJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseToSelectItemJPNTex.ia8.inc.c" +}; + +u64 gPauseToMapJPNTex[TEX_LEN(u64, gPauseToMapJPNTex_WIDTH, gPauseToMapJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseToMapJPNTex.ia8.inc.c" +}; + +u64 gPauseToQuestStatusJPNTex[TEX_LEN(u64, gPauseToQuestStatusJPNTex_WIDTH, gPauseToQuestStatusJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseToQuestStatusJPNTex.ia8.inc.c" +}; + +u64 gPauseToEquipmentJPNTex[TEX_LEN(u64, gPauseToEquipmentJPNTex_WIDTH, gPauseToEquipmentJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseToEquipmentJPNTex.ia8.inc.c" +}; + +u64 gPauseSavePromptJPNTex[TEX_LEN(u64, gPauseSavePromptJPNTex_WIDTH, gPauseSavePromptJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseSavePromptJPNTex.ia8.inc.c" +}; + +u64 gPauseSaveConfirmationJPNTex[TEX_LEN(u64, gPauseSaveConfirmationJPNTex_WIDTH, gPauseSaveConfirmationJPNTex_HEIGHT, + 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseSaveConfirmationJPNTex.ia8.inc.c" +}; + +u64 gPauseYesJPNTex[TEX_LEN(u64, gPauseYesJPNTex_WIDTH, gPauseYesJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseYesJPNTex.ia8.inc.c" +}; + +u64 gPauseNoJPNTex[TEX_LEN(u64, gPauseNoJPNTex_WIDTH, gPauseNoJPNTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseNoJPNTex.ia8.inc.c" +}; + +u64 gPauseCurrentPositionJPNTex[TEX_LEN(u64, gPauseCurrentPositionJPNTex_WIDTH, gPauseCurrentPositionJPNTex_HEIGHT, + 4)] = { +#include "assets/textures/icon_item_jpn_static/gPauseCurrentPositionJPNTex.i4.inc.c" +}; + +u64 gPauseEquipment10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseEquipment10JPNTex.ia8.inc.c" +}; + +u64 gPauseSelectItem00JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseSelectItem00JPNTex.ia8.inc.c" +}; + +u64 gPauseSelectItem10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseSelectItem10JPNTex.ia8.inc.c" +}; + +u64 gPauseSelectItem20JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseSelectItem20JPNTex.ia8.inc.c" +}; + +u64 gPauseMap10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseMap10JPNTex.ia8.inc.c" +}; + +u64 gPauseQuestStatus00JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseQuestStatus00JPNTex.ia8.inc.c" +}; + +u64 gPauseQuestStatus10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseQuestStatus10JPNTex.ia8.inc.c" +}; + +u64 gPauseQuestStatus20JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseQuestStatus20JPNTex.ia8.inc.c" +}; + +u64 gPauseSave10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_jpn_static/gPauseSave10JPNTex.ia8.inc.c" +}; diff --git a/assets/textures/icon_item_jpn_static/icon_item_jpn_static.h b/assets/textures/icon_item_jpn_static/icon_item_jpn_static.h new file mode 100644 index 0000000000..bd21c0a74e --- /dev/null +++ b/assets/textures/icon_item_jpn_static/icon_item_jpn_static.h @@ -0,0 +1,85 @@ +#ifndef ICON_ITEM_JPN_STATIC_H +#define ICON_ITEM_JPN_STATIC_H + +#include "ultra64.h" +#include "tex_len.h" +#include "src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" + +#define gPauseDekuTitleJPNTex_WIDTH 96 +#define gPauseDekuTitleJPNTex_HEIGHT 16 +extern u64 gPauseDekuTitleJPNTex[TEX_LEN(u64, gPauseDekuTitleJPNTex_WIDTH, gPauseDekuTitleJPNTex_HEIGHT, 8)]; +#define gPauseDodongoTitleJPNTex_WIDTH 96 +#define gPauseDodongoTitleJPNTex_HEIGHT 16 +extern u64 gPauseDodongoTitleJPNTex[TEX_LEN(u64, gPauseDodongoTitleJPNTex_WIDTH, gPauseDodongoTitleJPNTex_HEIGHT, 8)]; +#define gPauseJabuTitleJPNTex_WIDTH 96 +#define gPauseJabuTitleJPNTex_HEIGHT 16 +extern u64 gPauseJabuTitleJPNTex[TEX_LEN(u64, gPauseJabuTitleJPNTex_WIDTH, gPauseJabuTitleJPNTex_HEIGHT, 8)]; +#define gPauseForestTitleJPNTex_WIDTH 96 +#define gPauseForestTitleJPNTex_HEIGHT 16 +extern u64 gPauseForestTitleJPNTex[TEX_LEN(u64, gPauseForestTitleJPNTex_WIDTH, gPauseForestTitleJPNTex_HEIGHT, 8)]; +#define gPauseFireTitleJPNTex_WIDTH 96 +#define gPauseFireTitleJPNTex_HEIGHT 16 +extern u64 gPauseFireTitleJPNTex[TEX_LEN(u64, gPauseFireTitleJPNTex_WIDTH, gPauseFireTitleJPNTex_HEIGHT, 8)]; +#define gPauseWaterTitleJPNTex_WIDTH 96 +#define gPauseWaterTitleJPNTex_HEIGHT 16 +extern u64 gPauseWaterTitleJPNTex[TEX_LEN(u64, gPauseWaterTitleJPNTex_WIDTH, gPauseWaterTitleJPNTex_HEIGHT, 8)]; +#define gPauseSpiritTitleJPNTex_WIDTH 96 +#define gPauseSpiritTitleJPNTex_HEIGHT 16 +extern u64 gPauseSpiritTitleJPNTex[TEX_LEN(u64, gPauseSpiritTitleJPNTex_WIDTH, gPauseSpiritTitleJPNTex_HEIGHT, 8)]; +#define gPauseShadowTitleJPNTex_WIDTH 96 +#define gPauseShadowTitleJPNTex_HEIGHT 16 +extern u64 gPauseShadowTitleJPNTex[TEX_LEN(u64, gPauseShadowTitleJPNTex_WIDTH, gPauseShadowTitleJPNTex_HEIGHT, 8)]; +#define gPauseBotWTitleJPNTex_WIDTH 96 +#define gPauseBotWTitleJPNTex_HEIGHT 16 +extern u64 gPauseBotWTitleJPNTex[TEX_LEN(u64, gPauseBotWTitleJPNTex_WIDTH, gPauseBotWTitleJPNTex_HEIGHT, 8)]; +#define gPauseIceCavernTitleJPNTex_WIDTH 96 +#define gPauseIceCavernTitleJPNTex_HEIGHT 16 +extern u64 gPauseIceCavernTitleJPNTex[TEX_LEN(u64, gPauseIceCavernTitleJPNTex_WIDTH, gPauseIceCavernTitleJPNTex_HEIGHT, 8)]; +#define gPauseToEquipJPNTex_WIDTH 56 +#define gPauseToEquipJPNTex_HEIGHT 16 +extern u64 gPauseToEquipJPNTex[TEX_LEN(u64, gPauseToEquipJPNTex_WIDTH, gPauseToEquipJPNTex_HEIGHT, 8)]; +#define gPauseToDecideJPNTex_WIDTH 48 +#define gPauseToDecideJPNTex_HEIGHT 16 +extern u64 gPauseToDecideJPNTex[TEX_LEN(u64, gPauseToDecideJPNTex_WIDTH, gPauseToDecideJPNTex_HEIGHT, 8)]; +#define gPauseToPlayMelodyJPNTex_WIDTH 96 +#define gPauseToPlayMelodyJPNTex_HEIGHT 16 +extern u64 gPauseToPlayMelodyJPNTex[TEX_LEN(u64, gPauseToPlayMelodyJPNTex_WIDTH, gPauseToPlayMelodyJPNTex_HEIGHT, 8)]; +#define gPauseToSelectItemJPNTex_WIDTH 128 +#define gPauseToSelectItemJPNTex_HEIGHT 16 +extern u64 gPauseToSelectItemJPNTex[TEX_LEN(u64, gPauseToSelectItemJPNTex_WIDTH, gPauseToSelectItemJPNTex_HEIGHT, 8)]; +#define gPauseToMapJPNTex_WIDTH 128 +#define gPauseToMapJPNTex_HEIGHT 16 +extern u64 gPauseToMapJPNTex[TEX_LEN(u64, gPauseToMapJPNTex_WIDTH, gPauseToMapJPNTex_HEIGHT, 8)]; +#define gPauseToQuestStatusJPNTex_WIDTH 128 +#define gPauseToQuestStatusJPNTex_HEIGHT 16 +extern u64 gPauseToQuestStatusJPNTex[TEX_LEN(u64, gPauseToQuestStatusJPNTex_WIDTH, gPauseToQuestStatusJPNTex_HEIGHT, 8)]; +#define gPauseToEquipmentJPNTex_WIDTH 128 +#define gPauseToEquipmentJPNTex_HEIGHT 16 +extern u64 gPauseToEquipmentJPNTex[TEX_LEN(u64, gPauseToEquipmentJPNTex_WIDTH, gPauseToEquipmentJPNTex_HEIGHT, 8)]; +#define gPauseSavePromptJPNTex_WIDTH 152 +#define gPauseSavePromptJPNTex_HEIGHT 16 +extern u64 gPauseSavePromptJPNTex[TEX_LEN(u64, gPauseSavePromptJPNTex_WIDTH, gPauseSavePromptJPNTex_HEIGHT, 8)]; +#define gPauseSaveConfirmationJPNTex_WIDTH 152 +#define gPauseSaveConfirmationJPNTex_HEIGHT 16 +extern u64 gPauseSaveConfirmationJPNTex[TEX_LEN(u64, gPauseSaveConfirmationJPNTex_WIDTH, gPauseSaveConfirmationJPNTex_HEIGHT, 8)]; +#define gPauseYesJPNTex_WIDTH 48 +#define gPauseYesJPNTex_HEIGHT 16 +extern u64 gPauseYesJPNTex[TEX_LEN(u64, gPauseYesJPNTex_WIDTH, gPauseYesJPNTex_HEIGHT, 8)]; +#define gPauseNoJPNTex_WIDTH 48 +#define gPauseNoJPNTex_HEIGHT 16 +extern u64 gPauseNoJPNTex[TEX_LEN(u64, gPauseNoJPNTex_WIDTH, gPauseNoJPNTex_HEIGHT, 8)]; +#define gPauseCurrentPositionJPNTex_WIDTH 64 +#define gPauseCurrentPositionJPNTex_HEIGHT 8 +extern u64 gPauseCurrentPositionJPNTex[TEX_LEN(u64, gPauseCurrentPositionJPNTex_WIDTH, gPauseCurrentPositionJPNTex_HEIGHT, 4)]; + +extern u64 gPauseEquipment10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem00JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem20JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseMap10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus00JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus20JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSave10JPNTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; + +#endif diff --git a/assets/textures/icon_item_nes_static/icon_item_nes_static.c b/assets/textures/icon_item_nes_static/icon_item_nes_static.c new file mode 100644 index 0000000000..5e84c69162 --- /dev/null +++ b/assets/textures/icon_item_nes_static/icon_item_nes_static.c @@ -0,0 +1,127 @@ +#include "icon_item_nes_static.h" + +u64 gPauseDekuTitleENGTex[TEX_LEN(u64, gPauseDekuTitleENGTex_WIDTH, gPauseDekuTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseDekuTitleENGTex.ia8.inc.c" +}; + +u64 gPauseDodongoTitleENGTex[TEX_LEN(u64, gPauseDodongoTitleENGTex_WIDTH, gPauseDodongoTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseDodongoTitleENGTex.ia8.inc.c" +}; + +u64 gPauseJabuTitleENGTex[TEX_LEN(u64, gPauseJabuTitleENGTex_WIDTH, gPauseJabuTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseJabuTitleENGTex.ia8.inc.c" +}; + +u64 gPauseForestTitleENGTex[TEX_LEN(u64, gPauseForestTitleENGTex_WIDTH, gPauseForestTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseForestTitleENGTex.ia8.inc.c" +}; + +u64 gPauseFireTitleENGTex[TEX_LEN(u64, gPauseFireTitleENGTex_WIDTH, gPauseFireTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseFireTitleENGTex.ia8.inc.c" +}; + +u64 gPauseWaterTitleENGTex[TEX_LEN(u64, gPauseWaterTitleENGTex_WIDTH, gPauseWaterTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseWaterTitleENGTex.ia8.inc.c" +}; + +u64 gPauseSpiritTitleENGTex[TEX_LEN(u64, gPauseSpiritTitleENGTex_WIDTH, gPauseSpiritTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseSpiritTitleENGTex.ia8.inc.c" +}; + +u64 gPauseShadowTitleENGTex[TEX_LEN(u64, gPauseShadowTitleENGTex_WIDTH, gPauseShadowTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseShadowTitleENGTex.ia8.inc.c" +}; + +u64 gPauseBotWTitleENGTex[TEX_LEN(u64, gPauseBotWTitleENGTex_WIDTH, gPauseBotWTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseBotWTitleENGTex.ia8.inc.c" +}; + +u64 gPauseIceCavernTitleENGTex[TEX_LEN(u64, gPauseIceCavernTitleENGTex_WIDTH, gPauseIceCavernTitleENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseIceCavernTitleENGTex.ia8.inc.c" +}; + +u64 gPauseToEquipENGTex[TEX_LEN(u64, gPauseToEquipENGTex_WIDTH, gPauseToEquipENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseToEquipENGTex.ia8.inc.c" +}; + +u64 gPauseToDecideENGTex[TEX_LEN(u64, gPauseToDecideENGTex_WIDTH, gPauseToDecideENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseToDecideENGTex.ia8.inc.c" +}; + +u64 gPauseToPlayMelodyENGTex[TEX_LEN(u64, gPauseToPlayMelodyENGTex_WIDTH, gPauseToPlayMelodyENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseToPlayMelodyENGTex.ia8.inc.c" +}; + +u64 gPauseToSelectItemENGTex[TEX_LEN(u64, gPauseToSelectItemENGTex_WIDTH, gPauseToSelectItemENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseToSelectItemENGTex.ia8.inc.c" +}; + +u64 gPauseToMapENGTex[TEX_LEN(u64, gPauseToMapENGTex_WIDTH, gPauseToMapENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseToMapENGTex.ia8.inc.c" +}; + +u64 gPauseToQuestStatusENGTex[TEX_LEN(u64, gPauseToQuestStatusENGTex_WIDTH, gPauseToQuestStatusENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseToQuestStatusENGTex.ia8.inc.c" +}; + +u64 gPauseToEquipmentENGTex[TEX_LEN(u64, gPauseToEquipmentENGTex_WIDTH, gPauseToEquipmentENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseToEquipmentENGTex.ia8.inc.c" +}; + +u64 gPauseSavePromptENGTex[TEX_LEN(u64, gPauseSavePromptENGTex_WIDTH, gPauseSavePromptENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseSavePromptENGTex.ia8.inc.c" +}; + +u64 gPauseSaveConfirmationENGTex[TEX_LEN(u64, gPauseSaveConfirmationENGTex_WIDTH, gPauseSaveConfirmationENGTex_HEIGHT, + 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseSaveConfirmationENGTex.ia8.inc.c" +}; + +u64 gPauseYesENGTex[TEX_LEN(u64, gPauseYesENGTex_WIDTH, gPauseYesENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseYesENGTex.ia8.inc.c" +}; + +u64 gPauseNoENGTex[TEX_LEN(u64, gPauseNoENGTex_WIDTH, gPauseNoENGTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseNoENGTex.ia8.inc.c" +}; + +u64 gPauseCurrentPositionENGTex[TEX_LEN(u64, gPauseCurrentPositionENGTex_WIDTH, gPauseCurrentPositionENGTex_HEIGHT, + 4)] = { +#include "assets/textures/icon_item_nes_static/gPauseCurrentPositionENGTex.i4.inc.c" +}; + +u64 gPauseEquipment10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseEquipment10ENGTex.ia8.inc.c" +}; + +u64 gPauseSelectItem00ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseSelectItem00ENGTex.ia8.inc.c" +}; + +u64 gPauseSelectItem10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseSelectItem10ENGTex.ia8.inc.c" +}; + +u64 gPauseSelectItem20ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseSelectItem20ENGTex.ia8.inc.c" +}; + +u64 gPauseMap10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseMap10ENGTex.ia8.inc.c" +}; + +u64 gPauseQuestStatus00ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseQuestStatus00ENGTex.ia8.inc.c" +}; + +u64 gPauseQuestStatus10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseQuestStatus10ENGTex.ia8.inc.c" +}; + +u64 gPauseQuestStatus20ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseQuestStatus20ENGTex.ia8.inc.c" +}; + +u64 gPauseSave10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)] = { +#include "assets/textures/icon_item_nes_static/gPauseSave10ENGTex.ia8.inc.c" +}; diff --git a/assets/textures/icon_item_nes_static/icon_item_nes_static.h b/assets/textures/icon_item_nes_static/icon_item_nes_static.h new file mode 100644 index 0000000000..007bebf3bc --- /dev/null +++ b/assets/textures/icon_item_nes_static/icon_item_nes_static.h @@ -0,0 +1,85 @@ +#ifndef ICON_ITEM_NES_STATIC_H +#define ICON_ITEM_NES_STATIC_H + +#include "ultra64.h" +#include "tex_len.h" +#include "src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" + +#define gPauseDekuTitleENGTex_WIDTH 96 +#define gPauseDekuTitleENGTex_HEIGHT 16 +extern u64 gPauseDekuTitleENGTex[TEX_LEN(u64, gPauseDekuTitleENGTex_WIDTH, gPauseDekuTitleENGTex_HEIGHT, 8)]; +#define gPauseDodongoTitleENGTex_WIDTH 96 +#define gPauseDodongoTitleENGTex_HEIGHT 16 +extern u64 gPauseDodongoTitleENGTex[TEX_LEN(u64, gPauseDodongoTitleENGTex_WIDTH, gPauseDodongoTitleENGTex_HEIGHT, 8)]; +#define gPauseJabuTitleENGTex_WIDTH 96 +#define gPauseJabuTitleENGTex_HEIGHT 16 +extern u64 gPauseJabuTitleENGTex[TEX_LEN(u64, gPauseJabuTitleENGTex_WIDTH, gPauseJabuTitleENGTex_HEIGHT, 8)]; +#define gPauseForestTitleENGTex_WIDTH 96 +#define gPauseForestTitleENGTex_HEIGHT 16 +extern u64 gPauseForestTitleENGTex[TEX_LEN(u64, gPauseForestTitleENGTex_WIDTH, gPauseForestTitleENGTex_HEIGHT, 8)]; +#define gPauseFireTitleENGTex_WIDTH 96 +#define gPauseFireTitleENGTex_HEIGHT 16 +extern u64 gPauseFireTitleENGTex[TEX_LEN(u64, gPauseFireTitleENGTex_WIDTH, gPauseFireTitleENGTex_HEIGHT, 8)]; +#define gPauseWaterTitleENGTex_WIDTH 96 +#define gPauseWaterTitleENGTex_HEIGHT 16 +extern u64 gPauseWaterTitleENGTex[TEX_LEN(u64, gPauseWaterTitleENGTex_WIDTH, gPauseWaterTitleENGTex_HEIGHT, 8)]; +#define gPauseSpiritTitleENGTex_WIDTH 96 +#define gPauseSpiritTitleENGTex_HEIGHT 16 +extern u64 gPauseSpiritTitleENGTex[TEX_LEN(u64, gPauseSpiritTitleENGTex_WIDTH, gPauseSpiritTitleENGTex_HEIGHT, 8)]; +#define gPauseShadowTitleENGTex_WIDTH 96 +#define gPauseShadowTitleENGTex_HEIGHT 16 +extern u64 gPauseShadowTitleENGTex[TEX_LEN(u64, gPauseShadowTitleENGTex_WIDTH, gPauseShadowTitleENGTex_HEIGHT, 8)]; +#define gPauseBotWTitleENGTex_WIDTH 96 +#define gPauseBotWTitleENGTex_HEIGHT 16 +extern u64 gPauseBotWTitleENGTex[TEX_LEN(u64, gPauseBotWTitleENGTex_WIDTH, gPauseBotWTitleENGTex_HEIGHT, 8)]; +#define gPauseIceCavernTitleENGTex_WIDTH 96 +#define gPauseIceCavernTitleENGTex_HEIGHT 16 +extern u64 gPauseIceCavernTitleENGTex[TEX_LEN(u64, gPauseIceCavernTitleENGTex_WIDTH, gPauseIceCavernTitleENGTex_HEIGHT, 8)]; +#define gPauseToEquipENGTex_WIDTH 56 +#define gPauseToEquipENGTex_HEIGHT 16 +extern u64 gPauseToEquipENGTex[TEX_LEN(u64, gPauseToEquipENGTex_WIDTH, gPauseToEquipENGTex_HEIGHT, 8)]; +#define gPauseToDecideENGTex_WIDTH 64 +#define gPauseToDecideENGTex_HEIGHT 16 +extern u64 gPauseToDecideENGTex[TEX_LEN(u64, gPauseToDecideENGTex_WIDTH, gPauseToDecideENGTex_HEIGHT, 8)]; +#define gPauseToPlayMelodyENGTex_WIDTH 80 +#define gPauseToPlayMelodyENGTex_HEIGHT 16 +extern u64 gPauseToPlayMelodyENGTex[TEX_LEN(u64, gPauseToPlayMelodyENGTex_WIDTH, gPauseToPlayMelodyENGTex_HEIGHT, 8)]; +#define gPauseToSelectItemENGTex_WIDTH 128 +#define gPauseToSelectItemENGTex_HEIGHT 16 +extern u64 gPauseToSelectItemENGTex[TEX_LEN(u64, gPauseToSelectItemENGTex_WIDTH, gPauseToSelectItemENGTex_HEIGHT, 8)]; +#define gPauseToMapENGTex_WIDTH 128 +#define gPauseToMapENGTex_HEIGHT 16 +extern u64 gPauseToMapENGTex[TEX_LEN(u64, gPauseToMapENGTex_WIDTH, gPauseToMapENGTex_HEIGHT, 8)]; +#define gPauseToQuestStatusENGTex_WIDTH 128 +#define gPauseToQuestStatusENGTex_HEIGHT 16 +extern u64 gPauseToQuestStatusENGTex[TEX_LEN(u64, gPauseToQuestStatusENGTex_WIDTH, gPauseToQuestStatusENGTex_HEIGHT, 8)]; +#define gPauseToEquipmentENGTex_WIDTH 128 +#define gPauseToEquipmentENGTex_HEIGHT 16 +extern u64 gPauseToEquipmentENGTex[TEX_LEN(u64, gPauseToEquipmentENGTex_WIDTH, gPauseToEquipmentENGTex_HEIGHT, 8)]; +#define gPauseSavePromptENGTex_WIDTH 152 +#define gPauseSavePromptENGTex_HEIGHT 16 +extern u64 gPauseSavePromptENGTex[TEX_LEN(u64, gPauseSavePromptENGTex_WIDTH, gPauseSavePromptENGTex_HEIGHT, 8)]; +#define gPauseSaveConfirmationENGTex_WIDTH 152 +#define gPauseSaveConfirmationENGTex_HEIGHT 16 +extern u64 gPauseSaveConfirmationENGTex[TEX_LEN(u64, gPauseSaveConfirmationENGTex_WIDTH, gPauseSaveConfirmationENGTex_HEIGHT, 8)]; +#define gPauseYesENGTex_WIDTH 48 +#define gPauseYesENGTex_HEIGHT 16 +extern u64 gPauseYesENGTex[TEX_LEN(u64, gPauseYesENGTex_WIDTH, gPauseYesENGTex_HEIGHT, 8)]; +#define gPauseNoENGTex_WIDTH 48 +#define gPauseNoENGTex_HEIGHT 16 +extern u64 gPauseNoENGTex[TEX_LEN(u64, gPauseNoENGTex_WIDTH, gPauseNoENGTex_HEIGHT, 8)]; +#define gPauseCurrentPositionENGTex_WIDTH 64 +#define gPauseCurrentPositionENGTex_HEIGHT 8 +extern u64 gPauseCurrentPositionENGTex[TEX_LEN(u64, gPauseCurrentPositionENGTex_WIDTH, gPauseCurrentPositionENGTex_HEIGHT, 4)]; + +extern u64 gPauseEquipment10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem00ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSelectItem20ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseMap10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus00ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseQuestStatus20ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; +extern u64 gPauseSave10ENGTex[TEX_LEN(u64, PAGE_BG_QUAD_TEX_WIDTH, PAGE_BG_QUAD_TEX_HEIGHT, 8)]; + +#endif diff --git a/assets/textures/item_name_static/item_name_static.c b/assets/textures/item_name_static/item_name_static.c new file mode 100644 index 0000000000..30443f4aa2 --- /dev/null +++ b/assets/textures/item_name_static/item_name_static.c @@ -0,0 +1,1985 @@ +#include "item_name_static.h" + +#if OOT_NTSC + +// Japanese + +u64 gDekuStickItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuStickItemNameJPNTex.ia4.inc.c" +}; + +u64 gDekuNutItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuNutItemNameJPNTex.ia4.inc.c" +}; + +u64 gBombItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombItemNameJPNTex.ia4.inc.c" +}; + +u64 gFairyBowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyBowItemNameJPNTex.ia4.inc.c" +}; + +u64 gFireArrowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireArrowItemNameJPNTex.ia4.inc.c" +}; + +u64 gDinsFireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDinsFireItemNameJPNTex.ia4.inc.c" +}; + +u64 gFairySlingshotItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairySlingshotItemNameJPNTex.ia4.inc.c" +}; + +u64 gFairyOcarinaItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyOcarinaItemNameJPNTex.ia4.inc.c" +}; + +u64 gOcarinaOfTimeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOcarinaOfTimeItemNameJPNTex.ia4.inc.c" +}; + +u64 gBombchuItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombchuItemNameJPNTex.ia4.inc.c" +}; + +u64 gHookshotItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHookshotItemNameJPNTex.ia4.inc.c" +}; + +u64 gLongshotItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLongshotItemNameJPNTex.ia4.inc.c" +}; + +u64 gIceArrowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIceArrowItemNameJPNTex.ia4.inc.c" +}; + +u64 gFaroresWindItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFaroresWindItemNameJPNTex.ia4.inc.c" +}; + +u64 gBoomerangItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoomerangItemNameJPNTex.ia4.inc.c" +}; + +u64 gLensItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLensItemNameJPNTex.ia4.inc.c" +}; + +u64 gMagicBeansItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMagicBeansItemNameJPNTex.ia4.inc.c" +}; + +u64 gMegatonHammerItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMegatonHammerItemNameJPNTex.ia4.inc.c" +}; + +u64 gLightArrowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightArrowItemNameJPNTex.ia4.inc.c" +}; + +u64 gNayrusLoveItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNayrusLoveItemNameJPNTex.ia4.inc.c" +}; + +u64 gEmptyBottleItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEmptyBottleItemNameJPNTex.ia4.inc.c" +}; + +u64 gRedPotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRedPotionItemNameJPNTex.ia4.inc.c" +}; + +u64 gGreenPotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGreenPotionItemNameJPNTex.ia4.inc.c" +}; + +u64 gBluePotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBluePotionItemNameJPNTex.ia4.inc.c" +}; + +u64 gBottledFairyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBottledFairyItemNameJPNTex.ia4.inc.c" +}; + +u64 gFishItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFishItemNameJPNTex.ia4.inc.c" +}; + +u64 gFullMilkItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFullMilkItemNameJPNTex.ia4.inc.c" +}; + +u64 gRutosLetterItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRutosLetterItemNameJPNTex.ia4.inc.c" +}; + +u64 gBlueFireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBlueFireItemNameJPNTex.ia4.inc.c" +}; + +u64 gBugItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBugItemNameJPNTex.ia4.inc.c" +}; + +u64 gBigPoeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBigPoeItemNameJPNTex.ia4.inc.c" +}; + +u64 gHalfMilkItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHalfMilkItemNameJPNTex.ia4.inc.c" +}; + +u64 gPoeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoeItemNameJPNTex.ia4.inc.c" +}; + +u64 gWeirdEggItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWeirdEggItemNameJPNTex.ia4.inc.c" +}; + +u64 gCuccoItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCuccoItemNameJPNTex.ia4.inc.c" +}; + +u64 gZeldasLetterItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLetterItemNameJPNTex.ia4.inc.c" +}; + +u64 gKeatonMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKeatonMaskItemNameJPNTex.ia4.inc.c" +}; + +u64 gSkullMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSkullMaskItemNameJPNTex.ia4.inc.c" +}; + +u64 gSpookyMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpookyMaskItemNameJPNTex.ia4.inc.c" +}; + +u64 gBunnyHoodItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBunnyHoodItemNameJPNTex.ia4.inc.c" +}; + +u64 gGoronMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronMaskItemNameJPNTex.ia4.inc.c" +}; + +u64 gZoraMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraMaskItemNameJPNTex.ia4.inc.c" +}; + +u64 gGerudoMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudoMaskItemNameJPNTex.ia4.inc.c" +}; + +u64 gMaskofTruthItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMaskofTruthItemNameJPNTex.ia4.inc.c" +}; + +u64 gSOLDOUTItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSOLDOUTItemNameJPNTex.ia4.inc.c" +}; + +u64 gPocketEggItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketEggItemNameJPNTex.ia4.inc.c" +}; + +u64 gPocketCuccoItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketCuccoItemNameJPNTex.ia4.inc.c" +}; + +u64 gCojiroItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCojiroItemNameJPNTex.ia4.inc.c" +}; + +u64 gOddMushroomItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddMushroomItemNameJPNTex.ia4.inc.c" +}; + +u64 gOddPotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddPotionItemNameJPNTex.ia4.inc.c" +}; + +u64 gPoachersSawItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoachersSawItemNameJPNTex.ia4.inc.c" +}; + +u64 gBrokenGoronsSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGoronsSwordItemNameJPNTex.ia4.inc.c" +}; + +u64 gPrescriptionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPrescriptionItemNameJPNTex.ia4.inc.c" +}; + +u64 gEyeBallFrogItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeBallFrogItemNameJPNTex.ia4.inc.c" +}; + +u64 gEyeDropsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeDropsItemNameJPNTex.ia4.inc.c" +}; + +u64 gClaimCheckItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gClaimCheckItemNameJPNTex.ia4.inc.c" +}; + +u64 gUnusedWindMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedWindMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gUnusedFireMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedFireMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gUnusedIceMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedIceMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gKokiriSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriSwordItemNameJPNTex.ia4.inc.c" +}; + +u64 gMasterSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMasterSwordItemNameJPNTex.ia4.inc.c" +}; + +u64 gGiantsKnifeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGiantsKnifeItemNameJPNTex.ia4.inc.c" +}; + +u64 gDekuShieldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuShieldItemNameJPNTex.ia4.inc.c" +}; + +u64 gHylianShieldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHylianShieldItemNameJPNTex.ia4.inc.c" +}; + +u64 gMirrorShieldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMirrorShieldItemNameJPNTex.ia4.inc.c" +}; + +u64 gKokiriTunicItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriTunicItemNameJPNTex.ia4.inc.c" +}; + +u64 gGoronTunicItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronTunicItemNameJPNTex.ia4.inc.c" +}; + +u64 gZoraTunicItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraTunicItemNameJPNTex.ia4.inc.c" +}; + +u64 gKokiriBootsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriBootsItemNameJPNTex.ia4.inc.c" +}; + +u64 gIronBootsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIronBootsItemNameJPNTex.ia4.inc.c" +}; + +u64 gHoverBootsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHoverBootsItemNameJPNTex.ia4.inc.c" +}; + +u64 gBulletBag30ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag30ItemNameJPNTex.ia4.inc.c" +}; + +u64 gBulletBag40ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag40ItemNameJPNTex.ia4.inc.c" +}; + +u64 gBulletBag50ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag50ItemNameJPNTex.ia4.inc.c" +}; + +u64 gQuiver30ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver30ItemNameJPNTex.ia4.inc.c" +}; + +u64 gQuiver40ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver40ItemNameJPNTex.ia4.inc.c" +}; + +u64 gQuiver50ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver50ItemNameJPNTex.ia4.inc.c" +}; + +u64 gBombBag20ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag20ItemNameJPNTex.ia4.inc.c" +}; + +u64 gBombBag30ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag30ItemNameJPNTex.ia4.inc.c" +}; + +u64 gBombBag40ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag40ItemNameJPNTex.ia4.inc.c" +}; + +u64 gGoronsBraceletItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsBraceletItemNameJPNTex.ia4.inc.c" +}; + +u64 gSilverGauntletsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverGauntletsItemNameJPNTex.ia4.inc.c" +}; + +u64 gGoldenGauntletsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenGauntletsItemNameJPNTex.ia4.inc.c" +}; + +u64 gSilverScaleItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverScaleItemNameJPNTex.ia4.inc.c" +}; + +u64 gGoldenScaleItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenScaleItemNameJPNTex.ia4.inc.c" +}; + +u64 gBrokenGiantsKnifeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGiantsKnifeItemNameJPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName1JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName2JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName3JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName4JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName4JPNTex.ia4.inc.c" +}; + +u64 gMinuetOfForestItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMinuetOfForestItemNameJPNTex.ia4.inc.c" +}; + +u64 gBoleroOfFireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoleroOfFireItemNameJPNTex.ia4.inc.c" +}; + +u64 gSerenadeOfWaterItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSerenadeOfWaterItemNameJPNTex.ia4.inc.c" +}; + +u64 gRequiemOfSpiritItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRequiemOfSpiritItemNameJPNTex.ia4.inc.c" +}; + +u64 gNocturneOfShadowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNocturneOfShadowItemNameJPNTex.ia4.inc.c" +}; + +u64 gPreludeOfLightItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPreludeOfLightItemNameJPNTex.ia4.inc.c" +}; + +u64 gZeldasLullabyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLullabyItemNameJPNTex.ia4.inc.c" +}; + +u64 gEponasSongItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEponasSongItemNameJPNTex.ia4.inc.c" +}; + +u64 gSariasSongItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSariasSongItemNameJPNTex.ia4.inc.c" +}; + +u64 gSunsSongItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSunsSongItemNameJPNTex.ia4.inc.c" +}; + +u64 gSongOfTimeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfTimeItemNameJPNTex.ia4.inc.c" +}; + +u64 gSongOfStormsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfStormsItemNameJPNTex.ia4.inc.c" +}; + +u64 gForestMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gForestMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gFireMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gWaterMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWaterMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gSpiritMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpiritMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gShadowMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gShadowMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gLightMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightMedallionItemNameJPNTex.ia4.inc.c" +}; + +u64 gKokiriEmeraldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriEmeraldItemNameJPNTex.ia4.inc.c" +}; + +u64 gGoronsRubyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsRubyItemNameJPNTex.ia4.inc.c" +}; + +u64 gZorasSapphireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZorasSapphireItemNameJPNTex.ia4.inc.c" +}; + +u64 gStoneofAgonyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gStoneofAgonyItemNameJPNTex.ia4.inc.c" +}; + +u64 gGerudosCardItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudosCardItemNameJPNTex.ia4.inc.c" +}; + +u64 gGoldSkulltulaItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldSkulltulaItemNameJPNTex.ia4.inc.c" +}; + +u64 gPieceOfHeartItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPieceOfHeartItemNameJPNTex.ia4.inc.c" +}; + +u64 gUnusedPieceOfHeartItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedPieceOfHeartItemNameJPNTex.ia4.inc.c" +}; + +u64 gUnusedBigKeyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBigKeyItemNameJPNTex.ia4.inc.c" +}; + +u64 gCompassItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCompassItemNameJPNTex.ia4.inc.c" +}; + +u64 gDungeonMapItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDungeonMapItemNameJPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName5JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName5JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName6JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName6JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName7JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName7JPNTex.ia4.inc.c" +}; + +u64 gBiggoronsSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBiggoronsSwordItemNameJPNTex.ia4.inc.c" +}; + +#endif + +// English + +u64 gDekuStickItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuStickItemNameENGTex.ia4.inc.c" +}; + +u64 gDekuNutItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuNutItemNameENGTex.ia4.inc.c" +}; + +u64 gBombItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombItemNameENGTex.ia4.inc.c" +}; + +u64 gFairyBowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyBowItemNameENGTex.ia4.inc.c" +}; + +u64 gFireArrowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireArrowItemNameENGTex.ia4.inc.c" +}; + +u64 gDinsFireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDinsFireItemNameENGTex.ia4.inc.c" +}; + +u64 gFairySlingshotItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairySlingshotItemNameENGTex.ia4.inc.c" +}; + +u64 gFairyOcarinaItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyOcarinaItemNameENGTex.ia4.inc.c" +}; + +u64 gOcarinaOfTimeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOcarinaOfTimeItemNameENGTex.ia4.inc.c" +}; + +u64 gBombchuItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombchuItemNameENGTex.ia4.inc.c" +}; + +u64 gHookshotItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHookshotItemNameENGTex.ia4.inc.c" +}; + +u64 gLongshotItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLongshotItemNameENGTex.ia4.inc.c" +}; + +u64 gIceArrowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIceArrowItemNameENGTex.ia4.inc.c" +}; + +u64 gFaroresWindItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFaroresWindItemNameENGTex.ia4.inc.c" +}; + +u64 gBoomerangItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoomerangItemNameENGTex.ia4.inc.c" +}; + +u64 gLensItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLensItemNameENGTex.ia4.inc.c" +}; + +u64 gMagicBeansItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMagicBeansItemNameENGTex.ia4.inc.c" +}; + +u64 gMegatonHammerItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMegatonHammerItemNameENGTex.ia4.inc.c" +}; + +u64 gLightArrowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightArrowItemNameENGTex.ia4.inc.c" +}; + +u64 gNayrusLoveItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNayrusLoveItemNameENGTex.ia4.inc.c" +}; + +u64 gEmptyBottleItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEmptyBottleItemNameENGTex.ia4.inc.c" +}; + +u64 gRedPotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRedPotionItemNameENGTex.ia4.inc.c" +}; + +u64 gGreenPotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGreenPotionItemNameENGTex.ia4.inc.c" +}; + +u64 gBluePotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBluePotionItemNameENGTex.ia4.inc.c" +}; + +u64 gBottledFairyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBottledFairyItemNameENGTex.ia4.inc.c" +}; + +u64 gFishItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFishItemNameENGTex.ia4.inc.c" +}; + +u64 gFullMilkItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFullMilkItemNameENGTex.ia4.inc.c" +}; + +u64 gRutosLetterItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRutosLetterItemNameENGTex.ia4.inc.c" +}; + +u64 gBlueFireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBlueFireItemNameENGTex.ia4.inc.c" +}; + +u64 gBugItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBugItemNameENGTex.ia4.inc.c" +}; + +u64 gBigPoeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBigPoeItemNameENGTex.ia4.inc.c" +}; + +u64 gHalfMilkItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHalfMilkItemNameENGTex.ia4.inc.c" +}; + +u64 gPoeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoeItemNameENGTex.ia4.inc.c" +}; + +u64 gWeirdEggItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWeirdEggItemNameENGTex.ia4.inc.c" +}; + +u64 gCuccoItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCuccoItemNameENGTex.ia4.inc.c" +}; + +u64 gZeldasLetterItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLetterItemNameENGTex.ia4.inc.c" +}; + +u64 gKeatonMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKeatonMaskItemNameENGTex.ia4.inc.c" +}; + +u64 gSkullMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSkullMaskItemNameENGTex.ia4.inc.c" +}; + +u64 gSpookyMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpookyMaskItemNameENGTex.ia4.inc.c" +}; + +u64 gBunnyHoodItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBunnyHoodItemNameENGTex.ia4.inc.c" +}; + +u64 gGoronMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronMaskItemNameENGTex.ia4.inc.c" +}; + +u64 gZoraMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraMaskItemNameENGTex.ia4.inc.c" +}; + +u64 gGerudoMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudoMaskItemNameENGTex.ia4.inc.c" +}; + +u64 gMaskofTruthItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMaskofTruthItemNameENGTex.ia4.inc.c" +}; + +u64 gSOLDOUTItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSOLDOUTItemNameENGTex.ia4.inc.c" +}; + +u64 gPocketEggItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketEggItemNameENGTex.ia4.inc.c" +}; + +u64 gPocketCuccoItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketCuccoItemNameENGTex.ia4.inc.c" +}; + +u64 gCojiroItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCojiroItemNameENGTex.ia4.inc.c" +}; + +u64 gOddMushroomItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddMushroomItemNameENGTex.ia4.inc.c" +}; + +u64 gOddPotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddPotionItemNameENGTex.ia4.inc.c" +}; + +u64 gPoachersSawItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoachersSawItemNameENGTex.ia4.inc.c" +}; + +u64 gBrokenGoronsSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGoronsSwordItemNameENGTex.ia4.inc.c" +}; + +u64 gPrescriptionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPrescriptionItemNameENGTex.ia4.inc.c" +}; + +u64 gEyeBallFrogItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeBallFrogItemNameENGTex.ia4.inc.c" +}; + +u64 gEyeDropsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeDropsItemNameENGTex.ia4.inc.c" +}; + +u64 gClaimCheckItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gClaimCheckItemNameENGTex.ia4.inc.c" +}; + +u64 gUnusedWindMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedWindMedallionItemName1JPNTex.ia4.inc.c" +}; + +u64 gUnusedFireMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedFireMedallionItemName1JPNTex.ia4.inc.c" +}; + +u64 gUnusedIceMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedIceMedallionItemName1JPNTex.ia4.inc.c" +}; + +u64 gKokiriSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriSwordItemNameENGTex.ia4.inc.c" +}; + +u64 gMasterSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMasterSwordItemNameENGTex.ia4.inc.c" +}; + +u64 gGiantsKnifeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGiantsKnifeItemNameENGTex.ia4.inc.c" +}; + +u64 gDekuShieldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuShieldItemNameENGTex.ia4.inc.c" +}; + +u64 gHylianShieldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHylianShieldItemNameENGTex.ia4.inc.c" +}; + +u64 gMirrorShieldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMirrorShieldItemNameENGTex.ia4.inc.c" +}; + +u64 gKokiriTunicItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriTunicItemNameENGTex.ia4.inc.c" +}; + +u64 gGoronTunicItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronTunicItemNameENGTex.ia4.inc.c" +}; + +u64 gZoraTunicItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraTunicItemNameENGTex.ia4.inc.c" +}; + +u64 gKokiriBootsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriBootsItemNameENGTex.ia4.inc.c" +}; + +u64 gIronBootsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIronBootsItemNameENGTex.ia4.inc.c" +}; + +u64 gHoverBootsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHoverBootsItemNameENGTex.ia4.inc.c" +}; + +u64 gBulletBag30ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag30ItemNameENGTex.ia4.inc.c" +}; + +u64 gBulletBag40ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag40ItemNameENGTex.ia4.inc.c" +}; + +u64 gBulletBag50ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag50ItemNameENGTex.ia4.inc.c" +}; + +u64 gQuiver30ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver30ItemNameENGTex.ia4.inc.c" +}; + +u64 gQuiver40ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver40ItemNameENGTex.ia4.inc.c" +}; + +u64 gQuiver50ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver50ItemNameENGTex.ia4.inc.c" +}; + +u64 gBombBag20ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag20ItemNameENGTex.ia4.inc.c" +}; + +u64 gBombBag30ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag30ItemNameENGTex.ia4.inc.c" +}; + +u64 gBombBag40ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag40ItemNameENGTex.ia4.inc.c" +}; + +u64 gGoronsBraceletItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsBraceletItemNameENGTex.ia4.inc.c" +}; + +u64 gSilverGauntletsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverGauntletsItemNameENGTex.ia4.inc.c" +}; + +u64 gGoldenGauntletsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenGauntletsItemNameENGTex.ia4.inc.c" +}; + +u64 gSilverScaleItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverScaleItemNameENGTex.ia4.inc.c" +}; + +u64 gGoldenScaleItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenScaleItemNameENGTex.ia4.inc.c" +}; + +u64 gBrokenGiantsKnifeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGiantsKnifeItemNameENGTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName11JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName11JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName21JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName21JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName31JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName31JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName41JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName41JPNTex.ia4.inc.c" +}; + +u64 gMinuetOfForestItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMinuetOfForestItemNameENGTex.ia4.inc.c" +}; + +u64 gBoleroOfFireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoleroOfFireItemNameENGTex.ia4.inc.c" +}; + +u64 gSerenadeOfWaterItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSerenadeOfWaterItemNameENGTex.ia4.inc.c" +}; + +u64 gRequiemOfSpiritItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRequiemOfSpiritItemNameENGTex.ia4.inc.c" +}; + +u64 gNocturneOfShadowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNocturneOfShadowItemNameENGTex.ia4.inc.c" +}; + +u64 gPreludeOfLightItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPreludeOfLightItemNameENGTex.ia4.inc.c" +}; + +u64 gZeldasLullabyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLullabyItemNameENGTex.ia4.inc.c" +}; + +u64 gEponasSongItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEponasSongItemNameENGTex.ia4.inc.c" +}; + +u64 gSariasSongItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSariasSongItemNameENGTex.ia4.inc.c" +}; + +u64 gSunsSongItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSunsSongItemNameENGTex.ia4.inc.c" +}; + +u64 gSongOfTimeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfTimeItemNameENGTex.ia4.inc.c" +}; + +u64 gSongOfStormsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfStormsItemNameENGTex.ia4.inc.c" +}; + +u64 gForestMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gForestMedallionItemNameENGTex.ia4.inc.c" +}; + +u64 gFireMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireMedallionItemNameENGTex.ia4.inc.c" +}; + +u64 gWaterMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWaterMedallionItemNameENGTex.ia4.inc.c" +}; + +u64 gSpiritMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpiritMedallionItemNameENGTex.ia4.inc.c" +}; + +u64 gShadowMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gShadowMedallionItemNameENGTex.ia4.inc.c" +}; + +u64 gLightMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightMedallionItemNameENGTex.ia4.inc.c" +}; + +u64 gKokiriEmeraldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriEmeraldItemNameENGTex.ia4.inc.c" +}; + +u64 gGoronsRubyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsRubyItemNameENGTex.ia4.inc.c" +}; + +u64 gZorasSapphireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZorasSapphireItemNameENGTex.ia4.inc.c" +}; + +u64 gStoneofAgonyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gStoneofAgonyItemNameENGTex.ia4.inc.c" +}; + +u64 gGerudosCardItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudosCardItemNameENGTex.ia4.inc.c" +}; + +u64 gGoldSkulltulaItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldSkulltulaItemNameENGTex.ia4.inc.c" +}; + +u64 gPieceOfHeartItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPieceOfHeartItemNameENGTex.ia4.inc.c" +}; + +u64 gUnusedPieceOfHeartItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedPieceOfHeartItemName1JPNTex.ia4.inc.c" +}; + +u64 gUnusedBigKeyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBigKeyItemNameENGTex.ia4.inc.c" +}; + +u64 gCompassItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCompassItemNameENGTex.ia4.inc.c" +}; + +u64 gDungeonMapItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDungeonMapItemNameENGTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName51JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName51JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName61JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName61JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName71JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName71JPNTex.ia4.inc.c" +}; + +u64 gBiggoronsSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBiggoronsSwordItemNameENGTex.ia4.inc.c" +}; + +#if OOT_PAL + +// German + +u64 gDekuStickItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuStickItemNameGERTex.ia4.inc.c" +}; + +u64 gDekuNutItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuNutItemNameGERTex.ia4.inc.c" +}; + +u64 gBombItemNameItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombItemNameItemNameGERTex.ia4.inc.c" +}; + +u64 gFairyBowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyBowItemNameGERTex.ia4.inc.c" +}; + +u64 gFireArrowItemNameUnk2GERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireArrowItemNameUnk2GERTex.ia4.inc.c" +}; + +u64 gDinsFireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDinsFireItemNameGERTex.ia4.inc.c" +}; + +u64 gFairySlingshotItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairySlingshotItemNameGERTex.ia4.inc.c" +}; + +u64 gFairyOcarinaItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyOcarinaItemNameGERTex.ia4.inc.c" +}; + +u64 gOcarinaOfTimeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOcarinaOfTimeItemNameGERTex.ia4.inc.c" +}; + +u64 gBombchuItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombchuItemNameGERTex.ia4.inc.c" +}; + +u64 gHookshotItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHookshotItemNameGERTex.ia4.inc.c" +}; + +u64 gLongshotItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLongshotItemNameGERTex.ia4.inc.c" +}; + +u64 gIceArrowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIceArrowItemNameGERTex.ia4.inc.c" +}; + +u64 gFaroresWindItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFaroresWindItemNameGERTex.ia4.inc.c" +}; + +u64 gBoomerangItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoomerangItemNameGERTex.ia4.inc.c" +}; + +u64 gLensItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLensItemNameGERTex.ia4.inc.c" +}; + +u64 gMagicBeansItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMagicBeansItemNameGERTex.ia4.inc.c" +}; + +u64 gMegatonHammerItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMegatonHammerItemNameGERTex.ia4.inc.c" +}; + +u64 gLightArrowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightArrowItemNameGERTex.ia4.inc.c" +}; + +u64 gNayrusLoveItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNayrusLoveItemNameGERTex.ia4.inc.c" +}; + +u64 gEmptyBottleItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEmptyBottleItemNameGERTex.ia4.inc.c" +}; + +u64 gRedPotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRedPotionItemNameGERTex.ia4.inc.c" +}; + +u64 gGreenPotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGreenPotionItemNameGERTex.ia4.inc.c" +}; + +u64 gBluePotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBluePotionItemNameGERTex.ia4.inc.c" +}; + +u64 gBottledFairyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBottledFairyItemNameGERTex.ia4.inc.c" +}; + +u64 gFishItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFishItemNameGERTex.ia4.inc.c" +}; + +u64 gFullMilkItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFullMilkItemNameGERTex.ia4.inc.c" +}; + +u64 gRutosLetterItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRutosLetterItemNameGERTex.ia4.inc.c" +}; + +u64 gBlueFireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBlueFireItemNameGERTex.ia4.inc.c" +}; + +u64 gBugItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBugItemNameGERTex.ia4.inc.c" +}; + +u64 gBigPoeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBigPoeItemNameGERTex.ia4.inc.c" +}; + +u64 gHalfMilkItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHalfMilkItemNameGERTex.ia4.inc.c" +}; + +u64 gPoeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoeItemNameGERTex.ia4.inc.c" +}; + +u64 gWeirdEggItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWeirdEggItemNameGERTex.ia4.inc.c" +}; + +u64 gCuccoItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCuccoItemNameGERTex.ia4.inc.c" +}; + +u64 gZeldasLetterItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLetterItemNameGERTex.ia4.inc.c" +}; + +u64 gKeatonMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKeatonMaskItemNameGERTex.ia4.inc.c" +}; + +u64 gSkullMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSkullMaskItemNameGERTex.ia4.inc.c" +}; + +u64 gSpookyMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpookyMaskItemNameGERTex.ia4.inc.c" +}; + +u64 gBunnyHoodItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBunnyHoodItemNameGERTex.ia4.inc.c" +}; + +u64 gGoronMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronMaskItemNameGERTex.ia4.inc.c" +}; + +u64 gZoraMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraMaskItemNameGERTex.ia4.inc.c" +}; + +u64 gGerudoMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudoMaskItemNameGERTex.ia4.inc.c" +}; + +u64 gMaskofTruthItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMaskofTruthItemNameGERTex.ia4.inc.c" +}; + +u64 gSOLDOUTItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSOLDOUTItemNameGERTex.ia4.inc.c" +}; + +u64 gPocketEggItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketEggItemNameGERTex.ia4.inc.c" +}; + +u64 gPocketCuccoItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketCuccoItemNameGERTex.ia4.inc.c" +}; + +u64 gCojiroItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCojiroItemNameGERTex.ia4.inc.c" +}; + +u64 gOddMushroomItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddMushroomItemNameGERTex.ia4.inc.c" +}; + +u64 gOddPotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddPotionItemNameGERTex.ia4.inc.c" +}; + +u64 gPoachersSawItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoachersSawItemNameGERTex.ia4.inc.c" +}; + +u64 gBrokenGoronsSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGoronsSwordItemNameGERTex.ia4.inc.c" +}; + +u64 gPrescriptionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPrescriptionItemNameGERTex.ia4.inc.c" +}; + +u64 gEyeBallFrogItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeBallFrogItemNameGERTex.ia4.inc.c" +}; + +u64 gEyeDropsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeDropsItemNameGERTex.ia4.inc.c" +}; + +u64 gClaimCheckItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gClaimCheckItemNameGERTex.ia4.inc.c" +}; + +u64 gUnusedWindMedallionItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedWindMedallionItemName2JPNTex.ia4.inc.c" +}; + +u64 gUnusedFireMedallionItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedFireMedallionItemName2JPNTex.ia4.inc.c" +}; + +u64 gUnusedIceMedallionItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedIceMedallionItemName2JPNTex.ia4.inc.c" +}; + +u64 gKokiriSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriSwordItemNameGERTex.ia4.inc.c" +}; + +u64 gMasterSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMasterSwordItemNameGERTex.ia4.inc.c" +}; + +u64 gGiantsKnifeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGiantsKnifeItemNameGERTex.ia4.inc.c" +}; + +u64 gDekuShieldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuShieldItemNameGERTex.ia4.inc.c" +}; + +u64 gHylianShieldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHylianShieldItemNameGERTex.ia4.inc.c" +}; + +u64 gMirrorShieldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMirrorShieldItemNameGERTex.ia4.inc.c" +}; + +u64 gKokiriTunicItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriTunicItemNameGERTex.ia4.inc.c" +}; + +u64 gGoronTunicItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronTunicItemNameGERTex.ia4.inc.c" +}; + +u64 gZoraTunicItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraTunicItemNameGERTex.ia4.inc.c" +}; + +u64 gKokiriBootsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriBootsItemNameGERTex.ia4.inc.c" +}; + +u64 gIronBootsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIronBootsItemNameGERTex.ia4.inc.c" +}; + +u64 gHoverBootsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHoverBootsItemNameGERTex.ia4.inc.c" +}; + +u64 gBulletBag30ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag30ItemNameGERTex.ia4.inc.c" +}; + +u64 gBulletBag40ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag40ItemNameGERTex.ia4.inc.c" +}; + +u64 gBulletBag50ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag50ItemNameGERTex.ia4.inc.c" +}; + +u64 gQuiver30ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver30ItemNameGERTex.ia4.inc.c" +}; + +u64 gQuiver40ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver40ItemNameGERTex.ia4.inc.c" +}; + +u64 gQuiver50ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver50ItemNameGERTex.ia4.inc.c" +}; + +u64 gBombBag20ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag20ItemNameGERTex.ia4.inc.c" +}; + +u64 gBombBag30ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag30ItemNameGERTex.ia4.inc.c" +}; + +u64 gBombBag40ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag40ItemNameGERTex.ia4.inc.c" +}; + +u64 gGoronsBraceletItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsBraceletItemNameGERTex.ia4.inc.c" +}; + +u64 gSilverGauntletsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverGauntletsItemNameGERTex.ia4.inc.c" +}; + +u64 gGoldenGauntletsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenGauntletsItemNameGERTex.ia4.inc.c" +}; + +u64 gSilverScaleItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverScaleItemNameGERTex.ia4.inc.c" +}; + +u64 gGoldenScaleItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenScaleItemNameGERTex.ia4.inc.c" +}; + +u64 gBrokenGiantsKnifeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGiantsKnifeItemNameGERTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName12JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName12JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName22JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName22JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName32JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName32JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName42JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName42JPNTex.ia4.inc.c" +}; + +u64 gMinuetOfForestItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMinuetOfForestItemNameGERTex.ia4.inc.c" +}; + +u64 gBoleroOfFireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoleroOfFireItemNameGERTex.ia4.inc.c" +}; + +u64 gSerenadeOfWaterItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSerenadeOfWaterItemNameGERTex.ia4.inc.c" +}; + +u64 gRequiemOfSpiritItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRequiemOfSpiritItemNameGERTex.ia4.inc.c" +}; + +u64 gNocturneOfShadowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNocturneOfShadowItemNameGERTex.ia4.inc.c" +}; + +u64 gPreludeOfLightItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPreludeOfLightItemNameGERTex.ia4.inc.c" +}; + +u64 gZeldasLullabyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLullabyItemNameGERTex.ia4.inc.c" +}; + +u64 gEponasSongItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEponasSongItemNameGERTex.ia4.inc.c" +}; + +u64 gSariasSongItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSariasSongItemNameGERTex.ia4.inc.c" +}; + +u64 gSunsSongItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSunsSongItemNameGERTex.ia4.inc.c" +}; + +u64 gSongOfTimeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfTimeItemNameGERTex.ia4.inc.c" +}; + +u64 gSongOfStormsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfStormsItemNameGERTex.ia4.inc.c" +}; + +u64 gForestMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gForestMedallionItemNameGERTex.ia4.inc.c" +}; + +u64 gFireMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireMedallionItemNameGERTex.ia4.inc.c" +}; + +u64 gWaterMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWaterMedallionItemNameGERTex.ia4.inc.c" +}; + +u64 gSpiritMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpiritMedallionItemNameGERTex.ia4.inc.c" +}; + +u64 gShadowMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gShadowMedallionItemNameGERTex.ia4.inc.c" +}; + +u64 gLightMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightMedallionItemNameGERTex.ia4.inc.c" +}; + +u64 gKokiriEmeraldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriEmeraldItemNameGERTex.ia4.inc.c" +}; + +u64 gGoronsRubyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsRubyItemNameGERTex.ia4.inc.c" +}; + +u64 gZorasSapphireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZorasSapphireItemNameGERTex.ia4.inc.c" +}; + +u64 gStoneofAgonyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gStoneofAgonyItemNameGERTex.ia4.inc.c" +}; + +u64 gGerudosCardItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudosCardItemNameGERTex.ia4.inc.c" +}; + +u64 gGoldSkulltulaItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldSkulltulaItemNameGERTex.ia4.inc.c" +}; + +u64 gHeartContainerItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHeartContainerItemNameGERTex.ia4.inc.c" +}; + +u64 gUnusedPieceOfHeartItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedPieceOfHeartItemName2JPNTex.ia4.inc.c" +}; + +u64 gBigKeyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBigKeyItemNameGERTex.ia4.inc.c" +}; + +u64 gCompassItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCompassItemNameGERTex.ia4.inc.c" +}; + +u64 gDungeonMapItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDungeonMapItemNameGERTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName52JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName52JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName62JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName62JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName72JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName72JPNTex.ia4.inc.c" +}; + +u64 gBiggoronsSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBiggoronsSwordItemNameGERTex.ia4.inc.c" +}; + +// French + +u64 gDekuStickItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuStickItemNameFRATex.ia4.inc.c" +}; + +u64 gDekuNutItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuNutItemNameFRATex.ia4.inc.c" +}; + +u64 gBombItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombItemNameFRATex.ia4.inc.c" +}; + +u64 gFairyBowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyBowItemNameFRATex.ia4.inc.c" +}; + +u64 gFireArrowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireArrowItemNameFRATex.ia4.inc.c" +}; + +u64 gDinsFireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDinsFireItemNameFRATex.ia4.inc.c" +}; + +u64 gFairySlingshotItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairySlingshotItemNameFRATex.ia4.inc.c" +}; + +u64 gFairyOcarinaItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFairyOcarinaItemNameFRATex.ia4.inc.c" +}; + +u64 gOcarinaOfTimeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOcarinaOfTimeItemNameFRATex.ia4.inc.c" +}; + +u64 gBombchuItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombchuItemNameFRATex.ia4.inc.c" +}; + +u64 gHookshotItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHookshotItemNameFRATex.ia4.inc.c" +}; + +u64 gLongshotItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLongshotItemNameFRATex.ia4.inc.c" +}; + +u64 gIceArrowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIceArrowItemNameFRATex.ia4.inc.c" +}; + +u64 gFaroresWindItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFaroresWindItemNameFRATex.ia4.inc.c" +}; + +u64 gBoomerangItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoomerangItemNameFRATex.ia4.inc.c" +}; + +u64 gLensItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLensItemNameFRATex.ia4.inc.c" +}; + +u64 gMagicBeansItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMagicBeansItemNameFRATex.ia4.inc.c" +}; + +u64 gMegatonHammerItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMegatonHammerItemNameFRATex.ia4.inc.c" +}; + +u64 gLightArrowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightArrowItemNameFRATex.ia4.inc.c" +}; + +u64 gNayrusLoveItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNayrusLoveItemNameFRATex.ia4.inc.c" +}; + +u64 gEmptyBottleItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEmptyBottleItemNameFRATex.ia4.inc.c" +}; + +u64 gRedPotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRedPotionItemNameFRATex.ia4.inc.c" +}; + +u64 gGreenPotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGreenPotionItemNameFRATex.ia4.inc.c" +}; + +u64 gBluePotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBluePotionItemNameFRATex.ia4.inc.c" +}; + +u64 gBottledFairyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBottledFairyItemNameFRATex.ia4.inc.c" +}; + +u64 gFishItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFishItemNameFRATex.ia4.inc.c" +}; + +u64 gFullMilkItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFullMilkItemNameFRATex.ia4.inc.c" +}; + +u64 gRutosLetterItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRutosLetterItemNameFRATex.ia4.inc.c" +}; + +u64 gBlueFireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBlueFireItemNameFRATex.ia4.inc.c" +}; + +u64 gBugItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBugItemNameFRATex.ia4.inc.c" +}; + +u64 gBigPoeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBigPoeItemNameFRATex.ia4.inc.c" +}; + +u64 gHalfMilkItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHalfMilkItemNameFRATex.ia4.inc.c" +}; + +u64 gPoeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoeItemNameFRATex.ia4.inc.c" +}; + +u64 gWeirdEggItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWeirdEggItemNameFRATex.ia4.inc.c" +}; + +u64 gCuccoItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCuccoItemNameFRATex.ia4.inc.c" +}; + +u64 gZeldasLetterItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLetterItemNameFRATex.ia4.inc.c" +}; + +u64 gKeatonMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKeatonMaskItemNameFRATex.ia4.inc.c" +}; + +u64 gSkullMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSkullMaskItemNameFRATex.ia4.inc.c" +}; + +u64 gSpookyMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpookyMaskItemNameFRATex.ia4.inc.c" +}; + +u64 gBunnyHoodItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBunnyHoodItemNameFRATex.ia4.inc.c" +}; + +u64 gGoronMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronMaskItemNameFRATex.ia4.inc.c" +}; + +u64 gZoraMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraMaskItemNameFRATex.ia4.inc.c" +}; + +u64 gGerudoMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudoMaskItemNameFRATex.ia4.inc.c" +}; + +u64 gMaskofTruthItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMaskofTruthItemNameFRATex.ia4.inc.c" +}; + +u64 gSOLDOUTItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSOLDOUTItemNameFRATex.ia4.inc.c" +}; + +u64 gPocketEggItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketEggItemNameFRATex.ia4.inc.c" +}; + +u64 gPocketCuccoItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPocketCuccoItemNameFRATex.ia4.inc.c" +}; + +u64 gCojiroItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCojiroItemNameFRATex.ia4.inc.c" +}; + +u64 gOddMushroomItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddMushroomItemNameFRATex.ia4.inc.c" +}; + +u64 gOddPotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gOddPotionItemNameFRATex.ia4.inc.c" +}; + +u64 gPoachersSawItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPoachersSawItemNameFRATex.ia4.inc.c" +}; + +u64 gBrokenGoronsSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGoronsSwordItemNameFRATex.ia4.inc.c" +}; + +u64 gPrescriptionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPrescriptionItemNameFRATex.ia4.inc.c" +}; + +u64 gEyeBallFrogItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeBallFrogItemNameFRATex.ia4.inc.c" +}; + +u64 gEyeDropsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEyeDropsItemNameFRATex.ia4.inc.c" +}; + +u64 gClaimCheckItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gClaimCheckItemNameFRATex.ia4.inc.c" +}; + +u64 gUnusedWindMedallionItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedWindMedallionItemName3JPNTex.ia4.inc.c" +}; + +u64 gUnusedFireMedallionItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedFireMedallionItemName3JPNTex.ia4.inc.c" +}; + +u64 gUnusedIceMedallionItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedIceMedallionItemName3JPNTex.ia4.inc.c" +}; + +u64 gKokiriSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriSwordItemNameFRATex.ia4.inc.c" +}; + +u64 gMasterSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMasterSwordItemNameFRATex.ia4.inc.c" +}; + +u64 gGiantsKnifeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGiantsKnifeItemNameFRATex.ia4.inc.c" +}; + +u64 gDekuShieldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDekuShieldItemNameFRATex.ia4.inc.c" +}; + +u64 gHylianShieldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHylianShieldItemNameFRATex.ia4.inc.c" +}; + +u64 gMirrorShieldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMirrorShieldItemNameFRATex.ia4.inc.c" +}; + +u64 gKokiriTunicItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriTunicItemNameFRATex.ia4.inc.c" +}; + +u64 gGoronTunicItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronTunicItemNameFRATex.ia4.inc.c" +}; + +u64 gZoraTunicItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZoraTunicItemNameFRATex.ia4.inc.c" +}; + +u64 gKokiriBootsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriBootsItemNameFRATex.ia4.inc.c" +}; + +u64 gIronBootsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gIronBootsItemNameFRATex.ia4.inc.c" +}; + +u64 gHoverBootsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHoverBootsItemNameFRATex.ia4.inc.c" +}; + +u64 gBulletBag30ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag30ItemNameFRATex.ia4.inc.c" +}; + +u64 gBulletBag40ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag40ItemNameFRATex.ia4.inc.c" +}; + +u64 gBulletBag50ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBulletBag50ItemNameFRATex.ia4.inc.c" +}; + +u64 gQuiver30ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver30ItemNameFRATex.ia4.inc.c" +}; + +u64 gQuiver40ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver40ItemNameFRATex.ia4.inc.c" +}; + +u64 gQuiver50ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gQuiver50ItemNameFRATex.ia4.inc.c" +}; + +u64 gBombBag20ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag20ItemNameFRATex.ia4.inc.c" +}; + +u64 gBombBag30ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag30ItemNameFRATex.ia4.inc.c" +}; + +u64 gBombBag40ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBombBag40ItemNameFRATex.ia4.inc.c" +}; + +u64 gGoronsBraceletItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsBraceletItemNameFRATex.ia4.inc.c" +}; + +u64 gSilverGauntletsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverGauntletsItemNameFRATex.ia4.inc.c" +}; + +u64 gGoldenGauntletsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenGauntletsItemNameFRATex.ia4.inc.c" +}; + +u64 gSilverScaleItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSilverScaleItemNameFRATex.ia4.inc.c" +}; + +u64 gGoldenScaleItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldenScaleItemNameFRATex.ia4.inc.c" +}; + +u64 gBrokenGiantsKnifeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBrokenGiantsKnifeItemNameFRATex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName13JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName13JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName23JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName23JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName33JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName33JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName43JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName43JPNTex.ia4.inc.c" +}; + +u64 gMinuetOfForestItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gMinuetOfForestItemNameFRATex.ia4.inc.c" +}; + +u64 gBoleroOfFireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBoleroOfFireItemNameFRATex.ia4.inc.c" +}; + +u64 gSerenadeOfWaterItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSerenadeOfWaterItemNameFRATex.ia4.inc.c" +}; + +u64 gRequiemOfSpiritItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gRequiemOfSpiritItemNameFRATex.ia4.inc.c" +}; + +u64 gNocturneOfShadowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gNocturneOfShadowItemNameFRATex.ia4.inc.c" +}; + +u64 gPreludeOfLightItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gPreludeOfLightItemNameFRATex.ia4.inc.c" +}; + +u64 gZeldasLullabyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZeldasLullabyItemNameFRATex.ia4.inc.c" +}; + +u64 gEponasSongItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gEponasSongItemNameFRATex.ia4.inc.c" +}; + +u64 gSariasSongItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSariasSongItemNameFRATex.ia4.inc.c" +}; + +u64 gSunsSongItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSunsSongItemNameFRATex.ia4.inc.c" +}; + +u64 gSongOfTimeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfTimeItemNameFRATex.ia4.inc.c" +}; + +u64 gSongOfStormsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSongOfStormsItemNameFRATex.ia4.inc.c" +}; + +u64 gForestMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gForestMedallionItemNameFRATex.ia4.inc.c" +}; + +u64 gFireMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gFireMedallionItemNameFRATex.ia4.inc.c" +}; + +u64 gWaterMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gWaterMedallionItemNameFRATex.ia4.inc.c" +}; + +u64 gSpiritMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gSpiritMedallionItemNameFRATex.ia4.inc.c" +}; + +u64 gShadowMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gShadowMedallionItemNameFRATex.ia4.inc.c" +}; + +u64 gLightMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gLightMedallionItemNameFRATex.ia4.inc.c" +}; + +u64 gKokiriEmeraldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gKokiriEmeraldItemNameFRATex.ia4.inc.c" +}; + +u64 gGoronsRubyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoronsRubyItemNameFRATex.ia4.inc.c" +}; + +u64 gZorasSapphireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gZorasSapphireItemNameFRATex.ia4.inc.c" +}; + +u64 gStoneofAgonyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gStoneofAgonyItemNameFRATex.ia4.inc.c" +}; + +u64 gGerudosCardItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGerudosCardItemNameFRATex.ia4.inc.c" +}; + +u64 gGoldSkulltulaItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gGoldSkulltulaItemNameFRATex.ia4.inc.c" +}; + +u64 gHeartContainerItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gHeartContainerItemNameFRATex.ia4.inc.c" +}; + +u64 gUnusedPieceOfHeartItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedPieceOfHeartItemName3JPNTex.ia4.inc.c" +}; + +u64 gBossKeyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBossKeyItemNameFRATex.ia4.inc.c" +}; + +u64 gCompassItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gCompassItemNameFRATex.ia4.inc.c" +}; + +u64 gDungeonMapItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gDungeonMapItemNameFRATex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName53JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName53JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName63JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName63JPNTex.ia4.inc.c" +}; + +u64 gUnusedBossKeyItemName73JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gUnusedBossKeyItemName73JPNTex.ia4.inc.c" +}; + +u64 gBiggoronsSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)] = { +#include "assets/textures/item_name_static/gBiggoronsSwordItemNameFRATex.ia4.inc.c" +}; + +#endif diff --git a/assets/textures/item_name_static/item_name_static.h b/assets/textures/item_name_static/item_name_static.h new file mode 100644 index 0000000000..7a4c6cf7b7 --- /dev/null +++ b/assets/textures/item_name_static/item_name_static.h @@ -0,0 +1,513 @@ +#ifndef ITEM_NAME_STATIC_H +#define ITEM_NAME_STATIC_H + +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64item.h" + +#if OOT_NTSC + +extern u64 gDekuStickItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuNutItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyBowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireArrowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDinsFireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairySlingshotItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyOcarinaItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOcarinaOfTimeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombchuItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHookshotItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLongshotItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIceArrowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFaroresWindItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoomerangItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLensItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMagicBeansItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMegatonHammerItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightArrowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNayrusLoveItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEmptyBottleItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRedPotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGreenPotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBluePotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBottledFairyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFishItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFullMilkItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRutosLetterItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBlueFireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBugItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBigPoeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHalfMilkItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWeirdEggItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCuccoItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLetterItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKeatonMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSkullMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpookyMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBunnyHoodItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudoMaskItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMaskofTruthItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSOLDOUTItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketEggItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketCuccoItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCojiroItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddMushroomItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddPotionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoachersSawItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGoronsSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPrescriptionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeBallFrogItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeDropsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gClaimCheckItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedWindMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedFireMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedIceMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMasterSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGiantsKnifeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuShieldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHylianShieldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMirrorShieldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriTunicItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronTunicItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraTunicItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriBootsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIronBootsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHoverBootsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag30ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag40ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag50ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver30ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver40ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver50ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag20ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag30ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag40ItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsBraceletItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverGauntletsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenGauntletsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverScaleItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenScaleItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGiantsKnifeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName4JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMinuetOfForestItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoleroOfFireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSerenadeOfWaterItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRequiemOfSpiritItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNocturneOfShadowItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPreludeOfLightItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLullabyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEponasSongItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSariasSongItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSunsSongItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfTimeItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfStormsItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gForestMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWaterMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpiritMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gShadowMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightMedallionItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriEmeraldItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsRubyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZorasSapphireItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gStoneofAgonyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudosCardItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldSkulltulaItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPieceOfHeartItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedPieceOfHeartItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBigKeyItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCompassItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDungeonMapItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName5JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName6JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName7JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBiggoronsSwordItemNameJPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; + +#endif + +extern u64 gDekuStickItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuNutItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyBowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireArrowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDinsFireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairySlingshotItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyOcarinaItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOcarinaOfTimeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombchuItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHookshotItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLongshotItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIceArrowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFaroresWindItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoomerangItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLensItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMagicBeansItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMegatonHammerItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightArrowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNayrusLoveItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEmptyBottleItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRedPotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGreenPotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBluePotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBottledFairyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFishItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFullMilkItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRutosLetterItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBlueFireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBugItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBigPoeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHalfMilkItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWeirdEggItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCuccoItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLetterItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKeatonMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSkullMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpookyMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBunnyHoodItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudoMaskItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMaskofTruthItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSOLDOUTItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketEggItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketCuccoItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCojiroItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddMushroomItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddPotionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoachersSawItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGoronsSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPrescriptionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeBallFrogItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeDropsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gClaimCheckItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedWindMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedFireMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedIceMedallionItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMasterSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGiantsKnifeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuShieldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHylianShieldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMirrorShieldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriTunicItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronTunicItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraTunicItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriBootsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIronBootsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHoverBootsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag30ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag40ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag50ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver30ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver40ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver50ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag20ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag30ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag40ItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsBraceletItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverGauntletsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenGauntletsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverScaleItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenScaleItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGiantsKnifeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName4JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMinuetOfForestItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoleroOfFireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSerenadeOfWaterItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRequiemOfSpiritItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNocturneOfShadowItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPreludeOfLightItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLullabyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEponasSongItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSariasSongItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSunsSongItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfTimeItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfStormsItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gForestMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWaterMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpiritMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gShadowMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightMedallionItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriEmeraldItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsRubyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZorasSapphireItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gStoneofAgonyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudosCardItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldSkulltulaItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPieceOfHeartItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedPieceOfHeartItemName1JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBigKeyItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCompassItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDungeonMapItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName5JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName6JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName7JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBiggoronsSwordItemNameENGTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; + +#if OOT_PAL + +extern u64 gDekuStickItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuNutItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombItemNameItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyBowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireArrowItemNameUnk2GERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDinsFireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairySlingshotItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyOcarinaItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOcarinaOfTimeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombchuItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHookshotItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLongshotItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIceArrowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFaroresWindItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoomerangItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLensItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMagicBeansItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMegatonHammerItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightArrowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNayrusLoveItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEmptyBottleItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRedPotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGreenPotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBluePotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBottledFairyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFishItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFullMilkItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRutosLetterItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBlueFireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBugItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBigPoeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHalfMilkItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWeirdEggItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCuccoItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLetterItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKeatonMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSkullMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpookyMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBunnyHoodItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudoMaskItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMaskofTruthItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSOLDOUTItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketEggItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketCuccoItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCojiroItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddMushroomItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddPotionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoachersSawItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGoronsSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPrescriptionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeBallFrogItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeDropsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gClaimCheckItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedWindMedallionItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedFireMedallionItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedIceMedallionItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMasterSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGiantsKnifeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuShieldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHylianShieldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMirrorShieldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriTunicItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronTunicItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraTunicItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriBootsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIronBootsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHoverBootsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag30ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag40ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag50ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver30ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver40ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver50ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag20ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag30ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag40ItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsBraceletItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverGauntletsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenGauntletsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverScaleItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenScaleItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGiantsKnifeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName8JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName9JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName10JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName11JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMinuetOfForestItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoleroOfFireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSerenadeOfWaterItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRequiemOfSpiritItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNocturneOfShadowItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPreludeOfLightItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLullabyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEponasSongItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSariasSongItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSunsSongItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfTimeItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfStormsItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gForestMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWaterMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpiritMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gShadowMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightMedallionItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriEmeraldItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsRubyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZorasSapphireItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gStoneofAgonyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudosCardItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldSkulltulaItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHeartContainerItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedPieceOfHeartItemName2JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBigKeyItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCompassItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDungeonMapItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName12JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName13JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName14JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBiggoronsSwordItemNameGERTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; + +extern u64 gDekuStickItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuNutItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyBowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireArrowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDinsFireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairySlingshotItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFairyOcarinaItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOcarinaOfTimeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombchuItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHookshotItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLongshotItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIceArrowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFaroresWindItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoomerangItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLensItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMagicBeansItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMegatonHammerItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightArrowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNayrusLoveItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEmptyBottleItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRedPotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGreenPotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBluePotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBottledFairyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFishItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFullMilkItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRutosLetterItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBlueFireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBugItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBigPoeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHalfMilkItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWeirdEggItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCuccoItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLetterItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKeatonMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSkullMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpookyMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBunnyHoodItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudoMaskItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMaskofTruthItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSOLDOUTItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketEggItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPocketCuccoItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCojiroItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddMushroomItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gOddPotionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPoachersSawItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGoronsSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPrescriptionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeBallFrogItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEyeDropsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gClaimCheckItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedWindMedallionItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedFireMedallionItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedIceMedallionItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMasterSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGiantsKnifeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDekuShieldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHylianShieldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMirrorShieldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriTunicItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronTunicItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZoraTunicItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriBootsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gIronBootsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHoverBootsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag30ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag40ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBulletBag50ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver30ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver40ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gQuiver50ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag20ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag30ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBombBag40ItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsBraceletItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverGauntletsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenGauntletsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSilverScaleItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldenScaleItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBrokenGiantsKnifeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName15JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName16JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName17JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName18JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gMinuetOfForestItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBoleroOfFireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSerenadeOfWaterItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gRequiemOfSpiritItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gNocturneOfShadowItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gPreludeOfLightItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZeldasLullabyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gEponasSongItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSariasSongItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSunsSongItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfTimeItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSongOfStormsItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gForestMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gFireMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gWaterMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gSpiritMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gShadowMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gLightMedallionItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gKokiriEmeraldItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoronsRubyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gZorasSapphireItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gStoneofAgonyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGerudosCardItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gGoldSkulltulaItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gHeartContainerItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedPieceOfHeartItemName3JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBossKeyItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gCompassItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gDungeonMapItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName19JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName20JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gUnusedBossKeyItemName21JPNTex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; +extern u64 gBiggoronsSwordItemNameFRATex[TEX_LEN(u64, ITEM_NAME_TEX_WIDTH, ITEM_NAME_TEX_HEIGHT, 4)]; + +#endif + +#endif diff --git a/assets/xml/textures/item_name_static.xml b/assets/xml/textures/item_name_static.xml index 0740038d9b..0e2d769474 100644 --- a/assets/xml/textures/item_name_static.xml +++ b/assets/xml/textures/item_name_static.xml @@ -56,9 +56,9 @@ - - - + + + @@ -115,7 +115,7 @@ - + @@ -123,11 +123,12 @@ + - + - + @@ -179,9 +180,9 @@ - - - + + + @@ -209,10 +210,10 @@ - - - - + + + + @@ -237,14 +238,14 @@ - - - + + + - - - + + + diff --git a/assets/xml/textures/item_name_static_pal.xml b/assets/xml/textures/item_name_static_pal.xml index adf66fcb9b..321c890a94 100644 --- a/assets/xml/textures/item_name_static_pal.xml +++ b/assets/xml/textures/item_name_static_pal.xml @@ -86,10 +86,10 @@ - - - - + + + + @@ -119,10 +119,11 @@ - - - + + + + @@ -209,10 +210,10 @@ - - - - + + + + @@ -242,10 +243,11 @@ - - - + + + + @@ -332,10 +334,10 @@ - - - - + + + + @@ -365,9 +367,9 @@ - - - + + + diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 66725e67d4..e687efff02 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -974,16 +974,10 @@ assets/textures/backgrounds/vr_TTVR_static.c assets/textures/backgrounds/vr_ZRVR_pal_static.c assets/textures/backgrounds/vr_ZRVR_static.c assets/textures/do_action_static/do_action_static.c -assets/textures/icon_item_24_static/icon_item_24_static.c assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.c assets/textures/icon_item_field_static/icon_item_field_static.c -assets/textures/icon_item_fra_static/icon_item_fra_static.c assets/textures/icon_item_gameover_static/icon_item_gameover_static.c -assets/textures/icon_item_ger_static/icon_item_ger_static.c -assets/textures/icon_item_jpn_static/icon_item_jpn_static.c -assets/textures/icon_item_nes_static/icon_item_nes_static.c assets/textures/icon_item_static/icon_item_static.c -assets/textures/item_name_static/item_name_static.c assets/textures/kanji/kanji.c assets/textures/map_48x85_static/map_48x85_static.c assets/textures/map_grand_static/map_grand_static.c From 186dfb4aa9510d31d4ae6b1ca3d2e6ddbda9ac80 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 31 May 2025 10:41:58 +0200 Subject: [PATCH 06/42] GetItem_Draw: giDrawId and comment GID_ values (#2556) * rename GetItem_Draw's arg drawId -> giDrawId * comment GID_ enum values on sDrawItemTable * drawId -> giDrawId in GetItem_DrawXxx --- include/z64draw.h | 2 +- src/code/z_draw.c | 474 +++++++++++++++++++++++----------------------- 2 files changed, 238 insertions(+), 238 deletions(-) diff --git a/include/z64draw.h b/include/z64draw.h index 51250ed8c8..95c5aa2340 100644 --- a/include/z64draw.h +++ b/include/z64draw.h @@ -5,6 +5,6 @@ struct PlayState; -void GetItem_Draw(struct PlayState* play, s16 drawId); +void GetItem_Draw(struct PlayState* play, s16 giDrawId); #endif diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 9e0dd236eb..4cb14f017a 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -84,32 +84,32 @@ #include "assets/objects/object_st/object_st.h" // "Get Item" Model Draw Functions -void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId); -void GetItem_DrawSoldOut(PlayState* play, s16 drawId); -void GetItem_DrawBlueFire(PlayState* play, s16 drawId); -void GetItem_DrawPoes(PlayState* play, s16 drawId); -void GetItem_DrawFairy(PlayState* play, s16 drawId); -void GetItem_DrawMirrorShield(PlayState* play, s16 drawId); -void GetItem_DrawSkullToken(PlayState* play, s16 drawId); -void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId); -void GetItem_DrawCompass(PlayState* play, s16 drawId); -void GetItem_DrawPotion(PlayState* play, s16 drawId); -void GetItem_DrawGoronSword(PlayState* play, s16 drawId); -void GetItem_DrawDekuNuts(PlayState* play, s16 drawId); -void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId); -void GetItem_DrawFish(PlayState* play, s16 drawId); -void GetItem_DrawOpa0(PlayState* play, s16 drawId); -void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId); -void GetItem_DrawXlu01(PlayState* play, s16 drawId); -void GetItem_DrawOpa10Xlu2(PlayState* play, s16 drawId); -void GetItem_DrawMagicArrow(PlayState* play, s16 drawId); -void GetItem_DrawMagicSpell(PlayState* play, s16 drawId); -void GetItem_DrawOpa1023(PlayState* play, s16 drawId); -void GetItem_DrawOpa10Xlu32(PlayState* play, s16 drawId); -void GetItem_DrawSmallRupee(PlayState* play, s16 drawId); -void GetItem_DrawScale(PlayState* play, s16 drawId); -void GetItem_DrawBulletBag(PlayState* play, s16 drawId); -void GetItem_DrawWallet(PlayState* play, s16 drawId); +void GetItem_DrawMaskOrBombchu(PlayState* play, s16 giDrawId); +void GetItem_DrawSoldOut(PlayState* play, s16 giDrawId); +void GetItem_DrawBlueFire(PlayState* play, s16 giDrawId); +void GetItem_DrawPoes(PlayState* play, s16 giDrawId); +void GetItem_DrawFairy(PlayState* play, s16 giDrawId); +void GetItem_DrawMirrorShield(PlayState* play, s16 giDrawId); +void GetItem_DrawSkullToken(PlayState* play, s16 giDrawId); +void GetItem_DrawEggOrMedallion(PlayState* play, s16 giDrawId); +void GetItem_DrawCompass(PlayState* play, s16 giDrawId); +void GetItem_DrawPotion(PlayState* play, s16 giDrawId); +void GetItem_DrawGoronSword(PlayState* play, s16 giDrawId); +void GetItem_DrawDekuNuts(PlayState* play, s16 giDrawId); +void GetItem_DrawRecoveryHeart(PlayState* play, s16 giDrawId); +void GetItem_DrawFish(PlayState* play, s16 giDrawId); +void GetItem_DrawOpa0(PlayState* play, s16 giDrawId); +void GetItem_DrawOpa0Xlu1(PlayState* play, s16 giDrawId); +void GetItem_DrawXlu01(PlayState* play, s16 giDrawId); +void GetItem_DrawOpa10Xlu2(PlayState* play, s16 giDrawId); +void GetItem_DrawMagicArrow(PlayState* play, s16 giDrawId); +void GetItem_DrawMagicSpell(PlayState* play, s16 giDrawId); +void GetItem_DrawOpa1023(PlayState* play, s16 giDrawId); +void GetItem_DrawOpa10Xlu32(PlayState* play, s16 giDrawId); +void GetItem_DrawSmallRupee(PlayState* play, s16 giDrawId); +void GetItem_DrawScale(PlayState* play, s16 giDrawId); +void GetItem_DrawBulletBag(PlayState* play, s16 giDrawId); +void GetItem_DrawWallet(PlayState* play, s16 giDrawId); typedef struct DrawItemTableEntry { /* 0x00 */ void (*drawFunc)(PlayState*, s16); @@ -117,260 +117,260 @@ typedef struct DrawItemTableEntry { } DrawItemTableEntry; // size = 0x24 DrawItemTableEntry sDrawItemTable[] = { - // bottle, OBJECT_GI_BOTTLE + // GID_BOTTLE_EMPTY { GetItem_DrawOpa0Xlu1, { gGiBottleStopperDL, gGiBottleDL } }, - // small key, OBJECT_GI_KEY + // GID_SMALL_KEY { GetItem_DrawOpa0, { gGiSmallKeyDL } }, - // minuet of forest, OBJECT_GI_MELODY + // GID_SONG_MINUET { GetItem_DrawXlu01, { gGiMinuetColorDL, gGiSongNoteDL } }, - // bolero of fire, OBJECT_GI_MELODY + // GID_SONG_BOLERO { GetItem_DrawXlu01, { gGiBoleroColorDL, gGiSongNoteDL } }, - // serenade of water, OBJECT_GI_MELODY + // GID_SONG_SERENADE { GetItem_DrawXlu01, { gGiSerenadeColorDL, gGiSongNoteDL } }, - // requiem of spirit, OBJECT_GI_MELODY + // GID_SONG_REQUIEM { GetItem_DrawXlu01, { gGiRequiemColorDL, gGiSongNoteDL } }, - // nocturne of shadow, OBJECT_GI_MELODY + // GID_SONG_NOCTURNE { GetItem_DrawXlu01, { gGiNocturneColorDL, gGiSongNoteDL } }, - // prelude of light, OBJECT_GI_MELODY + // GID_SONG_PRELUDE { GetItem_DrawXlu01, { gGiPreludeColorDL, gGiSongNoteDL } }, - // recovery heart, OBJECT_GI_HEART + // GID_RECOVERY_HEART { GetItem_DrawRecoveryHeart, { gGiRecoveryHeartDL } }, - // boss key, OBJECT_GI_BOSSKEY + // GID_BOSS_KEY { GetItem_DrawOpa0Xlu1, { gGiBossKeyDL, gGiBossKeyGemDL } }, - // compass, OBJECT_GI_COMPASS + // GID_COMPASS { GetItem_DrawCompass, { gGiCompassDL, gGiCompassGlassDL } }, - // forest medallion, OBJECT_GI_MEDAL + // GID_MEDALLION_FOREST { GetItem_DrawEggOrMedallion, { gGiForestMedallionFaceDL, gGiMedallionDL } }, - // fire medallion, OBJECT_GI_MEDAL + // GID_MEDALLION_FIRE { GetItem_DrawEggOrMedallion, { gGiFireMedallionFaceDL, gGiMedallionDL } }, - // water medallion, OBJECT_GI_MEDAL + // GID_MEDALLION_WATER { GetItem_DrawEggOrMedallion, { gGiWaterMedallionFaceDL, gGiMedallionDL } }, - // spirit medallion, OBJECT_GI_MEDAL + // GID_MEDALLION_SPIRIT { GetItem_DrawEggOrMedallion, { gGiSpiritMedallionFaceDL, gGiMedallionDL } }, - // shadow medallion, OBJECT_GI_MEDAL + // GID_MEDALLION_SHADOW { GetItem_DrawEggOrMedallion, { gGiShadowMedallionFaceDL, gGiMedallionDL } }, - // light medallion, OBJECT_GI_MEDAL + // GID_MEDALLION_LIGHT { GetItem_DrawEggOrMedallion, { gGiLightMedallionFaceDL, gGiMedallionDL } }, - // deku nuts, OBJECT_GI_NUTS + // GID_DEKU_NUTS { GetItem_DrawDekuNuts, { gGiNutDL } }, - // heart container, OBJECT_GI_HEARTS + // GID_HEART_CONTAINER { GetItem_DrawXlu01, { gGiHeartBorderDL, gGiHeartContainerDL } }, - // heart piece, OBJECT_GI_HEARTS + // GID_HEART_PIECE { GetItem_DrawXlu01, { gGiHeartBorderDL, gGiHeartPieceDL } }, - // quiver 30, OBJECT_GI_ARROWCASE + // GID_QUIVER_30 { GetItem_DrawOpa1023, { gGiQuiverInnerDL, gGiQuiver30InnerColorDL, gGiQuiver30OuterColorDL, gGiQuiverOuterDL } }, - // quiver 40, OBJECT_GI_ARROWCASE + // GID_QUIVER_40 { GetItem_DrawOpa1023, { gGiQuiverInnerDL, gGiQuiver40InnerColorDL, gGiQuiver40OuterColorDL, gGiQuiverOuterDL } }, - // quiver 50, OBJECT_GI_ARROWCASE + // GID_QUIVER_50 { GetItem_DrawOpa1023, { gGiQuiverInnerDL, gGiQuiver50InnerColorDL, gGiQuiver50OuterColorDL, gGiQuiverOuterDL } }, - // bomb bag 20, OBJECT_GI_BOMBPOUCH + // GID_BOMB_BAG_20 { GetItem_DrawOpa1023, { gGiBombBagDL, gGiBombBag20BagColorDL, gGiBombBag20RingColorDL, gGiBombBagRingDL } }, - // bomb bag 30, OBJECT_GI_BOMBPOUCH + // GID_BOMB_BAG_30 { GetItem_DrawOpa1023, { gGiBombBagDL, gGiBombBag30BagColorDL, gGiBombBag30RingColorDL, gGiBombBagRingDL } }, - // bomb bag 40, OBJECT_GI_BOMBPOUCH + // GID_BOMB_BAG_40 { GetItem_DrawOpa1023, { gGiBombBagDL, gGiBombBag40BagColorDL, gGiBombBag40RingColorDL, gGiBombBagRingDL } }, - // stick, OBJECT_GI_STICK + // GID_DEKU_STICK { GetItem_DrawOpa0, { gGiStickDL } }, - // dungeon map, OBJECT_GI_MAP + // GID_DUNGEON_MAP { GetItem_DrawOpa0, { gGiDungeonMapDL } }, - // deku shield, OBJECT_GI_SHIELD_1 + // GID_SHIELD_DEKU { GetItem_DrawOpa0, { gGiDekuShieldDL } }, - // small magic jar, OBJECT_GI_MAGICPOT + // GID_MAGIC_JAR_SMALL { GetItem_DrawOpa0, { gGiMagicJarSmallDL } }, - // large magic jar, OBJECT_GI_MAGICPOT + // GID_MAGIC_JAR_LARGE { GetItem_DrawOpa0, { gGiMagicJarLargeDL } }, - // bombs, OBJECT_GI_BOMB_1 + // GID_BOMB { GetItem_DrawOpa0, { gGiBombDL } }, - // stone of agony, OBJECT_GI_MAP + // GID_STONE_OF_AGONY { GetItem_DrawOpa0, { gGiStoneOfAgonyDL } }, - // adult's wallet, OBJECT_GI_PURSE + // GID_WALLET_ADULT { GetItem_DrawWallet, { gGiWalletDL, gGiAdultWalletColorDL, gGiAdultWalletRupeeOuterColorDL, gGiWalletRupeeOuterDL, gGiAdultWalletStringColorDL, gGiWalletStringDL, gGiAdultWalletRupeeInnerColorDL, gGiWalletRupeeInnerDL } }, - // giant's wallet, OBJECT_GI_PURSE + // GID_WALLET_GIANT { GetItem_DrawWallet, { gGiWalletDL, gGiGiantsWalletColorDL, gGiGiantsWalletRupeeOuterColorDL, gGiWalletRupeeOuterDL, gGiGiantsWalletStringColorDL, gGiWalletStringDL, gGiGiantsWalletRupeeInnerColorDL, gGiWalletRupeeInnerDL } }, - // gerudo card, OBJECT_GI_GERUDO + // GID_GERUDOS_CARD { GetItem_DrawOpa0, { gGiGerudoCardDL } }, - // arrows (small), OBJECT_GI_ARROW + // GID_ARROWS_5 { GetItem_DrawOpa0, { gGiArrowSmallDL } }, - // arrows (medium), OBJECT_GI_ARROW + // GID_ARROWS_10 { GetItem_DrawOpa0, { gGiArrowMediumDL } }, - // arrows (large), OBJECT_GI_ARROW + // GID_ARROWS_30 { GetItem_DrawOpa0, { gGiArrowLargeDL } }, - // bombchus, OBJECT_GI_BOMB_2 + // GID_BOMBCHU { GetItem_DrawMaskOrBombchu, { gGiBombchuDL } }, - // egg, OBJECT_GI_EGG + // GID_EGG { GetItem_DrawEggOrMedallion, { gGiEggMaterialDL, gGiEggDL } }, - // silver scale, OBJECT_GI_SCALE + // GID_SCALE_SILVER { GetItem_DrawScale, { gGiScaleWaterDL, gGiSilverScaleWaterColorDL, gGiSilverScaleColorDL, gGiScaleDL } }, - // gold scale, OBJECT_GI_SCALE + // GID_SCALE_GOLDEN { GetItem_DrawScale, { gGiScaleWaterDL, gGiGoldenScaleWaterColorDL, gGiGoldenScaleColorDL, gGiScaleDL } }, - // hylian shield, OBJECT_GI_SHIELD_2 + // GID_SHIELD_HYLIAN { GetItem_DrawOpa0, { gGiHylianShieldDL } }, - // hookshot, OBJECT_GI_HOOKSHOT + // GID_HOOKSHOT { GetItem_DrawOpa0, { gGiHookshotDL } }, - // longshot, OBJECT_GI_HOOKSHOT + // GID_LONGSHOT { GetItem_DrawOpa0, { gGiLongshotDL } }, - // ocarina of time, OBJECT_GI_OCARINA + // GID_OCARINA_OF_TIME { GetItem_DrawOpa0Xlu1, { gGiOcarinaTimeDL, gGiOcarinaTimeHolesDL } }, - // milk, OBJECT_GI_MILK + // GID_BOTTLE_MILK_FULL { GetItem_DrawOpa0Xlu1, { gGiMilkBottleContentsDL, gGiMilkBottleDL } }, - // keaton mask, OBJECT_GI_KI_TAN_MASK + // GID_MASK_KEATON { GetItem_DrawOpa0Xlu1, { gGiKeatonMaskDL, gGiKeatonMaskEyesDL } }, - // spooky mask, OBJECT_GI_REDEAD_MASK + // GID_MASK_SPOOKY { GetItem_DrawOpa0, { gGiSpookyMaskDL } }, - // slingshot, OBJECT_GI_PACHINKO + // GID_SLINGSHOT { GetItem_DrawOpa0, { gGiSlingshotDL } }, - // boomerang, OBJECT_GI_BOOMERANG + // GID_BOOMERANG { GetItem_DrawOpa0, { gGiBoomerangDL } }, - // bow, OBJECT_GI_BOW + // GID_BOW { GetItem_DrawOpa0, { gGiBowDL } }, - // lens, OBJECT_GI_GLASSES + // GID_LENS_OF_TRUTH { GetItem_DrawOpa0Xlu1, { gGiLensDL, gGiLensGlassDL } }, - // green potion, OBJECT_GI_LIQUID + // GID_BOTTLE_POTION_GREEN { GetItem_DrawPotion, { gGiPotionPotDL, gGiGreenPotColorDL, gGiGreenLiquidColorDL, gGiPotionLiquidDL, gGiGreenPatternColorDL, gGiPotionPatternDL } }, - // red potion, OBJECT_GI_LIQUID + // GID_BOTTLE_POTION_RED { GetItem_DrawPotion, { gGiPotionPotDL, gGiRedPotColorDL, gGiRedLiquidColorDL, gGiPotionLiquidDL, gGiRedPatternColorDL, gGiPotionPatternDL } }, - // blue potion, OBJECT_GI_LIQUID + // GID_BOTTLE_POTION_BLUE { GetItem_DrawPotion, { gGiPotionPotDL, gGiBluePotColorDL, gGiBlueLiquidColorDL, gGiPotionLiquidDL, gGiBluePatternColorDL, gGiPotionPatternDL } }, - // mirror shield, OBJECT_GI_SHIELD_3 + // GID_SHIELD_MIRROR { GetItem_DrawMirrorShield, { gGiMirrorShieldDL, gGiMirrorShieldSymbolDL } }, - // zelda's letter, OBJECT_GI_LETTER + // GID_ZELDAS_LETTER { GetItem_DrawOpa0Xlu1, { gGiLetterDL, gGiLetterWritingDL } }, - // goron tunic, OBJECT_GI_CLOTHES + // GID_TUNIC_GORON { GetItem_DrawOpa1023, { gGiTunicCollarDL, gGiGoronCollarColorDL, gGiGoronTunicColorDL, gGiTunicDL } }, - // zora tunic, OBJECT_GI_CLOTHES + // GID_TUNIC_ZORA { GetItem_DrawOpa1023, { gGiTunicCollarDL, gGiZoraCollarColorDL, gGiZoraTunicColorDL, gGiTunicDL } }, - // beans, OBJECT_GI_BEAN + // GID_MAGIC_BEAN { GetItem_DrawOpa0, { gGiBeanDL } }, - // fish, OBJECT_GI_FISH + // GID_FISH { GetItem_DrawFish, { gGiFishDL } }, - // saw, OBJECT_GI_SAW + // GID_POACHERS_SAW { GetItem_DrawOpa0, { gGiSawDL } }, - // hammer, OBJECT_GI_HAMMER + // GID_HAMMER { GetItem_DrawOpa0, { gGiHammerDL } }, - // grass, OBJECT_GI_GRASS + // GID_GRASS { GetItem_DrawOpa0, { gGiGrassDL } }, - // biggorons sword, OBJECT_GI_LONGSWORD + // GID_SWORD_BIGGORON { GetItem_DrawGoronSword, { gGiBiggoronSwordDL } }, - // chicken, OBJECT_GI_NIWATORI + // GID_CUCCO { GetItem_DrawOpa10Xlu2, { gGiChickenDL, gGiChickenColorDL, gGiChickenEyesDL } }, - // ruto's letter, OBJECT_GI_BOTTLE_LETTER + // GID_BOTTLE_RUTOS_LETTER { GetItem_DrawOpa0Xlu1, { gGiLetterBottleContentsDL, gGiLetterBottleDL } }, - // fairy ocarina, OBJECT_GI_OCARINA_0 + // GID_OCARINA_FAIRY { GetItem_DrawOpa0Xlu1, { gGiOcarinaFairyDL, gGiOcarinaFairyHolesDL } }, - // iron boots, OBJECT_GI_BOOTS_2 + // GID_BOOTS_IRON { GetItem_DrawOpa0Xlu1, { gGiIronBootsDL, gGiIronBootsRivetsDL } }, - // seeds, OBJECT_GI_SEED + // GID_DEKU_SEEDS { GetItem_DrawOpa0, { gGiSeedDL } }, - // silver gauntlets, OBJECT_GI_GLOVES + // GID_SILVER_GAUNTLETS { GetItem_DrawOpa10Xlu32, { gGiGauntletsDL, gGiSilverGauntletsColorDL, gGiGauntletsPlateDL, gGiSilverGauntletsPlateColorDL } }, - // golden gauntlets, OBJECT_GI_GLOVES + // GID_GOLD_GAUNTLETS { GetItem_DrawOpa10Xlu32, { gGiGauntletsDL, gGiGoldenGauntletsColorDL, gGiGauntletsPlateDL, gGiGoldenGauntletsPlateColorDL } }, - // yellow n coin, OBJECT_GI_COIN + // GID_NCOIN_YELLOW { GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiYellowCoinColorDL, gGiNDL } }, - // red n coin, OBJECT_GI_COIN + // GID_NCOIN_RED { GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiRedCoinColorDL, gGiNDL } }, - // green n coin, OBJECT_GI_COIN + // GID_NCOIN_GREEN { GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiGreenCoinColorDL, gGiNDL } }, - // blue n coin, OBJECT_GI_COIN + // GID_NCOIN_BLUE { GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiBlueCoinColorDL, gGiNDL } }, - // skull mask, OBJECT_GI_SKJ_MASK + // GID_MASK_SKULL { GetItem_DrawOpa0, { gGiSkullMaskDL } }, - // bunny hood OBJECT_GI_RABIT_MASK + // GID_MASK_BUNNY_HOOD { GetItem_DrawOpa0Xlu1, { gGiBunnyHoodDL, gGiBunnyHoodEyesDL } }, - // mask of truth, OBJECT_GI_TRUTH_MASK + // GID_MASK_TRUTH { GetItem_DrawOpa0Xlu1, { gGiMaskOfTruthDL, gGiMaskOfTruthAccentsDL } }, - // eyedrops, OBJECT_GI_EYE_LOTION + // GID_EYE_DROPS { GetItem_DrawOpa0Xlu1, { gGiEyeDropsCapDL, gGiEyeDropsBottleDL } }, - // odd potion, OBJECT_GI_POWDER + // GID_ODD_POTION { GetItem_DrawOpa0, { gGiOddPotionDL } }, - // odd mushroom, OBJECT_GI_MUSHROOM + // GID_ODD_MUSHROOM { GetItem_DrawOpa0, { gGiOddMushroomDL } }, - // claim check, OBJECT_GI_TICKETSTONE + // GID_CLAIM_CHECK { GetItem_DrawOpa0Xlu1, { gGiClaimCheckDL, gGiClaimCheckWritingDL } }, - // broken goron's sword, OBJECT_GI_BROKENSWORD + // GID_BROKEN_GORONS_SWORD { GetItem_DrawGoronSword, { gGiBrokenGoronSwordDL } }, - // prescription, OBJECT_GI_PRESCRIPTION + // GID_PRESCRIPTION { GetItem_DrawOpa0Xlu1, { gGiPrescriptionDL, gGiPrescriptionWritingDL } }, - // goron bracelet, OBJECT_GI_BRACELET + // GID_GORONS_BRACELET { GetItem_DrawOpa0, { gGiGoronBraceletDL } }, - // sold out, OBJECT_GI_SOLDOUT + // GID_SOLDOUT { GetItem_DrawSoldOut, { gGiSoldOutDL } }, - // frog, OBJECT_GI_FROG + // GID_EYEBALL_FROG { GetItem_DrawOpa0Xlu1, { gGiFrogDL, gGiFrogEyesDL } }, - // goron mask, OBJECT_GI_GOLONMASK + // GID_MASK_GORON { GetItem_DrawMaskOrBombchu, { gGiGoronMaskDL } }, - // zora mask, OBJECT_GI_ZORAMASK + // GID_MASK_ZORA { GetItem_DrawMaskOrBombchu, { gGiZoraMaskDL } }, - // gerudo mask, OBJECT_GI_GERUDOMASK + // GID_MASK_GERUDO { GetItem_DrawMaskOrBombchu, { gGiGerudoMaskDL } }, - // cojiro, OBJECT_GI_NIWATORI + // GID_COJIRO { GetItem_DrawOpa10Xlu2, { gGiChickenDL, gGiCojiroColorDL, gGiChickenEyesDL } }, - // hover boots, OBJECT_GI_HOVERBOOTS + // GID_BOOTS_HOVER { GetItem_DrawOpa0, { gGiHoverBootsDL } }, - // fire arrows, OBJECT_GI_M_ARROW + // GID_ARROW_FIRE { GetItem_DrawMagicArrow, { gGiMagicArrowDL, gGiFireArrowColorDL, gGiArrowMagicDL } }, - // ice arrows, OBJECT_GI_M_ARROW + // GID_ARROW_ICE { GetItem_DrawMagicArrow, { gGiMagicArrowDL, gGiIceArrowColorDL, gGiArrowMagicDL } }, - // light arrows, OBJECT_GI_M_ARROW + // GID_ARROW_LIGHT { GetItem_DrawMagicArrow, { gGiMagicArrowDL, gGiLightArrowColorDL, gGiArrowMagicDL } }, - // skulltula token, OBJECT_GI_SUTARU + // GID_SKULL_TOKEN { GetItem_DrawSkullToken, { gGiSkulltulaTokenDL, gGiSkulltulaTokenFlameDL } }, - // din's fire, OBJECT_GI_GODDESS + // GID_DINS_FIRE { GetItem_DrawMagicSpell, { gGiMagicSpellDiamondDL, gGiDinsFireColorDL, gGiMagicSpellOrbDL } }, - // farore's wind, OBJECT_GI_GODDESS + // GID_FARORES_WIND { GetItem_DrawMagicSpell, { gGiMagicSpellDiamondDL, gGiFaroresWindColorDL, gGiMagicSpellOrbDL } }, - // nayru's Love, OBJECT_GI_GODDESS + // GID_NAYRUS_LOVE { GetItem_DrawMagicSpell, { gGiMagicSpellDiamondDL, gGiNayrusLoveColorDL, gGiMagicSpellOrbDL } }, - // blue fire, OBJECT_GI_FIRE + // GID_BLUE_FIRE { GetItem_DrawBlueFire, { gGiBlueFireChamberstickDL, gGiBlueFireFlameDL } }, - // bugs, OBJECT_GI_INSECT + // GID_BUG { GetItem_DrawOpa0Xlu1, { gGiBugsContainerDL, gGiBugsGlassDL } }, - // butterfly, OBJECT_GI_BUTTERFLY + // GID_BUTTERFLY { GetItem_DrawOpa0Xlu1, { gGiButterflyContainerDL, gGiButterflyGlassDL } }, - // poe, OBJECT_GI_GHOST + // GID_POE { GetItem_DrawPoes, { gGiGhostContainerLidDL, gGiGhostContainerGlassDL, gGiGhostContainerContentsDL, gGiPoeColorDL } }, - // fairy, OBJECT_GI_SOUL + // GID_FAIRY { GetItem_DrawFairy, { gGiFairyContainerBaseCapDL, gGiFairyContainerGlassDL, gGiFairyContainerContentsDL } }, - // bullet bag 40, OBJECT_GI_DEKUPOUCH + // GID_BULLET_BAG { GetItem_DrawBulletBag, { gGiBulletBagDL, gGiBulletBagColorDL, gGiBulletBagStringDL, gGiBulletBagStringColorDL, gGiBulletBagWritingDL } }, - // green rupee, OBJECT_GI_RUPY + // GID_RUPEE_GREEN { GetItem_DrawSmallRupee, { gGiRupeeInnerDL, gGiGreenRupeeInnerColorDL, gGiRupeeOuterDL, gGiGreenRupeeOuterColorDL } }, - // blue rupee, OBJECT_GI_RUPY + // GID_RUPEE_BLUE { GetItem_DrawSmallRupee, { gGiRupeeInnerDL, gGiBlueRupeeInnerColorDL, gGiRupeeOuterDL, gGiBlueRupeeOuterColorDL } }, - // red rupee, OBJECT_GI_RUPY + // GID_RUPEE_RED { GetItem_DrawSmallRupee, { gGiRupeeInnerDL, gGiRedRupeeInnerColorDL, gGiRupeeOuterDL, gGiRedRupeeOuterColorDL } }, - // big poe, OBJECT_GI_GHOST + // GID_BIG_POE { GetItem_DrawPoes, { gGiGhostContainerLidDL, gGiGhostContainerGlassDL, gGiGhostContainerContentsDL, gGiBigPoeColorDL } }, - // purple rupee, OBJECT_GI_RUPY + // GID_RUPEE_PURPLE { GetItem_DrawOpa10Xlu32, { gGiRupeeInnerDL, gGiPurpleRupeeInnerColorDL, gGiRupeeOuterDL, gGiPurpleRupeeOuterColorDL } }, - // gold rupee, OBJECT_GI_RUPY + // GID_RUPEE_GOLD { GetItem_DrawOpa10Xlu32, { gGiRupeeInnerDL, gGiGoldRupeeInnerColorDL, gGiRupeeOuterDL, gGiGoldRupeeOuterColorDL } }, - // bullet bag 50, OBJECT_GI_DEKUPOUCH + // GID_BULLET_BAG_50 { GetItem_DrawBulletBag, { gGiBulletBagDL, gGiBulletBag50ColorDL, gGiBulletBagStringDL, gGiBulletBag50StringColorDL, gGiBulletBagWritingDL } }, - // kokiri sword, OBJECT_GI_SWORD_1 + // GID_SWORD_KOKIRI { GetItem_DrawOpa0, { gGiKokiriSwordDL } }, - // gold skulltula token, OBJECT_ST + // GID_SKULL_TOKEN_2 { GetItem_DrawSkullToken, { gSkulltulaTokenDL, gSkulltulaTokenFlameDL } }, }; @@ -378,44 +378,44 @@ DrawItemTableEntry sDrawItemTable[] = { * Draw "Get Item" Model * Calls the corresponding draw function for the given draw ID */ -void GetItem_Draw(PlayState* play, s16 drawId) { - sDrawItemTable[drawId].drawFunc(play, drawId); +void GetItem_Draw(PlayState* play, s16 giDrawId) { + sDrawItemTable[giDrawId].drawFunc(play, giDrawId); } // All remaining functions in this file are draw functions referenced in the table and called by the function above -void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId) { +void GetItem_DrawMaskOrBombchu(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 556); Gfx_SetupDL_26Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 560); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 565); } -void GetItem_DrawSoldOut(PlayState* play, s16 drawId) { +void GetItem_DrawSoldOut(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 572); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_5); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 576); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 581); } -void GetItem_DrawBlueFire(PlayState* play, s16 drawId) { +void GetItem_DrawBlueFire(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 588); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 592); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -426,24 +426,24 @@ void GetItem_DrawBlueFire(PlayState* play, s16 drawId) { Matrix_Translate(-8.0f, -2.0f, 0.0f, MTXMODE_APPLY); Matrix_ReplaceRotation(&play->billboardMtxF); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 615); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); Matrix_Pop(); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 621); } -void GetItem_DrawPoes(PlayState* play, s16 drawId) { +void GetItem_DrawPoes(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 628); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 632); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 641); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 0 * (play->state.frames * 0), 0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1), @@ -451,25 +451,25 @@ void GetItem_DrawPoes(PlayState* play, s16 drawId) { Matrix_Push(); Matrix_ReplaceRotation(&play->billboardMtxF); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 656); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); Matrix_Pop(); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 663); } -void GetItem_DrawFairy(PlayState* play, s16 drawId) { +void GetItem_DrawFairy(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 670); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 674); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 683); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 0 * (play->state.frames * 0), 0 * (play->state.frames * 0), 32, 32, 1, 1 * (play->state.frames * 1), @@ -477,13 +477,13 @@ void GetItem_DrawFairy(PlayState* play, s16 drawId) { Matrix_Push(); Matrix_ReplaceRotation(&play->billboardMtxF); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 698); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); Matrix_Pop(); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 704); } -void GetItem_DrawMirrorShield(PlayState* play, s16 drawId) { +void GetItem_DrawMirrorShield(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 712); @@ -494,23 +494,23 @@ void GetItem_DrawMirrorShield(PlayState* play, s16 drawId) { 1 * (play->state.frames * 2) % 256, 64, 64, 1, 0 * (play->state.frames * 0) % 128, 1 * (play->state.frames * 1) % 128, 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 723); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 730); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 735); } -void GetItem_DrawSkullToken(PlayState* play, s16 drawId) { +void GetItem_DrawSkullToken(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 742); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 746); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -518,13 +518,13 @@ void GetItem_DrawSkullToken(PlayState* play, s16 drawId) { 1 * -(play->state.frames * 5), 32, 32, 1, 0 * (play->state.frames * 0), 0 * (play->state.frames * 0), 32, 64)); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 760); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 765); } -void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId) { - DrawItemTableEntry* entry = &sDrawItemTable[drawId]; +void GetItem_DrawEggOrMedallion(PlayState* play, s16 giDrawId) { + DrawItemTableEntry* entry = &sDrawItemTable[giDrawId]; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 772); @@ -536,23 +536,23 @@ void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId) { CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 783); } -void GetItem_DrawCompass(PlayState* play, s16 drawId) { +void GetItem_DrawCompass(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 811); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 815); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_5); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 822); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 827); } -void GetItem_DrawPotion(PlayState* play, s16 drawId) { +void GetItem_DrawPotion(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 834); @@ -563,20 +563,20 @@ void GetItem_DrawPotion(PlayState* play, s16 drawId) { 1 * (play->state.frames * 1), 32, 32, 1, -1 * (play->state.frames * 1), 1 * (play->state.frames * 1), 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 845); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[2]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[3]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 855); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[5]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[4]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[5]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 861); } -void GetItem_DrawGoronSword(PlayState* play, s16 drawId) { +void GetItem_DrawGoronSword(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 868); @@ -587,12 +587,12 @@ void GetItem_DrawGoronSword(PlayState* play, s16 drawId) { 0 * (play->state.frames * 1), 32, 32, 1, 0 * (play->state.frames * 1), 0 * (play->state.frames * 1), 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 878); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 883); } -void GetItem_DrawDekuNuts(PlayState* play, s16 drawId) { +void GetItem_DrawDekuNuts(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 890); @@ -603,12 +603,12 @@ void GetItem_DrawDekuNuts(PlayState* play, s16 drawId) { 1 * (play->state.frames * 6), 32, 32, 1, 1 * (play->state.frames * 6), 1 * (play->state.frames * 6), 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 901); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 906); } -void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) { +void GetItem_DrawRecoveryHeart(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 913); @@ -619,12 +619,12 @@ void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) { 1 * -(play->state.frames * 3), 32, 32, 1, 0 * (play->state.frames * 1), 1 * -(play->state.frames * 2), 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 924); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 929); } -void GetItem_DrawFish(PlayState* play, s16 drawId) { +void GetItem_DrawFish(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 936); @@ -635,41 +635,41 @@ void GetItem_DrawFish(PlayState* play, s16 drawId) { 1 * (play->state.frames * 1), 32, 32, 1, 0 * (play->state.frames * 0), 1 * (play->state.frames * 1), 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 947); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 952); } -void GetItem_DrawOpa0(PlayState* play, s16 drawId) { +void GetItem_DrawOpa0(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 959); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 963); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 968); } -void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId) { +void GetItem_DrawOpa0Xlu1(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 975); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 979); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 986); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 991); } -void GetItem_DrawXlu01(PlayState* play, s16 drawId) { - DrawItemTableEntry* entry = &sDrawItemTable[drawId]; +void GetItem_DrawXlu01(PlayState* play, s16 giDrawId) { + DrawItemTableEntry* entry = &sDrawItemTable[giDrawId]; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 998); @@ -681,41 +681,41 @@ void GetItem_DrawXlu01(PlayState* play, s16 drawId) { CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1008); } -void GetItem_DrawOpa10Xlu2(PlayState* play, s16 drawId) { +void GetItem_DrawOpa10Xlu2(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1015); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 1019); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 1027); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1032); } -void GetItem_DrawMagicArrow(PlayState* play, s16 drawId) { +void GetItem_DrawMagicArrow(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1039); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 1043); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 1050); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1056); } -void GetItem_DrawMagicSpell(PlayState* play, s16 drawId) { +void GetItem_DrawMagicSpell(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1063); @@ -726,47 +726,47 @@ void GetItem_DrawMagicSpell(PlayState* play, s16 drawId) { 1 * -(play->state.frames * 6), 32, 32, 1, 1 * (play->state.frames * 1), -1 * (play->state.frames * 2), 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 1074); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1081); } -void GetItem_DrawOpa1023(PlayState* play, s16 drawId) { +void GetItem_DrawOpa1023(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1088); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 1092); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[2]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[3]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1100); } -void GetItem_DrawOpa10Xlu32(PlayState* play, s16 drawId) { +void GetItem_DrawOpa10Xlu32(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1108); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 1112); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 1120); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1126); } -void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) { +void GetItem_DrawSmallRupee(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1133); @@ -775,18 +775,18 @@ void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) { Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 1140); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); Gfx_SetupDL_25Xlu(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 1148); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1154); } -void GetItem_DrawScale(PlayState* play, s16 drawId) { +void GetItem_DrawScale(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1162); @@ -797,16 +797,16 @@ void GetItem_DrawScale(PlayState* play, s16 drawId) { -1 * (play->state.frames * 2), 64, 64, 1, 1 * (play->state.frames * 4), 1 * -(play->state.frames * 4), 32, 32)); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_draw.c", 1173); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[2]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[3]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[giDrawId].dlists[0]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1181); } -void GetItem_DrawBulletBag(PlayState* play, s16 drawId) { - DrawItemTableEntry* entry = &sDrawItemTable[drawId]; +void GetItem_DrawBulletBag(PlayState* play, s16 giDrawId) { + DrawItemTableEntry* entry = &sDrawItemTable[giDrawId]; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1188); @@ -824,21 +824,21 @@ void GetItem_DrawBulletBag(PlayState* play, s16 drawId) { CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1207); } -void GetItem_DrawWallet(PlayState* play, s16 drawId) { +void GetItem_DrawWallet(PlayState* play, s16 giDrawId) { s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1214); Gfx_SetupDL_25Opa(play->state.gfxCtx); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_draw.c", 1218); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[4]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[5]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[6]); - gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[7]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[1]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[0]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[2]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[3]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[4]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[5]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[6]); + gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[giDrawId].dlists[7]); CLOSE_DISPS(play->state.gfxCtx, "../z_draw.c", 1230); } From 84d4b6701fabc00004f4d7bb1aa72bb88f357f49 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 31 May 2025 14:14:22 +0200 Subject: [PATCH 07/42] T() macro in overlays 8 (#2551) * There is no bank!! * T() horse_game_check, hs, ice_hono, insect * T() ishi, kusa * T() kakasi, kakasi2, kakasi3 * T() Got the rail data * T() ko, ny, okarina_tag * review * review2 --- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 3 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 4 +- .../z_en_horse_game_check.c | 4 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 10 ++--- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 5 ++- .../actors/ovl_En_Insect/z_en_insect.c | 9 ++-- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 4 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 8 ++-- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 24 +++++------ .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 14 ++++--- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 4 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 8 ++-- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 9 ++-- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 7 ++-- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 41 ++++++++++--------- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 6 ++- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 7 +++- 17 files changed, 88 insertions(+), 79 deletions(-) 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 aebb758cd7..9484ff4053 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -10,6 +10,7 @@ #include "rand.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64draw.h" #include "z64play.h" @@ -402,7 +403,7 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) { if (this->requiredObjectSlot < 0) { Actor_Kill(&this->actor); PRINTF_COLOR_ERROR(); - PRINTF("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]); + PRINTF(T("バンクが無いよ！！(%s)\n", "There is no bank!! (%s)\n"), sShopItemDescriptions[params]); PRINTF_RST(); ASSERT(0, "0", "../z_en_girlA.c", 1434); return; 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 474912abb6..91a896632d 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -14,6 +14,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" #include "z64player.h" @@ -71,8 +72,7 @@ void EnGuest_Init(Actor* thisx, PlayState* play) { this->osAnimeObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_OS_ANIME); if (this->osAnimeObjectSlot < 0) { PRINTF_COLOR_ERROR(); - // "No such bank!!" - PRINTF("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", 129); + PRINTF(T("%s[%d] : バンクが無いよ！！\n", "%s[%d] : There is no bank!!\n"), "../z_en_guest.c", 129); PRINTF_RST(); ASSERT(0, "0", "../z_en_guest.c", 132); } diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index eefef20798..dc23954d50 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -15,6 +15,7 @@ #include "seqcmd.h" #include "sequence.h" #include "sys_math3d.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" #include "z64player.h" @@ -319,8 +320,7 @@ void EnHorseGameCheck_FinishMalonRace(EnHorseGameCheckMalonRace* this, PlayState play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); play->transitionTrigger = TRANS_TRIGGER_START; } else { - // "not supported" - PRINTF("En_HGC_Spot20_Ta_end():対応せず\n"); + PRINTF(T("En_HGC_Spot20_Ta_end():対応せず\n", "En_HGC_Spot20_Ta_end(): not supported\n")); gSaveContext.save.cutsceneIndex = 0; play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); 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 935fdedd97..76281c549f 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -12,6 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" #include "z64player.h" @@ -85,17 +86,14 @@ void EnHs_Init(Actor* thisx, PlayState* play) { } if (this->actor.params == 1) { - // "chicken shop (adult era)" - PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" ヒヨコの店(大人の時) \n", " chicken shop (adult era) \n") VT_RST); func_80A6E3A0(this, func_80A6E9AC); if (GET_ITEMGETINF(ITEMGETINF_30)) { - // "chicken shop closed" - PRINTF(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" ヒヨコ屋閉店 \n", " chicken shop closed \n") VT_RST); Actor_Kill(&this->actor); } } else { - // "chicken shop (child era)" - PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" ヒヨコの店(子人の時) \n", " chicken shop (child era) \n") VT_RST); func_80A6E3A0(this, func_80A6E9AC); } diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 8db6b38d0f..b165f34647 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -13,6 +13,7 @@ #include "printf.h" #include "sfx.h" #include "sys_matrix.h" +#include "translation.h" #include "z_lib.h" #include "z64item.h" #include "z64light.h" @@ -186,7 +187,7 @@ void EnIceHono_Init(Actor* thisx, PlayState* play) { this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo); this->unk_154 = Rand_ZeroOne() * (0x1FFFF / 2.0f); this->unk_156 = Rand_ZeroOne() * (0x1FFFF / 2.0f); - PRINTF("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); // "(ice flame)" + PRINTF(T("(ice 炎)(arg_data 0x%04x)\n", "(ice flame)(arg_data 0x%04x)\n"), this->actor.params); } } @@ -373,7 +374,7 @@ void EnIceHono_Update(Actor* thisx, PlayState* play) { #if DEBUG_FEATURES if ((intensity > 0.7f) || (intensity < 0.2f)) { - PRINTF("ありえない値(ratio = %f)\n", intensity); // "impossible value(ratio = %f)" + PRINTF(T("ありえない値(ratio = %f)\n", "Impossible value (ratio = %f)\n"), intensity); } #endif 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 16a4b5abf1..8695ba0a58 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -15,6 +15,7 @@ #include "sfx.h" #include "sys_math3d.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64effect.h" #include "z64play.h" @@ -593,8 +594,8 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) { } else { if (this->insectFlags & INSECT_FLAG_FOUND_SOIL) { PRINTF_COLOR_WARNING(); - // "warning: target Actor is NULL" - PRINTF("warning:目標 Actor が NULL (%s %d)\n", "../z_en_mushi.c", 1046); + PRINTF(T("warning:目標 Actor が NULL (%s %d)\n", "warning: target Actor is NULL (%s %d)\n"), + "../z_en_mushi.c", 1046); PRINTF_RST(); } distanceSq = 40.0f; @@ -721,8 +722,8 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) { (this->insectFlags & INSECT_FLAG_0) && this->lifeTimer <= 0 && this->actionTimer <= 0 && this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f) { PRINTF_COLOR_WARNING(); - // "BG missing? To do Actor_delete" - PRINTF("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_mushi.c", 1197); + PRINTF(T("BG 抜け？ Actor_delete します(%s %d)\n", "BG missing? To do Actor_delete (%s %d)\n"), + "../z_en_mushi.c", 1197); PRINTF_RST(); Actor_Kill(&this->actor); } 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 bcf59dfbe7..de24197b7d 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -20,6 +20,7 @@ #include "sys_matrix.h" #include "quake.h" #include "terminal.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" @@ -143,8 +144,7 @@ s32 EnIshi_SnapToFloor(EnIshi* this, PlayState* play, f32 arg2) { return true; } else { PRINTF_COLOR_WARNING(); - // "Failure attaching to ground" - PRINTF("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388); + PRINTF(T("地面に付着失敗(%s %d)\n", "Failed to attach to ground (%s %d)\n"), "../z_en_ishi.c", 388); PRINTF_RST(); return false; } 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 d2d807cd28..b94806e585 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -15,6 +15,7 @@ #include "regs.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64ocarina.h" #include "z64play.h" @@ -251,8 +252,7 @@ void func_80A8F8D0(EnKakasi* this, PlayState* play) { Player* player = GET_PLAYER(play); if (play->msgCtx.ocarinaMode == OCARINA_MODE_04 && play->msgCtx.msgMode == MSGMODE_NONE) { - // "end?" - PRINTF(VT_FGCOL(BLUE) "☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) T("☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n", "☆☆☆☆☆ end? ☆☆☆☆☆ \n") VT_RST); if (this->unk_19A != 0) { Message_CloseTextbox(play); @@ -355,8 +355,8 @@ void EnKakasi_Draw(Actor* thisx, PlayState* play) { if (BREG(3) != 0) { PRINTF("\n\n"); - // "flag!" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowLongSongSet); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ flag! ☆☆☆☆☆ %d\n") VT_RST, + gSaveContext.save.info.scarecrowLongSongSet); } Gfx_SetupDL_25Opa(play->state.gfxCtx); SkelAnime_DrawFlexOpa(play, this->skelanime.skeleton, this->skelanime.jointTable, this->skelanime.dListCount, NULL, 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 7651842925..c8057cff92 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -12,6 +12,7 @@ #include "regs.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64debug_display.h" #include "z64ocarina.h" @@ -75,8 +76,7 @@ void EnKakasi2_Init(Actor* thisx, PlayState* play) { f32 spawnRangeXZ; PRINTF("\n\n"); - // "Visit Umeda" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n", "☆☆☆☆☆ Umeda Sangyo visit! ☆☆☆☆☆ \n") VT_RST); this->switchFlag = PARAMS_GET_U(this->actor.params, 0, 6); spawnRangeY = PARAMS_GET_U(this->actor.params, 6, 8); @@ -88,16 +88,16 @@ void EnKakasi2_Init(Actor* thisx, PlayState* play) { this->maxSpawnDistance.x = (spawnRangeY * 40.0f) + 40.0f; this->maxSpawnDistance.y = (spawnRangeXZ * 40.0f) + 40.0f; - // "Former? (Argument 0)" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" VT_RST, spawnRangeY); - // "Former? (Z angle)" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" VT_RST, spawnRangeXZ); - // "Correction coordinates X" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x); - // "Correction coordinates Y" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.y); - // "Correction coordinates Z" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.z); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n", "☆☆☆☆☆ Former? (Argument 0) ☆☆☆☆ %f\n") VT_RST, + spawnRangeY); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n", "☆☆☆☆☆ Former? (Z angle) ☆☆ %f\n") VT_RST, + spawnRangeXZ); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Correction coordinates X ☆☆☆☆☆ %f\n") VT_RST, + this->maxSpawnDistance.x); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Correction coordinates Y ☆☆☆☆☆ %f\n") VT_RST, + this->maxSpawnDistance.y); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Correction coordinates Z ☆☆☆☆☆ %f\n") VT_RST, + this->maxSpawnDistance.z); PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); PRINTF("\n\n"); 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 8f4d21e36d..254d4d8f4b 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -15,6 +15,7 @@ #include "regs.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64ocarina.h" #include "z64play.h" @@ -357,8 +358,8 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) { Player* player = GET_PLAYER(play); if (BREG(3) != 0) { - // "No way!" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ No way! ☆☆☆☆☆ %d\n") VT_RST, + play->msgCtx.ocarinaMode); } if ((play->msgCtx.ocarinaMode == OCARINA_MODE_04 || (play->msgCtx.ocarinaMode >= OCARINA_MODE_05 && play->msgCtx.ocarinaMode < OCARINA_MODE_0B)) && @@ -377,8 +378,9 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) { play->msgCtx.ocarinaMode = OCARINA_MODE_04; if (BREG(3) != 0) { PRINTF("\n\n"); - // "With this, other guys are OK! That's it!" - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n", + "☆☆☆☆☆ With this, other guys are OK! That's it! ☆☆☆☆☆ %d\n") VT_RST, + play->msgCtx.ocarinaMode); } this->unk_195 = true; Message_StartTextbox(play, 0x40A7, NULL); @@ -425,8 +427,8 @@ void EnKakasi3_Update(Actor* thisx, PlayState* play) { if (BREG(2) != 0) { PRINTF("\n\n"); - // "flag!" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowSpawnSongSet); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ flag! ☆☆☆☆☆ %d\n") VT_RST, + gSaveContext.save.info.scarecrowSpawnSongSet); } this->unk_198++; 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..348c3a0acc 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -13,6 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z_lib.h" #include "z64face_reaction.h" @@ -1195,8 +1196,7 @@ void func_80A99048(EnKo* this, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit); if (ENKO_TYPE == ENKO_TYPE_CHILD_7) { - // "Angle Z" - PRINTF(VT_BGCOL(BLUE) " アングルＺ->(%d)\n" VT_RST, this->actor.shape.rot.z); + PRINTF(VT_BGCOL(BLUE) T(" アングルＺ->(%d)\n", " Angle Z->(%d)\n") VT_RST, this->actor.shape.rot.z); if (LINK_IS_ADULT && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)) { if (this->actor.shape.rot.z != 1) { Actor_Kill(&this->actor); 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 aa955365dd..771d9377d8 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -15,6 +15,7 @@ #include "rand.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" @@ -128,8 +129,7 @@ s32 EnKusa_SnapToFloor(EnKusa* this, PlayState* play, f32 yOffset) { return true; } else { PRINTF_COLOR_WARNING(); - // "Failure attaching to ground" - PRINTF("地面に付着失敗(%s %d)\n", "../z_en_kusa.c", 323); + PRINTF(T("地面に付着失敗(%s %d)\n", "Failed to attach to ground (%s %d)\n"), "../z_en_kusa.c", 323); PRINTF_RST(); return false; } @@ -268,8 +268,8 @@ void EnKusa_Init(Actor* thisx, PlayState* play) { this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[PARAMS_GET_U(thisx->params, 0, 2)]); if (this->requiredObjectSlot < 0) { - // "Bank danger!" - PRINTF("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", thisx->params, "../z_en_kusa.c", 561); + PRINTF(T("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"), + thisx->params, "../z_en_kusa.c", 561); Actor_Kill(&this->actor); return; } 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 2a00eb9ef6..1c937e8721 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -140,11 +140,12 @@ void EnNb_UpdatePath(EnNb* this, PlayState* play) { this->finalPos.z = pointPos[1].z; this->pathYaw = RAD_TO_BINANG(Math_FAtan2F(this->finalPos.x - this->initialPos.x, this->finalPos.z - this->initialPos.z)); - // "En_Nb_Get_path_info Rail Data Get! = %d!!!!!!!!!!!!!!" - PRINTF("En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", path); + PRINTF(T("En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", + "En_Nb_Get_path_info Got the rail data = %d!!!!!!!!!!!!!!\n"), + path); } else { - // "En_Nb_Get_path_info Rail Data Doesn't Exist!!!!!!!!!!!!!!!!!!!!" - PRINTF("En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n", + "En_Nb_Get_path_info No rail data!!!!!!!!!!!!!!!!!!!!\n")); } } diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 5423fad2d2..be7fc69f09 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -9,6 +9,7 @@ #include "rand.h" #include "sfx.h" #include "sys_matrix.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" @@ -141,8 +142,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) { this->unk_1E8 = 0.0f; this->unk_1E0 = 0.25f; if (this->actor.params == 0) { - // "New initials" - PRINTF("ニュウ イニシャル[ %d ] ！！\n", this->actor.params); + PRINTF(T("ニュウ イニシャル[ %d ] ！！\n", "New init [ %d ] !!\n"), this->actor.params); this->actor.colChkInfo.mass = 0; this->unk_1D4 = 0; this->unk_1D8 = 0xFF; @@ -150,8 +150,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) { func_80ABCDBC(this); } else { // This mode is unused in the final game - // "Dummy new initials" - PRINTF("ダミーニュウ イニシャル[ %d ] ！！\n", this->actor.params); + PRINTF(T("ダミーニュウ イニシャル[ %d ] ！！\n", "Dummy new init [ %d ] !!\n"), this->actor.params); PRINTF("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused); this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->actor.update = EnNy_UpdateUnused; 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 2ec4c8f08f..430540c659 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 @@ -12,6 +12,7 @@ #include "segmented_address.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z_lib.h" #include "z64audio.h" @@ -59,8 +60,8 @@ void EnOkarinaTag_Init(Actor* thisx, PlayState* play) { EnOkarinaTag* this = (EnOkarinaTag*)thisx; PRINTF("\n\n"); - // "Ocarina tag outbreak" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Ocarina tag occurrence ☆☆☆☆☆ %x\n") VT_RST, + this->actor.params); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->type = PARAMS_GET_U(this->actor.params, 10, 6); this->ocarinaSong = PARAMS_GET_U(this->actor.params, 6, 4); @@ -77,18 +78,17 @@ void EnOkarinaTag_Init(Actor* thisx, PlayState* play) { this->interactRange = this->actor.world.rot.z * 40.0f; } - // "Save information" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セーブ情報\t ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); - // "Type index" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" VT_RST, this->type); - // "Correct answer information" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 正解情報\t ☆☆☆☆☆ %d\n" VT_RST, this->ocarinaSong); - // "Range information" - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 範囲情報\t ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z); - // "Processing range information" - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 処理範囲情報\t ☆☆☆☆☆ %f\n" VT_RST, this->interactRange); - // "Hit?" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 当り？\t\t ☆☆☆☆☆ %d\n" VT_RST, this->unk_158); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セーブ情報\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Save information\t ☆☆☆☆☆ %d\n") VT_RST, + this->switchFlag); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type index ☆☆☆☆☆ %d\n") VT_RST, this->type); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 正解情報\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Correct answer information\t ☆☆☆☆☆ %d\n") VT_RST, + this->ocarinaSong); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 範囲情報\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Range information\t ☆☆☆☆☆ %d\n") VT_RST, + this->actor.world.rot.z); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 処理範囲情報\t ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Processing range information\t ☆☆☆☆☆ %f\n") + VT_RST, + this->interactRange); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 当り？\t\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Hit?\t\t ☆☆☆☆☆ %d\n") VT_RST, this->unk_158); PRINTF("\n\n"); if ((this->switchFlag >= 0) && (Flags_GetSwitch(play, this->switchFlag))) { @@ -131,8 +131,8 @@ void func_80ABEF2C(EnOkarinaTag* this, PlayState* play) { } else { if ((this->ocarinaSong != 6) || (gSaveContext.save.info.scarecrowSpawnSongSet)) { if (player->stateFlags2 & PLAYER_STATE2_24) { - // "North! ! ! ! !" - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 北！！！！！ ☆☆☆☆☆ %f\n" VT_RST, this->actor.xzDistToPlayer); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 北！！！！！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ North!!!!! ☆☆☆☆☆ %f\n") VT_RST, + this->actor.xzDistToPlayer); } if ((this->actor.xzDistToPlayer < (90.0f + this->interactRange)) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) { @@ -228,8 +228,9 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) { Message_StartOcarina(play, OCARINA_ACTION_CHECK_LULLABY); break; default: - // "Ocarina Invisible-kun demo start check error source" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n" VT_RST, + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n", + "☆☆☆☆☆ Ocarina Invisible-kun demo start check error source ☆☆☆☆☆ %d\n") + VT_RST, this->type); Actor_Kill(&this->actor); break; @@ -320,8 +321,8 @@ void func_80ABF708(EnOkarinaTag* this, PlayState* play) { } void func_80ABF7CC(EnOkarinaTag* this, PlayState* play) { - // "Open sesame sesame!" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 開けゴマゴマゴマ！ ☆☆☆☆☆ %d\n" VT_RST, Message_GetState(&play->msgCtx)); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 開けゴマゴマゴマ！ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Open gomagomagoma! ☆☆☆☆☆ %d\n") VT_RST, + Message_GetState(&play->msgCtx)); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) { Message_CloseTextbox(play); 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 9d70c9019a..f962295fdb 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -13,6 +13,7 @@ #include "segmented_address.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" #include "z64player.h" @@ -640,7 +641,7 @@ void EnOssan_Init(Actor* thisx, PlayState* play) { if (this->objectSlot1 < 0) { Actor_Kill(&this->actor); PRINTF_COLOR_ERROR(); - PRINTF("バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); + PRINTF(T("バンクが無いよ！！(%s)\n", "There is no bank!! (%s)\n"), sShopkeeperPrintName[this->actor.params]); PRINTF_RST(); ASSERT(0, "0", "../z_en_oB1.c", 1284); return; @@ -649,7 +650,8 @@ void EnOssan_Init(Actor* thisx, PlayState* play) { if (EnOssan_TryGetObjBankIndices(this, play, objectIds) == 0) { Actor_Kill(&this->actor); PRINTF_COLOR_ERROR(); - PRINTF("予備バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); + PRINTF(T("予備バンクが無いよ！！(%s)\n", "There is no spare bank!! (%s)\n"), + sShopkeeperPrintName[this->actor.params]); PRINTF_RST(); ASSERT(0, "0", "../z_en_oB1.c", 1295); return; 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 ca44cb5731..7977dfbe55 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -1606,9 +1606,12 @@ void func_80B56F10(EnZl3* this, PlayState* play) { pathHead += waypoint; this->unk_30C = pathHead; this->unk_310 = pathHead->count; - PRINTF("En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", waypoint); + PRINTF(T("En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", + "En_Zl3_Get_path_info Got the rail data = %d!!!!!!!!!!!!!!\n"), + waypoint); } else { - PRINTF("En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n", + "En_Zl3_Get_path_info No rail data!!!!!!!!!!!!!!!!!!!!\n")); } } From 66a7720dcd09e1350188d871827f2b8a663489a8 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 1 Jun 2025 15:18:13 +0200 Subject: [PATCH 08/42] csdis.py: write `CS_CMD_ACTOR_CUE_` names in actor cue list header (#2561) --- tools/csdis.py | 156 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 145 insertions(+), 11 deletions(-) diff --git a/tools/csdis.py b/tools/csdis.py index f83efd3aa1..d4baec1398 100755 --- a/tools/csdis.py +++ b/tools/csdis.py @@ -306,6 +306,138 @@ sequence_ids = { 0xFFFF: "NA_BGM_DISABLED", } +cutscene_cmd_ids = { + 0xFFFF: "CS_CMD_END_OF_SCRIPT", + 0x0001: "CS_CMD_CAM_EYE_SPLINE", + 0x0002: "CS_CMD_CAM_AT_SPLINE", + 0x0003: "CS_CMD_MISC", + 0x0004: "CS_CMD_LIGHT_SETTING", + 0x0005: "CS_CMD_CAM_EYE_SPLINE_REL_TO_PLAYER", + 0x0006: "CS_CMD_CAM_AT_SPLINE_REL_TO_PLAYER", + 0x0007: "CS_CMD_CAM_EYE", + 0x0008: "CS_CMD_CAM_AT", + 0x0009: "CS_CMD_RUMBLE_CONTROLLER", + 0x000A: "CS_CMD_PLAYER_CUE", + 0x000B: "CS_CMD_UNIMPLEMENTED_B", + 0x000D: "CS_CMD_UNIMPLEMENTED_D", + 0x000E: "CS_CMD_ACTOR_CUE_1_0", + 0x000F: "CS_CMD_ACTOR_CUE_0_0", + 0x0010: "CS_CMD_ACTOR_CUE_1_1", + 0x0011: "CS_CMD_ACTOR_CUE_0_1", + 0x0012: "CS_CMD_ACTOR_CUE_0_2", + 0x0013: "CS_CMD_TEXT", + 0x0015: "CS_CMD_UNIMPLEMENTED_15", + 0x0016: "CS_CMD_UNIMPLEMENTED_16", + 0x0017: "CS_CMD_ACTOR_CUE_0_3", + 0x0018: "CS_CMD_ACTOR_CUE_1_2", + 0x0019: "CS_CMD_ACTOR_CUE_2_0", + 0x001B: "CS_CMD_UNIMPLEMENTED_1B", + 0x001C: "CS_CMD_UNIMPLEMENTED_1C", + 0x001D: "CS_CMD_ACTOR_CUE_3_0", + 0x001E: "CS_CMD_ACTOR_CUE_4_0", + 0x001F: "CS_CMD_ACTOR_CUE_6_0", + 0x0020: "CS_CMD_UNIMPLEMENTED_20", + 0x0021: "CS_CMD_UNIMPLEMENTED_21", + 0x0022: "CS_CMD_ACTOR_CUE_0_4", + 0x0023: "CS_CMD_ACTOR_CUE_1_3", + 0x0024: "CS_CMD_ACTOR_CUE_2_1", + 0x0025: "CS_CMD_ACTOR_CUE_3_1", + 0x0026: "CS_CMD_ACTOR_CUE_4_1", + 0x0027: "CS_CMD_ACTOR_CUE_0_5", + 0x0028: "CS_CMD_ACTOR_CUE_1_4", + 0x0029: "CS_CMD_ACTOR_CUE_2_2", + 0x002A: "CS_CMD_ACTOR_CUE_3_2", + 0x002B: "CS_CMD_ACTOR_CUE_4_2", + 0x002C: "CS_CMD_ACTOR_CUE_5_0", + 0x002D: "CS_CMD_TRANSITION", + 0x002E: "CS_CMD_ACTOR_CUE_0_6", + 0x002F: "CS_CMD_ACTOR_CUE_4_3", + 0x0030: "CS_CMD_ACTOR_CUE_1_5", + 0x0031: "CS_CMD_ACTOR_CUE_7_0", + 0x0032: "CS_CMD_ACTOR_CUE_2_3", + 0x0033: "CS_CMD_ACTOR_CUE_3_3", + 0x0034: "CS_CMD_ACTOR_CUE_6_1", + 0x0035: "CS_CMD_ACTOR_CUE_3_4", + 0x0036: "CS_CMD_ACTOR_CUE_4_4", + 0x0037: "CS_CMD_ACTOR_CUE_5_1", + 0x0039: "CS_CMD_ACTOR_CUE_6_2", + 0x003A: "CS_CMD_ACTOR_CUE_6_3", + 0x003B: "CS_CMD_UNIMPLEMENTED_3B", + 0x003C: "CS_CMD_ACTOR_CUE_7_1", + 0x003D: "CS_CMD_UNIMPLEMENTED_3D", + 0x003E: "CS_CMD_ACTOR_CUE_8_0", + 0x003F: "CS_CMD_ACTOR_CUE_3_5", + 0x0040: "CS_CMD_ACTOR_CUE_1_6", + 0x0041: "CS_CMD_ACTOR_CUE_3_6", + 0x0042: "CS_CMD_ACTOR_CUE_3_7", + 0x0043: "CS_CMD_ACTOR_CUE_2_4", + 0x0044: "CS_CMD_ACTOR_CUE_1_7", + 0x0045: "CS_CMD_ACTOR_CUE_2_5", + 0x0046: "CS_CMD_ACTOR_CUE_1_8", + 0x0047: "CS_CMD_UNIMPLEMENTED_47", + 0x0048: "CS_CMD_ACTOR_CUE_2_6", + 0x0049: "CS_CMD_UNIMPLEMENTED_49", + 0x004A: "CS_CMD_ACTOR_CUE_2_7", + 0x004B: "CS_CMD_ACTOR_CUE_3_8", + 0x004C: "CS_CMD_ACTOR_CUE_0_7", + 0x004D: "CS_CMD_ACTOR_CUE_5_2", + 0x004E: "CS_CMD_ACTOR_CUE_1_9", + 0x004F: "CS_CMD_ACTOR_CUE_4_5", + 0x0050: "CS_CMD_ACTOR_CUE_1_10", + 0x0051: "CS_CMD_ACTOR_CUE_2_8", + 0x0052: "CS_CMD_ACTOR_CUE_3_9", + 0x0053: "CS_CMD_ACTOR_CUE_4_6", + 0x0054: "CS_CMD_ACTOR_CUE_5_3", + 0x0055: "CS_CMD_ACTOR_CUE_0_8", + 0x0056: "CS_CMD_START_SEQ", + 0x0057: "CS_CMD_STOP_SEQ", + 0x0058: "CS_CMD_ACTOR_CUE_6_4", + 0x0059: "CS_CMD_ACTOR_CUE_7_2", + 0x005A: "CS_CMD_ACTOR_CUE_5_4", + 0x005D: "CS_CMD_ACTOR_CUE_0_9", + 0x005E: "CS_CMD_ACTOR_CUE_1_11", + 0x0069: "CS_CMD_ACTOR_CUE_0_10", + 0x006A: "CS_CMD_ACTOR_CUE_2_9", + 0x006B: "CS_CMD_ACTOR_CUE_0_11", + 0x006C: "CS_CMD_ACTOR_CUE_3_10", + 0x006D: "CS_CMD_UNIMPLEMENTED_6D", + 0x006E: "CS_CMD_ACTOR_CUE_0_12", + 0x006F: "CS_CMD_ACTOR_CUE_7_3", + 0x0070: "CS_CMD_UNIMPLEMENTED_70", + 0x0071: "CS_CMD_UNIMPLEMENTED_71", + 0x0072: "CS_CMD_ACTOR_CUE_7_4", + 0x0073: "CS_CMD_ACTOR_CUE_6_5", + 0x0074: "CS_CMD_ACTOR_CUE_1_12", + 0x0075: "CS_CMD_ACTOR_CUE_2_10", + 0x0076: "CS_CMD_ACTOR_CUE_1_13", + 0x0077: "CS_CMD_ACTOR_CUE_0_13", + 0x0078: "CS_CMD_ACTOR_CUE_1_14", + 0x0079: "CS_CMD_ACTOR_CUE_2_11", + 0x007B: "CS_CMD_ACTOR_CUE_0_14", + 0x007C: "CS_CMD_FADE_OUT_SEQ", + 0x007D: "CS_CMD_ACTOR_CUE_1_15", + 0x007E: "CS_CMD_ACTOR_CUE_2_12", + 0x007F: "CS_CMD_ACTOR_CUE_3_11", + 0x0080: "CS_CMD_ACTOR_CUE_4_7", + 0x0081: "CS_CMD_ACTOR_CUE_5_5", + 0x0082: "CS_CMD_ACTOR_CUE_6_6", + 0x0083: "CS_CMD_ACTOR_CUE_1_16", + 0x0084: "CS_CMD_ACTOR_CUE_2_13", + 0x0085: "CS_CMD_ACTOR_CUE_3_12", + 0x0086: "CS_CMD_ACTOR_CUE_7_5", + 0x0087: "CS_CMD_ACTOR_CUE_4_8", + 0x0088: "CS_CMD_ACTOR_CUE_5_6", + 0x0089: "CS_CMD_ACTOR_CUE_6_7", + 0x008A: "CS_CMD_ACTOR_CUE_0_15", + 0x008B: "CS_CMD_ACTOR_CUE_0_16", + 0x008C: "CS_CMD_TIME", + 0x008D: "CS_CMD_ACTOR_CUE_1_17", + 0x008E: "CS_CMD_ACTOR_CUE_7_6", + 0x008F: "CS_CMD_ACTOR_CUE_9_0", + 0x0090: "CS_CMD_ACTOR_CUE_0_17", + 0x03E8: "CS_CMD_DESTINATION", +} + cutscene_misc_types = { 0x00: "CS_MISC_UNIMPLEMENTED_0", 0x01: "CS_MISC_RAIN", @@ -508,17 +640,17 @@ cutscene_command_macros = { 10: ("CS_PLAYER_CUE_LIST(%w1:1:s)", 2, None, 0, "CS_PLAYER_CUE(%h2:1:e6, %h1:1:s, %h2:2:s, %h1:2:x, %h2:3:x, %h1:3:x, %w1:4:s, %w1:5:s, %w1:6:s, %w1:7:s, %w1:8:s, %w1:9:s, %w1:10:f, %w1:11:f, %w1:12:f)", 12), - (15,17,18,23,34,39,46,76,85,93,105,107,110,119,123,138,139,144, # npc action 1 - 14,16,24,35,40,48,64,68,70,78,80,94,116,118,120,125,131,141, # npc action 2 - 25,36,41,50,67,69,72,74,81,106,117,121,126,132, # npc action 3 - 29,37,42,51,53,63,65,66,75,82,108,127,133, # npc action 4 - 30,38,43,47,54,79,83,128,135, # npc action 5 - 44,55,77,84,90,129,136, # npc action 6 - 31,52,57,58,88,115,130,137, # npc action 7 - 49,60,89,111,114,134,142, # npc action 8 - 62, # npc action 9 - 143): # npc action 10 - ("CS_ACTOR_CUE_LIST(%w1:0:s, %w1:1:s)", 2, None, 0, + (15,17,18,23,34,39,46,76,85,93,105,107,110,119,123,138,139,144, # actor cue 1 + 14,16,24,35,40,48,64,68,70,78,80,94,116,118,120,125,131,141, # actor cue 2 + 25,36,41,50,67,69,72,74,81,106,117,121,126,132, # actor cue 3 + 29,37,42,51,53,63,65,66,75,82,108,127,133, # actor cue 4 + 30,38,43,47,54,79,83,128,135, # actor cue 5 + 44,55,77,84,90,129,136, # actor cue 6 + 31,52,57,58,88,115,130,137, # actor cue 7 + 49,60,89,111,114,134,142, # actor cue 8 + 62, # actor cue 9 + 143): # actor cue 10 + ("CS_ACTOR_CUE_LIST(%w1:0:e8, %w1:1:s)", 2, None, 0, "CS_ACTOR_CUE(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %h2:3:x, %h1:3:x, %w1:4:s, %w1:5:s, %w1:6:s, %w1:7:s, %w1:8:s, %w1:9:s, %w1:10:f, %w1:11:f, %w1:12:f)", 12), 1: ("CS_CAM_EYE_SPLINE(%h1:1:s, %h2:2:s)", 3, 0, None, @@ -672,6 +804,8 @@ def format_arg(arg, words): result = player_cue_ids[unsigned_value] elif enum_no == 7: result = fade_out_seq_player[unsigned_value] + elif enum_no == 8: + result = cutscene_cmd_ids[unsigned_value] elif format_type == "u": result = str(value) elif format_type == "s": From f4028e49b93133deac7df95a506379198f43fd9e Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 1 Jun 2025 15:37:42 +0200 Subject: [PATCH 09/42] T() macro in overlays 10 (#2553) * T() mm2, niw, file_choose, file_nameset, kaleido_equipment, kaleido_item * T() girla, ossan, xc * review --- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 8 ++- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 3 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 43 ++++++++----- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 18 ++---- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 11 ++-- .../ovl_file_choose/z_file_choose.c | 3 +- .../ovl_file_choose/z_file_nameset.c | 3 +- .../ovl_kaleido_scope/z_kaleido_equipment.c | 5 +- .../misc/ovl_kaleido_scope/z_kaleido_item.c | 61 ++++++++++--------- 9 files changed, 85 insertions(+), 70 deletions(-) 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 9484ff4053..61eaa9967e 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -387,12 +387,13 @@ s32 EnGirlA_TryChangeShopItem(EnGirlA* this) { void EnGirlA_InitItem(EnGirlA* this, PlayState* play) { s16 params = this->actor.params; - PRINTF("%s(%2d)初期設定\n", sShopItemDescriptions[params], params); + PRINTF(T("%s(%2d)初期設定\n", "%s(%2d) Initial setup\n"), sShopItemDescriptions[params], params); if ((params >= SI_MAX) && (params < 0)) { Actor_Kill(&this->actor); PRINTF_COLOR_ERROR(); - PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); + PRINTF(T("引数がおかしいよ(arg_data=%d)！！\n", "The arguments are strange (arg_data=%d)!!\n"), + this->actor.params); PRINTF_RST(); ASSERT(0, "0", "../z_en_girlA.c", 1421); return; @@ -418,7 +419,8 @@ void EnGirlA_Init(Actor* thisx, PlayState* play) { EnGirlA_TryChangeShopItem(this); EnGirlA_InitItem(this, play); - PRINTF("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params); + PRINTF(T("%s(%2d)初期設定\n", "%s(%2d) Initial setup\n"), sShopItemDescriptions[this->actor.params], + this->actor.params); } void EnGirlA_Destroy(Actor* thisx, PlayState* play) { 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 d2f444a193..2144294ab3 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -14,6 +14,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" #include "z64save.h" @@ -162,7 +163,7 @@ void EnMm2_Init(Actor* thisx, PlayState* play2) { } if (this->actor.params == 1) { if (!GET_INFTABLE(INFTABLE_17F) || !GET_EVENTINF(EVENTINF_MARATHON_ACTIVE)) { - PRINTF(VT_FGCOL(CYAN) " マラソン 開始されていない \n" VT_RST "\n"); + PRINTF(VT_FGCOL(CYAN) T(" マラソン 開始されていない \n", " Marathon not started \n") VT_RST "\n"); Actor_Kill(&this->actor); } } 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 6be5e39db0..71cc497e10 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -21,6 +21,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z_lib.h" #include "z64effect.h" @@ -153,7 +154,8 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (this->actor.params == 0xB) { if (sLowerRiverSpawned) { Actor_Kill(&this->actor); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) + T("☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.1 ☆☆☆☆☆ \n") VT_RST); return; } sLowerRiverSpawned = true; @@ -164,7 +166,8 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (this->actor.params == 0xC) { if (sUpperRiverSpawned) { Actor_Kill(&this->actor); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) + T("☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.2 ☆☆☆☆☆ \n") VT_RST); return; } sUpperRiverSpawned = true; @@ -181,7 +184,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (fabsf(this->actor.world.pos.x - sKakarikoPosList[i].x) < 40.0f && fabsf(this->actor.world.pos.z - sKakarikoPosList[i].z) < 40.0f) { this->unk_2AA = i; - PRINTF(VT_FGCOL(YELLOW) " 通常鶏index %d\n" VT_RST, this->unk_2AA); + PRINTF(VT_FGCOL(YELLOW) T(" 通常鶏index %d\n", " Normal chicken index %d\n") VT_RST, this->unk_2AA); if (gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] & sKakarikoFlagList[i]) { this->actor.world.pos.x = 300.0f; @@ -259,7 +262,8 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { break; } - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ What kind of guy? ☆☆☆☆☆ %d\n") VT_RST, + this->actor.params); PRINTF("\n\n"); this->actionFunc = EnNiw_ResetAction; } @@ -386,7 +390,7 @@ void EnNiw_SpawnAttackCucco(EnNiw* this, PlayState* play) { this->timer5 = 10; } else { PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n", " ☆☆☆☆☆ Cannot occur ☆☆☆☆☆ \n") VT_RST); } } } @@ -983,17 +987,21 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { f32 camResult; s32 pad3[10]; - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n" VT_RST, thisx->floorHeight); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Up and down? ☆☆☆☆☆ %f\n") VT_RST, + thisx->floorHeight); cam.x = play->view.at.x - play->view.eye.x; cam.y = play->view.at.y - play->view.eye.y; cam.z = play->view.at.z - play->view.eye.z; camResult = cam.y / sqrtf(SQ(cam.x) + SQ(cam.y) + SQ(cam.z)); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.x); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.y); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.z); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ X out of range! ☆☆☆☆☆ %f\n") VT_RST, + thisx->world.pos.x); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Y out of range! ☆☆☆☆☆ %f\n") VT_RST, + thisx->world.pos.y); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Z out of range! ☆☆☆☆☆ %f\n") VT_RST, + thisx->world.pos.z); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Set X! ☆☆☆☆☆ %f\n") VT_RST, thisx->home.pos.x); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Set Y! ☆☆☆☆☆ %f\n") VT_RST, thisx->home.pos.y); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Set Z! ☆☆☆☆☆ %f\n") VT_RST, thisx->home.pos.z); thisx->world.pos.x = thisx->home.pos.x; thisx->world.pos.z = thisx->home.pos.z; thisx->world.pos.y = ((thisx->home.pos.y + play->view.eye.y) + (camResult * 160.0f)); @@ -1002,9 +1010,12 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { thisx->world.pos.y = thisx->home.pos.y + 300.0f; } - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ X after correction! ☆☆☆☆☆ %f\n") VT_RST, + thisx->world.pos.x); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Y after correction! ☆☆☆☆☆ %f\n") VT_RST, + thisx->world.pos.y); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Z after correction! ☆☆☆☆☆ %f\n") VT_RST, + thisx->world.pos.z); PRINTF("\n\n"); thisx->speed = 0.0f; thisx->gravity = -2.0f; @@ -1045,7 +1056,7 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400); this->timer5 = 0; PRINTF("\n\n"); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n", "☆☆☆☆☆ Bubbling ☆☆☆☆☆ \n") VT_RST); PRINTF("\n\n"); this->actionFunc = func_80AB6F04; return; 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 f962295fdb..86848da362 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -173,17 +173,10 @@ static s16 D_80AC8904[] = { 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x00 #if DEBUG_FEATURES static char* sShopkeeperPrintName[] = { - "コキリの店 ", // "Kokiri Shop" - "薬屋 ", // "Potion Shop" - "夜の店 ", // "Night Shop" - "路地裏の店 ", // "Back Alley Shop" - "盾の店 ", // "Shield Shop" - "大人の店 ", // "Adult Shop" - "タロンの店 ", // "Talon Shop" - "ゾーラの店 ", // "Zora Shop" - "ゴロン夜の店", // "Goron Night Shop" - "インゴーの店", // "Ingo Store" - "お面屋 ", // "Mask Shop" + T("コキリの店 ", "Kokiri Shop"), T("薬屋 ", "Potion Shop"), T("夜の店 ", "Night Shop"), + T("路地裏の店 ", "Back Alley Shop"), T("盾の店 ", "Shield Shop"), T("大人の店 ", "Adult Shop"), + T("タロンの店 ", "Talon Shop"), T("ゾーラの店 ", "Zora Shop"), T("ゴロン夜の店", "Goron Night Shop"), + T("インゴーの店", "Ingo Store"), T("お面屋 ", "Mask Shop"), }; #endif @@ -612,7 +605,8 @@ void EnOssan_Init(Actor* thisx, PlayState* play) { if (this->actor.params > OSSAN_TYPE_MASK && this->actor.params < OSSAN_TYPE_KOKIRI) { Actor_Kill(&this->actor); PRINTF_COLOR_ERROR(); - PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); + PRINTF(T("引数がおかしいよ(arg_data=%d)！！\n", "The arguments are strange (arg_data=%d)!!\n"), + this->actor.params); PRINTF_RST(); ASSERT(0, "0", "../z_en_oB1.c", 1246); return; 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 c8b6685587..c657a761f0 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -376,10 +376,10 @@ void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) { s32 pad; this->action = SHEIK_ACTION_SERENADE; - PRINTF("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n", "Water serenade Sheik's birth!!!!!!!!!!!!!!!!!!\n")); } else { Actor_Kill(&this->actor); - PRINTF("水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n", "Water serenade Sheik vanishes!!!!!!!!!!!!!!!!!!\n")); } } @@ -396,10 +396,10 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) { gSaveContext.cutsceneTrigger = 1; SET_EVENTCHKINF(EVENTCHKINF_52); // Learned Serenade of Water Flag Item_Give(play, ITEM_SONG_SERENADE); - PRINTF("ブーツを取った!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("ブーツを取った!!!!!!!!!!!!!!!!!!\n", "I took the boots!!!!!!!!!!!!!!!!!!\n")); return true; } else { - PRINTF("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n", "Quickly get your boots!!!!!!!!!!!!!!!!!!\n")); return false; } } @@ -2402,7 +2402,8 @@ void EnXc_Init(Actor* thisx, PlayState* play) { break; #endif default: - PRINTF(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T(" En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n", + " En_Oa2 arg_data is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); EnXc_DoNothing(this, play); } } 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 e8934c3731..2ad81b90f3 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -22,6 +22,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z_lib.h" #include "z64audio.h" @@ -365,7 +366,7 @@ void FileSelect_InitModeUpdate(GameState* thisx) { this->nextTitleLabel = FS_TITLE_OPEN_FILE; PRINTF("Ｓｒａｍ Ｓｔａｒｔ─Ｌｏａｄ 》》》》》 "); Sram_VerifyAndLoadAllSaves(this, sramCtx); - PRINTF("終了！！！\n"); + PRINTF(T("終了！！！\n", "End!!!\n")); } #else if (this->configMode == CM_FADE_IN_START) { diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index bc7ae7edc1..c3042a2ce9 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -12,6 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z64audio.h" #include "z64save.h" @@ -1370,7 +1371,7 @@ void FileSelect_UpdateOptionsMenu(GameState* thisx) { PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.soundSetting); PRINTF_RST(); Audio_SetSoundOutputMode(gSaveContext.soundSetting); - PRINTF("終了\n"); + PRINTF(T("終了\n", "end\n")); return; } diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 6b7da76bbd..9843e4efa3 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -6,6 +6,7 @@ #include "printf.h" #include "regs.h" #include "sfx.h" +#include "translation.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" @@ -481,7 +482,9 @@ void KaleidoScope_DrawEquipment(PlayState* play) { } else { cursorItem = ITEM_QUIVER_30 + sUpgradeItemOffsets[pauseCtx->cursorY[PAUSE_EQUIP]] + CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) - 1; - PRINTF("大人 H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem); + PRINTF(T("大人 H_arrowcase_1 + non_equip_item_table = %d\n", + "Adult H_arrowcase_1 + non_equip_item_table = %d\n"), + cursorItem); } } } else { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 97458d024f..4a9389e9ce 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -7,6 +7,7 @@ #include "printf.h" #include "regs.h" #include "sfx.h" +#include "translation.h" #include "z64play.h" #include "z64save.h" @@ -697,19 +698,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.save.info.equips.cButtonSlots[0] = pauseCtx->equipTargetSlot; Interface_LoadItemIcon1(play, 1); - PRINTF("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - PRINTF("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF(T("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C left sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1], + gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]); + PRINTF(T("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C left sl_number=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0], + gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]); } else if (pauseCtx->equipTargetCBtn == 1) { - PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF(T("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1], + gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]); + PRINTF(T("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_number=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0], + gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]); if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) { if (gSaveContext.save.info.equips.buttonItems[2] != ITEM_NONE) { @@ -772,19 +773,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.save.info.equips.cButtonSlots[1] = pauseCtx->equipTargetSlot; Interface_LoadItemIcon1(play, 2); - PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF(T("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1], + gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]); + PRINTF(T("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_number=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0], + gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]); } else { - PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF(T("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1], + gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]); + PRINTF(T("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_number=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0], + gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]); if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) { if (gSaveContext.save.info.equips.buttonItems[3] != ITEM_NONE) { @@ -847,12 +848,12 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.save.info.equips.cButtonSlots[2] = pauseCtx->equipTargetSlot; Interface_LoadItemIcon1(play, 3); - PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF(T("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1], + gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]); + PRINTF(T("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_number=%d (1)=%d (2)=%d (3)=%d\n"), + pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0], + gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]); } pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; From 1f9bf023a08df21cf1099e11f432d6c643343d13 Mon Sep 17 00:00:00 2001 From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Date: Sun, 1 Jun 2025 17:10:49 +0200 Subject: [PATCH 10/42] Document kaleido debug menu (#2506) * Document kaleido debug menu * Fix BSS * bss * Address reviews * bss * add #pragma increment_block_number to z_parameter and let CI do its thing * bss * buffer -> digitBuf * reformat comments on sSectionPositions. trick clang-format into not ruining the array by adding // comments on their own line * rename to KaleidoScope_DrawInventoryEditor --------- Co-authored-by: Dragorn421 --- include/z64pause.h | 9 +- src/boot/z_std_dma.c | 4 +- src/code/flg_set.c | 2 +- src/code/main.c | 2 +- src/code/z_bgcheck.c | 2 +- src/code/z_camera.c | 2 +- src/code/z_kaleido_scope_call.c | 2 +- src/code/z_kaleido_setup.c | 4 +- src/code/z_parameter.c | 6 +- src/code/z_player_lib.c | 4 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 422 ++++++++++++------ .../misc/ovl_kaleido_scope/z_kaleido_item.c | 2 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 15 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 2 +- 15 files changed, 314 insertions(+), 168 deletions(-) diff --git a/include/z64pause.h b/include/z64pause.h index da0e56038a..24f53a93d8 100644 --- a/include/z64pause.h +++ b/include/z64pause.h @@ -79,11 +79,18 @@ typedef enum PauseState { /* 19 */ PAUSE_STATE_RESUME_GAMEPLAY // Handles returning to normal gameplay once the pause menu is visually closed } PauseState; +typedef enum PauseDebugState { + /* 0 */ PAUSE_DEBUG_STATE_CLOSED, + /* 1 */ PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING, + /* 2 */ PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN, + /* 3 */ PAUSE_DEBUG_STATE_FLAG_SET_OPEN +} PauseDebugState; + #define IS_PAUSE_STATE_GAMEOVER(pauseCtx) \ (((pauseCtx)->state >= PAUSE_STATE_GAME_OVER_START) && ((pauseCtx)->state <= PAUSE_STATE_GAME_OVER_FINISH)) #define IS_PAUSED(pauseCtx) \ - (((pauseCtx)->state != PAUSE_STATE_OFF) || ((pauseCtx)->debugState != 0)) + (((pauseCtx)->state != PAUSE_STATE_OFF) || ((pauseCtx)->debugState != PAUSE_DEBUG_STATE_CLOSED)) // Sub-states of PAUSE_STATE_MAIN typedef enum PauseMainState { diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index f38edf74a4..7678168549 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -45,8 +45,8 @@ #include "z64dma.h" #include "z64thread.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:86" \ - "pal-1.0:84 pal-1.1:84" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:82" \ + "pal-1.0:80 pal-1.1:80" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 88f32a3e4e..efc044074a 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -184,7 +184,7 @@ void FlagSet_Update(PlayState* play) { } if (CHECK_BTN_ALL(input->press.button, BTN_L)) { - play->pauseCtx.debugState = 0; + play->pauseCtx.debugState = PAUSE_DEBUG_STATE_CLOSED; } CLOSE_DISPS(gfxCtx, "../flg_set.c", 241); diff --git a/src/code/main.c b/src/code/main.c index 9bd722f9ce..902e624aa6 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -44,7 +44,7 @@ extern struct IrqMgr gIrqMgr; #include "z64thread.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ique-cn:0 ntsc-1.0:54 ntsc-1.1:54 ntsc-1.2:54 pal-1.0:52 pal-1.1:52" + "ique-cn:0 ntsc-1.0:51 ntsc-1.1:51 ntsc-1.2:51 pal-1.0:49 pal-1.1:49" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 945051552a..65ff40ee46 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -14,7 +14,7 @@ #include "z64player.h" #include "z64skin_matrix.h" -#pragma increment_block_number "ntsc-1.0:152 ntsc-1.1:152 ntsc-1.2:152" +#pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144" 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 cf18c3634a..cf5ed30730 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3661,7 +3661,7 @@ s32 Camera_KeepOn3(Camera* camera) { } #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ique-cn:128 ntsc-1.0:86 ntsc-1.1:86 ntsc-1.2:86 pal-1.0:86 pal-1.1:86" + "ique-cn:128 ntsc-1.0:83 ntsc-1.1:83 ntsc-1.2:83 pal-1.0:83 pal-1.1:83" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 2707db8265..1e225eb670 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -1,4 +1,4 @@ -#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80 ique-cn:80" \ +#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80 ique-cn:64" \ "ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96" #include "libu64/debug.h" diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 2cffb853f5..6401f3fef3 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -79,7 +79,7 @@ void KaleidoSetup_Update(PlayState* play) { if (CHECK_BTN_ALL(input->cur.button, BTN_L) && CHECK_BTN_ALL(input->press.button, BTN_CUP)) { if (DEBUG_FEATURES && BREG(0)) { - pauseCtx->debugState = 3; + pauseCtx->debugState = PAUSE_DEBUG_STATE_FLAG_SET_OPEN; } } else if (CHECK_BTN_ALL(input->press.button, BTN_START)) { // The start button was pressed, pause @@ -134,7 +134,7 @@ void KaleidoSetup_Init(PlayState* play) { PauseContext* pauseCtx = &play->pauseCtx; pauseCtx->state = PAUSE_STATE_OFF; - pauseCtx->debugState = 0; + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; pauseCtx->eye.x = pauseCtx->eye.y = 0.0f; pauseCtx->eye.z = 64.0f; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index b6d5c911a2..6ae3959c86 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -29,6 +29,8 @@ #include "assets/textures/do_action_static/do_action_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" +#pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" + typedef struct RestrictionFlags { /* 0x00 */ u8 sceneId; /* 0x01 */ u8 flags1; @@ -3221,7 +3223,7 @@ void Interface_Draw(PlayState* play) { gSPSegment(OVERLAY_DISP++, 0x08, interfaceCtx->iconItemSegment); gSPSegment(OVERLAY_DISP++, 0x0B, interfaceCtx->mapSegment); - if (pauseCtx->debugState == 0) { + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) { Interface_InitVertices(play); func_8008A994(interfaceCtx); Health_DrawMeter(play); @@ -4026,7 +4028,7 @@ void Interface_Draw(PlayState* play) { } #if DEBUG_FEATURES - if (pauseCtx->debugState == 3) { + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_FLAG_SET_OPEN) { FlagSet_Update(play); } #endif diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 6e18ae1ccd..3ce2143c5b 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -17,8 +17,8 @@ #include "assets/objects/object_link_boy/object_link_boy.h" #include "assets/objects/object_link_child/object_link_child.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "pal-1.0:0 pal-1.1:0" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 pal-1.0:0" \ + "pal-1.1:0" typedef struct BowSlingshotStringData { /* 0x00 */ Gfx* dList; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 58929bd248..7f3c3eb85b 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -37,8 +37,8 @@ #include "cic6105.h" #endif -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:0" \ - "ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:128" \ + "ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index a8433e9f2e..b849ca74b4 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -6,35 +6,165 @@ #include "gfx_setupdl.h" #include "gfxalloc.h" #include "printf.h" +#include "translation.h" #include "z64play.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" +typedef enum DebugSection { + /* 0x00 */ SECTION_RUPEES, + /* 0x01 */ SECTION_HEALTH_CAPACITY, + /* 0x02 */ SECTION_CURRENT_HEALTH, + /* 0x03 */ SECTION_FIRST_INVENTORY_SLOT, + /* 0x1A */ SECTION_LAST_INVENTORY_SLOT = 0x1A, + /* 0x1B */ SECTION_FIRST_KEY_COUNT, + /* 0x2B */ SECTION_LAST_KEY_COUNT = 0x2B, + /* 0x2C */ SECTION_FIRST_UPGRADE, + /* 0x33 */ SECTION_LAST_UPGRADE = 0x33, + /* 0x34 */ SECTION_FIRST_EQUIPMENT, + /* 0x37 */ SECTION_LAST_EQUIPMENT = 0x37, + /* 0x38 */ SECTION_FIRST_DUNGEON_ITEMS, + /* 0x43 */ SECTION_LAST_DUNGEON_ITEMS = 0x43, + /* 0x44 */ SECTION_FIRST_MEDALLION, + /* 0x49 */ SECTION_LAST_MEDALLION = 0x49, + /* 0x4A */ SECTION_FIRST_SONG, + /* 0x55 */ SECTION_LAST_SONG = 0x55, + /* 0x56 */ SECTION_FIRST_SPIRITUAL_STONE, + /* 0x58 */ SECTION_LAST_SPIRITUAL_STONE = 0x58, + /* 0x59 */ SECTION_STONE_OF_AGONY, + /* 0x5A */ SECTION_GERUDO_CARD, + /* 0x5B */ SECTION_SKULL_TOKENS, + /* 0x5C */ SECTION_HEART_PIECES, + /* 0x5D */ SECTION_MAX +} DebugSection; + // Positions of each input section in the editor -static u16 sSectionPositions[][2] = { - { 64, 15 }, { 144, 15 }, { 170, 15 }, { 78, 35 }, { 104, 35 }, { 130, 35 }, { 156, 35 }, { 182, 35 }, - { 208, 35 }, { 78, 50 }, { 104, 50 }, { 130, 50 }, { 156, 50 }, { 182, 50 }, { 208, 50 }, { 78, 65 }, - { 104, 65 }, { 130, 65 }, { 156, 65 }, { 182, 65 }, { 208, 65 }, { 78, 80 }, { 104, 80 }, { 130, 80 }, - { 156, 80 }, { 182, 80 }, { 208, 80 }, { 78, 98 }, { 88, 98 }, { 98, 98 }, { 108, 98 }, { 118, 98 }, - { 128, 98 }, { 138, 98 }, { 148, 98 }, { 158, 98 }, { 168, 98 }, { 178, 98 }, { 188, 98 }, { 198, 98 }, - { 208, 98 }, { 218, 98 }, { 228, 98 }, { 238, 98 }, { 78, 115 }, { 90, 115 }, { 102, 115 }, { 114, 115 }, - { 126, 115 }, { 138, 115 }, { 150, 115 }, { 162, 115 }, { 202, 115 }, { 214, 115 }, { 226, 115 }, { 238, 115 }, - { 78, 132 }, { 90, 132 }, { 102, 132 }, { 114, 132 }, { 126, 132 }, { 138, 132 }, { 150, 132 }, { 162, 132 }, - { 174, 132 }, { 186, 132 }, { 198, 132 }, { 210, 132 }, { 78, 149 }, { 90, 149 }, { 102, 149 }, { 114, 149 }, - { 126, 149 }, { 138, 149 }, { 78, 166 }, { 90, 166 }, { 102, 166 }, { 114, 166 }, { 126, 166 }, { 138, 166 }, - { 150, 166 }, { 162, 166 }, { 174, 166 }, { 186, 166 }, { 198, 166 }, { 210, 166 }, { 210, 149 }, { 222, 149 }, - { 234, 149 }, { 78, 185 }, { 90, 185 }, { 145, 185 }, { 210, 185 }, +static u16 sSectionPositions[SECTION_MAX][2] = { + { 64, 15 }, // SECTION_RUPEES + { 144, 15 }, // SECTION_HEALTH_CAPACITY + { 170, 15 }, // SECTION_CURRENT_HEALTH + + { 78, 35 }, // SECTION_FIRST_INVENTORY_SLOT + { 104, 35 }, + { 130, 35 }, + { 156, 35 }, + { 182, 35 }, + { 208, 35 }, + // + { 78, 50 }, + { 104, 50 }, + { 130, 50 }, + { 156, 50 }, + { 182, 50 }, + { 208, 50 }, + // + { 78, 65 }, + { 104, 65 }, + { 130, 65 }, + { 156, 65 }, + { 182, 65 }, + { 208, 65 }, + // + { 78, 80 }, + { 104, 80 }, + { 130, 80 }, + { 156, 80 }, + { 182, 80 }, + { 208, 80 }, // SECTION_LAST_INVENTORY_SLOT + + { 78, 98 }, // SECTION_FIRST_KEY_COUNT + { 88, 98 }, + { 98, 98 }, + { 108, 98 }, + { 118, 98 }, + { 128, 98 }, + { 138, 98 }, + { 148, 98 }, + { 158, 98 }, + { 168, 98 }, + { 178, 98 }, + { 188, 98 }, + { 198, 98 }, + { 208, 98 }, + { 218, 98 }, + { 228, 98 }, + { 238, 98 }, // SECTION_LAST_KEY_COUNT + + { 78, 115 }, // SECTION_FIRST_UPGRADE + { 90, 115 }, + { 102, 115 }, + { 114, 115 }, + { 126, 115 }, + { 138, 115 }, + { 150, 115 }, + { 162, 115 }, // SECTION_LAST_UPGRADE + + { 202, 115 }, // SECTION_FIRST_EQUIPMENT + { 214, 115 }, + { 226, 115 }, + { 238, 115 }, // SECTION_LAST_EQUIPMENT + + { 78, 132 }, // SECTION_FIRST_DUNGEON_ITEMS + { 90, 132 }, + { 102, 132 }, + { 114, 132 }, + { 126, 132 }, + { 138, 132 }, + { 150, 132 }, + { 162, 132 }, + { 174, 132 }, + { 186, 132 }, + { 198, 132 }, + { 210, 132 }, // SECTION_LAST_DUNGEON_ITEMS + + { 78, 149 }, // SECTION_FIRST_MEDALLION + { 90, 149 }, + { 102, 149 }, + { 114, 149 }, + { 126, 149 }, + { 138, 149 }, // SECTION_LAST_MEDALLION + + { 78, 166 }, // SECTION_FIRST_SONG + { 90, 166 }, + { 102, 166 }, + { 114, 166 }, + { 126, 166 }, + { 138, 166 }, + { 150, 166 }, + { 162, 166 }, + { 174, 166 }, + { 186, 166 }, + { 198, 166 }, + { 210, 166 }, // SECTION_LAST_SONG + + { 210, 149 }, // SECTION_FIRST_SPIRITUAL_STONE + { 222, 149 }, + { 234, 149 }, // SECTION_LAST_SPIRITUAL_STONE + + { 78, 185 }, // SECTION_STONE_OF_AGONY + { 90, 185 }, // SECTION_GERUDO_CARD + { 145, 185 }, // SECTION_SKULL_TOKENS + { 210, 185 }, // SECTION_HEART_PIECES }; // First section of each row in the editor (starting from the top) static u16 sRowFirstSections[] = { - 0x00, 0x03, 0x1B, 0x2C, 0x34, 0x38, 0x44, 0x4A, 0x56, 0x59, 0x5C, + SECTION_RUPEES, SECTION_FIRST_INVENTORY_SLOT, SECTION_FIRST_KEY_COUNT, + SECTION_FIRST_UPGRADE, SECTION_FIRST_EQUIPMENT, SECTION_FIRST_DUNGEON_ITEMS, + SECTION_FIRST_MEDALLION, SECTION_FIRST_SONG, SECTION_FIRST_SPIRITUAL_STONE, + SECTION_STONE_OF_AGONY, SECTION_HEART_PIECES, }; -// Maximum value of each upgrade type static u8 sMaxUpgradeValues[] = { - 3, 3, 3, 2, 2, 3, 3, 3, + /* UPG_QUIVER */ 3, + /* UPG_BOMB_BAG */ 3, + /* UPG_STRENGTH */ 3, + /* UPG_SCALE */ 2, + /* UPG_WALLET */ 2, + /* UPG_BULLET_BAG */ 3, + /* UPG_DEKU_STICKS */ 3, + /* UPG_DEKU_NUTS */ 3, }; // Item ID corresponding to each slot, aside from bottles and trade items @@ -44,7 +174,7 @@ static s16 sSlotItems[] = { ITEM_BOOMERANG, ITEM_LENS_OF_TRUTH, ITEM_MAGIC_BEAN, ITEM_HAMMER, ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE, }; -void KaleidoScope_DrawDebugEditorText(Gfx** gfxP) { +void KaleidoScope_DrawInventoryEditorText(Gfx** gfxP) { GfxPrint printer; s32 pad[2]; @@ -53,35 +183,35 @@ void KaleidoScope_DrawDebugEditorText(Gfx** gfxP) { GfxPrint_SetPos(&printer, 4, 2); GfxPrint_SetColor(&printer, 255, 60, 0, 255); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾙﾋﾟｰ"); // "Rupee" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ﾙﾋﾟｰ", "Rupee")); GfxPrint_SetPos(&printer, 15, 2); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾊｰﾄ"); // "Heart" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ﾊｰﾄ", "Heart")); GfxPrint_SetPos(&printer, 26, 3); GfxPrint_Printf(&printer, "%s", "/4"); GfxPrint_SetPos(&printer, 4, 5); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｱｲﾃﾑ"); // "Item" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｱｲﾃﾑ", "Item")); GfxPrint_SetPos(&printer, 4, 13); GfxPrint_Printf(&printer, "%s", "KEY"); GfxPrint_SetPos(&printer, 4, 15); - GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ｿｳﾋﾞ"); // "Equipment" + GfxPrint_Printf(&printer, "%s", T(GFXP_HIRAGANA "ｿｳﾋﾞ", "Equipment")); GfxPrint_SetPos(&printer, 23, 14); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｹﾝ"); // "Sword" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｹﾝ", "Sword")); GfxPrint_SetPos(&printer, 23, 15); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾀﾃ"); // "Shield" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ﾀﾃ", "Shield")); GfxPrint_SetPos(&printer, 4, 17); GfxPrint_Printf(&printer, "%s", "MAP"); GfxPrint_SetPos(&printer, 4, 19); - GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ﾌｳｲﾝ"); // "Seal" + GfxPrint_Printf(&printer, "%s", T(GFXP_HIRAGANA "ﾌｳｲﾝ", "Seal")); GfxPrint_SetPos(&printer, 20, 19); - GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ｾｲﾚｲｾｷ"); // "Spiritual Stone" + GfxPrint_Printf(&printer, "%s", T(GFXP_HIRAGANA "ｾｲﾚｲｾｷ", "Spiritual Stone")); GfxPrint_SetPos(&printer, 4, 21); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｵｶﾘﾅ"); // "Ocarina" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｵｶﾘﾅ", "Ocarina")); GfxPrint_SetPos(&printer, 4, 24); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｺﾚｸﾄ"); // "Collect" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｺﾚｸﾄ", "Collect")); GfxPrint_SetPos(&printer, 14, 24); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｷﾝｽﾀ"); // "Skulltula" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｷﾝｽﾀ", "Skulltula")); GfxPrint_SetPos(&printer, 23, 24); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｶｹﾗ"); // "Gold Token" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｶｹﾗ", "Gold Token")); GfxPrint_SetPos(&printer, 28, 24); GfxPrint_Printf(&printer, "%s", "/4"); @@ -101,8 +231,8 @@ void KaleidoScope_DrawDigit(PlayState* play, s32 digit, s32 rectLeft, s32 rectTo CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_debug.c", 220); } -void KaleidoScope_DrawDebugEditor(PlayState* play) { - static s16 curSection = 0; +void KaleidoScope_DrawInventoryEditor(PlayState* play) { + static s16 curSection = SECTION_RUPEES; static s16 curRow = 0; static s32 prevDBtnInput = 0; static s32 heldDBtnTimer = 0; @@ -110,7 +240,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { Input* input = &play->state.input[0]; Gfx* gfx; Gfx* gfxRef; - s16 spD8[4]; + // Used for both storing the digits of the drawn numbers and digit positions + s16 digitBuf[4]; s16 slot; s16 i; s16 j; @@ -137,7 +268,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gfx = Gfx_Open(gfxRef); gSPDisplayList(OVERLAY_DISP++, gfx); - KaleidoScope_DrawDebugEditorText(&gfx); + KaleidoScope_DrawInventoryEditorText(&gfx); gSPEndDisplayList(gfx++); Gfx_Close(gfxRef, gfx); @@ -154,162 +285,162 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); // Rupees - spD8[0] = spD8[1] = spD8[2] = 0; - spD8[3] = gSaveContext.save.info.playerData.rupees; - while (spD8[3] >= 1000) { - spD8[0]++; - spD8[3] -= 1000; + digitBuf[0] = digitBuf[1] = digitBuf[2] = 0; + digitBuf[3] = gSaveContext.save.info.playerData.rupees; + while (digitBuf[3] >= 1000) { + digitBuf[0]++; + digitBuf[3] -= 1000; } - while (spD8[3] >= 100) { - spD8[1]++; - spD8[3] -= 100; + while (digitBuf[3] >= 100) { + digitBuf[1]++; + digitBuf[3] -= 100; } - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } for (i = 0, x = 68; i < 4; i++, x += 10) { - KaleidoScope_DrawDigit(play, spD8[i], x, 15); + KaleidoScope_DrawDigit(play, digitBuf[i], x, 15); } // Health capacity - spD8[2] = 0; - spD8[3] = gSaveContext.save.info.playerData.healthCapacity / 0x10; - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + digitBuf[2] = 0; + digitBuf[3] = gSaveContext.save.info.playerData.healthCapacity / 0x10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } - KaleidoScope_DrawDigit(play, spD8[2], 146, 15); - KaleidoScope_DrawDigit(play, spD8[3], 156, 15); + KaleidoScope_DrawDigit(play, digitBuf[2], 146, 15); + KaleidoScope_DrawDigit(play, digitBuf[3], 156, 15); // Health - spD8[2] = 0; - spD8[3] = gSaveContext.save.info.playerData.health / 0x10; - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + digitBuf[2] = 0; + digitBuf[3] = gSaveContext.save.info.playerData.health / 0x10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } - KaleidoScope_DrawDigit(play, spD8[2], 172, 15); - KaleidoScope_DrawDigit(play, spD8[3], 182, 15); + KaleidoScope_DrawDigit(play, digitBuf[2], 172, 15); + KaleidoScope_DrawDigit(play, digitBuf[3], 182, 15); // Inventory for (slot = 0, i = 0, y = 35; i < 4; i++, y += 15) { for (j = 0, x = 78; j < 6; j++, slot++, x += 26) { - spD8[2] = 0; + digitBuf[2] = 0; if ((slot <= SLOT_BOW) || (slot == SLOT_SLINGSHOT) || (slot == SLOT_BOMBCHU) || (slot == SLOT_MAGIC_BEAN)) { - spD8[3] = AMMO(gAmmoItems[slot]); + digitBuf[3] = AMMO(gAmmoItems[slot]); } else if (slot == SLOT_OCARINA) { - spD8[3] = gSaveContext.save.info.inventory.items[slot]; + digitBuf[3] = gSaveContext.save.info.inventory.items[slot]; } else { - spD8[3] = gSaveContext.save.info.inventory.items[slot]; + digitBuf[3] = gSaveContext.save.info.inventory.items[slot]; } - if (spD8[3] != ITEM_NONE) { - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + if (digitBuf[3] != ITEM_NONE) { + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } } else { - spD8[2] = spD8[3] = 0; + digitBuf[2] = digitBuf[3] = 0; } - KaleidoScope_DrawDigit(play, spD8[2], x, y); - KaleidoScope_DrawDigit(play, spD8[3], x + 10, y); + KaleidoScope_DrawDigit(play, digitBuf[2], x, y); + KaleidoScope_DrawDigit(play, digitBuf[3], x + 10, y); } } // Keys - for (spD8[1] = 78, i = 0; i < 17; i++) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 17; i++) { + digitBuf[2] = 0; - if ((spD8[3] = gSaveContext.save.info.inventory.dungeonKeys[i]) >= 0) { - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + if ((digitBuf[3] = gSaveContext.save.info.inventory.dungeonKeys[i]) >= 0) { + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } } else { - spD8[2] = spD8[3] = 0; + digitBuf[2] = digitBuf[3] = 0; } - KaleidoScope_DrawDigit(play, spD8[3], spD8[1], 98); - spD8[1] += 10; + KaleidoScope_DrawDigit(play, digitBuf[3], digitBuf[1], 98); + digitBuf[1] += 10; } // Upgrades - for (spD8[1] = 78, i = 0; i < 8; i++, spD8[1] += 12) { - KaleidoScope_DrawDigit(play, CUR_UPG_VALUE(i), spD8[1], 115); + for (digitBuf[1] = 78, i = 0; i < 8; i++, digitBuf[1] += 12) { + KaleidoScope_DrawDigit(play, CUR_UPG_VALUE(i), digitBuf[1], 115); } // Equipment - for (spD8[1] = 202, i = 0; i < 4; i++, spD8[1] += 12) { - KaleidoScope_DrawDigit(play, ALL_EQUIP_VALUE(i), spD8[1], 115); + for (digitBuf[1] = 202, i = 0; i < 4; i++, digitBuf[1] += 12) { + KaleidoScope_DrawDigit(play, ALL_EQUIP_VALUE(i), digitBuf[1], 115); } // Dungeon Items - for (spD8[1] = 78, i = 0; i < 12; i++, spD8[1] += 12) { - spD8[2] = gSaveContext.save.info.inventory.dungeonItems[i] & gEquipMasks[0]; - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 132); + for (digitBuf[1] = 78, i = 0; i < 12; i++, digitBuf[1] += 12) { + digitBuf[2] = gSaveContext.save.info.inventory.dungeonItems[i] & gEquipMasks[0]; + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 132); } // Medallions - for (spD8[1] = 78, i = 0; i < 6; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 6; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 149); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 149); } // Spiritual Stones - for (spD8[1] = 210, i = 0; i < 3; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 210, i = 0; i < 3; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 149); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 149); } // Songs - for (spD8[1] = 78, i = 0; i < 12; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 12; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_SONG_MINUET + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 166); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 166); } // Other Quest Items - for (spD8[1] = 78, i = 0; i < 2; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 2; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 185); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 185); } // GS Tokens - spD8[3] = gSaveContext.save.info.inventory.gsTokens; - spD8[1] = 0; - spD8[2] = 0; - while (spD8[3] >= 100) { - spD8[1]++; - spD8[3] -= 100; + digitBuf[3] = gSaveContext.save.info.inventory.gsTokens; + digitBuf[1] = 0; + digitBuf[2] = 0; + while (digitBuf[3] >= 100) { + digitBuf[1]++; + digitBuf[3] -= 100; } - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } - KaleidoScope_DrawDigit(play, spD8[1], 145, 185); - KaleidoScope_DrawDigit(play, spD8[2], 155, 185); - KaleidoScope_DrawDigit(play, spD8[3], 165, 185); + KaleidoScope_DrawDigit(play, digitBuf[1], 145, 185); + KaleidoScope_DrawDigit(play, digitBuf[2], 155, 185); + KaleidoScope_DrawDigit(play, digitBuf[3], 165, 185); // Heart Pieces (X / 4) KaleidoScope_DrawDigit( @@ -341,18 +472,18 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } curSection = sRowFirstSections[curRow]; } else if (CHECK_BTN_ANY(dBtnInput, BTN_DLEFT)) { - if (--curSection < 0) { - curSection = 0x5C; + if (--curSection < SECTION_RUPEES) { + curSection = SECTION_HEART_PIECES; } } else if (CHECK_BTN_ANY(dBtnInput, BTN_DRIGHT)) { - if (++curSection > 0x5C) { - curSection = 0; + if (++curSection > SECTION_HEART_PIECES) { + curSection = SECTION_RUPEES; } } // Handles the logic to change values based on the selected section switch (curSection) { - case 0: + case SECTION_RUPEES: if (CHECK_BTN_ALL(input->press.button, BTN_CUP)) { gSaveContext.save.info.playerData.rupees -= 100; if (gSaveContext.save.info.playerData.rupees < 0) { @@ -376,7 +507,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } break; - case 1: + case SECTION_HEALTH_CAPACITY: if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.playerData.healthCapacity -= 0x10; if (gSaveContext.save.info.playerData.healthCapacity < 0x30) { @@ -391,7 +522,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } break; - case 2: + case SECTION_CURRENT_HEALTH: if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { Health_ChangeBy(play, -4); } else if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { @@ -403,7 +534,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } break; - case 0x5C: + case SECTION_HEART_PIECES: if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { if ((((gSaveContext.save.info.inventory.questItems & 0xF0000000) & 0xF0000000) >> QUEST_HEART_PIECE_COUNT) != 0) { @@ -418,8 +549,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { break; default: - if (curSection < 0x1B) { - i = curSection - 3; + if (curSection <= SECTION_LAST_INVENTORY_SLOT) { + i = curSection - SECTION_FIRST_INVENTORY_SLOT; if ((i <= SLOT_BOW) || (i == SLOT_SLINGSHOT) || (i == SLOT_BOMBCHU) || (i == SLOT_MAGIC_BEAN)) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP)) { Inventory_DeleteItem(gAmmoItems[i], SLOT(gAmmoItems[i])); @@ -552,16 +683,16 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } } } - } else if (curSection < 0x2C) { + } else if (curSection <= SECTION_LAST_KEY_COUNT) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { - i = curSection - 0x1B; + i = curSection - SECTION_FIRST_KEY_COUNT; gSaveContext.save.info.inventory.dungeonKeys[i]--; if (gSaveContext.save.info.inventory.dungeonKeys[i] < 0) { gSaveContext.save.info.inventory.dungeonKeys[i] = -1; } } else if (CHECK_BTN_ALL(input->press.button, BTN_CDOWN) || CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { - i = curSection - 0x1B; + i = curSection - SECTION_FIRST_KEY_COUNT; if (gSaveContext.save.info.inventory.dungeonKeys[i] < 0) { gSaveContext.save.info.inventory.dungeonKeys[i] = 1; } else { @@ -572,9 +703,9 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } } } else { - if (curSection < 0x38) { - i = curSection - 0x2C; - if ((curSection >= 0x2C) && (curSection < 0x34)) { + if (curSection <= SECTION_LAST_EQUIPMENT) { + i = curSection - SECTION_FIRST_UPGRADE; + if ((curSection >= SECTION_FIRST_UPGRADE) && (curSection <= SECTION_LAST_UPGRADE)) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { if (CUR_UPG_VALUE(i) != 0) { @@ -587,7 +718,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } } } else { - i = curSection - 0x34; // 0 <= i < 4 + i = curSection - SECTION_FIRST_EQUIPMENT; // 0 <= i < 4 if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(i, 0); } @@ -601,8 +732,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gSaveContext.save.info.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(i, 3); } } - } else if (curSection < 0x44) { - i = curSection - 0x38; + } else if (curSection <= SECTION_LAST_DUNGEON_ITEMS) { + i = curSection - SECTION_FIRST_DUNGEON_ITEMS; if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.dungeonItems[i] ^= 4; } @@ -612,7 +743,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { gSaveContext.save.info.inventory.dungeonItems[i] ^= 1; } - } else if (curSection == 0x5B) { + } else if (curSection == SECTION_SKULL_TOKENS) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.gsTokens++; #if PLATFORM_N64 @@ -627,8 +758,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gSaveContext.save.info.inventory.gsTokens = 0; } } - } else if (curSection < 0x5C) { - i = curSection - 0x44; + } else if (curSection < SECTION_HEART_PIECES) { + i = curSection - SECTION_FIRST_MEDALLION; if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.questItems ^= gBitFlags[i]; } @@ -643,23 +774,28 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 200, 120); - if (curSection == 0) { + if (curSection == SECTION_RUPEES) { + // 4 digit long box gDPFillRectangle(POLY_OPA_DISP++, sSectionPositions[curSection][0], sSectionPositions[curSection][1], sSectionPositions[curSection][0] + 45, sSectionPositions[curSection][1] + 16); - } else if ((curSection >= 0x1B) || (curSection == 0x5B)) { + } else if ((curSection >= SECTION_FIRST_KEY_COUNT) || (curSection == SECTION_SKULL_TOKENS)) { + // 1 digit long box gDPFillRectangle(POLY_OPA_DISP++, sSectionPositions[curSection][0] - 2, sSectionPositions[curSection][1], sSectionPositions[curSection][0] + 14, sSectionPositions[curSection][1] + 16); } else { + // 2 digit long box gDPFillRectangle(POLY_OPA_DISP++, sSectionPositions[curSection][0] - 4, sSectionPositions[curSection][1], sSectionPositions[curSection][0] + 24, sSectionPositions[curSection][1] + 16); } // Handles exiting the inventory editor with the L button - // The editor is opened with `debugState` set to 1, and becomes closable after a frame once `debugState` is set to 2 - if (pauseCtx->debugState == 1) { - pauseCtx->debugState = 2; - } else if ((pauseCtx->debugState == 2) && CHECK_BTN_ALL(input->press.button, BTN_L)) { - pauseCtx->debugState = 0; + // The editor is opened with `debugState` set to PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING, + // and becomes closable after a frame once `debugState` is set to PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING) { + pauseCtx->debugState = PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN; + } else if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN) && + CHECK_BTN_ALL(input->press.button, BTN_L)) { + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; } CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_debug.c", 861); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 4a9389e9ce..96524d29ba 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -385,7 +385,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { index = cursorSlot * 4; // required to match? KaleidoScope_SetCursorPos(pauseCtx, index, pauseCtx->itemVtx); - if ((pauseCtx->debugState == 0) && (pauseCtx->state == PAUSE_STATE_MAIN) && + if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) && (pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { if (CHECK_BTN_ANY(input->press.button, BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT)) { if (CHECK_AGE_REQ_SLOT(cursorSlot) && (cursorItem != ITEM_SOLD_OUT)) { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 79a5d05193..f2f1966c9e 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -1103,9 +1103,9 @@ void KaleidoScope_SetupPageSwitch(PauseContext* pauseCtx, u8 pt) { } void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) { - if ((pauseCtx->debugState == 0) && CHECK_BTN_ALL(input->press.button, BTN_L)) { + if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) && CHECK_BTN_ALL(input->press.button, BTN_L)) { #if DEBUG_FEATURES - pauseCtx->debugState = 1; + pauseCtx->debugState = PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING; #endif return; } @@ -3397,7 +3397,7 @@ void KaleidoScope_Draw(PlayState* play) { gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->iconItemAltSegment); gSPSegment(POLY_OPA_DISP++, 0x0D, pauseCtx->iconItemLangSegment); - if (pauseCtx->debugState == 0) { + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) { KaleidoScope_SetView(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z); Gfx_SetupDL_42Opa(play->state.gfxCtx); @@ -3419,8 +3419,9 @@ void KaleidoScope_Draw(PlayState* play) { KaleidoScope_DrawGameOver(play); } - if ((pauseCtx->debugState == 1) || (pauseCtx->debugState == 2)) { - KaleidoScope_DrawDebugEditor(play); + if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING) || + (pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN)) { + KaleidoScope_DrawInventoryEditor(play); } CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3254); @@ -4312,7 +4313,7 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->alpha = 0; } } else { - pauseCtx->debugState = 0; + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY; pauseCtx->itemPagePitch = pauseCtx->equipPagePitch = pauseCtx->mapPagePitch = pauseCtx->questPagePitch = 160.0f; @@ -4655,7 +4656,7 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->alpha = 0; } } else { - pauseCtx->debugState = 0; + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY; pauseCtx->questPagePitch = 160.0f; pauseCtx->mapPagePitch = 160.0f; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index fcc84c5395..8c5d583887 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -220,7 +220,7 @@ typedef enum ItemQuad { void KaleidoScope_DrawQuestStatus(struct PlayState* play, GraphicsContext* gfxCtx); s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point); -void KaleidoScope_DrawDebugEditor(struct PlayState* play); +void KaleidoScope_DrawInventoryEditor(struct PlayState* play); void KaleidoScope_DrawPlayerWork(struct PlayState* play); void KaleidoScope_DrawEquipment(struct PlayState* play); void KaleidoScope_SetCursorPos(PauseContext* pauseCtx, u16 index, Vtx* vtx); From a4182086eeb6194aab27282674e37c4732a8164f Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 1 Jun 2025 17:53:13 +0200 Subject: [PATCH 11/42] T() macro in overlays 9 (#2552) * T() okarina_effect, ossan, reeba, rr * T() ru1, sb, sth, syateki_itm * T() syateki_niw, ta, takara_man, tite * T() tubo_trap, wall_tubo, weather_tag, wf * T() wonder_talk, wonder_talk2 * review --- .../z_en_okarina_effect.c | 7 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 18 ++- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 10 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 13 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 17 ++- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 6 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 10 +- .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 31 +++-- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 7 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 12 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 7 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 6 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 8 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 4 +- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 33 +++--- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 6 +- .../ovl_En_Wonder_Talk/z_en_wonder_talk.c | 73 ++++++------ .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 112 ++++++++++-------- 18 files changed, 196 insertions(+), 184 deletions(-) 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 eb9941b46b..5b361c6f1f 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 @@ -10,6 +10,7 @@ #include "regs.h" #include "sequence.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z64audio.h" #include "z64cutscene_flags.h" @@ -64,8 +65,8 @@ void EnOkarinaEffect_Init(Actor* thisx, PlayState* play) { EnOkarinaEffect* this = (EnOkarinaEffect*)thisx; PRINTF("\n\n"); - // "Ocarina Storm Effect" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n", + "☆☆☆☆☆ Ocarina storm effect sparkle sparkle sparkle ☆☆☆☆☆ \n") VT_RST); PRINTF("\n\n"); if (play->envCtx.precipitation[PRECIP_RAIN_CUR] != 0) { Actor_Kill(&this->actor); @@ -97,7 +98,7 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, PlayState* play) { } PRINTF("\nthis->timer=[%d]", this->timer); if (this->timer == 308) { - PRINTF("\n\n\n豆よ のびろ 指定\n\n\n"); // "Let's grow some beans" + PRINTF(T("\n\n\n豆よ のびろ 指定\n\n\n", "\n\n\nBeans, grow!\n\n\n")); CutsceneFlags_Set(play, 5); } } 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 86848da362..25f881cf99 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -673,8 +673,8 @@ void EnOssan_UpdateCursorPos(PlayState* play, EnOssan* this) { void EnOssan_EndInteraction(PlayState* play, EnOssan* this) { Player* player = GET_PLAYER(play); - // "End of conversation!" - PRINTF(VT_FGCOL(YELLOW) "%s[%d]:★★★ 会話終了！！ ★★★" VT_RST "\n", "../z_en_oB1.c", 1337); + PRINTF(VT_FGCOL(YELLOW) T("%s[%d]:★★★ 会話終了！！ ★★★", "%s[%d]:★★★ End of conversation!! ★★★") VT_RST "\n", + "../z_en_oB1.c", 1337); YREG(31) = 0; Actor_TalkOfferAccepted(&this->actor, play); play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; @@ -761,8 +761,7 @@ void EnOssan_State_Idle(EnOssan* this, PlayState* play, Player* player) { this->headTargetRot = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (Actor_TalkOfferAccepted(&this->actor, play)) { - // "Start conversation!!" - PRINTF(VT_FGCOL(YELLOW) "★★★ 会話開始！！ ★★★" VT_RST "\n"); + PRINTF(VT_FGCOL(YELLOW) T("★★★ 会話開始！！ ★★★", "★★★ Start conversation!! ★★★") VT_RST "\n"); player->stateFlags2 |= PLAYER_STATE2_29; Play_SetShopBrowsingViewpoint(play); EnOssan_SetStateStartShopping(play, this, false); @@ -951,8 +950,7 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla } if (!EnOssan_TestEndInteraction(this, play, &play->state.input[0])) { - // "Shop around by moving the stick left and right" - PRINTF("「スティック左右で品物みてくれ！」\n"); + PRINTF(T("「スティック左右で品物みてくれ！」\n", "「Shop around by moving the stick left and right!」\n")); EnOssan_StartShopping(play, this); } } @@ -2141,14 +2139,14 @@ void EnOssan_InitActionFunc(EnOssan* this, PlayState* play) { if (this->shelves == NULL) { PRINTF_COLOR_ERROR(); - // "Warning!! There are no shelves!!" - PRINTF("★★★ 警告！！ 棚がないよ！！ ★★★\n"); + PRINTF(T("★★★ 警告！！ 棚がないよ！！ ★★★\n", "★★★ Warning!! There are no shelves!! ★★★\n")); PRINTF_RST(); return; } - // "Shopkeeper (params) init" - PRINTF(VT_FGCOL(YELLOW) "◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇" VT_RST "\n", this->actor.params); + PRINTF(VT_FGCOL(YELLOW) T("◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇", "◇◇◇ Shopkeeper ( %d ) initial setting ◇◇◇") + VT_RST "\n", + this->actor.params); this->actor.world.pos.x += sShopkeeperPositionOffsets[this->actor.params].x; this->actor.world.pos.y += sShopkeeperPositionOffsets[this->actor.params].y; 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 856958e81e..b4cafe6817 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -17,6 +17,7 @@ #include "regs.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64debug_display.h" @@ -147,8 +148,8 @@ void EnReeba_Init(Actor* thisx, PlayState* play) { this->scale *= 1.5f; this->collider.dim.radius = 35; this->collider.dim.height = 45; - // "Reeba Boss Appears %f" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" VT_RST, this->scale); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Reeba boss appears ☆☆☆☆☆ %f\n") VT_RST, + this->scale); this->actor.colChkInfo.health = 20; this->collider.elem.atDmgInfo.effect = 4; this->collider.elem.atDmgInfo.damage = 16; @@ -520,9 +521,10 @@ void EnReeba_Die(EnReeba* this, PlayState* play) { if (spawner->killCount < 10) { spawner->killCount++; } - // "How many are dead?" PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" VT_RST, spawner->killCount); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n", "☆☆☆☆☆ How many are DEAD? ☆☆☆☆☆%d\n") + VT_RST, + spawner->killCount); PRINTF("\n\n"); } 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 b4e136a75a..ad19ebe447 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -16,6 +16,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" @@ -468,9 +469,9 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { dropType++; // magic jar FALLTHROUGH; case RR_DMG_NORMAL: - // "ouch" - PRINTF(VT_FGCOL(RED) "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！" VT_RST "\n", this->frameCount, - this->actor.colChkInfo.health, this->actor.colChkInfo.damage, + PRINTF(VT_FGCOL(RED) T("いてっ( %d : LIFE %d : DAMAGE %d : %x )！！", + "ouch ( %d : LIFE %d : DAMAGE %d : %x )!!") VT_RST "\n", + this->frameCount, this->actor.colChkInfo.health, this->actor.colChkInfo.damage, this->actor.colChkInfo.damageEffect); this->stopScroll = false; Actor_ApplyDamage(&this->actor); @@ -532,8 +533,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { ((this->collider1.base.ocFlags1 & OC1_HIT) || (this->collider2.base.ocFlags1 & OC1_HIT))) { this->collider1.base.ocFlags1 &= ~OC1_HIT; this->collider2.base.ocFlags1 &= ~OC1_HIT; - // "catch" - PRINTF(VT_FGCOL(GREEN) "キャッチ(%d)！！" VT_RST "\n", this->frameCount); + PRINTF(VT_FGCOL(GREEN) T("キャッチ(%d)！！", "catch (%d)!!") VT_RST "\n", this->frameCount); if (play->grabPlayer(play, player)) { player->actor.parent = &this->actor; this->stopScroll = false; @@ -714,8 +714,7 @@ void EnRr_Death(EnRr* this, PlayState* play) { Item_DropCollectible(play, &dropPos, ITEM00_TUNIC_ZORA); break; } - // "dropped" - PRINTF(VT_FGCOL(GREEN) "「%s」が出た！！" VT_RST "\n", sDropNames[this->dropType]); + PRINTF(VT_FGCOL(GREEN) T("「%s」が出た！！", "「%s」dropped!!") VT_RST "\n", sDropNames[this->dropType]); switch (this->dropType) { case RR_DROP_MAGIC: Item_DropCollectible(play, &dropPos, ITEM00_MAGIC_SMALL); 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 85ef778479..0e4573f90d 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -322,8 +322,8 @@ BgBdanObjects* EnRu1_FindSwitch(PlayState* play) { } actorIt = actorIt->next; } - // "There is no stand" - PRINTF(VT_FGCOL(RED) "お立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("お立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n", "There is no stand!!!!!!!!!!!!!!!!!!!!!!!!!\n") + VT_RST); return NULL; } @@ -2246,11 +2246,9 @@ void func_80AEFF94(EnRu1* this, PlayState* play) { this->roomNum1 = actorRoom; this->roomNum3 = actorRoom; this->roomNum2 = actorRoom; - // "Ruto switch set" - PRINTF("スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n", "Ruto switch set!!!!!!!!!!!!!!!!!!!!!!\n")); } else { - // "Ruto switch not set" - PRINTF("スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n", "Ruto switch not set!!!!!!!!!!!!!!!!!!!!!!\n")); Actor_Kill(&this->actor); } } @@ -2313,8 +2311,7 @@ void EnRu1_Init(Actor* thisx, PlayState* play) { #endif default: Actor_Kill(&this->actor); - // "Relevant arge_data = %d unacceptable" - PRINTF("該当 arge_data = %d 無し\n", func_80AEADF0(this)); + PRINTF(T("該当 arge_data = %d 無し\n", "Relevant arge_data = %d unacceptable\n"), func_80AEADF0(this)); break; } } @@ -2340,8 +2337,8 @@ s32 EnRu1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p EnRu1* this = (EnRu1*)thisx; if ((this->unk_290 < 0) || (this->unk_290 > 0) || (*sPreLimbDrawFuncs[this->unk_290] == NULL)) { - // "Neck rotation mode is improper!" - PRINTF(VT_FGCOL(RED) "首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "Neck rotation mode is improper!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); } else { sPreLimbDrawFuncs[this->unk_290](this, play, limbIndex, rot); } 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 152f5ea753..52e3134b6a 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -12,6 +12,7 @@ #include "rand.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" @@ -277,8 +278,7 @@ void EnSb_TurnAround(EnSb* this, PlayState* play) { EnSb_SpawnBubbles(play, this); this->bouncesLeft = 3; EnSb_SetupLunge(this); - // "Attack!!" - PRINTF("アタァ〜ック！！\n"); + PRINTF(T("アタァ〜ック！！\n", "Attack!!\n")); } } @@ -322,7 +322,7 @@ void EnSb_Bounce(EnSb* this, PlayState* play) { this->actor.speed = 0.0f; this->timer = 1; EnSb_SetupWaitClosed(this); - PRINTF(VT_FGCOL(RED) "攻撃終了！！" VT_RST "\n"); // "Attack Complete!" + PRINTF(VT_FGCOL(RED) T("攻撃終了！！", "Attack complete!!") VT_RST "\n"); } } } 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 9eb1679a56..58ee87f235 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -12,6 +12,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" #include "z64save.h" @@ -107,18 +108,17 @@ void EnSth_Init(Actor* thisx, PlayState* play) { s32 params = this->actor.params; s32 objectSlot; - PRINTF(VT_FGCOL(BLUE) "金スタル屋 no = %d\n" VT_RST, params); // "Gold Skulltula Shop" + PRINTF(VT_FGCOL(BLUE) T("金スタル屋 no = %d\n", "Gold Skulltula Shop no = %d\n") VT_RST, params); if (this->actor.params == 0) { if (gSaveContext.save.info.inventory.gsTokens < 100) { Actor_Kill(&this->actor); - // "Gold Skulltula Shop I still can't be a human" - PRINTF("金スタル屋 まだ 人間に戻れない \n"); + PRINTF(T("金スタル屋 まだ 人間に戻れない \n", "Gold Skulltula Shop I still can't be a human \n")); return; } } else if (gSaveContext.save.info.inventory.gsTokens < (this->actor.params * 10)) { Actor_Kill(&this->actor); - // "Gold Skulltula Shop I still can't be a human" - PRINTF(VT_FGCOL(BLUE) "金スタル屋 まだ 人間に戻れない \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) T("金スタル屋 まだ 人間に戻れない \n", "Gold Skulltula Shop I still can't be a human \n") + VT_RST); return; } 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 e409e9c246..0dc3434660 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 @@ -8,6 +8,7 @@ #include "regs.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64debug_display.h" #include "z64play.h" @@ -85,8 +86,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) { this->man = (EnSyatekiMan*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SYATEKI_MAN, 140.0f, 0.0f, 255.0f, 0, -0x4000, 0, 0); if (this->man == NULL) { - // "Spawn error" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ エラー原 ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ エラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Spawn error ☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } @@ -94,8 +94,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) { this->markers[i] = (EnExRuppy*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_RUPPY, sRupeePos[i].x, sRupeePos[i].y, sRupeePos[i].z, 0, 0, 0, 4); if (this->markers[i] == NULL) { - // "Second spawn error" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n", "☆☆☆☆☆ Second spawn error ☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } @@ -246,8 +245,7 @@ void EnSyatekiItm_SpawnTargets(EnSyatekiItm* this, PlayState* play) { &play->actorCtx, &this->actor, play, ACTOR_EN_G_SWITCH, this->targetHome[i].x, this->targetHome[i].y, this->targetHome[i].z, 0, 0, 0, (ENGSWITCH_TARGET_RUPEE << 0xC) | 0x3F); if (this->targets[i] == NULL) { - // "Rupee spawn error" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Rupee spawn error ☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } @@ -324,17 +322,16 @@ void EnSyatekiItm_EndGame(EnSyatekiItm* this, PlayState* play) { this->actionFunc = EnSyatekiItm_Idle; } if (this->signal == ENSYATEKI_START) { - // "1 frame attack and defense!" - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n", "☆☆☆☆☆ 1 frame attack and defense! ☆☆☆☆ \n") VT_RST); this->signal = ENSYATEKI_NONE; this->actionFunc = EnSyatekiItm_Idle; } 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 970ebb32d3..5eca8ac947 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 @@ -15,6 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64effect.h" #include "z64play.h" @@ -96,13 +97,11 @@ void EnSyatekiNiw_Init(Actor* thisx, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); if (this->minigameType == SYATEKI_MINIGAME_ARCHERY) { PRINTF("\n\n"); - // "Archery range chicken" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n", "☆☆☆☆☆ Archery range chicken ☆☆☆☆☆ \n") VT_RST); Actor_SetScale(&this->actor, 0.01f); } else { PRINTF("\n\n"); - // "Bomb chicken" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ボムにわ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ボムにわ！ ☆☆☆☆☆ \n", "☆☆☆☆☆ Bomb chicken! ☆☆☆☆☆ \n") VT_RST); this->actor.colChkInfo.mass = MASS_IMMOVABLE; Actor_SetScale(&this->actor, 0.01f); } 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 68335d64b2..fd4f5b91c1 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -20,6 +20,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64audio.h" #include "z64face_reaction.h" @@ -176,8 +177,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { switch (this->actor.params) { case ENTA_IN_KAKARIKO: - // "Exile Talon" - PRINTF(VT_FGCOL(CYAN) " 追放タロン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" 追放タロン \n", " Exile Talon \n") VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) { Actor_Kill(&this->actor); } else if (!LINK_IS_ADULT) { @@ -197,15 +197,14 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { break; case ENTA_RETURNED_FROM_KAKARIKO: - // "Return Talon" - PRINTF(VT_FGCOL(CYAN) " 出戻りタロン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" 出戻りタロン \n", " Return Talon \n") VT_RST); if (!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) { Actor_Kill(&this->actor); } else if (!LINK_IS_ADULT) { Actor_Kill(&this->actor); } else if (play->sceneId == SCENE_STABLE && !IS_DAY) { Actor_Kill(&this->actor); - PRINTF(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" 夜はいない \n", " He's not here at night \n") VT_RST); } else { EnTa_SetupAction(this, EnTa_IdleAtRanch, EnTa_AnimRepeatCurrent); this->eyeIndex = TALON_EYE_INDEX_OPEN; @@ -215,8 +214,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { break; default: // Child era Talon - // "Other Talon" - PRINTF(VT_FGCOL(CYAN) " その他のタロン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" その他のタロン \n", " Other Talon \n") VT_RST); if (play->sceneId == SCENE_HYRULE_CASTLE) { if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { Actor_Kill(&this->actor); 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 8d51dae459..b61e51abdb 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 @@ -12,6 +12,7 @@ #include "rand.h" #include "segmented_address.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z64play.h" #include "z64save.h" @@ -56,14 +57,14 @@ void EnTakaraMan_Init(Actor* thisx, PlayState* play) { if (sTakaraIsInitialized) { Actor_Kill(&this->actor); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); // "Already initialized" + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Already initialized ☆☆☆☆☆ \n") VT_RST); return; } sTakaraIsInitialized = true; PRINTF("\n\n"); - // "Bun! %x" (needs a better translation) - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" VT_RST, play->actorCtx.flags.chest); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Bang! ☆☆☆☆☆ %x\n") VT_RST, + play->actorCtx.flags.chest); play->actorCtx.flags.chest = 0; gSaveContext.save.info.inventory.dungeonKeys[gSaveContext.mapIndex] = -1; SkelAnime_InitFlex(play, &this->skelAnime, &object_ts_Skel_004FE0, &object_ts_Anim_000498, this->jointTable, 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 3435b040fc..71ea089bbd 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -17,6 +17,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" @@ -226,8 +227,9 @@ void EnTite_Destroy(Actor* thisx, PlayState* play) { spawner->curNumSpawn--; } PRINTF("\n\n"); - // "Number of simultaneous occurrences" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, spawner->curNumSpawn); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n") + VT_RST, + spawner->curNumSpawn); PRINTF("\n\n"); } Collider_DestroyJntSph(play, &this->collider); 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 31ae178197..7ff6013e48 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 @@ -12,6 +12,7 @@ #include "regs.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" @@ -69,7 +70,7 @@ void EnTuboTrap_Init(Actor* thisx, PlayState* play) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 2.0f); PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); // "Urn Trap" + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Urn Trap ☆☆☆☆☆ %x\n") VT_RST, this->actor.params); Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); Actor_SetScale(&this->actor, 0.1f); @@ -234,8 +235,9 @@ void EnTuboTrap_WaitForProximity(EnTuboTrap* this, PlayState* play) { f32 targetHeight; if (BREG(2) != 0) { - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ わて ☆☆☆☆☆ %f\n" VT_RST, this->actor.world.pos.y); // "You" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n" VT_RST, player->actor.world.pos.y); // "Me" + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ わて ☆☆☆☆☆ %f\n", "☆☆☆☆☆ You ☆☆☆☆☆ %f\n") VT_RST, this->actor.world.pos.y); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Me ☆☆☆☆☆ %f\n") VT_RST, + player->actor.world.pos.y); PRINTF("\n\n"); } 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 149eba4700..d54a570d2a 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 @@ -15,6 +15,7 @@ #include "printf.h" #include "quake.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64debug_display.h" #include "z64effect.h" @@ -46,8 +47,7 @@ void EnWallTubo_Init(Actor* thisx, PlayState* play) { EnWallTubo* this = (EnWallTubo*)thisx; PRINTF("\n\n"); - // "Wall Target" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n", "☆☆☆☆☆ Points on the wall ☆☆☆☆☆ \n") VT_RST); this->unk_164 = this->actor.world.pos; this->actionFunc = EnWallTubo_FindGirl; } 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 04082aa10f..520e7edc61 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 @@ -9,6 +9,7 @@ #include "printf.h" #include "regs.h" #include "terminal.h" +#include "translation.h" #include "versions.h" #include "z_lib.h" #include "z64debug_display.h" @@ -67,14 +68,14 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { switch (PARAMS_GET_U(this->actor.params, 0, 4)) { case EN_WEATHER_TAG_TYPE_CLOUDY_MARKET: PRINTF("\n\n"); - // "☆☆☆☆☆ (;o;) About ☆☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n", "☆☆☆☆☆ (;o;) About that much ☆☆☆☆☆ \n") + VT_RST); EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyHyruleMarket); break; case EN_WEATHER_TAG_TYPE_CLOUDY_LON_LON_RANCH: PRINTF("\n\n"); - // "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n", + "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆ \n") VT_RST); if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) { Actor_Kill(&this->actor); } @@ -82,8 +83,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { break; case EN_WEATHER_TAG_TYPE_SNOW_ZORAS_DOMAIN: PRINTF("\n\n"); - // "☆☆☆☆☆ Yukigafuru You won't come (._.) ☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n", + "☆☆☆☆☆ The snow is falling... You're not coming... (._.) ☆☆☆☆☆ \n") VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_4A)) { Actor_Kill(&this->actor); @@ -92,8 +93,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { break; case EN_WEATHER_TAG_TYPE_RAIN_LAKE_HYLIA: PRINTF("\n\n"); - // "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n", + "☆☆☆☆☆ Waaaa- Na-ga-sa-ki wa- (^o^) ☆☆☆☆☆ \n") VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_4A)) { Actor_Kill(&this->actor); @@ -102,8 +103,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { break; case EN_WEATHER_TAG_TYPE_CLOUDY_DEATH_MOUNTAIN: PRINTF("\n\n"); - // "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) + T("☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n", "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆") VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_49)) { Actor_Kill(&this->actor); } @@ -111,8 +112,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { break; case EN_WEATHER_TAG_TYPE_THUNDERSTORM_KAKARIKO: PRINTF("\n\n"); - // "☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n", + "☆☆☆☆☆ Cloudy with rain and thunder (;O;) Wow, I'm depressed ☆☆☆☆☆ \n") VT_RST); if (!GET_EVENTCHKINF(EVENTCHKINF_48) || !GET_EVENTCHKINF(EVENTCHKINF_49) || !GET_EVENTCHKINF(EVENTCHKINF_4A) || CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) { @@ -122,14 +123,14 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { break; case EN_WEATHER_TAG_TYPE_SANDSTORM_INTENSITY: PRINTF("\n\n"); - // "☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n", "☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆ \n") + VT_RST); EnWeatherTag_SetupAction(this, EnWeatherTag_SetSandstormIntensity); break; case EN_WEATHER_TAG_TYPE_THUNDERSTORM_GRAVEYARD: PRINTF("\n\n"); - // "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n", + "☆☆☆☆☆ Waaaa- Na-ga-sa-ki wa- (^o^) ☆☆☆☆☆ \n") VT_RST); EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledRainThunder); break; 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 4014597de7..f7ae2db60b 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -19,6 +19,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_en_item00.h" #include "z_lib.h" #include "z64audio.h" @@ -292,8 +293,9 @@ void EnWf_Destroy(Actor* thisx, PlayState* play) { } PRINTF("\n\n"); - // "☆☆☆☆☆ Number of concurrent events ☆☆☆☆☆" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, parent->curNumSpawn); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n") + VT_RST, + parent->curNumSpawn); PRINTF("\n\n"); } } 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 fb455390a7..4b43e59cb2 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 @@ -9,6 +9,7 @@ #include "printf.h" #include "regs.h" #include "terminal.h" +#include "translation.h" #include "z64debug_display.h" #include "z64play.h" #include "z64save.h" @@ -42,8 +43,8 @@ void EnWonderTalk_Init(Actor* thisx, PlayState* play) { EnWonderTalk* this = (EnWonderTalk*)thisx; PRINTF("\n\n"); - // "Special conversation" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 特殊会話くん ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 特殊会話くん ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Special conversation ☆☆☆☆☆ %x\n") VT_RST, + this->actor.params); this->unk_150 = PARAMS_GET_U(this->actor.params, 11, 5); this->unk_152 = PARAMS_GET_U(this->actor.params, 6, 5); @@ -67,19 +68,17 @@ void func_80B391CC(EnWonderTalk* this, PlayState* play) { if (this->switchFlag < 0 || !Flags_GetSwitch(play, this->switchFlag)) { switch (this->unk_150) { case 1: - // "Slate GO!" - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 石板ＧＯ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 石板ＧＯ！ ☆☆☆☆☆ \n", " ☆☆☆☆☆ Slate GO! ☆☆☆☆☆ \n") VT_RST); this->height = 0.0f; this->unk_15C = 80.0f; - // "Attention coordinates" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n", + "☆☆☆☆☆ Attention coordinates\t \t☆☆☆☆☆ %f\n") VT_RST, + 0.0f); if (!LINK_IS_ADULT) { this->actor.textId = 0x7040; - // "Children" - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ こども ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ こども ☆☆☆☆☆ \n", " ☆☆☆☆☆ Child ☆☆☆☆☆ \n") VT_RST); } else { - // "Adult" - PRINTF(VT_FGCOL(CYAN) " ☆☆☆☆☆ おとな ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" ☆☆☆☆☆ おとな ☆☆☆☆☆ \n", " ☆☆☆☆☆ Adult ☆☆☆☆☆ \n") VT_RST); this->actor.textId = 0x7088; } @@ -87,29 +86,31 @@ void func_80B391CC(EnWonderTalk* this, PlayState* play) { PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" VT_RST, this->actor.textId); break; case 2: - // "Diary start!" - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 日記帳スタート！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 日記帳スタート！ ☆☆☆☆☆ \n", " ☆☆☆☆☆ Diary start! ☆☆☆☆☆ \n") VT_RST); this->actor.textId = 0x5002; this->unk_156 = TEXT_STATE_CHOICE; this->unk_15C = 40.0f; this->height = 30.0f; - // "Attention coordinates" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 30.0f); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n", + "☆☆☆☆☆ Attention coordinates\t \t☆☆☆☆☆ %f\n") VT_RST, + 30.0f); break; case 3: this->actor.textId = 0x501E; this->unk_156 = TEXT_STATE_EVENT; this->height = 0.0f; this->unk_15C = 110.0f; - // "Attention coordinates" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n", + "☆☆☆☆☆ Attention coordinates\t \t☆☆☆☆☆ %f\n") VT_RST, + 0.0f); break; case 4: this->actor.textId = 0x5020; this->unk_156 = TEXT_STATE_DONE; this->height = 0.0f; - // "Attention coordinates" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n", + "☆☆☆☆☆ Attention coordinates\t \t☆☆☆☆☆ %f\n") VT_RST, + 0.0f); this->unk_15C = 120.0f; if (GET_EVENTCHKINF(EVENTCHKINF_1D)) { Actor_Kill(&this->actor); @@ -120,8 +121,9 @@ void func_80B391CC(EnWonderTalk* this, PlayState* play) { this->unk_156 = TEXT_STATE_EVENT; this->height = 0.0f; this->unk_15C = 110.0f; - // "Attention coordinates" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n", + "☆☆☆☆☆ Attention coordinates\t \t☆☆☆☆☆ %f\n") VT_RST, + 0.0f); break; default: this->actor.textId = 0x7072; @@ -161,14 +163,18 @@ void func_80B3943C(EnWonderTalk* this, PlayState* play) { if (yawDiff < 0x4000) { if (this->unk_15A >= 2) { PRINTF("\n\n"); - // "Save information" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報\t\t☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); - // "Type index" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 種類インデックス\t☆☆☆☆☆ %d\n" VT_RST, this->unk_150); - // "Actual message type" - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); - // "Specified range" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ セーブ情報\t\t☆☆☆☆☆ %d\n", "☆☆☆☆☆ Save information\t\t☆☆☆☆☆ %d\n") + VT_RST, + this->switchFlag); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 種類インデックス\t☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type index\t☆☆☆☆☆ %d\n") + VT_RST, + this->unk_150); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 実質メッセージ種類 %x\n", "☆☆☆☆☆ Actual message type %x\n") + VT_RST, + this->actor.textId); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 指定範囲 %d\n", + "☆☆☆☆☆ Specified range %d\n") VT_RST, + this->actor.world.rot.z); PRINTF("\n\n"); } this->unk_15A = 0; @@ -193,18 +199,17 @@ void func_80B395F0(EnWonderTalk* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: if (!LINK_IS_ADULT) { - // "I'm still a child!" - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ まだコドモなの！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ まだコドモなの！ ☆☆☆☆☆ \n", + " ☆☆☆☆☆ I'm still a child! ☆☆☆☆☆ \n") VT_RST); this->actor.textId = 0x5001; } else { - // "I'm an adult. .. .." - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ アダルトなの。。。 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ アダルトなの。。。 ☆☆☆☆☆ \n", + " ☆☆☆☆☆ I'm an adult... ☆☆☆☆☆ \n") VT_RST); this->actor.textId = 0x5003; } break; case 1: - // "Out!" - PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ はずれ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆☆☆☆ はずれ！ ☆☆☆☆☆ \n", " ☆☆☆☆☆ No luck! ☆☆☆☆☆ \n") VT_RST); this->actor.textId = 0x5004; break; } 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 bb58339fc1..78e8d152d7 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 @@ -9,6 +9,7 @@ #include "printf.h" #include "regs.h" #include "terminal.h" +#include "translation.h" #include "z64debug_display.h" #include "z64item.h" #include "z64play.h" @@ -48,8 +49,8 @@ void EnWonderTalk2_Init(Actor* thisx, PlayState* play) { EnWonderTalk2* this = (EnWonderTalk2*)thisx; PRINTF("\n\n"); - // "Transparent message" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Transparent message ☆☆☆☆☆ %x\n") VT_RST, + this->actor.params); this->baseMsgId = PARAMS_GET_U(this->actor.params, 6, 8); if (this->actor.world.rot.z > 0) { s32 rangeIndex = 0; @@ -68,12 +69,12 @@ void EnWonderTalk2_Init(Actor* thisx, PlayState* play) { this->actor.attentionRangeType = D_80B3A8E0[rangeIndex]; PRINTF("\n\n"); - // "originally?" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z); - // "The range is?" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.attentionRangeType); - // "Is the range?" - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n" VT_RST, this->triggerRange); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Originally? ☆☆☆☆☆ %d\n") VT_RST, + this->actor.world.rot.z); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ The range is? ☆☆☆☆☆ %d\n") VT_RST, + this->actor.attentionRangeType); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ The range is? ☆☆☆☆☆ %f\n") VT_RST, + this->triggerRange); PRINTF("\n\n"); PRINTF("\n\n"); PRINTF("\n\n"); @@ -127,8 +128,9 @@ void func_80B3A15C(EnWonderTalk2* this, PlayState* play) { } else if (Actor_TalkOfferAccepted(&this->actor, play)) { if ((this->switchFlag >= 0) && (this->talkMode != 2)) { Flags_SetSwitch(play, this->switchFlag); - // "I saved it! All of it!" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n", "☆☆☆☆☆ I saved it! All of it! %x\n") + VT_RST, + this->switchFlag); } this->actionFunc = func_80B3A10C; @@ -140,30 +142,33 @@ void func_80B3A15C(EnWonderTalk2* this, PlayState* play) { if (DEBUG_FEATURES && this->unk_158 >= 2) { PRINTF("\n\n"); - // "Transparent Message Kimi Set" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); - // "Save Information" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); - // "Specified message type" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->baseMsgId); - // "Actual message type" - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); - // "Specified range" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); - // "Processing range" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->triggerRange); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 透明メッセージ君せっと %x\n", "☆☆☆☆☆ Transparent Message Kimi Set %x\n") + VT_RST, + this->actor.params); + PRINTF(VT_FGCOL(YELLOW) + T("☆☆☆☆☆ セーブ情報 \t %x\n", "☆☆☆☆☆ Save Information \t %x\n") VT_RST, + this->switchFlag); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 指定メッセージ種類 %x\n", "☆☆☆☆☆ Specified message type %x\n") + VT_RST, + this->baseMsgId); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 実質メッセージ種類 %x\n", "☆☆☆☆☆ Actual message type %x\n") + VT_RST, + this->actor.textId); + PRINTF(VT_FGCOL(GREEN) + T("☆☆☆☆☆ 指定範囲 %d\n", "☆☆☆☆☆ Specified range %d\n") VT_RST, + this->actor.world.rot.z); + PRINTF(VT_FGCOL(YELLOW) + T("☆☆☆☆☆ 処理範囲 %f\n", "☆☆☆☆☆ Processing range %f\n") VT_RST, + this->triggerRange); switch (this->talkMode) { case 0: - // "Normal" - PRINTF(VT_FGCOL(MAGENTA) " ☆☆ 通常 ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆ 通常 ☆☆ \n", " ☆☆ Normal ☆☆ \n") VT_RST); break; case 2: - // "Check only" - PRINTF(VT_FGCOL(MAGENTA) " ☆☆ チェックのみ ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆ チェックのみ ☆☆ \n", " ☆☆ Check only ☆☆ \n") VT_RST); break; case 3: - // "Lock only" - PRINTF(VT_FGCOL(MAGENTA) " ☆☆ ロックのみ ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆ ロックのみ ☆☆ \n", " ☆☆ Lock only ☆☆ \n") VT_RST); break; } } @@ -176,8 +181,7 @@ void func_80B3A15C(EnWonderTalk2* this, PlayState* play) { void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) { if (BREG(2) != 0) { - // "Oh" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ わー %d\n" VT_RST, Message_GetState(&play->msgCtx)); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ わー %d\n", "☆☆☆☆☆ Oh %d\n") VT_RST, Message_GetState(&play->msgCtx)); } switch (Message_GetState(&play->msgCtx)) { @@ -193,8 +197,9 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) { case TEXT_STATE_NONE: if ((this->switchFlag >= 0) && (this->talkMode != 4)) { Flags_SetSwitch(play, this->switchFlag); - // "(Forced) I saved it! All of it!" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n", + "☆☆☆☆☆ (Forced) I saved it! All of it! %x\n") VT_RST, + this->switchFlag); } if (this->talkMode == 4) { @@ -220,8 +225,7 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) { } } else if ((this->talkMode != 4) || !this->unk_15A) { if (BREG(2) != 0) { - // "distance" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ きょり %f\n" VT_RST, this->actor.xzDistToPlayer); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ きょり %f\n", "☆☆☆☆☆ distance %f\n") VT_RST, this->actor.xzDistToPlayer); } if (((this->actor.xzDistToPlayer < (40.0f + this->triggerRange)) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 100.0f)) && @@ -229,30 +233,34 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) { if (DEBUG_FEATURES && this->unk_158 >= 2) { PRINTF("\n\n"); - // "Transparent Message Kimi Seto" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); - // "Save Information" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); - // "Specified message type" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->baseMsgId); - // "Real message type" - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); - // "Specified range" - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); - // "Processing range" - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->triggerRange); - // "What is your range?" - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ レンジは？ \t\t %d\n" VT_RST, this->actor.attentionRangeType); + PRINTF(VT_FGCOL(GREEN) + T("☆☆☆☆☆ 透明メッセージ君せっと %x\n", "☆☆☆☆☆ Transparent Message Kimi Seto %x\n") VT_RST, + this->actor.params); + PRINTF(VT_FGCOL(YELLOW) + T("☆☆☆☆☆ セーブ情報 \t %x\n", "☆☆☆☆☆ Save Information \t %x\n") VT_RST, + this->switchFlag); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 指定メッセージ種類 %x\n", "☆☆☆☆☆ Specified message type %x\n") + VT_RST, + this->baseMsgId); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 実質メッセージ種類 %x\n", "☆☆☆☆☆ Real message type %x\n") VT_RST, + this->actor.textId); + PRINTF(VT_FGCOL(GREEN) + T("☆☆☆☆☆ 指定範囲 %d\n", "☆☆☆☆☆ Specified range %d\n") VT_RST, + this->actor.world.rot.z); + PRINTF(VT_FGCOL(YELLOW) + T("☆☆☆☆☆ 処理範囲 %f\n", "☆☆☆☆☆ Processing range %f\n") VT_RST, + this->triggerRange); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ レンジは？ \t\t %d\n", "☆☆☆☆☆ The range is? \t\t %d\n") VT_RST, + this->actor.attentionRangeType); PRINTF("\n\n"); PRINTF("\n\n"); switch (this->talkMode) { case 1: - // "Compulsion" - PRINTF(VT_FGCOL(MAGENTA) " ☆☆ 強制 ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆ 強制 ☆☆ \n", " ☆☆ Compulsion ☆☆ \n") VT_RST); break; case 4: - // "Gerudo Training Grounds Forced Check Only" - PRINTF(VT_FGCOL(RED) " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) T(" ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n", + " ☆☆ Gerudo Training Grounds Forced Check Only ☆☆ \n") VT_RST); break; } From d2ef1028021039d3fd5b3e8a13c956f75c2b4879 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 1 Jun 2025 18:53:56 +0200 Subject: [PATCH 12/42] Add Vtx[] resources in xmls for undocumented assets (#2547) --- assets/xml/objects/object_Bb.xml | 18 ++++ assets/xml/objects/object_b_heart.xml | 6 ++ assets/xml/objects/object_bigokuta.xml | 57 ++++++++++++ assets/xml/objects/object_bombiwa.xml | 3 + assets/xml/objects/object_bwall.xml | 3 + assets/xml/objects/object_bxa.xml | 9 ++ assets/xml/objects/object_d_elevator.xml | 3 + assets/xml/objects/object_daiku.xml | 60 ++++++++++++ assets/xml/objects/object_dekujr.xml | 6 ++ assets/xml/objects/object_demo_6k.xml | 6 ++ assets/xml/objects/object_dh.xml | 54 +++++++++++ assets/xml/objects/object_dodojr.xml | 15 +++ assets/xml/objects/object_door_killer.xml | 36 +++++++ assets/xml/objects/object_ds2.xml | 24 +++++ assets/xml/objects/object_efc_erupc.xml | 9 ++ assets/xml/objects/object_efc_star_field.xml | 6 ++ assets/xml/objects/object_fr.xml | 66 +++++++++++++ assets/xml/objects/object_ganon_objects.xml | 3 + assets/xml/objects/object_gnd_magic.xml | 3 + assets/xml/objects/object_haka_objects.xml | 93 +++++++++++++++++++ assets/xml/objects/object_hs.xml | 33 +++++++ assets/xml/objects/object_ka.xml | 69 ++++++++++++++ assets/xml/objects/object_kanban.xml | 36 +++++++ assets/xml/objects/object_kingdodongo_pal.xml | 75 +++++++++++++++ assets/xml/objects/object_kusa.xml | 6 ++ assets/xml/objects/object_lightbox.xml | 12 +++ assets/xml/objects/object_lightswitch.xml | 9 ++ assets/xml/objects/object_medal.xml | 18 ++++ assets/xml/objects/object_mk.xml | 36 +++++++ assets/xml/objects/object_mori_hineri1.xml | 3 + assets/xml/objects/object_mori_hineri1a.xml | 3 + assets/xml/objects/object_mori_hineri2.xml | 3 + assets/xml/objects/object_mori_hineri2a.xml | 3 + assets/xml/objects/object_mu.xml | 90 ++++++++++++++++++ assets/xml/objects/object_oA1.xml | 45 +++++++++ assets/xml/objects/object_oA10.xml | 45 +++++++++ assets/xml/objects/object_oA11.xml | 21 +++++ assets/xml/objects/object_oA2.xml | 45 +++++++++ assets/xml/objects/object_oA3.xml | 3 + assets/xml/objects/object_oA4.xml | 45 +++++++++ assets/xml/objects/object_oA5.xml | 45 +++++++++ assets/xml/objects/object_oA6.xml | 45 +++++++++ assets/xml/objects/object_oA7.xml | 45 +++++++++ assets/xml/objects/object_oA8.xml | 45 +++++++++ assets/xml/objects/object_oA9.xml | 3 + assets/xml/objects/object_oB1.xml | 45 +++++++++ assets/xml/objects/object_oB2.xml | 24 +++++ assets/xml/objects/object_oB3.xml | 45 +++++++++ assets/xml/objects/object_oB4.xml | 45 +++++++++ assets/xml/objects/object_oE1.xml | 45 +++++++++ assets/xml/objects/object_oE10.xml | 3 + assets/xml/objects/object_oE11.xml | 3 + assets/xml/objects/object_oE12.xml | 3 + assets/xml/objects/object_oE1s.xml | 45 +++++++++ assets/xml/objects/object_oE2.xml | 45 +++++++++ assets/xml/objects/object_oE3.xml | 45 +++++++++ assets/xml/objects/object_oE4.xml | 45 +++++++++ assets/xml/objects/object_oE4s.xml | 45 +++++++++ assets/xml/objects/object_oE5.xml | 24 +++++ assets/xml/objects/object_oE6.xml | 3 + assets/xml/objects/object_oE7.xml | 3 + assets/xml/objects/object_oE8.xml | 3 + assets/xml/objects/object_oE9.xml | 3 + assets/xml/objects/object_oF1s.xml | 48 ++++++++++ assets/xml/objects/object_ossan.xml | 27 ++++++ assets/xml/objects/object_ouke_haka.xml | 3 + assets/xml/objects/object_reeba.xml | 18 ++++ assets/xml/objects/object_rl.xml | 27 ++++++ assets/xml/objects/object_sb.xml | 6 ++ assets/xml/objects/object_siofuki.xml | 3 + assets/xml/objects/object_spot03_object.xml | 3 + assets/xml/objects/object_spot05_objects.xml | 6 ++ assets/xml/objects/object_spot07_object.xml | 18 ++++ assets/xml/objects/object_ssh.xml | 39 ++++++++ assets/xml/objects/object_stream.xml | 3 + assets/xml/objects/object_tite.xml | 27 ++++++ assets/xml/objects/object_toki_objects.xml | 30 ++++++ assets/xml/objects/object_toryo.xml | 48 ++++++++++ assets/xml/objects/object_ts.xml | 27 ++++++ assets/xml/objects/object_tsubo.xml | 6 ++ assets/xml/objects/object_wood02.xml | 45 +++++++++ assets/xml/objects/object_yabusame_point.xml | 3 + 82 files changed, 2124 insertions(+) diff --git a/assets/xml/objects/object_Bb.xml b/assets/xml/objects/object_Bb.xml index 5d04bde451..b65f7f6b60 100644 --- a/assets/xml/objects/object_Bb.xml +++ b/assets/xml/objects/object_Bb.xml @@ -3,6 +3,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_b_heart.xml b/assets/xml/objects/object_b_heart.xml index 00f7cd6773..dc4e7fa4c3 100644 --- a/assets/xml/objects/object_b_heart.xml +++ b/assets/xml/objects/object_b_heart.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/assets/xml/objects/object_bigokuta.xml b/assets/xml/objects/object_bigokuta.xml index 1c7d39e319..9c77261caf 100644 --- a/assets/xml/objects/object_bigokuta.xml +++ b/assets/xml/objects/object_bigokuta.xml @@ -5,6 +5,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bombiwa.xml b/assets/xml/objects/object_bombiwa.xml index 26ab6b4f33..0f3f5a7e40 100644 --- a/assets/xml/objects/object_bombiwa.xml +++ b/assets/xml/objects/object_bombiwa.xml @@ -2,6 +2,9 @@ + + + diff --git a/assets/xml/objects/object_bwall.xml b/assets/xml/objects/object_bwall.xml index d4f43ddc14..e0bdea1b40 100644 --- a/assets/xml/objects/object_bwall.xml +++ b/assets/xml/objects/object_bwall.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_bxa.xml b/assets/xml/objects/object_bxa.xml index fb78c117e0..f1ad934e25 100644 --- a/assets/xml/objects/object_bxa.xml +++ b/assets/xml/objects/object_bxa.xml @@ -1,9 +1,18 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_d_elevator.xml b/assets/xml/objects/object_d_elevator.xml index 6be59c154b..d2761b4f5c 100644 --- a/assets/xml/objects/object_d_elevator.xml +++ b/assets/xml/objects/object_d_elevator.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_daiku.xml b/assets/xml/objects/object_daiku.xml index 1524c7a26c..c2c538e1be 100644 --- a/assets/xml/objects/object_daiku.xml +++ b/assets/xml/objects/object_daiku.xml @@ -16,6 +16,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dekujr.xml b/assets/xml/objects/object_dekujr.xml index e906bf61c4..7f4e70681b 100644 --- a/assets/xml/objects/object_dekujr.xml +++ b/assets/xml/objects/object_dekujr.xml @@ -7,6 +7,12 @@ + + + + + + diff --git a/assets/xml/objects/object_demo_6k.xml b/assets/xml/objects/object_demo_6k.xml index e2de93db2e..9cb598a2e1 100644 --- a/assets/xml/objects/object_demo_6k.xml +++ b/assets/xml/objects/object_demo_6k.xml @@ -2,8 +2,14 @@ + + + + + + diff --git a/assets/xml/objects/object_dh.xml b/assets/xml/objects/object_dh.xml index 7a52d7dbe7..0e8d7fc7e1 100644 --- a/assets/xml/objects/object_dh.xml +++ b/assets/xml/objects/object_dh.xml @@ -1,5 +1,14 @@ + + + + + + + + + @@ -22,6 +31,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52,6 +103,9 @@ + + + diff --git a/assets/xml/objects/object_dodojr.xml b/assets/xml/objects/object_dodojr.xml index 4dfd7d6e45..1938fc574d 100644 --- a/assets/xml/objects/object_dodojr.xml +++ b/assets/xml/objects/object_dodojr.xml @@ -5,6 +5,21 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml index fbee0e5f70..7f8d8f186c 100644 --- a/assets/xml/objects/object_door_killer.xml +++ b/assets/xml/objects/object_door_killer.xml @@ -1,5 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -8,9 +32,21 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml index 683bcc68d4..9c61ea4d24 100644 --- a/assets/xml/objects/object_ds2.xml +++ b/assets/xml/objects/object_ds2.xml @@ -1,6 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_efc_erupc.xml b/assets/xml/objects/object_efc_erupc.xml index 13cc2ab033..14d28438b2 100644 --- a/assets/xml/objects/object_efc_erupc.xml +++ b/assets/xml/objects/object_efc_erupc.xml @@ -3,9 +3,18 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_efc_star_field.xml b/assets/xml/objects/object_efc_star_field.xml index 00b47c460f..66782689c1 100644 --- a/assets/xml/objects/object_efc_star_field.xml +++ b/assets/xml/objects/object_efc_star_field.xml @@ -1,7 +1,13 @@ + + + + + + diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml index 25ee2ad42e..19675d84fd 100644 --- a/assets/xml/objects/object_fr.xml +++ b/assets/xml/objects/object_fr.xml @@ -15,6 +15,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon_objects.xml b/assets/xml/objects/object_ganon_objects.xml index 5e32610ffc..dc2cfdb40f 100644 --- a/assets/xml/objects/object_ganon_objects.xml +++ b/assets/xml/objects/object_ganon_objects.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_gnd_magic.xml b/assets/xml/objects/object_gnd_magic.xml index a88d419d7a..f8bc83dcd9 100644 --- a/assets/xml/objects/object_gnd_magic.xml +++ b/assets/xml/objects/object_gnd_magic.xml @@ -2,6 +2,9 @@ + + + diff --git a/assets/xml/objects/object_haka_objects.xml b/assets/xml/objects/object_haka_objects.xml index 3ca6d27c08..e0961ec596 100644 --- a/assets/xml/objects/object_haka_objects.xml +++ b/assets/xml/objects/object_haka_objects.xml @@ -1,55 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_hs.xml b/assets/xml/objects/object_hs.xml index cf5d06e1a2..3a3dfb46f7 100644 --- a/assets/xml/objects/object_hs.xml +++ b/assets/xml/objects/object_hs.xml @@ -3,6 +3,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ka.xml b/assets/xml/objects/object_ka.xml index eb952732b4..9c7ae1317b 100644 --- a/assets/xml/objects/object_ka.xml +++ b/assets/xml/objects/object_ka.xml @@ -1,6 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kanban.xml b/assets/xml/objects/object_kanban.xml index b989d3572a..f859164472 100644 --- a/assets/xml/objects/object_kanban.xml +++ b/assets/xml/objects/object_kanban.xml @@ -1,6 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13,6 +46,9 @@ + + + diff --git a/assets/xml/objects/object_kingdodongo_pal.xml b/assets/xml/objects/object_kingdodongo_pal.xml index a0790a6db5..e323584205 100644 --- a/assets/xml/objects/object_kingdodongo_pal.xml +++ b/assets/xml/objects/object_kingdodongo_pal.xml @@ -10,6 +10,9 @@ + + + @@ -17,25 +20,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102,6 +165,9 @@ + + + @@ -111,8 +177,17 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_kusa.xml b/assets/xml/objects/object_kusa.xml index 5eaaa99c58..b6bb8fcd0a 100644 --- a/assets/xml/objects/object_kusa.xml +++ b/assets/xml/objects/object_kusa.xml @@ -1,7 +1,13 @@ + + + + + + diff --git a/assets/xml/objects/object_lightbox.xml b/assets/xml/objects/object_lightbox.xml index c67059b89d..47fd57dfbf 100644 --- a/assets/xml/objects/object_lightbox.xml +++ b/assets/xml/objects/object_lightbox.xml @@ -1,12 +1,24 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_lightswitch.xml b/assets/xml/objects/object_lightswitch.xml index cfd5dcfb40..9caeb59b19 100644 --- a/assets/xml/objects/object_lightswitch.xml +++ b/assets/xml/objects/object_lightswitch.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_medal.xml b/assets/xml/objects/object_medal.xml index 94976bd3f9..2ab2e87faa 100644 --- a/assets/xml/objects/object_medal.xml +++ b/assets/xml/objects/object_medal.xml @@ -1,11 +1,29 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mk.xml b/assets/xml/objects/object_mk.xml index 0b4aaae8aa..8ae1bd3959 100644 --- a/assets/xml/objects/object_mk.xml +++ b/assets/xml/objects/object_mk.xml @@ -4,6 +4,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mori_hineri1.xml b/assets/xml/objects/object_mori_hineri1.xml index 572eb6e1f3..d99fa0759a 100644 --- a/assets/xml/objects/object_mori_hineri1.xml +++ b/assets/xml/objects/object_mori_hineri1.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_mori_hineri1a.xml b/assets/xml/objects/object_mori_hineri1a.xml index 23e6f5e665..941c53fc4a 100644 --- a/assets/xml/objects/object_mori_hineri1a.xml +++ b/assets/xml/objects/object_mori_hineri1a.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_mori_hineri2.xml b/assets/xml/objects/object_mori_hineri2.xml index d539cd86f0..8f44a82af9 100644 --- a/assets/xml/objects/object_mori_hineri2.xml +++ b/assets/xml/objects/object_mori_hineri2.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_mori_hineri2a.xml b/assets/xml/objects/object_mori_hineri2a.xml index 0334488567..52dd3a0916 100644 --- a/assets/xml/objects/object_mori_hineri2a.xml +++ b/assets/xml/objects/object_mori_hineri2a.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_mu.xml b/assets/xml/objects/object_mu.xml index 7251ff7212..ac4aeb084d 100644 --- a/assets/xml/objects/object_mu.xml +++ b/assets/xml/objects/object_mu.xml @@ -12,6 +12,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -54,6 +93,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA1.xml b/assets/xml/objects/object_oA1.xml index 1d665f1010..192a19b5a7 100644 --- a/assets/xml/objects/object_oA1.xml +++ b/assets/xml/objects/object_oA1.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA10.xml b/assets/xml/objects/object_oA10.xml index 65d0808349..ae234bf692 100644 --- a/assets/xml/objects/object_oA10.xml +++ b/assets/xml/objects/object_oA10.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA11.xml b/assets/xml/objects/object_oA11.xml index 92ae474b60..c1e0efe191 100644 --- a/assets/xml/objects/object_oA11.xml +++ b/assets/xml/objects/object_oA11.xml @@ -51,6 +51,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA2.xml b/assets/xml/objects/object_oA2.xml index ffdcd79896..81c97bed89 100644 --- a/assets/xml/objects/object_oA2.xml +++ b/assets/xml/objects/object_oA2.xml @@ -39,20 +39,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA3.xml b/assets/xml/objects/object_oA3.xml index 176ad09315..7abe8dd474 100644 --- a/assets/xml/objects/object_oA3.xml +++ b/assets/xml/objects/object_oA3.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_oA4.xml b/assets/xml/objects/object_oA4.xml index dcdbbfff9b..e883f3bcf3 100644 --- a/assets/xml/objects/object_oA4.xml +++ b/assets/xml/objects/object_oA4.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA5.xml b/assets/xml/objects/object_oA5.xml index 55072176dd..14a6b19e22 100644 --- a/assets/xml/objects/object_oA5.xml +++ b/assets/xml/objects/object_oA5.xml @@ -39,20 +39,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA6.xml b/assets/xml/objects/object_oA6.xml index c17a510881..72db514fcb 100644 --- a/assets/xml/objects/object_oA6.xml +++ b/assets/xml/objects/object_oA6.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA7.xml b/assets/xml/objects/object_oA7.xml index 52c68f6394..083f5f3ce5 100644 --- a/assets/xml/objects/object_oA7.xml +++ b/assets/xml/objects/object_oA7.xml @@ -39,20 +39,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA8.xml b/assets/xml/objects/object_oA8.xml index 8ed2d3df50..884797e6d9 100644 --- a/assets/xml/objects/object_oA8.xml +++ b/assets/xml/objects/object_oA8.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA9.xml b/assets/xml/objects/object_oA9.xml index d5c16abfcd..464e8c91ba 100644 --- a/assets/xml/objects/object_oA9.xml +++ b/assets/xml/objects/object_oA9.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oB1.xml b/assets/xml/objects/object_oB1.xml index 2f50c967b2..9115a2b953 100644 --- a/assets/xml/objects/object_oB1.xml +++ b/assets/xml/objects/object_oB1.xml @@ -39,20 +39,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB2.xml b/assets/xml/objects/object_oB2.xml index 230783ceae..eb56eae40f 100644 --- a/assets/xml/objects/object_oB2.xml +++ b/assets/xml/objects/object_oB2.xml @@ -54,6 +54,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB3.xml b/assets/xml/objects/object_oB3.xml index 1c42ddaccc..396c341702 100644 --- a/assets/xml/objects/object_oB3.xml +++ b/assets/xml/objects/object_oB3.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB4.xml b/assets/xml/objects/object_oB4.xml index 2924c9e753..6cdff038ed 100644 --- a/assets/xml/objects/object_oB4.xml +++ b/assets/xml/objects/object_oB4.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE1.xml b/assets/xml/objects/object_oE1.xml index 5b3234893e..e3e8374dd9 100644 --- a/assets/xml/objects/object_oE1.xml +++ b/assets/xml/objects/object_oE1.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE10.xml b/assets/xml/objects/object_oE10.xml index 04ce914372..7e2717e541 100644 --- a/assets/xml/objects/object_oE10.xml +++ b/assets/xml/objects/object_oE10.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oE11.xml b/assets/xml/objects/object_oE11.xml index 26ff739cd0..64b9ad265a 100644 --- a/assets/xml/objects/object_oE11.xml +++ b/assets/xml/objects/object_oE11.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oE12.xml b/assets/xml/objects/object_oE12.xml index 4b89954e0d..e500448084 100644 --- a/assets/xml/objects/object_oE12.xml +++ b/assets/xml/objects/object_oE12.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oE1s.xml b/assets/xml/objects/object_oE1s.xml index faf6ab7342..d9a419e5fa 100644 --- a/assets/xml/objects/object_oE1s.xml +++ b/assets/xml/objects/object_oE1s.xml @@ -31,6 +31,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE2.xml b/assets/xml/objects/object_oE2.xml index ea3ba91fc6..714060fd6c 100644 --- a/assets/xml/objects/object_oE2.xml +++ b/assets/xml/objects/object_oE2.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE3.xml b/assets/xml/objects/object_oE3.xml index 4a6cb3d926..b61b850fba 100644 --- a/assets/xml/objects/object_oE3.xml +++ b/assets/xml/objects/object_oE3.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE4.xml b/assets/xml/objects/object_oE4.xml index ae48d2adef..e353bfb9ce 100644 --- a/assets/xml/objects/object_oE4.xml +++ b/assets/xml/objects/object_oE4.xml @@ -39,6 +39,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE4s.xml b/assets/xml/objects/object_oE4s.xml index 584019568a..1f1b33dcfa 100644 --- a/assets/xml/objects/object_oE4s.xml +++ b/assets/xml/objects/object_oE4s.xml @@ -27,6 +27,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE5.xml b/assets/xml/objects/object_oE5.xml index c05917dc9a..89e9947adc 100644 --- a/assets/xml/objects/object_oE5.xml +++ b/assets/xml/objects/object_oE5.xml @@ -39,6 +39,30 @@ --> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE6.xml b/assets/xml/objects/object_oE6.xml index d253130af1..019797be82 100644 --- a/assets/xml/objects/object_oE6.xml +++ b/assets/xml/objects/object_oE6.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oE7.xml b/assets/xml/objects/object_oE7.xml index 2b6b5cf316..bdf32d3b6c 100644 --- a/assets/xml/objects/object_oE7.xml +++ b/assets/xml/objects/object_oE7.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oE8.xml b/assets/xml/objects/object_oE8.xml index 8b1333fa9c..d14c141bfd 100644 --- a/assets/xml/objects/object_oE8.xml +++ b/assets/xml/objects/object_oE8.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oE9.xml b/assets/xml/objects/object_oE9.xml index e43cee426b..f8c4fa1e78 100644 --- a/assets/xml/objects/object_oE9.xml +++ b/assets/xml/objects/object_oE9.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_oF1s.xml b/assets/xml/objects/object_oF1s.xml index fe41dde630..26491d565c 100644 --- a/assets/xml/objects/object_oF1s.xml +++ b/assets/xml/objects/object_oF1s.xml @@ -38,6 +38,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ossan.xml b/assets/xml/objects/object_ossan.xml index 7e51c33bce..c0d80ad0b0 100644 --- a/assets/xml/objects/object_ossan.xml +++ b/assets/xml/objects/object_ossan.xml @@ -4,12 +4,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ouke_haka.xml b/assets/xml/objects/object_ouke_haka.xml index 11da9b26ef..49dc2a4af1 100644 --- a/assets/xml/objects/object_ouke_haka.xml +++ b/assets/xml/objects/object_ouke_haka.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml index 32c697bd9d..474e4edc59 100644 --- a/assets/xml/objects/object_reeba.xml +++ b/assets/xml/objects/object_reeba.xml @@ -4,21 +4,39 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml index 8453935b1f..e9a26ef2fb 100644 --- a/assets/xml/objects/object_rl.xml +++ b/assets/xml/objects/object_rl.xml @@ -3,6 +3,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -20,6 +44,9 @@ + + + diff --git a/assets/xml/objects/object_sb.xml b/assets/xml/objects/object_sb.xml index 57a0f7f8f7..7ba041f183 100644 --- a/assets/xml/objects/object_sb.xml +++ b/assets/xml/objects/object_sb.xml @@ -15,6 +15,12 @@ + + + + + + diff --git a/assets/xml/objects/object_siofuki.xml b/assets/xml/objects/object_siofuki.xml index f8a9e50d83..0a758500c9 100644 --- a/assets/xml/objects/object_siofuki.xml +++ b/assets/xml/objects/object_siofuki.xml @@ -2,6 +2,9 @@ + + + diff --git a/assets/xml/objects/object_spot03_object.xml b/assets/xml/objects/object_spot03_object.xml index f182e7d99a..c844a45103 100644 --- a/assets/xml/objects/object_spot03_object.xml +++ b/assets/xml/objects/object_spot03_object.xml @@ -11,6 +11,9 @@ + + + diff --git a/assets/xml/objects/object_spot05_objects.xml b/assets/xml/objects/object_spot05_objects.xml index 6e70791493..dcca34043a 100644 --- a/assets/xml/objects/object_spot05_objects.xml +++ b/assets/xml/objects/object_spot05_objects.xml @@ -1,9 +1,15 @@ + + + + + + diff --git a/assets/xml/objects/object_spot07_object.xml b/assets/xml/objects/object_spot07_object.xml index 5bc2bfb6bf..6f0263173e 100644 --- a/assets/xml/objects/object_spot07_object.xml +++ b/assets/xml/objects/object_spot07_object.xml @@ -1,14 +1,32 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml index 6283f8e9f2..3f50161d96 100644 --- a/assets/xml/objects/object_ssh.xml +++ b/assets/xml/objects/object_ssh.xml @@ -12,6 +12,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_stream.xml b/assets/xml/objects/object_stream.xml index 6c65f77c34..e8710781c8 100644 --- a/assets/xml/objects/object_stream.xml +++ b/assets/xml/objects/object_stream.xml @@ -2,6 +2,9 @@ + + + diff --git a/assets/xml/objects/object_tite.xml b/assets/xml/objects/object_tite.xml index 1be65c4950..4474dab205 100644 --- a/assets/xml/objects/object_tite.xml +++ b/assets/xml/objects/object_tite.xml @@ -17,6 +17,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_toki_objects.xml b/assets/xml/objects/object_toki_objects.xml index 917d239347..7534d44d1e 100644 --- a/assets/xml/objects/object_toki_objects.xml +++ b/assets/xml/objects/object_toki_objects.xml @@ -2,11 +2,23 @@ + + + + + + + + + + + + @@ -16,12 +28,30 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_toryo.xml b/assets/xml/objects/object_toryo.xml index 73f3dcb1e2..9bd5b09711 100644 --- a/assets/xml/objects/object_toryo.xml +++ b/assets/xml/objects/object_toryo.xml @@ -16,6 +16,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ts.xml b/assets/xml/objects/object_ts.xml index 567277bc39..ce99c27e0b 100644 --- a/assets/xml/objects/object_ts.xml +++ b/assets/xml/objects/object_ts.xml @@ -11,6 +11,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tsubo.xml b/assets/xml/objects/object_tsubo.xml index ee2c5e1846..bdfd9070af 100644 --- a/assets/xml/objects/object_tsubo.xml +++ b/assets/xml/objects/object_tsubo.xml @@ -3,7 +3,13 @@ + + + + + + diff --git a/assets/xml/objects/object_wood02.xml b/assets/xml/objects/object_wood02.xml index dcf6d21291..a79fe654dc 100644 --- a/assets/xml/objects/object_wood02.xml +++ b/assets/xml/objects/object_wood02.xml @@ -1,11 +1,26 @@ + + + + + + + + + + + + + + + @@ -18,16 +33,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_yabusame_point.xml b/assets/xml/objects/object_yabusame_point.xml index bed9e8a609..5a06a44e68 100644 --- a/assets/xml/objects/object_yabusame_point.xml +++ b/assets/xml/objects/object_yabusame_point.xml @@ -3,6 +3,9 @@ + + + From 1627f8415b200144ba6db8d297ad0080b796c80d Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Mon, 2 Jun 2025 12:15:29 -0400 Subject: [PATCH 13/42] Child Ruto Part 2: Rename resurfacing animation (#2569) --- assets/xml/objects/object_ru1.xml | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/xml/objects/object_ru1.xml b/assets/xml/objects/object_ru1.xml index 482949c903..7ac2fbc256 100644 --- a/assets/xml/objects/object_ru1.xml +++ b/assets/xml/objects/object_ru1.xml @@ -18,7 +18,7 @@ - + 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 0e4573f90d..906928e25a 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -645,10 +645,10 @@ void func_80AEBD94(EnRu1* this, PlayState* play) { f32 frameCount; if (func_80AEB480(play, 3)) { - frameCount = Animation_GetLastFrame(&gRutoChildAnim_009060); + frameCount = Animation_GetLastFrame(&gRutoChildResurfaceAnim); func_80AEB934(this, play); func_80AEB738(this, play); - Animation_Change(&this->skelAnime, &gRutoChildAnim_009060, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &gRutoChildResurfaceAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f); this->action = 2; this->drawConfig = 1; } From 0c1b1231d3f77a758e1fce7c0e18dcb4465f5269 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 3 Jun 2025 12:40:55 +0200 Subject: [PATCH 14/42] T() macro loose ends 1 (#2563) * more T() in debug_malloc.c graph.c z_actor.c malloc.c * more T() in Zl2, Zl3 * T() diving_game, fire_rock * T() girla * more T() in heishi[124] * T() in hs2, kakasi2, ru2 * format * keaton * Diving GO --- src/code/debug_malloc.c | 14 +-- src/code/graph.c | 16 +-- src/code/z_actor.c | 22 +++-- src/libc64/malloc.c | 14 +-- .../ovl_En_Diving_Game/z_en_diving_game.c | 4 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 4 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 98 +++++++++---------- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 18 ++-- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 4 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 22 +++-- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 3 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 6 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 6 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 2 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 9 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 27 +++-- 16 files changed, 146 insertions(+), 123 deletions(-) diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index ad7c786f34..772a9a8876 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -34,7 +34,7 @@ void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char* void* DebugArena_Malloc(u32 size) { void* ptr = __osMalloc(&sDebugArena, size); - DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc", "確保"); // "Secure" + DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc", T("確保", "Secure")); return ptr; } @@ -42,7 +42,7 @@ void* DebugArena_Malloc(u32 size) { void* DebugArena_MallocDebug(u32 size, const char* file, int line) { void* ptr = __osMallocDebug(&sDebugArena, size, file, line); - DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_DEBUG", "確保"); // "Secure" + DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_DEBUG", T("確保", "Secure")); return ptr; } #endif @@ -50,7 +50,7 @@ void* DebugArena_MallocDebug(u32 size, const char* file, int line) { void* DebugArena_MallocR(u32 size) { void* ptr = __osMallocR(&sDebugArena, size); - DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r", "確保"); // "Secure" + DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r", T("確保", "Secure")); return ptr; } @@ -58,21 +58,21 @@ void* DebugArena_MallocR(u32 size) { void* DebugArena_MallocRDebug(u32 size, const char* file, int line) { void* ptr = __osMallocRDebug(&sDebugArena, size, file, line); - DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r_DEBUG", "確保"); // "Secure" + DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r_DEBUG", T("確保", "Secure")); return ptr; } #endif void* DebugArena_Realloc(void* ptr, u32 newSize) { ptr = __osRealloc(&sDebugArena, ptr, newSize); - DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc", "再確保"); // "Re-securing" + DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc", T("再確保", "Re-secure")); return ptr; } #if DEBUG_FEATURES void* DebugArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int line) { ptr = __osReallocDebug(&sDebugArena, ptr, newSize, file, line); - DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc_DEBUG", "再確保"); // "Re-securing" + DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc_DEBUG", T("再確保", "Re-secure")); return ptr; } #endif @@ -96,7 +96,7 @@ void* DebugArena_Calloc(u32 num, u32 size) { bzero(ret, n); } - DEBUG_ARENA_CHECK_POINTER(ret, n, "debug_calloc", "確保"); + DEBUG_ARENA_CHECK_POINTER(ret, n, "debug_calloc", T("確保", "Secure")); return ret; } diff --git a/src/code/graph.c b/src/code/graph.c index 86543cc50d..8a4646808f 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -331,10 +331,10 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { #if DEBUG_FEATURES OPEN_DISPS(gfxCtx, "../graph.c", 966); - gDPNoOpString(WORK_DISP++, "WORK_DISP 開始", 0); - gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 開始", 0); - gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 開始", 0); - gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 開始", 0); + gDPNoOpString(WORK_DISP++, T("WORK_DISP 開始", "WORK_DISP start"), 0); + gDPNoOpString(POLY_OPA_DISP++, T("POLY_OPA_DISP 開始", "POLY_OPA_DISP start"), 0); + gDPNoOpString(POLY_XLU_DISP++, T("POLY_XLU_DISP 開始", "POLY_XLU_DISP start"), 0); + gDPNoOpString(OVERLAY_DISP++, T("OVERLAY_DISP 開始", "OVERLAY_DISP start"), 0); CLOSE_DISPS(gfxCtx, "../graph.c", 975); #endif @@ -345,10 +345,10 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { #if DEBUG_FEATURES OPEN_DISPS(gfxCtx, "../graph.c", 987); - gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0); - gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0); - gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0); - gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 終了", 0); + gDPNoOpString(WORK_DISP++, T("WORK_DISP 終了", "WORK_DISP end"), 0); + gDPNoOpString(POLY_OPA_DISP++, T("POLY_OPA_DISP 終了", "POLY_OPA_DISP end"), 0); + gDPNoOpString(POLY_XLU_DISP++, T("POLY_XLU_DISP 終了", "POLY_XLU_DISP end"), 0); + gDPNoOpString(OVERLAY_DISP++, T("OVERLAY_DISP 終了", "OVERLAY_DISP end"), 0); CLOSE_DISPS(gfxCtx, "../graph.c", 996); #endif diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 83105d23ec..15138b3e5a 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2688,7 +2688,7 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis OPEN_DISPS(gfxCtx, "../z_actor.c", 6197); - gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); // "Magic lens START" + gDPNoOpString(POLY_OPA_DISP++, T("魔法のメガネ START", "Magic lens START"), 0); gDPPipeSync(POLY_XLU_DISP++); @@ -2728,23 +2728,25 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis // The z-buffer will be updated where the mask is not fully transparent. Actor_DrawLensOverlay(gfxCtx); - // "Magic lens invisible Actor display START" - gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", numInvisibleActors); + gDPNoOpString(POLY_OPA_DISP++, + T("魔法のメガネ 見えないＡcｔｏｒ表示 START", "Magic lens invisible Actor display START"), + numInvisibleActors); invisibleActor = &invisibleActors[0]; for (i = 0; i < numInvisibleActors; i++) { - // "Magic lens invisible Actor display" - gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示", i); + gDPNoOpString(POLY_OPA_DISP++, T("魔法のメガネ 見えないＡcｔｏｒ表示", "Magic lens invisible Actor display"), + i); Actor_Draw(play, *(invisibleActor++)); } - // "Magic lens invisible Actor display END" - gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", numInvisibleActors); + gDPNoOpString(POLY_OPA_DISP++, + T("魔法のメガネ 見えないＡcｔｏｒ表示 END", "Magic lens invisible Actor display END"), + numInvisibleActors); if (play->roomCtx.curRoom.lensMode != LENS_MODE_SHOW_ACTORS) { // Draw the lens overlay to the color frame buffer - gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 0); // "Blue spectacles (exterior)" + gDPNoOpString(POLY_OPA_DISP++, T("青い眼鏡(外側)", "Blue glasses (outside)"), 0); gDPPipeSync(POLY_XLU_DISP++); @@ -2757,10 +2759,10 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis Actor_DrawLensOverlay(gfxCtx); - gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 1); // "Blue spectacles (exterior)" + gDPNoOpString(POLY_OPA_DISP++, T("青い眼鏡(外側)", "Blue glasses (outside)"), 1); } - gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); // "Magic lens END" + gDPNoOpString(POLY_OPA_DISP++, T("魔法のメガネ END", "Magic lens END"), 0); CLOSE_DISPS(gfxCtx, "../z_actor.c", 6284); } diff --git a/src/libc64/malloc.c b/src/libc64/malloc.c index 8b9c9b6705..6dc183dc14 100644 --- a/src/libc64/malloc.c +++ b/src/libc64/malloc.c @@ -41,7 +41,7 @@ void* SystemArena_Malloc(u32 size) { ptr = __osMalloc(&gSystemArena, size); RESTORE_INTERRUPTS(); - SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc", "確保"); // "Secure" + SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc", T("確保", "Secure")); return ptr; } @@ -54,7 +54,7 @@ void* SystemArena_MallocDebug(u32 size, const char* file, int line) { ptr = __osMallocDebug(&gSystemArena, size, file, line); RESTORE_INTERRUPTS(); - SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_DEBUG", "確保"); // "Secure" + SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_DEBUG", T("確保", "Secure")); return ptr; } #endif @@ -67,7 +67,7 @@ void* SystemArena_MallocR(u32 size) { ptr = __osMallocR(&gSystemArena, size); RESTORE_INTERRUPTS(); - SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r", "確保"); // "Secure" + SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r", T("確保", "Secure")); return ptr; } @@ -80,7 +80,7 @@ void* SystemArena_MallocRDebug(u32 size, const char* file, int line) { ptr = __osMallocRDebug(&gSystemArena, size, file, line); RESTORE_INTERRUPTS(); - SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r_DEBUG", "確保"); // "Secure" + SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r_DEBUG", T("確保", "Secure")); return ptr; } #endif @@ -92,7 +92,7 @@ void* SystemArena_Realloc(void* ptr, u32 newSize) { ptr = __osRealloc(&gSystemArena, ptr, newSize); RESTORE_INTERRUPTS(); - SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc", "再確保"); // "Re-securing" + SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc", T("再確保", "Re-secure")); return ptr; } @@ -104,7 +104,7 @@ void* SystemArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int lin ptr = __osReallocDebug(&gSystemArena, ptr, newSize, file, line); RESTORE_INTERRUPTS(); - SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc_DEBUG", "再確保"); // "Re-securing" + SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc_DEBUG", T("再確保", "Re-secure")); return ptr; } #endif @@ -140,7 +140,7 @@ void* SystemArena_Calloc(u32 num, u32 size) { bzero(ret, n); } - SYSTEM_ARENA_CHECK_POINTER(ret, n, "calloc", "確保"); + SYSTEM_ARENA_CHECK_POINTER(ret, n, "calloc", T("確保", "Secure")); return ret; } 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 8cb2f45151..82c27f315e 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 @@ -101,13 +101,13 @@ void EnDivingGame_Init(Actor* thisx, PlayState* play) { SkelAnime_InitFlex(play, &this->skelAnime, &gZoraSkel, &gZoraIdleAnim, this->jointTable, this->morphTable, 20); Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n", "☆☆☆☆☆ Diving GO ☆☆☆☆☆ \n") VT_RST); this->actor.room = -1; this->actor.scale.x = 0.01f; this->actor.scale.y = 0.012999999f; this->actor.scale.z = 0.0139999995f; if (D_809EF0B0) { - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here ☆☆☆☆☆ \n") VT_RST); this->unk_31F = 1; Actor_Kill(&this->actor); } else { 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 85a1fa0cee..10b2e7fb54 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 @@ -270,7 +270,7 @@ void EnFireRock_SpawnMoreBrokenPieces(EnFireRock* this, PlayState* play) { } spawnedFireRock->scale = this->scale - 0.01f; } else { - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n", "☆☆☆☆☆ It's full ☆☆☆☆☆ \n") VT_RST); } } Actor_PlaySfx(&this->actor, NA_SE_EN_VALVAISA_ROCK); @@ -291,7 +291,7 @@ void FireRock_WaitSpawnRocksFromCeiling(EnFireRock* this, PlayState* play) { if (spawnedFireRock != NULL) { spawnedFireRock->timer = 10; } else { - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n", "☆☆☆☆☆ It's full ☆☆☆☆☆ \n") VT_RST); } } this->playerNearby = 1; 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 61eaa9967e..da20b5db11 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -90,56 +90,56 @@ ActorProfile En_GirlA_Profile = { #if DEBUG_FEATURES static char* sShopItemDescriptions[] = { - "デクの実×5 ", // "Deku nut x5" - "矢×30 ", // "Arrow x30" - "矢×50 ", // "Arrow x50" - "爆弾×5 ", // "bomb" - "デクの実×10 ", // "Deku nut x10" - "デクの棒 ", // "Deku stick" - "爆弾×10 ", // "Bomb x10" - "さかな ", // "Fish" - "赤クスリ ", // "Red medicine" - "緑クスリ ", // "Green medicine" - "青クスリ ", // "Blue medicine" - "巨人のナイフ ", // "Giant knife" - "ハイリアの盾 ", // "Hyria Shield" - "デクの盾 ", // "Deku Shield" - "ゴロンの服 ", // "Goron's clothes" - "ゾ─ラの服 ", // "Zora's clothes" - "回復のハート ", // "Heart of recovery" - "ロンロン牛乳 ", // "Ron Ron milk" - "鶏の卵 ", // "Chicken egg" - "インゴー牛乳 ", // "Ingo milk" - "インゴー卵 ", // "Ingo egg" - "もだえ石 ", // "Modae stone" - "大人の財布 ", // "Adult wallet" - "ハートの欠片 ", // "Heart fragment" - "ボムチュウ ", // "Bombchu" - "ボムチュウ ", // "Bombchu" - "ボムチュウ ", // "Bombchu" - "ボムチュウ ", // "Bombchu" - "ボムチュウ ", // "Bombchu" - "デクのタネ ", // "Deku seeds" - "キータンのお面", // "Ketan's mask" - "こわそなお面 ", // "Scary face" - "ドクロのお面 ", // "Skull mask" - "ウサギずきん ", // "Rabbit hood" - "まことの仮面 ", // "True mask" - "ゾーラのお面 ", // "Zora's mask" - "ゴロンのお面 ", // "Goron's mask" - "ゲルドのお面 ", // "Gerd's mask" + T("デクの実×5 ", "Deku nuts x5 "), + T("矢×30 ", "Arrows x30 "), + T("矢×50 ", "Arrows x50 "), + T("爆弾×5 ", "Bombs x5 "), + T("デクの実×10 ", "Deku nuts x10 "), + T("デクの棒 ", "Deku stick "), + T("爆弾×10 ", "Bombs x10 "), + T("さかな ", "Fish "), + T("赤クスリ ", "Red medicine "), + T("緑クスリ ", "Green medicine"), + T("青クスリ ", "Blue medicine "), + T("巨人のナイフ ", "Giant's knife "), + T("ハイリアの盾 ", "Hylian shield "), + T("デクの盾 ", "Deku shield "), + T("ゴロンの服 ", "Goron clothing"), + T("ゾ─ラの服 ", "Zora's clothes"), + T("回復のハート ", "Heart of recovery"), + T("ロンロン牛乳 ", "Lon Lon milk "), + T("鶏の卵 ", "Chicken egg "), + T("インゴー牛乳 ", "Ingo milk "), + T("インゴー卵 ", "Ingo egg "), + T("もだえ石 ", "Writhing stone"), + T("大人の財布 ", "Adult wallet "), + T("ハートの欠片 ", "Piece of heart"), + T("ボムチュウ ", "Bombchu "), + T("ボムチュウ ", "Bombchu "), + T("ボムチュウ ", "Bombchu "), + T("ボムチュウ ", "Bombchu "), + T("ボムチュウ ", "Bombchu "), + T("デクのタネ ", "Deku seeds "), + T("キータンのお面", "Keaton mask "), + T("こわそなお面 ", "Scary mask "), + T("ドクロのお面 ", "Skull mask "), + T("ウサギずきん ", "Rabbit hood "), + T("まことの仮面 ", "True mask "), + T("ゾーラのお面 ", "Zora's mask "), + T("ゴロンのお面 ", "Goron mask "), + T("ゲルドのお面 ", "Gerudo mask "), "ＳＯＬＤＯＵＴ", - "炎 ", // "Flame" - "虫 ", // "Bugs" - "チョウチョ ", // "Butterfly" - "ポウ ", // "Poe" - "妖精の魂 ", // "Fairy soul" - "矢×10 ", // "Arrow" - "爆弾×20 ", // "Bomb x20" - "爆弾×30 ", // "Bomb x30" - "爆弾×5 ", // "Bomb x5" - "赤クスリ ", // "Red medicine" - "赤クスリ " // "Red medicine" + T("炎 ", "Flame "), + T("虫 ", "Insect "), + T("チョウチョ ", "Butterfly "), + T("ポウ ", "Poe "), + T("妖精の魂 ", "Fairy soul "), + T("矢×10 ", "Arrows x10 "), + T("爆弾×20 ", "Bombs x20 "), + T("爆弾×30 ", "Bombs x30 "), + T("爆弾×5 ", "Bombs x5 "), + T("赤クスリ ", "Red medicine "), + T("赤クスリ ", "Red medicine "), }; #endif 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 4236fe05bd..3a0347e555 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -207,11 +207,11 @@ void EnHeishi1_Walk(EnHeishi1* this, PlayState* play) { Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax); if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) { - PRINTF(VT_FGCOL(RED) " 種類 %d\n" VT_RST, this->path); - PRINTF(VT_FGCOL(RED) " ぱす %d\n" VT_RST, this->waypoint); - PRINTF(VT_FGCOL(RED) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); - PRINTF(VT_FGCOL(RED) " 時間 %d\n" VT_RST, this->waypointTimer); - PRINTF(VT_FGCOL(RED) " 点座 %d\n" VT_RST, path->count); + PRINTF(VT_FGCOL(RED) T(" 種類 %d\n", " Type %d\n") VT_RST, this->path); + PRINTF(VT_FGCOL(RED) T(" ぱす %d\n", " Path %d\n") VT_RST, this->waypoint); + PRINTF(VT_FGCOL(RED) T(" 反転 %d\n", " Turning around %d\n") VT_RST, this->bodyTurnSpeed); + PRINTF(VT_FGCOL(RED) T(" 時間 %d\n", " Time %d\n") VT_RST, this->waypointTimer); + PRINTF(VT_FGCOL(RED) T(" 点座 %d\n", " Tenza %d\n") VT_RST, path->count); PRINTF("\n\n"); } @@ -325,10 +325,10 @@ void EnHeishi1_Wait(EnHeishi1* this, PlayState* play) { this->headTurnSpeedMax + this->headTurnSpeedMax); if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) { - PRINTF(VT_FGCOL(GREEN) " 種類 %d\n" VT_RST, this->path); - PRINTF(VT_FGCOL(GREEN) " ぱす %d\n" VT_RST, this->waypoint); - PRINTF(VT_FGCOL(GREEN) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); - PRINTF(VT_FGCOL(GREEN) " 時間 %d\n" VT_RST, this->waypointTimer); + PRINTF(VT_FGCOL(GREEN) T(" 種類 %d\n", " Type %d\n") VT_RST, this->path); + PRINTF(VT_FGCOL(GREEN) T(" ぱす %d\n", " Path %d\n") VT_RST, this->waypoint); + PRINTF(VT_FGCOL(GREEN) T(" 反転 %d\n", " Turning around %d\n") VT_RST, this->bodyTurnSpeed); + PRINTF(VT_FGCOL(GREEN) T(" 時間 %d\n", " Time %d\n") VT_RST, this->waypointTimer); PRINTF("\n\n"); } } 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 f9d5999c88..abb33f3fe3 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -113,8 +113,8 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) { } else { PRINTF("\n\n"); - // "No, I'm completely disappointed" (message for when shooting guard window in courtyard) - PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) + T(" ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n", " ☆☆☆☆☆ Oh, no, I was just careless. ☆☆☆☆☆ \n") VT_RST); Actor_SetScale(&this->actor, 0.02f); 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..6a7866f17d 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -4,6 +4,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "terminal.h" +#include "translation.h" #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" @@ -104,9 +105,15 @@ void EnHeishi4_Init(Actor* thisx, PlayState* play) { } this->unk_27C = PARAMS_GET_U(thisx->params, 8, 8); PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, thisx->params); - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！\t ☆☆☆☆☆ %d\n" VT_RST, this->type); - PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, PARAMS_GET_U(thisx->params, 8, 4)); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Soldier Set 2 Completed! ☆☆☆☆☆ %d\n") + VT_RST, + thisx->params); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ 識別完了！\t ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Identification Completed!\t ☆☆☆☆☆ %d\n") + VT_RST, + this->type); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n", " ☆☆☆☆☆ Message completed! ☆☆☆☆☆ %x\n\n") + VT_RST, + PARAMS_GET_U(thisx->params, 8, 4)); PRINTF("\n\n"); } @@ -176,7 +183,7 @@ void func_80A56544(EnHeishi4* this, PlayState* play) { Animation_Change(&this->skelAnime, &gEnHeishiIdleAnim, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, -10.0f); if (LINK_AGE_IN_YEARS != YEARS_CHILD) { - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n", " ☆☆☆☆☆ Oh, no! I'm an adult! ☆☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); } else { this->actionFunc = func_80A56614; @@ -223,7 +230,8 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) { f32 frames; if (GET_EVENTCHKINF(EVENTCHKINF_45)) { - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n", + " ☆☆☆☆☆ Congratulations on obtaining the Master Sword! ☆☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } @@ -236,11 +244,11 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) { this->actor.textId = 0x7007; this->unk_282 = TEXT_STATE_EVENT; this->unk_284 = 1; - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n", " ☆☆☆☆☆ Demo begins! ☆☆☆☆☆ \n") VT_RST); } else { this->actor.textId = 0x7008; this->unk_282 = TEXT_STATE_DONE; - PRINTF(VT_FGCOL(BLUE) " ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) T(" ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n", " ☆☆☆☆☆ No reply ☆☆☆☆☆ \n") VT_RST); } this->actionFunc = func_80A56874; } else { 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..d63bc0c0ba 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -11,6 +11,7 @@ #include "printf.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64face_reaction.h" #include "z64play.h" @@ -69,7 +70,7 @@ void EnHs2_Init(Actor* thisx, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); this->actor.colChkInfo.mass = MASS_IMMOVABLE; Actor_SetScale(&this->actor, 0.01f); - PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" ヒヨコの店(子人の時) \n", " Chick's Shop (Children's Time) \n") VT_RST); this->actionFunc = func_80A6F1A4; this->unk_2A8 = 0; this->actor.attentionRangeType = ATTENTION_RANGE_6; 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 c8057cff92..216365d4c6 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -146,7 +146,8 @@ void func_80A90264(EnKakasi2* this, PlayState* play) { Flags_SetSwitch(play, this->switchFlag); } - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ SAVE finished ☆☆☆☆☆ %d\n") VT_RST, + this->switchFlag); this->actionFunc = func_80A904D8; } else if ((this->actor.xzDistToPlayer < this->maxSpawnDistance.x) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y) && @@ -157,7 +158,8 @@ void func_80A90264(EnKakasi2* this, PlayState* play) { if (this->switchFlag >= 0) { Flags_SetSwitch(play, this->switchFlag); } - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ SAVE finished ☆☆☆☆☆ %d\n") VT_RST, + this->switchFlag); play->msgCtx.ocarinaMode = OCARINA_MODE_04; this->actor.draw = func_80A90948; Collider_InitCylinder(play, &this->collider); 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 b6c7405a03..063a7f53b9 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -835,13 +835,11 @@ void EnRu2_DialogCameraHandler(EnRu2* this, PlayState* play) { if (dialogState == TEXT_STATE_DONE_FADING) { if (this->lastDialogState != TEXT_STATE_DONE_FADING) { - // "I'm Komatsu!" (cinema scene dev) - PRINTF("おれが小松だ！ \n"); + PRINTF(T("おれが小松だ！ \n", "I'm Komatsu! \n")); // (cinema scene dev) this->textboxCount++; if (this->textboxCount % 6 == 3) { player = GET_PLAYER(play); - // "uorya-!" (screeming sound) - PRINTF("うおりゃー！ \n"); + PRINTF(T("うおりゃー！ \n", "uorya-! \n")); // (screaming sound) Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); player->actor.world.pos.x = 820.0f; player->actor.world.pos.y = 0.0f; 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 b61e51abdb..994f01478f 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 @@ -57,7 +57,7 @@ void EnTakaraMan_Init(Actor* thisx, PlayState* play) { if (sTakaraIsInitialized) { Actor_Kill(&this->actor); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Already initialized ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here ☆☆☆☆☆ \n") VT_RST); return; } 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 c00790e02c..8d937cba88 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -1603,7 +1603,8 @@ void func_80B52114(EnZl2* this, PlayState* play) { break; #endif default: - PRINTF(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T(" En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n", + " En_Oa2 arg_data is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); func_80B4FD90(this, play); } } @@ -1616,7 +1617,8 @@ void func_80B521A0(EnZl2* this, PlayState* play) { #if DEBUG_FEATURES if (objectSlot < 0) { - PRINTF(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n", + "En_Zl2_main_bank Can't read animation bank!!!!!!!!!!!!\n") VT_RST); return; } #endif @@ -1665,7 +1667,8 @@ s32 EnZl2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p if (this->overrideLimbDrawConfig < 0 || this->overrideLimbDrawConfig > 0 || sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig] == NULL) { - PRINTF(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "The pre-drawing mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); return 0; } return sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig](play, limbIndex, dList, pos, rot, thisx, gfx); 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 7977dfbe55..a73e7f3203 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -813,7 +813,8 @@ void func_80B54F18(EnZl3* this, PlayState* play) { } void func_80B54FB4(EnZl3* this, PlayState* play) { - PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "I'm going through Princess Zelda's En_Zl3_Actor_inFinal_Init!!!!!!!!!!!!!!!!!!!!!!!!!\n")); func_80B54E14(this, &gZelda2Anime2Anim_008AD0, 0, 0.0f, 0); EnZl3_setEyeIndex(this, 4); EnZl3_setMouthIndex(this, 2); @@ -823,7 +824,8 @@ void func_80B54FB4(EnZl3* this, PlayState* play) { this->actor.shape.rot.z = 0; this->unk_3C4 = this->actor.world.rot.z; this->actor.world.rot.z = this->actor.shape.rot.z; - PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "Princess Zelda's En_Zl3_Actor_inFinal_Init passed!!!!!!!!!!!!!!!!!!!!!!!!!\n")); } void func_80B55054(EnZl3* this) { @@ -1028,11 +1030,13 @@ void func_80B5572C(EnZl3* this, PlayState* play) { } void func_80B55780(EnZl3* this, PlayState* play) { - PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "I'm going through Princess Zelda's En_Zl3_Actor_inFinal2_Init!!!!!!!!!!!!!!!!!!!!!!!!!\n")); func_80B54E14(this, &gZelda2Anime2Anim_005A0C, 0, 0.0f, 0); this->action = 7; this->drawConfig = 1; - PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "Princess Zelda's En_Zl3_Actor_inFinal2_Init passed!!!!!!!!!!!!!!!!!!!!!!!!!\n")); EnZl3_setMouthIndex(this, 1); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; } @@ -2660,7 +2664,8 @@ void func_80B59B6C(EnZl3* this, PlayState* play) { func_80B59828(this, play); break; default: - PRINTF(VT_FGCOL(RED) " En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T(" En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n", + " En_Oa3 arg_data is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); Actor_Kill(&this->actor); } } @@ -2673,7 +2678,8 @@ void func_80B59DB8(EnZl3* this, PlayState* play) { #if DEBUG_FEATURES if (objectSlot < 0) { - PRINTF(VT_FGCOL(RED) "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n", + "En_Zl3_main_bank Can't read animation bank!!!!!!!!!!!!\n") VT_RST); return; } #endif @@ -2710,7 +2716,8 @@ void EnZl3_Init(Actor* thisx, PlayState* play) { ActorShape* shape = &this->actor.shape; s32 pad; - PRINTF("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "I'm going through Princess Zelda's En_Zl3_Actor_ct!!!!!!!!!!!!!!!!!!!!!!!!!\n")); ActorShape_Init(shape, 0.0f, ActorShadow_DrawCircle, 30.0f); shape->shadowAlpha = 0; func_80B533B0(thisx, play); @@ -2725,7 +2732,8 @@ void EnZl3_Init(Actor* thisx, PlayState* play) { break; } - PRINTF("ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "Princess Zelda's En_Zl3_Actor_ct passed!!!!!!!!!!!!!!!!!!!!!!!!!\n")); } static OverrideLimbDraw sOverrideLimbDrawFuncs[] = { @@ -2739,7 +2747,8 @@ s32 EnZl3_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p if (this->unk_308 < 0 || this->unk_308 >= ARRAY_COUNT(sOverrideLimbDrawFuncs) || sOverrideLimbDrawFuncs[this->unk_308] == NULL) { - PRINTF(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "The pre-drawing mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); return 0; } return sOverrideLimbDrawFuncs[this->unk_308](play, limbIndex, dList, pos, rot, thisx, gfx); From 31f8c32ed947dfcbfb2c73e4e6aff6ef3dbbb4d5 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 00:45:32 +0200 Subject: [PATCH 15/42] Rename `damageEffect` -> `damageReaction` (#2554) * CollisionCheckInfo.damageEffect -> damageReaction * damageEffect -> damageReaction in other structs/temps * DMGEFF -> DMGREAC * EnSkb.lastDamageEffect -> lastDamageReaction * EnTest.lastDamageEffect -> lastDamageReaction * enums: DamageEffect -> DamageReaction * cleanup: EnGeldBDamageReactions -> EnGeldBDamageReaction * DMG_ENTRY effect -> reaction * cleanup: GELDB_DMG_ -> GELDB_DMGREAC_ * PEAHAT_DMG_EFF -> PEAHAT_DMGREAC * cleanup: RR_DMG_ -> RR_DMGREAC_ * cleanup: EnWallmas DAMAGE_EFFECT_ -> WALLMAS_DMGREAC_ * cleanup: EnPeehat's DamageReaction -> EnPeehatDamageReaction * format * review * _DMGREAC_ -> _DMG_REAC_ * _DMG_REAC_ -> _DMG_REACT_ * format --- include/z64collision_check.h | 4 +- src/code/z_collision_check.c | 4 +- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 6 +- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 98 +++++------ src/overlays/actors/ovl_En_Am/z_en_am.h | 2 +- .../actors/ovl_En_Anubice/z_en_anubice.c | 76 ++++---- .../actors/ovl_En_Anubice/z_en_anubice.h | 2 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 6 +- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 96 +++++------ src/overlays/actors/ovl_En_Bw/z_en_bw.c | 12 +- src/overlays/actors/ovl_En_Bw/z_en_bw.h | 2 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 8 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 163 +++++++++--------- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 6 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 2 +- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 2 +- .../actors/ovl_En_Dodojr/z_en_dodojr.c | 4 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 10 +- .../actors/ovl_En_Dodongo/z_en_dodongo.h | 2 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 4 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 14 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 10 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 94 +++++----- src/overlays/actors/ovl_En_GeldB/z_en_geldb.h | 2 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 88 +++++----- src/overlays/actors/ovl_En_Ik/z_en_ik.h | 2 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 156 ++++++++--------- src/overlays/actors/ovl_En_Mb/z_en_mb.h | 2 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 4 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 92 +++++----- .../actors/ovl_En_Po_Field/z_en_po_field.c | 2 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 6 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 2 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 97 +++++------ src/overlays/actors/ovl_En_Rd/z_en_rd.h | 2 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 96 +++++------ src/overlays/actors/ovl_En_Rr/z_en_rr.c | 112 ++++++------ src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 12 +- src/overlays/actors/ovl_En_Skb/z_en_skb.h | 2 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 2 +- src/overlays/actors/ovl_En_St/z_en_st.c | 2 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 98 +++++------ src/overlays/actors/ovl_En_Test/z_en_test.h | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 10 +- src/overlays/actors/ovl_En_Tite/z_en_tite.h | 2 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 2 +- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 88 +++++----- src/overlays/actors/ovl_En_Tp/z_en_tp.h | 2 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 96 +++++------ .../actors/ovl_En_Wallmas/z_en_wallmas.c | 85 ++++----- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 4 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 92 +++++----- src/overlays/actors/ovl_En_Wf/z_en_wf.h | 2 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 94 +++++----- src/overlays/actors/ovl_En_Zf/z_en_zf.h | 2 +- 61 files changed, 953 insertions(+), 948 deletions(-) diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 2c27563766..4a15431acc 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -391,7 +391,7 @@ typedef struct CollisionCheckContext { #define OCLINE_NONE 0 // Did not have an OcLine collision #define OCLINE_HIT (1 << 0) // Had an OcLine collision -#define DMG_ENTRY(damage, effect) ((damage) | ((effect) << 4)) +#define DMG_ENTRY(damage, reaction) ((damage) | ((reaction) << 4)) #define DMG_DEKU_NUT (1 << 0) #define DMG_DEKU_STICK (1 << 1) @@ -464,7 +464,7 @@ typedef struct CollisionCheckInfo { /* 0x16 */ u8 mass; // Used to compute displacement for OC collisions /* 0x17 */ u8 health; // Note: some actors may use their own health variable instead of this one /* 0x18 */ u8 damage; // Amount to decrement health by - /* 0x19 */ u8 damageEffect; // Stores what effect should occur when hit by a weapon + /* 0x19 */ u8 damageReaction; // Stores what reaction should occur after being hit /* 0x1A */ u8 atHitEffect; // Stores what effect should occur when AT connects with an AC /* 0x1B */ u8 acHitEffect; // Stores what effect should occur when AC is touched by an AT } CollisionCheckInfo; // size = 0x1C diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index dcf07766e6..283a9b2fb0 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -3027,7 +3027,7 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { */ void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { info->damage = 0; - info->damageEffect = 0; + info->damageReaction = 0; info->atHitEffect = 0; info->acHitEffect = 0; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; @@ -3108,7 +3108,7 @@ void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCt } damage = tbl->table[i] & 0xF; - col->actor->colChkInfo.damageEffect = tbl->table[i] >> 4 & 0xF; + col->actor->colChkInfo.damageReaction = tbl->table[i] >> 4 & 0xF; } if (!(col->acFlags & AC_HARD)) { col->actor->colChkInfo.damage += damage; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 89ba5fab34..ccd825ad52 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -2552,7 +2552,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { s32 bothHands = true; this->colliderJntSph.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); this->colliderJntSph.base.acFlags &= ~AC_ON; this->colliderJntSph.base.ocFlags1 &= ~OC1_NO_PUSH; @@ -2563,7 +2563,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { } this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - if (this->actor.colChkInfo.damageEffect == 3) { + if (this->actor.colChkInfo.damageReaction == 3) { BossSst_HandSetupFrozen(this); } else { BossSst_HandSetupReel(this); @@ -2583,7 +2583,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { void BossSst_HeadCollisionCheck(BossSst* this, PlayState* play) { if (this->colliderCylinder.base.acFlags & AC_HIT) { this->colliderCylinder.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { if (this->actionFunc == BossSst_HeadVulnerable) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index aec25c7cf2..f9e617573c 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1402,7 +1402,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { if (this->timer >= 0) { if (this->invincibilityTimer == 0) { this->invincibilityTimer = 8; - if (this->actor.colChkInfo.damageEffect != 1) { + if (this->actor.colChkInfo.damageReaction != 1) { this->actor.world.rot.y = this->actor.yawTowardsPlayer; Actor_PlaySfx(&this->actor, NA_SE_EN_BALINADE_DAMAGE); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 12); diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 3f7649ea7e..507e29ba8f 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -127,48 +127,48 @@ static ColliderQuadInit sQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum ArmosDamageEffect { - /* 0 */ AM_DMGEFF_NONE, // used by anything that can't kill the armos - /* 1 */ AM_DMGEFF_NUT, - /* 6 */ AM_DMGEFF_STUN = 6, // doesn't include deku nuts - /* 13 */ AM_DMGEFF_ICE = 13, - /* 14 */ AM_DMGEFF_MAGIC_FIRE_LIGHT, - /* 15 */ AM_DMGEFF_KILL // any damage source that can kill the armos (and isn't a special case) -} ArmosDamageEffect; +typedef enum ArmosDamageReaction { + /* 0 */ AM_DMG_REACT_NONE, // used by anything that can't kill the armos + /* 1 */ AM_DMG_REACT_NUT, + /* 6 */ AM_DMG_REACT_STUN = 6, // doesn't include deku nuts + /* 13 */ AM_DMG_REACT_ICE = 13, + /* 14 */ AM_DMG_REACT_MAGIC_FIRE_LIGHT, + /* 15 */ AM_DMG_REACT_KILL // any damage source that can kill the armos (and isn't a special case) +} ArmosDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, AM_DMGEFF_NUT), - /* Deku stick */ DMG_ENTRY(2, AM_DMGEFF_NONE), - /* Slingshot */ DMG_ENTRY(1, AM_DMGEFF_NONE), - /* Explosive */ DMG_ENTRY(2, AM_DMGEFF_KILL), - /* Boomerang */ DMG_ENTRY(0, AM_DMGEFF_STUN), - /* Normal arrow */ DMG_ENTRY(2, AM_DMGEFF_KILL), - /* Hammer swing */ DMG_ENTRY(2, AM_DMGEFF_KILL), - /* Hookshot */ DMG_ENTRY(0, AM_DMGEFF_STUN), - /* Kokiri sword */ DMG_ENTRY(1, AM_DMGEFF_NONE), - /* Master sword */ DMG_ENTRY(2, AM_DMGEFF_KILL), - /* Giant's Knife */ DMG_ENTRY(4, AM_DMGEFF_KILL), - /* Fire arrow */ DMG_ENTRY(2, AM_DMGEFF_KILL), - /* Ice arrow */ DMG_ENTRY(4, AM_DMGEFF_ICE), - /* Light arrow */ DMG_ENTRY(2, AM_DMGEFF_KILL), - /* Unk arrow 1 */ DMG_ENTRY(2, AM_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(2, AM_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(2, AM_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(0, AM_DMGEFF_MAGIC_FIRE_LIGHT), - /* Ice magic */ DMG_ENTRY(3, AM_DMGEFF_ICE), - /* Light magic */ DMG_ENTRY(0, AM_DMGEFF_MAGIC_FIRE_LIGHT), - /* Shield */ DMG_ENTRY(0, AM_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, AM_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, AM_DMGEFF_NONE), - /* Giant spin */ DMG_ENTRY(4, AM_DMGEFF_KILL), - /* Master spin */ DMG_ENTRY(2, AM_DMGEFF_KILL), - /* Kokiri jump */ DMG_ENTRY(2, AM_DMGEFF_NONE), - /* Giant jump */ DMG_ENTRY(8, AM_DMGEFF_KILL), - /* Master jump */ DMG_ENTRY(4, AM_DMGEFF_KILL), - /* Unknown 1 */ DMG_ENTRY(0, AM_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, AM_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, AM_DMGEFF_KILL), - /* Unknown 2 */ DMG_ENTRY(0, AM_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, AM_DMG_REACT_NUT), + /* Deku stick */ DMG_ENTRY(2, AM_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(1, AM_DMG_REACT_NONE), + /* Explosive */ DMG_ENTRY(2, AM_DMG_REACT_KILL), + /* Boomerang */ DMG_ENTRY(0, AM_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, AM_DMG_REACT_KILL), + /* Hammer swing */ DMG_ENTRY(2, AM_DMG_REACT_KILL), + /* Hookshot */ DMG_ENTRY(0, AM_DMG_REACT_STUN), + /* Kokiri sword */ DMG_ENTRY(1, AM_DMG_REACT_NONE), + /* Master sword */ DMG_ENTRY(2, AM_DMG_REACT_KILL), + /* Giant's Knife */ DMG_ENTRY(4, AM_DMG_REACT_KILL), + /* Fire arrow */ DMG_ENTRY(2, AM_DMG_REACT_KILL), + /* Ice arrow */ DMG_ENTRY(4, AM_DMG_REACT_ICE), + /* Light arrow */ DMG_ENTRY(2, AM_DMG_REACT_KILL), + /* Unk arrow 1 */ DMG_ENTRY(2, AM_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(2, AM_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(2, AM_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(0, AM_DMG_REACT_MAGIC_FIRE_LIGHT), + /* Ice magic */ DMG_ENTRY(3, AM_DMG_REACT_ICE), + /* Light magic */ DMG_ENTRY(0, AM_DMG_REACT_MAGIC_FIRE_LIGHT), + /* Shield */ DMG_ENTRY(0, AM_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, AM_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, AM_DMG_REACT_NONE), + /* Giant spin */ DMG_ENTRY(4, AM_DMG_REACT_KILL), + /* Master spin */ DMG_ENTRY(2, AM_DMG_REACT_KILL), + /* Kokiri jump */ DMG_ENTRY(2, AM_DMG_REACT_NONE), + /* Giant jump */ DMG_ENTRY(8, AM_DMG_REACT_KILL), + /* Master jump */ DMG_ENTRY(4, AM_DMG_REACT_KILL), + /* Unknown 1 */ DMG_ENTRY(0, AM_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, AM_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, AM_DMG_REACT_KILL), + /* Unknown 2 */ DMG_ENTRY(0, AM_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -735,7 +735,7 @@ void EnAm_SetupStunned(EnAm* this, PlayState* play) { Actor_SetColorFilter(&this->dyna.actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 100); - if (this->damageEffect == AM_DMGEFF_ICE) { + if (this->damageReaction == AM_DMG_REACT_ICE) { this->iceTimer = 48; } @@ -810,27 +810,27 @@ void EnAm_UpdateDamage(EnAm* this, PlayState* play) { } else if ((this->hurtCollider.base.acFlags & AC_HIT) && (this->behavior >= AM_BEHAVIOR_5)) { this->hurtCollider.base.acFlags &= ~AC_HIT; - if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) { + if (this->dyna.actor.colChkInfo.damageReaction != AM_DMG_REACT_MAGIC_FIRE_LIGHT) { this->unk_264 = 0; - this->damageEffect = this->dyna.actor.colChkInfo.damageEffect; + this->damageReaction = this->dyna.actor.colChkInfo.damageReaction; Actor_SetDropFlag(&this->dyna.actor, &this->hurtCollider.elem, false); - if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_NUT) || - (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) || - (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_ICE)) { + if ((this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_NUT) || + (this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_STUN) || + (this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_ICE)) { if (this->behavior != AM_BEHAVIOR_STUNNED) { EnAm_SetupStunned(this, play); if (this->dyna.actor.colChkInfo.damage != 0) { this->dyna.actor.colChkInfo.health = 0; } - } else if (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) { + } else if (this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_STUN) { Vec3f sparkPos = this->dyna.actor.world.pos; sparkPos.y += 50.0f; CollisionCheck_SpawnShieldParticlesMetal(play, &sparkPos); } - } else if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_KILL) || + } else if ((this->dyna.actor.colChkInfo.damageReaction == AM_DMG_REACT_KILL) || (this->behavior == AM_BEHAVIOR_STUNNED)) { this->dyna.actor.colChkInfo.health = 0; @@ -857,7 +857,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) { EnAm_UpdateDamage(this, play); } - if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) { + if (this->dyna.actor.colChkInfo.damageReaction != AM_DMG_REACT_MAGIC_FIRE_LIGHT) { if (this->attackTimer != 0) { this->attackTimer--; } diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h index 2903a3b6ea..a8335c5ad3 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.h +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -23,7 +23,7 @@ typedef struct EnAm { /* 0x0262 */ s16 panicSpinRot; // used when panicking before death /* 0x0264 */ s16 unk_264; /* 0x0266 */ u8 textureBlend; // 0 = statue textures; 255 = enemy textures - /* 0x0267 */ u8 damageEffect; + /* 0x0267 */ u8 damageReaction; /* 0x0267 */ Vec3f shakeOrigin; // center point to shake around when waking up /* 0x0274 */ ColliderCylinder hurtCollider; /* 0x02C0 */ ColliderCylinder blockCollider; 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 a37aae8954..dca62ddf43 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -73,45 +73,45 @@ static ColliderCylinderInit sCylinderInit = { { 29, 103, 0, { 0, 0, 0 } }, }; -typedef enum AnubiceDamageEffect { - /* 0x0 */ ANUBICE_DMGEFF_NONE, - /* 0x2 */ ANUBICE_DMGEFF_FIRE = 2, - /* 0xF */ ANUBICE_DMGEFF_0xF = 0xF // Treated the same as ANUBICE_DMGEFF_NONE in code -} AnubiceDamageEffect; +typedef enum AnubiceDamageReaction { + /* 0x0 */ ANUBICE_DMG_REACT_NONE, + /* 0x2 */ ANUBICE_DMG_REACT_FIRE = 2, + /* 0xF */ ANUBICE_DMG_REACT_0xF = 0xF // Treated the same as ANUBICE_DMG_REACT_NONE in code +} AnubiceDamageReaction; static DamageTable sDamageTable[] = { - /* Deku nut */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Deku stick */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Slingshot */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Explosive */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Boomerang */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Normal arrow */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Hammer swing */ DMG_ENTRY(1, ANUBICE_DMGEFF_0xF), - /* Hookshot */ DMG_ENTRY(2, ANUBICE_DMGEFF_0xF), - /* Kokiri sword */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Master sword */ DMG_ENTRY(2, ANUBICE_DMGEFF_0xF), - /* Giant's Knife */ DMG_ENTRY(6, ANUBICE_DMGEFF_0xF), - /* Fire arrow */ DMG_ENTRY(2, ANUBICE_DMGEFF_FIRE), - /* Ice arrow */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Light arrow */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Unk arrow 1 */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Unk arrow 2 */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Unk arrow 3 */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Fire magic */ DMG_ENTRY(3, ANUBICE_DMGEFF_FIRE), - /* Ice magic */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Light magic */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Shield */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Giant spin */ DMG_ENTRY(6, ANUBICE_DMGEFF_0xF), - /* Master spin */ DMG_ENTRY(2, ANUBICE_DMGEFF_0xF), - /* Kokiri jump */ DMG_ENTRY(0, ANUBICE_DMGEFF_0xF), - /* Giant jump */ DMG_ENTRY(12, ANUBICE_DMGEFF_0xF), - /* Master jump */ DMG_ENTRY(4, ANUBICE_DMGEFF_0xF), - /* Unknown 1 */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, ANUBICE_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Deku stick */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Slingshot */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Explosive */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Boomerang */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Normal arrow */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Hammer swing */ DMG_ENTRY(1, ANUBICE_DMG_REACT_0xF), + /* Hookshot */ DMG_ENTRY(2, ANUBICE_DMG_REACT_0xF), + /* Kokiri sword */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Master sword */ DMG_ENTRY(2, ANUBICE_DMG_REACT_0xF), + /* Giant's Knife */ DMG_ENTRY(6, ANUBICE_DMG_REACT_0xF), + /* Fire arrow */ DMG_ENTRY(2, ANUBICE_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Light arrow */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Unk arrow 1 */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Unk arrow 2 */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Unk arrow 3 */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Fire magic */ DMG_ENTRY(3, ANUBICE_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Light magic */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Shield */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Giant spin */ DMG_ENTRY(6, ANUBICE_DMG_REACT_0xF), + /* Master spin */ DMG_ENTRY(2, ANUBICE_DMG_REACT_0xF), + /* Kokiri jump */ DMG_ENTRY(0, ANUBICE_DMG_REACT_0xF), + /* Giant jump */ DMG_ENTRY(12, ANUBICE_DMG_REACT_0xF), + /* Master jump */ DMG_ENTRY(4, ANUBICE_DMG_REACT_0xF), + /* Unknown 1 */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, ANUBICE_DMG_REACT_NONE), }; void EnAnubice_Hover(EnAnubice* this, PlayState* play) { @@ -399,7 +399,7 @@ void EnAnubice_Update(Actor* thisx, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect == ANUBICE_DMGEFF_FIRE) { + if (this->actor.colChkInfo.damageReaction == ANUBICE_DMG_REACT_FIRE) { Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_PROP); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; Enemy_StartFinishingBlow(play, &this->actor); diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h index 51cd02d1ef..0ad49e2eb3 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h @@ -41,7 +41,7 @@ typedef struct EnAnubice { /* 0x025C */ s16 knockbackTimer; /* 0x025E */ s16 isMirroringPlayer; /* 0x0260 */ s16 isPlayerOutOfRange; - /* 0x0262 */ s16 isKnockedback; // Hit by an attack without ANUBICE_DMGEFF_FIRE + /* 0x0262 */ s16 isKnockedback; // Hit by an attack without ANUBICE_DMG_REACT_FIRE /* 0x0264 */ s16 hasSearchedForFlameCircles; /* 0x0268 */ f32 hoverVelocityTimer; /* 0x026C */ f32 animLastFrame; diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 18dad81519..86b167bcae 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -1169,7 +1169,7 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) { } if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - this->dmgEffect = this->actor.colChkInfo.damageEffect; + this->dmgEffect = this->actor.colChkInfo.damageReaction; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, false); switch (this->dmgEffect) { case 7: @@ -1252,7 +1252,7 @@ void EnBb_Update(Actor* thisx, PlayState* play2) { if (this->actor.params <= ENBB_BLUE) { EnBb_CollisionCheck(this, play); } - if (this->actor.colChkInfo.damageEffect != 0xD) { + if (this->actor.colChkInfo.damageReaction != 0xD) { this->actionFunc(this, play); if ((this->actor.params <= ENBB_BLUE) && (this->actor.speed >= -6.0f) && !(this->actor.flags & ACTOR_FLAG_ATTACHED_TO_ARROW)) { diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 4243bbdf79..7760866ae5 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -767,12 +767,12 @@ void func_809BE798(EnBigokuta* this, PlayState* play) { void EnBigokuta_UpdateDamage(EnBigokuta* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageReaction == 1) { if (this->actionFunc != func_809BE058) { func_809BD524(this); } - } else if (this->actor.colChkInfo.damageEffect == 0xF) { + } else if (this->actor.colChkInfo.damageReaction == 0xF) { func_809BD47C(this); } else if (!Actor_IsFacingPlayer(&this->actor, 0x4000)) { if (Actor_ApplyDamage(&this->actor) == 0) { // Dead diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 82f7b62796..7a6b7fd78b 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -78,48 +78,48 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 9, 28, -20, 30 }; -typedef enum BiriDamageEffect { - /* 0x0 */ BIRI_DMGEFF_NONE, - /* 0x1 */ BIRI_DMGEFF_DEKUNUT, - /* 0x2 */ BIRI_DMGEFF_FIRE, - /* 0x3 */ BIRI_DMGEFF_ICE, - /* 0xE */ BIRI_DMGEFF_SLINGSHOT = 0xE, - /* 0xF */ BIRI_DMGEFF_SWORD -} BiriDamageEffect; +typedef enum BiriDamageReaction { + /* 0x0 */ BIRI_DMG_REACT_NONE, + /* 0x1 */ BIRI_DMG_REACT_DEKUNUT, + /* 0x2 */ BIRI_DMG_REACT_FIRE, + /* 0x3 */ BIRI_DMG_REACT_ICE, + /* 0xE */ BIRI_DMG_REACT_SLINGSHOT = 0xE, + /* 0xF */ BIRI_DMG_REACT_SWORD +} BiriDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, BIRI_DMGEFF_DEKUNUT), - /* Deku stick */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Slingshot */ DMG_ENTRY(0, BIRI_DMGEFF_SLINGSHOT), - /* Explosive */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(1, BIRI_DMGEFF_NONE), - /* Normal arrow */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Hookshot */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Kokiri sword */ DMG_ENTRY(1, BIRI_DMGEFF_SWORD), - /* Master sword */ DMG_ENTRY(2, BIRI_DMGEFF_SWORD), - /* Giant's Knife */ DMG_ENTRY(4, BIRI_DMGEFF_SWORD), - /* Fire arrow */ DMG_ENTRY(4, BIRI_DMGEFF_FIRE), - /* Ice arrow */ DMG_ENTRY(4, BIRI_DMGEFF_ICE), - /* Light arrow */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Unk arrow 1 */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(4, BIRI_DMGEFF_FIRE), - /* Ice magic */ DMG_ENTRY(4, BIRI_DMGEFF_ICE), - /* Light magic */ DMG_ENTRY(0, BIRI_DMGEFF_NONE), - /* Shield */ DMG_ENTRY(0, BIRI_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, BIRI_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, BIRI_DMGEFF_NONE), - /* Giant spin */ DMG_ENTRY(4, BIRI_DMGEFF_NONE), - /* Master spin */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Kokiri jump */ DMG_ENTRY(2, BIRI_DMGEFF_NONE), - /* Giant jump */ DMG_ENTRY(8, BIRI_DMGEFF_NONE), - /* Master jump */ DMG_ENTRY(4, BIRI_DMGEFF_NONE), - /* Unknown 1 */ DMG_ENTRY(0, BIRI_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, BIRI_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, BIRI_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, BIRI_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, BIRI_DMG_REACT_DEKUNUT), + /* Deku stick */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(0, BIRI_DMG_REACT_SLINGSHOT), + /* Explosive */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(1, BIRI_DMG_REACT_NONE), + /* Normal arrow */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Hookshot */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Kokiri sword */ DMG_ENTRY(1, BIRI_DMG_REACT_SWORD), + /* Master sword */ DMG_ENTRY(2, BIRI_DMG_REACT_SWORD), + /* Giant's Knife */ DMG_ENTRY(4, BIRI_DMG_REACT_SWORD), + /* Fire arrow */ DMG_ENTRY(4, BIRI_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(4, BIRI_DMG_REACT_ICE), + /* Light arrow */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Unk arrow 1 */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(4, BIRI_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(4, BIRI_DMG_REACT_ICE), + /* Light magic */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE), + /* Shield */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, BIRI_DMG_REACT_NONE), + /* Giant spin */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE), + /* Master spin */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Kokiri jump */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE), + /* Giant jump */ DMG_ENTRY(8, BIRI_DMG_REACT_NONE), + /* Master jump */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE), + /* Unknown 1 */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -566,26 +566,26 @@ void EnBili_Frozen(EnBili* this, PlayState* play) { } void EnBili_UpdateDamage(EnBili* this, PlayState* play) { - u8 damageEffect; + u8 damageReaction; if ((this->actor.colChkInfo.health != 0) && (this->collider.base.acFlags & AC_HIT)) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_DEAD); Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; } - damageEffect = this->actor.colChkInfo.damageEffect; + damageReaction = this->actor.colChkInfo.damageReaction; - if (damageEffect == BIRI_DMGEFF_DEKUNUT) { + if (damageReaction == BIRI_DMG_REACT_DEKUNUT) { if (this->actionFunc != EnBili_Stunned) { EnBili_SetupStunned(this); } - } else if (damageEffect == BIRI_DMGEFF_SWORD) { + } else if (damageReaction == BIRI_DMG_REACT_SWORD) { if (this->actionFunc != EnBili_Stunned) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_XLU, 10); @@ -596,12 +596,12 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) { } else { EnBili_SetupBurnt(this); } - } else if (damageEffect == BIRI_DMGEFF_FIRE) { + } else if (damageReaction == BIRI_DMG_REACT_FIRE) { EnBili_SetupBurnt(this); this->timer = 2; - } else if (damageEffect == BIRI_DMGEFF_ICE) { + } else if (damageReaction == BIRI_DMG_REACT_ICE) { EnBili_SetupFrozen(this, play); - } else if (damageEffect == BIRI_DMGEFF_SLINGSHOT) { + } else if (damageReaction == BIRI_DMG_REACT_SLINGSHOT) { EnBili_SetupRecoil(this); } else { EnBili_SetupBurnt(this); diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 0aad9cccae..3e82fd07cd 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -617,7 +617,7 @@ void func_809D01CC(EnBw* this) { this->actor.speed = 0.0f; this->unk_25C = (Rand_ZeroOne() * 0.25f) + 1.0f; this->unk_260 = 0.0f; - if (this->damageEffect == 0xE) { + if (this->damageReaction == 0xE) { this->iceTimer = 0x50; } this->unk_222 = (this->actor.colorFilterParams & 0x4000) ? 25 : 80; @@ -658,7 +658,7 @@ void func_809D0268(EnBw* this, PlayState* play) { void func_809D03CC(EnBw* this) { this->actor.speed = 0.0f; - if (this->damageEffect == 0xE) { + if (this->damageReaction == 0xE) { this->iceTimer = 32; } this->unk_23C = this->actor.colorFilterTimer; @@ -706,12 +706,12 @@ void func_809D0584(EnBw* this, PlayState* play) { } else { if (this->collider2.base.acFlags & AC_HIT) { this->collider2.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect == 0) || (this->unk_220 == 6)) { + if ((this->actor.colChkInfo.damageReaction == 0) || (this->unk_220 == 6)) { return; } - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageReaction = this->actor.colChkInfo.damageReaction; Actor_SetDropFlag(&this->actor, &this->collider2.elem, false); - if ((this->damageEffect == 1) || (this->damageEffect == 0xE)) { + if ((this->damageReaction == 1) || (this->damageReaction == 0xE)) { if (this->unk_23C == 0) { Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); @@ -771,7 +771,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { Color_RGBA8 sp44 = { 0, 0, 0, 220 }; func_809D0584(this, play); - if (thisx->colChkInfo.damageEffect != 6) { + if (thisx->colChkInfo.damageReaction != 6) { this->actionFunc(this, play); if (this->unk_23C == 0) { this->unk_23A = (this->unk_23A + 4) & 0x7F; diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.h b/src/overlays/actors/ovl_En_Bw/z_en_bw.h index 7c0698d22c..fdcf31765f 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.h +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.h @@ -35,7 +35,7 @@ typedef struct EnBw { /* 0x0228 */ EnBwActionFunc actionFunc; /* 0x022C */ Color_RGBA8 color1; /* 0x0230 */ u8 unk_230; - /* 0x0231 */ u8 damageEffect; + /* 0x0231 */ u8 damageReaction; /* 0x0232 */ u8 unk_232; /* 0x0234 */ s16 unk_234; /* 0x0236 */ s16 unk_236; diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 3ce86ff9d3..5fa951f44e 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -169,7 +169,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { this->actor.lockOnArrowOffset = 0.0f; Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_DEAD); - if (this->actor.colChkInfo.damageEffect == 3) { // Ice arrows + if (this->actor.colChkInfo.damageReaction == 3) { // Ice arrows Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 40); for (i = 0; i < 8; i++) { iceParticlePos.x = ((i & 1 ? 7.0f : -7.0f) * scale) + this->actor.world.pos.x; @@ -178,7 +178,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &iceParticlePos, 150, 150, 150, 250, 235, 245, 255, ((Rand_ZeroOne() * 0.15f) + 0.85f) * scale); } - } else if (this->actor.colChkInfo.damageEffect == 2) { // Fire arrows and Din's Fire + } else if (this->actor.colChkInfo.damageReaction == 2) { // Fire arrows and Din's Fire Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40); for (i = 0; i < 4; i++) { @@ -426,8 +426,8 @@ void EnCrow_UpdateDamage(EnCrow* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { - if (this->actor.colChkInfo.damageEffect == 1) { // Deku Nuts + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->actor.colChkInfo.damageReaction == 1) { // Deku Nuts EnCrow_SetupTurnAway(this); } else { Actor_ApplyDamage(&this->actor); diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index df9b566f87..f9bb260404 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -150,84 +150,84 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit sColChkInfoInit = { 2, 25, 25, MASS_IMMOVABLE }; -typedef enum DekuBabaDamageEffect { - /* 0x0 */ DEKUBABA_DMGEFF_NONE, - /* 0x1 */ DEKUBABA_DMGEFF_DEKUNUT, - /* 0x2 */ DEKUBABA_DMGEFF_FIRE, - /* 0xE */ DEKUBABA_DMGEFF_BOOMERANG = 14, - /* 0xF */ DEKUBABA_DMGEFF_SWORD -} DekuBabaDamageEffect; +typedef enum DekuBabaDamageReaction { + /* 0x0 */ DEKUBABA_DMG_REACT_NONE, + /* 0x1 */ DEKUBABA_DMG_REACT_DEKUNUT, + /* 0x2 */ DEKUBABA_DMG_REACT_FIRE, + /* 0xE */ DEKUBABA_DMG_REACT_BOOMERANG = 14, + /* 0xF */ DEKUBABA_DMG_REACT_SWORD +} DekuBabaDamageReaction; static DamageTable sDekuBabaDamageTable = { - /* Deku nut */ DMG_ENTRY(0, DEKUBABA_DMGEFF_DEKUNUT), - /* Deku stick */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Slingshot */ DMG_ENTRY(1, DEKUBABA_DMGEFF_NONE), - /* Explosive */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(2, DEKUBABA_DMGEFF_BOOMERANG), - /* Normal arrow */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Hookshot */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Kokiri sword */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD), - /* Master sword */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD), - /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD), - /* Fire arrow */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE), - /* Ice arrow */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Light arrow */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Unk arrow 1 */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE), - /* Ice magic */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Light magic */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Shield */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD), - /* Giant spin */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD), - /* Master spin */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD), - /* Kokiri jump */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD), - /* Giant jump */ DMG_ENTRY(8, DEKUBABA_DMGEFF_SWORD), - /* Master jump */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD), - /* Unknown 1 */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_DEKUNUT), + /* Deku stick */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_NONE), + /* Explosive */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_BOOMERANG), + /* Normal arrow */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Hookshot */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Kokiri sword */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD), + /* Master sword */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD), + /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD), + /* Fire arrow */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Light arrow */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Unk arrow 1 */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Light magic */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Shield */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD), + /* Giant spin */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD), + /* Master spin */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD), + /* Kokiri jump */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD), + /* Giant jump */ DMG_ENTRY(8, DEKUBABA_DMG_REACT_SWORD), + /* Master jump */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD), + /* Unknown 1 */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), }; // The only difference is that for Big Deku Babas, Hookshot will act the same as Deku Nuts: i.e. it will stun, but // cannot kill. static DamageTable sBigDekuBabaDamageTable = { - /* Deku nut */ DMG_ENTRY(0, DEKUBABA_DMGEFF_DEKUNUT), - /* Deku stick */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Slingshot */ DMG_ENTRY(1, DEKUBABA_DMGEFF_NONE), - /* Explosive */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(2, DEKUBABA_DMGEFF_BOOMERANG), - /* Normal arrow */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Hookshot */ DMG_ENTRY(0, DEKUBABA_DMGEFF_DEKUNUT), - /* Kokiri sword */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD), - /* Master sword */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD), - /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD), - /* Fire arrow */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE), - /* Ice arrow */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Light arrow */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Unk arrow 1 */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(2, DEKUBABA_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(4, DEKUBABA_DMGEFF_FIRE), - /* Ice magic */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Light magic */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Shield */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, DEKUBABA_DMGEFF_SWORD), - /* Giant spin */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD), - /* Master spin */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD), - /* Kokiri jump */ DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD), - /* Giant jump */ DMG_ENTRY(8, DEKUBABA_DMGEFF_SWORD), - /* Master jump */ DMG_ENTRY(4, DEKUBABA_DMGEFF_SWORD), - /* Unknown 1 */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, DEKUBABA_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_DEKUNUT), + /* Deku stick */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_NONE), + /* Explosive */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_BOOMERANG), + /* Normal arrow */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Hookshot */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_DEKUNUT), + /* Kokiri sword */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD), + /* Master sword */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD), + /* Giant's Knife */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD), + /* Fire arrow */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Light arrow */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Unk arrow 1 */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Light magic */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Shield */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, DEKUBABA_DMG_REACT_SWORD), + /* Giant spin */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD), + /* Master spin */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD), + /* Kokiri jump */ DMG_ENTRY(2, DEKUBABA_DMG_REACT_SWORD), + /* Giant jump */ DMG_ENTRY(8, DEKUBABA_DMG_REACT_SWORD), + /* Master jump */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_SWORD), + /* Unknown 1 */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, DEKUBABA_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -257,7 +257,7 @@ void EnDekubaba_Init(Actor* thisx, PlayState* play) { // (Of course they reckoned without each age being able to use the other's items, so Stick and Master Sword // jumpslash can give the Stick drop as adult, and neither will as child.) if (!LINK_IS_ADULT) { - sBigDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE); // DMG_JUMP_MASTER + sBigDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE); // DMG_JUMP_MASTER } CollisionCheck_SetInfo(&this->actor.colChkInfo, &sBigDekuBabaDamageTable, &sColChkInfoInit); @@ -272,7 +272,7 @@ void EnDekubaba_Init(Actor* thisx, PlayState* play) { } if (!LINK_IS_ADULT) { - sDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMGEFF_NONE); // DMG_JUMP_MASTER + sDekuBabaDamageTable.table[0x1B] = DMG_ENTRY(4, DEKUBABA_DMG_REACT_NONE); // DMG_JUMP_MASTER } CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDekuBabaDamageTable, &sColChkInfoInit); @@ -1049,14 +1049,15 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { Actor_SetDropFlagJntSph(&this->actor, &this->collider, true); if ((this->collider.base.colMaterial != COL_MATERIAL_HARD) && - ((this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0))) { + ((this->actor.colChkInfo.damageReaction != DEKUBABA_DMG_REACT_NONE) || + (this->actor.colChkInfo.damage != 0))) { phi_s0 = this->actor.colChkInfo.health - this->actor.colChkInfo.damage; if (this->actionFunc != EnDekubaba_StunnedVertical) { - if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) || - (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_DEKUNUT)) { - if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) { + if ((this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_BOOMERANG) || + (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_DEKUNUT)) { + if (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_BOOMERANG) { phi_s0 = this->actor.colChkInfo.health; } @@ -1070,14 +1071,14 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } else { EnDekubaba_SetupHit(this, 0); } - } else if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) || - (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_SWORD)) { + } else if ((this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_BOOMERANG) || + (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_SWORD)) { if (phi_s0 > 0) { EnDekubaba_SetupSway(this); } else { EnDekubaba_SetupPrunedSomersault(this); } - } else if (this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_DEKUNUT) { + } else if (this->actor.colChkInfo.damageReaction != DEKUBABA_DMG_REACT_DEKUNUT) { EnDekubaba_SetupHit(this, 0); } else { return; @@ -1085,7 +1086,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { this->actor.colChkInfo.health = CLAMP_MIN(phi_s0, 0); - if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_FIRE) { + if (this->actor.colChkInfo.damageReaction == DEKUBABA_DMG_REACT_FIRE) { firePos = &this->actor.world.pos; fireScale = (this->size * 70.0f); diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index cf498eb726..800ddacca6 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -456,9 +456,9 @@ void EnDekunuts_ColliderCheck(EnDekunuts* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); if (this->actor.colChkInfo.mass == 50) { - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { - if (this->actor.colChkInfo.damageEffect != 1) { - if (this->actor.colChkInfo.damageEffect == 2) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->actor.colChkInfo.damageReaction != 1) { + if (this->actor.colChkInfo.damageReaction == 2) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 50); } EnDekunuts_SetupBeDamaged(this); diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 34acb2d982..4e9b399cfa 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -507,7 +507,7 @@ void EnDh_CollisionCheck(EnDh* this, PlayState* play) { if ((this->colliderJntSph.base.acFlags & AC_HIT) && !this->retreat) { this->colliderJntSph.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != 0) && (this->actor.colChkInfo.damageEffect != 6)) { + if ((this->actor.colChkInfo.damageReaction != 0) && (this->actor.colChkInfo.damageReaction != 6)) { this->colliderJntSph.base.atFlags = this->colliderJntSph.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE this->colliderJntSph.elements[0].base.atDmgInfo.dmgFlags = diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 5754d8ae1e..9be8d65d94 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -409,7 +409,7 @@ void EnDha_UpdateHealth(EnDha* this, PlayState* play) { if (!((this->unk_1C0 >= 8) || !(this->collider.base.acFlags & AC_HIT))) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect == 0 || this->actor.colChkInfo.damageEffect == 6) { + if (this->actor.colChkInfo.damageReaction == 0 || this->actor.colChkInfo.damageReaction == 6) { return; } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8); diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 1d967ed5fa..dba63237b4 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -360,14 +360,14 @@ s32 EnDodojr_CheckDamaged(EnDodojr* this, PlayState* play) { this->actor.shape.shadowDraw = ActorShadow_DrawCircle; } - if ((this->actor.colChkInfo.damageEffect == 0) && (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction == 0) && (this->actor.colChkInfo.damage != 0)) { Enemy_StartFinishingBlow(play, &this->actor); this->freezeFrameTimer = 2; this->actionFunc = EnDodojr_WaitFreezeFrames; return true; } - if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != EnDodojr_Stunned) && + if ((this->actor.colChkInfo.damageReaction == 1) && (this->actionFunc != EnDodojr_Stunned) && (this->actionFunc != EnDodojr_StunnedBounce)) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->stunTimer = 120; diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 5d013911eb..602e879afb 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -415,7 +415,7 @@ void EnDodongo_SetupStunned(EnDodongo* this) { Animation_Change(&this->skelAnime, &gDodongoBreatheFireAnim, 0.0f, 25.0f, 0.0f, ANIMMODE_ONCE, -4.0f); this->actionState = DODONGO_STUNNED; this->actor.speed = 0.0f; - if (this->damageEffect == 0xF) { + if (this->damageReaction == 0xF) { this->iceTimer = 36; } Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); @@ -733,9 +733,9 @@ void EnDodongo_CollisionCheck(EnDodongo* this, PlayState* play) { } else if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->actionState > DODONGO_DEATH)) { this->bodyCollider.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->bodyCollider, false); - if (this->actor.colChkInfo.damageEffect != 0xE) { - this->damageEffect = this->actor.colChkInfo.damageEffect; - if ((this->actor.colChkInfo.damageEffect == 1) || (this->actor.colChkInfo.damageEffect == 0xF)) { + if (this->actor.colChkInfo.damageReaction != 0xE) { + this->damageReaction = this->actor.colChkInfo.damageReaction; + if ((this->actor.colChkInfo.damageReaction == 1) || (this->actor.colChkInfo.damageReaction == 0xF)) { if (this->actionState != DODONGO_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -783,7 +783,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play) { EnDodongo* this = (EnDodongo*)thisx; EnDodongo_CollisionCheck(this, play); - if (this->actor.colChkInfo.damageEffect != 0xE) { + if (this->actor.colChkInfo.damageReaction != 0xE) { this->actionFunc(this, play); Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 60.0f, 70.0f, diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h index 7785030d49..bbaab19f82 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -30,7 +30,7 @@ typedef struct EnDodongo { /* 0x0358 */ Vec3f icePos[9]; /* 0x03C4 */ Color_RGBA8 bombSmokePrimColor; /* 0x03C8 */ Color_RGBA8 bombSmokeEnvColor; - /* 0x03CC */ u8 damageEffect; + /* 0x03CC */ u8 damageReaction; /* 0x03D0 */ s32 blureIdx; /* 0x03D4 */ ColliderQuad colliderAT; /* 0x0454 */ ColliderTris colliderHard; diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 9477eb0df1..35239e2dcb 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -616,7 +616,7 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_EIER_DEAD); @@ -630,7 +630,7 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) { } else { EnEiyer_SetupDie(this); } - } else if (this->actor.colChkInfo.damageEffect == 1) { + } else if (this->actor.colChkInfo.damageReaction == 1) { if (this->actionFunc != EnEiyer_Stunned) { EnEiyer_SetupStunned(this); } diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index e674ee9bf5..5604e83b74 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -637,21 +637,21 @@ void EnFirefly_Combust(EnFirefly* this, PlayState* play) { } void EnFirefly_UpdateDamage(EnFirefly* this, PlayState* play) { - u8 damageEffect; + u8 damageReaction; if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; } - damageEffect = this->actor.colChkInfo.damageEffect; + damageReaction = this->actor.colChkInfo.damageReaction; - if (damageEffect == 2) { // Din's Fire + if (damageReaction == 2) { // Din's Fire if (this->actor.params == KEESE_ICE_FLY) { this->actor.colChkInfo.health = 0; Enemy_StartFinishingBlow(play, &this->actor); @@ -663,18 +663,18 @@ void EnFirefly_UpdateDamage(EnFirefly* this, PlayState* play) { EnFirefly_SetupFlyIdle(this); } } - } else if (damageEffect == 3) { // Ice Arrows or Ice Magic + } else if (damageReaction == 3) { // Ice Arrows or Ice Magic if (this->actor.params == KEESE_ICE_FLY) { EnFirefly_SetupFall(this); } else { EnFirefly_SetupFrozenFall(this, play); } - } else if (damageEffect == 1) { // Deku Nuts + } else if (damageReaction == 1) { // Deku Nuts if (this->actionFunc != EnFirefly_Stunned) { EnFirefly_SetupStunned(this); } } else { // Fire Arrows - if ((damageEffect == 0xF) && (this->actor.params == KEESE_ICE_FLY)) { + if ((damageReaction == 0xF) && (this->actor.params == KEESE_ICE_FLY)) { EnFirefly_Combust(this, play); } EnFirefly_SetupFall(this); diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 87747933d3..4f31952f72 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -423,7 +423,7 @@ void EnFloormas_SetupRecover(EnFloormas* this) { void EnFloormas_SetupFreeze(EnFloormas* this) { Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f); this->actor.speed = 0.0f; - if (this->actor.colChkInfo.damageEffect == 4) { + if (this->actor.colChkInfo.damageReaction == 4) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -992,7 +992,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { if (this->collider.base.colMaterial != COL_MATERIAL_HARD) { isSmall = false; if (this->actor.scale.x < 0.01f) { @@ -1000,7 +1000,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { } if (isSmall && this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) { this->actor.colChkInfo.damage = 2; - this->actor.colChkInfo.damageEffect = 0; + this->actor.colChkInfo.damageReaction = 0; } if (Actor_ApplyDamage(&this->actor) == 0) { if (isSmall) { @@ -1014,12 +1014,12 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE); } - if ((this->actor.colChkInfo.damageEffect == 4) || (this->actor.colChkInfo.damageEffect == 1)) { + if ((this->actor.colChkInfo.damageReaction == 4) || (this->actor.colChkInfo.damageReaction == 1)) { if (this->actionFunc != EnFloormas_Freeze) { EnFloormas_SetupFreeze(this); } } else { - if (this->actor.colChkInfo.damageEffect == 2) { + if (this->actor.colChkInfo.damageReaction == 2) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, this->actor.scale.x * 4000.0f, this->actor.scale.x * 4000.0f); } diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 6ded127aef..73ee412ee5 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -356,7 +356,7 @@ void EnFz_ApplyDamage(EnFz* this, PlayState* play) { this->collider1.base.acFlags &= ~AC_HIT; } else if (this->collider1.base.acFlags & AC_HIT) { this->collider1.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageReaction) { case 0xF: Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_XLU, 8); diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index a0fea77783..e24904798e 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -177,48 +177,48 @@ static ColliderQuadInit sSwordQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum EnGeldBDamageEffects { - /* 0x0 */ GELDB_DMG_NORMAL, - /* 0x1 */ GELDB_DMG_STUN, - /* 0x6 */ GELDB_DMG_UNK_6 = 0x6, - /* 0xD */ GELDB_DMG_UNK_D = 0xD, - /* 0xE */ GELDB_DMG_UNK_E, - /* 0xF */ GELDB_DMG_FREEZE -} EnGeldBDamageEffects; +typedef enum EnGeldBDamageReaction { + /* 0x0 */ GELDB_DMG_REACT_NORMAL, + /* 0x1 */ GELDB_DMG_REACT_STUN, + /* 0x6 */ GELDB_DMG_REACT_UNK_6 = 0x6, + /* 0xD */ GELDB_DMG_REACT_UNK_D = 0xD, + /* 0xE */ GELDB_DMG_REACT_UNK_E, + /* 0xF */ GELDB_DMG_REACT_FREEZE +} EnGeldBDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, GELDB_DMG_STUN), - /* Deku stick */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Slingshot */ DMG_ENTRY(1, GELDB_DMG_NORMAL), - /* Explosive */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Boomerang */ DMG_ENTRY(0, GELDB_DMG_STUN), - /* Normal arrow */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Hammer swing */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Hookshot */ DMG_ENTRY(0, GELDB_DMG_STUN), - /* Kokiri sword */ DMG_ENTRY(1, GELDB_DMG_NORMAL), - /* Master sword */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Giant's Knife */ DMG_ENTRY(4, GELDB_DMG_NORMAL), - /* Fire arrow */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Ice arrow */ DMG_ENTRY(2, GELDB_DMG_FREEZE), - /* Light arrow */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Unk arrow 1 */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Unk arrow 2 */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Unk arrow 3 */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Fire magic */ DMG_ENTRY(4, GELDB_DMG_UNK_E), - /* Ice magic */ DMG_ENTRY(0, GELDB_DMG_UNK_6), - /* Light magic */ DMG_ENTRY(3, GELDB_DMG_UNK_D), - /* Shield */ DMG_ENTRY(0, GELDB_DMG_NORMAL), - /* Mirror Ray */ DMG_ENTRY(0, GELDB_DMG_NORMAL), - /* Kokiri spin */ DMG_ENTRY(1, GELDB_DMG_NORMAL), - /* Giant spin */ DMG_ENTRY(4, GELDB_DMG_NORMAL), - /* Master spin */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Kokiri jump */ DMG_ENTRY(2, GELDB_DMG_NORMAL), - /* Giant jump */ DMG_ENTRY(8, GELDB_DMG_NORMAL), - /* Master jump */ DMG_ENTRY(4, GELDB_DMG_NORMAL), - /* Unknown 1 */ DMG_ENTRY(4, GELDB_DMG_NORMAL), - /* Unblockable */ DMG_ENTRY(0, GELDB_DMG_NORMAL), - /* Hammer jump */ DMG_ENTRY(4, GELDB_DMG_NORMAL), - /* Unknown 2 */ DMG_ENTRY(0, GELDB_DMG_NORMAL), + /* Deku nut */ DMG_ENTRY(0, GELDB_DMG_REACT_STUN), + /* Deku stick */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Slingshot */ DMG_ENTRY(1, GELDB_DMG_REACT_NORMAL), + /* Explosive */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Boomerang */ DMG_ENTRY(0, GELDB_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Hammer swing */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Hookshot */ DMG_ENTRY(0, GELDB_DMG_REACT_STUN), + /* Kokiri sword */ DMG_ENTRY(1, GELDB_DMG_REACT_NORMAL), + /* Master sword */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Giant's Knife */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL), + /* Fire arrow */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Ice arrow */ DMG_ENTRY(2, GELDB_DMG_REACT_FREEZE), + /* Light arrow */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Unk arrow 1 */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Unk arrow 2 */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Unk arrow 3 */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Fire magic */ DMG_ENTRY(4, GELDB_DMG_REACT_UNK_E), + /* Ice magic */ DMG_ENTRY(0, GELDB_DMG_REACT_UNK_6), + /* Light magic */ DMG_ENTRY(3, GELDB_DMG_REACT_UNK_D), + /* Shield */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL), + /* Mirror Ray */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL), + /* Kokiri spin */ DMG_ENTRY(1, GELDB_DMG_REACT_NORMAL), + /* Giant spin */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL), + /* Master spin */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Kokiri jump */ DMG_ENTRY(2, GELDB_DMG_REACT_NORMAL), + /* Giant jump */ DMG_ENTRY(8, GELDB_DMG_REACT_NORMAL), + /* Master jump */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL), + /* Unknown 1 */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL), + /* Unblockable */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL), + /* Hammer jump */ DMG_ENTRY(4, GELDB_DMG_REACT_NORMAL), + /* Unknown 2 */ DMG_ENTRY(0, GELDB_DMG_REACT_NORMAL), }; static InitChainEntry sInitChain[] = { @@ -1030,10 +1030,10 @@ void EnGeldB_SetupStunned(EnGeldB* this) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { this->actor.speed = 0.0f; } - if ((this->damageEffect != GELDB_DMG_FREEZE) || (this->action == GELDB_SPIN_ATTACK)) { + if ((this->damageReaction != GELDB_DMG_REACT_FREEZE) || (this->action == GELDB_SPIN_ATTACK)) { Animation_PlayOnceSetSpeed(&this->skelAnime, &gGerudoRedDamageAnim, 0.0f); } - if (this->damageEffect == GELDB_DMG_FREEZE) { + if (this->damageReaction == GELDB_DMG_REACT_FREEZE) { this->iceTimer = 36; } Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); @@ -1390,12 +1390,12 @@ void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) { } else if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->action >= GELDB_READY) && (this->spinAttackState < 2)) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) { - this->damageEffect = this->actor.colChkInfo.damageEffect; + if (this->actor.colChkInfo.damageReaction != GELDB_DMG_REACT_UNK_6) { + this->damageReaction = this->actor.colChkInfo.damageReaction; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_GERUDOFT_BREATH); - if ((this->actor.colChkInfo.damageEffect == GELDB_DMG_STUN) || - (this->actor.colChkInfo.damageEffect == GELDB_DMG_FREEZE)) { + if ((this->actor.colChkInfo.damageReaction == GELDB_DMG_REACT_STUN) || + (this->actor.colChkInfo.damageReaction == GELDB_DMG_REACT_FREEZE)) { if (this->action != GELDB_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -1429,7 +1429,7 @@ void EnGeldB_Update(Actor* thisx, PlayState* play) { EnGeldB* this = (EnGeldB*)thisx; EnGeldB_CollisionCheck(this, play); - if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) { + if (this->actor.colChkInfo.damageReaction != GELDB_DMG_REACT_UNK_6) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 15.0f, 30.0f, 60.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h index e1a7ff3ea0..a2c9563ac6 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h @@ -48,7 +48,7 @@ typedef struct EnGeldB { /* 0x02F8 */ s16 unkTimer; /* 0x02FA */ s16 lookTimer; /* 0x02FC */ s16 iceTimer; - /* 0x02FE */ u8 damageEffect; + /* 0x02FE */ u8 damageReaction; /* 0x0300 */ s32 timer; /* 0x0304 */ f32 approachRate; /* 0x0308 */ char unk_308[4]; diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 4e590217f0..8beef25775 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -544,7 +544,7 @@ void EnGs_Update(Actor* thisx, PlayState* play2) { this->unk_19F = 0; this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageReaction) { case 15: this->unk_19E |= 1; func_80A4F77C(this); 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 582455f17e..690d2d29d9 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -52,13 +52,13 @@ typedef enum EnIkCsDrawMode { /* 0x02 */ IK_CS_DRAW_DEFEAT } EnIkCsDrawMode; -typedef enum EnIkDamageEffect { - /* 0x0 */ EN_IK_DMGEFF_NONE, - /* 0x6 */ EN_IK_DMGEFF_ELEMENTAL_MAGIC = 0x6, - /* 0xD */ EN_IK_DMGEFF_SPARKS_NO_DMG = 0xD, - /* 0xE */ EN_IK_DMGEFF_PROJECTILE, - /* 0xF */ EN_IK_DMGEFF_DAMAGE -} EnIkDamageEffect; +typedef enum EnIkDamageReaction { + /* 0x0 */ EN_IK_DMG_REACT_NONE, + /* 0x6 */ EN_IK_DMG_REACT_ELEMENTAL_MAGIC = 0x6, + /* 0xD */ EN_IK_DMG_REACT_SPARKS_NO_DMG = 0xD, + /* 0xE */ EN_IK_DMG_REACT_PROJECTILE, + /* 0xF */ EN_IK_DMG_REACT_DAMAGE +} EnIkDamageReaction; void EnIk_UpdateEnemy(Actor* thisx, PlayState* play); void EnIk_DrawEnemy(Actor* thisx, PlayState* play); @@ -166,38 +166,38 @@ static ColliderQuadInit sQuadInit = { }; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, EN_IK_DMGEFF_SPARKS_NO_DMG), - /* Deku stick */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE), - /* Slingshot */ DMG_ENTRY(1, EN_IK_DMGEFF_PROJECTILE), - /* Explosive */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE), - /* Boomerang */ DMG_ENTRY(0, EN_IK_DMGEFF_SPARKS_NO_DMG), - /* Normal arrow */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE), - /* Hammer swing */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE), - /* Hookshot */ DMG_ENTRY(0, EN_IK_DMGEFF_SPARKS_NO_DMG), - /* Kokiri sword */ DMG_ENTRY(1, EN_IK_DMGEFF_DAMAGE), - /* Master sword */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE), - /* Giant's Knife */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE), - /* Fire arrow */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE), - /* Ice arrow */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE), - /* Light arrow */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE), - /* Unk arrow 1 */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE), - /* Unk arrow 2 */ DMG_ENTRY(2, EN_IK_DMGEFF_PROJECTILE), - /* Unk arrow 3 */ DMG_ENTRY(15, EN_IK_DMGEFF_PROJECTILE), - /* Fire magic */ DMG_ENTRY(0, EN_IK_DMGEFF_ELEMENTAL_MAGIC), - /* Ice magic */ DMG_ENTRY(0, EN_IK_DMGEFF_ELEMENTAL_MAGIC), - /* Light magic */ DMG_ENTRY(0, EN_IK_DMGEFF_ELEMENTAL_MAGIC), - /* Shield */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, EN_IK_DMGEFF_DAMAGE), - /* Giant spin */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE), - /* Master spin */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE), - /* Kokiri jump */ DMG_ENTRY(2, EN_IK_DMGEFF_DAMAGE), - /* Giant jump */ DMG_ENTRY(8, EN_IK_DMGEFF_DAMAGE), - /* Master jump */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE), - /* Unknown 1 */ DMG_ENTRY(10, EN_IK_DMGEFF_DAMAGE), - /* Unblockable */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, EN_IK_DMGEFF_DAMAGE), - /* Unknown 2 */ DMG_ENTRY(0, EN_IK_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, EN_IK_DMG_REACT_SPARKS_NO_DMG), + /* Deku stick */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE), + /* Slingshot */ DMG_ENTRY(1, EN_IK_DMG_REACT_PROJECTILE), + /* Explosive */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE), + /* Boomerang */ DMG_ENTRY(0, EN_IK_DMG_REACT_SPARKS_NO_DMG), + /* Normal arrow */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE), + /* Hammer swing */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE), + /* Hookshot */ DMG_ENTRY(0, EN_IK_DMG_REACT_SPARKS_NO_DMG), + /* Kokiri sword */ DMG_ENTRY(1, EN_IK_DMG_REACT_DAMAGE), + /* Master sword */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE), + /* Giant's Knife */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE), + /* Fire arrow */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE), + /* Ice arrow */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE), + /* Light arrow */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE), + /* Unk arrow 1 */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE), + /* Unk arrow 2 */ DMG_ENTRY(2, EN_IK_DMG_REACT_PROJECTILE), + /* Unk arrow 3 */ DMG_ENTRY(15, EN_IK_DMG_REACT_PROJECTILE), + /* Fire magic */ DMG_ENTRY(0, EN_IK_DMG_REACT_ELEMENTAL_MAGIC), + /* Ice magic */ DMG_ENTRY(0, EN_IK_DMG_REACT_ELEMENTAL_MAGIC), + /* Light magic */ DMG_ENTRY(0, EN_IK_DMG_REACT_ELEMENTAL_MAGIC), + /* Shield */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, EN_IK_DMG_REACT_DAMAGE), + /* Giant spin */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE), + /* Master spin */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE), + /* Kokiri jump */ DMG_ENTRY(2, EN_IK_DMG_REACT_DAMAGE), + /* Giant jump */ DMG_ENTRY(8, EN_IK_DMG_REACT_DAMAGE), + /* Master jump */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE), + /* Unknown 1 */ DMG_ENTRY(10, EN_IK_DMG_REACT_DAMAGE), + /* Unblockable */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, EN_IK_DMG_REACT_DAMAGE), + /* Unknown 2 */ DMG_ENTRY(0, EN_IK_DMG_REACT_NONE), }; void EnIk_Destroy(Actor* thisx, PlayState* play) { @@ -747,19 +747,19 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { } else if (this->bodyCollider.base.acFlags & AC_HIT) { s16 pad; u8 prevHealth; - s32 damageEffect; + s32 damageReaction; Vec3f sparksPos = this->actor.world.pos; sparksPos.y += 50.0f; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageReaction = this->actor.colChkInfo.damageReaction; this->bodyCollider.base.acFlags &= ~AC_HIT; - if ((this->damageEffect == EN_IK_DMGEFF_NONE) || (this->damageEffect == EN_IK_DMGEFF_SPARKS_NO_DMG) || - ((this->armorStatusFlag == 0) && (this->damageEffect == EN_IK_DMGEFF_PROJECTILE))) { - if (this->damageEffect != EN_IK_DMGEFF_NONE) { + if ((this->damageReaction == EN_IK_DMG_REACT_NONE) || (this->damageReaction == EN_IK_DMG_REACT_SPARKS_NO_DMG) || + ((this->armorStatusFlag == 0) && (this->damageReaction == EN_IK_DMG_REACT_PROJECTILE))) { + if (this->damageReaction != EN_IK_DMG_REACT_NONE) { // spawn sparks and don't damage CollisionCheck_SpawnShieldParticlesMetal(play, &sparksPos); } diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h index 9b4c16d7b9..e9fb906d52 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -99,7 +99,7 @@ typedef struct EnIk { /* 0x02FA */ u8 drawArmorFlag; /* 0x02FB */ u8 armorStatusFlag; /* 0x02FC */ u8 isBreakingProp; - /* 0x02FD */ u8 damageEffect; + /* 0x02FD */ u8 damageReaction; /* 0x02FE */ s8 unk_2FE; /* 0x02FF */ s8 unk_2FF; /* 0x0300 */ s16 unk_300; diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index a69a25f0d5..a2700bd6b5 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -184,82 +184,82 @@ static ColliderQuadInit sAttackColliderQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum EnMbDamageEffect { - /* 0x0 */ ENMB_DMGEFF_IGNORE, - /* 0x1 */ ENMB_DMGEFF_STUN, - /* 0x5 */ ENMB_DMGEFF_FREEZE = 0x5, - /* 0x6 */ ENMB_DMGEFF_STUN_ICE, - /* 0xF */ ENMB_DMGEFF_DEFAULT = 0xF -} EnMbDamageEffect; +typedef enum EnMbDamageReaction { + /* 0x0 */ ENMB_DMG_REACT_IGNORE, + /* 0x1 */ ENMB_DMG_REACT_STUN, + /* 0x5 */ ENMB_DMG_REACT_FREEZE = 0x5, + /* 0x6 */ ENMB_DMG_REACT_STUN_ICE, + /* 0xF */ ENMB_DMG_REACT_DEFAULT = 0xF +} EnMbDamageReaction; static DamageTable sSpearMoblinDamageTable = { - /* Deku nut */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Deku stick */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Slingshot */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT), - /* Explosive */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Boomerang */ DMG_ENTRY(0, ENMB_DMGEFF_STUN), - /* Normal arrow */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Hammer swing */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Hookshot */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Kokiri sword */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT), - /* Master sword */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Fire arrow */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Ice arrow */ DMG_ENTRY(4, ENMB_DMGEFF_STUN_ICE), - /* Light arrow */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Unk arrow 1 */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Unk arrow 2 */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Unk arrow 3 */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Fire magic */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Ice magic */ DMG_ENTRY(3, ENMB_DMGEFF_STUN_ICE), - /* Light magic */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Shield */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Mirror Ray */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Kokiri spin */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT), - /* Giant spin */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Master spin */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Kokiri jump */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Giant jump */ DMG_ENTRY(8, ENMB_DMGEFF_DEFAULT), - /* Master jump */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Unknown 1 */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Unblockable */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Hammer jump */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Unknown 2 */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), + /* Deku nut */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Deku stick */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Slingshot */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT), + /* Explosive */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Boomerang */ DMG_ENTRY(0, ENMB_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Hammer swing */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Hookshot */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Kokiri sword */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT), + /* Master sword */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Fire arrow */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Ice arrow */ DMG_ENTRY(4, ENMB_DMG_REACT_STUN_ICE), + /* Light arrow */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Unk arrow 1 */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Unk arrow 2 */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Unk arrow 3 */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Fire magic */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Ice magic */ DMG_ENTRY(3, ENMB_DMG_REACT_STUN_ICE), + /* Light magic */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Shield */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Mirror Ray */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Kokiri spin */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT), + /* Giant spin */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Master spin */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Kokiri jump */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Giant jump */ DMG_ENTRY(8, ENMB_DMG_REACT_DEFAULT), + /* Master jump */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Unknown 1 */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Unblockable */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Hammer jump */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Unknown 2 */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), }; static DamageTable sClubMoblinDamageTable = { - /* Deku nut */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Deku stick */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Slingshot */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Explosive */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Boomerang */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Normal arrow */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Hammer swing */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Hookshot */ DMG_ENTRY(0, ENMB_DMGEFF_STUN), - /* Kokiri sword */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT), - /* Master sword */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Fire arrow */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Ice arrow */ DMG_ENTRY(4, ENMB_DMGEFF_STUN_ICE), - /* Light arrow */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Unk arrow 1 */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Unk arrow 2 */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Unk arrow 3 */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Fire magic */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Ice magic */ DMG_ENTRY(3, ENMB_DMGEFF_STUN_ICE), - /* Light magic */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Shield */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Mirror Ray */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Kokiri spin */ DMG_ENTRY(1, ENMB_DMGEFF_DEFAULT), - /* Giant spin */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Master spin */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Kokiri jump */ DMG_ENTRY(2, ENMB_DMGEFF_DEFAULT), - /* Giant jump */ DMG_ENTRY(8, ENMB_DMGEFF_DEFAULT), - /* Master jump */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Unknown 1 */ DMG_ENTRY(0, ENMB_DMGEFF_FREEZE), - /* Unblockable */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), - /* Hammer jump */ DMG_ENTRY(4, ENMB_DMGEFF_DEFAULT), - /* Unknown 2 */ DMG_ENTRY(0, ENMB_DMGEFF_IGNORE), + /* Deku nut */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Deku stick */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Slingshot */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Explosive */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Boomerang */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Normal arrow */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Hammer swing */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Hookshot */ DMG_ENTRY(0, ENMB_DMG_REACT_STUN), + /* Kokiri sword */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT), + /* Master sword */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Giant's Knife */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Fire arrow */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Ice arrow */ DMG_ENTRY(4, ENMB_DMG_REACT_STUN_ICE), + /* Light arrow */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Unk arrow 1 */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Unk arrow 2 */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Unk arrow 3 */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Fire magic */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Ice magic */ DMG_ENTRY(3, ENMB_DMG_REACT_STUN_ICE), + /* Light magic */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Shield */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Mirror Ray */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Kokiri spin */ DMG_ENTRY(1, ENMB_DMG_REACT_DEFAULT), + /* Giant spin */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Master spin */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Kokiri jump */ DMG_ENTRY(2, ENMB_DMG_REACT_DEFAULT), + /* Giant jump */ DMG_ENTRY(8, ENMB_DMG_REACT_DEFAULT), + /* Master jump */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Unknown 1 */ DMG_ENTRY(0, ENMB_DMG_REACT_FREEZE), + /* Unblockable */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), + /* Hammer jump */ DMG_ENTRY(4, ENMB_DMG_REACT_DEFAULT), + /* Unknown 2 */ DMG_ENTRY(0, ENMB_DMG_REACT_IGNORE), }; static InitChainEntry sInitChain[] = { @@ -605,7 +605,7 @@ void EnMb_SetupStunned(EnMb* this) { this->state = ENMB_STATE_STUNNED; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); - if (this->damageEffect == ENMB_DMGEFF_STUN_ICE) { + if (this->damageReaction == ENMB_DMG_REACT_STUN_ICE) { this->iceEffectTimer = 40; } else { if (this->actor.params != ENMB_TYPE_CLUB) { @@ -1440,8 +1440,8 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) { this->bodyCollider.base.acFlags &= ~AC_HIT; } else if ((this->bodyCollider.base.acFlags & AC_HIT) && this->state >= ENMB_STATE_STUNNED) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_IGNORE && - this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { + if (this->actor.colChkInfo.damageReaction != ENMB_DMG_REACT_IGNORE && + this->actor.colChkInfo.damageReaction != ENMB_DMG_REACT_FREEZE) { if ((player->stateFlags2 & PLAYER_STATE2_7) && player->actor.parent == &this->actor) { player->stateFlags2 &= ~PLAYER_STATE2_7; player->actor.parent = NULL; @@ -1450,11 +1450,11 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) { #endif Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 6.0f, this->actor.world.rot.y, 6.0f); } - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageReaction = this->actor.colChkInfo.damageReaction; this->attack = ENMB_ATTACK_NONE; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); - if (this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN || - this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN_ICE) { + if (this->actor.colChkInfo.damageReaction == ENMB_DMG_REACT_STUN || + this->actor.colChkInfo.damageReaction == ENMB_DMG_REACT_STUN_ICE) { if (this->state != ENMB_STATE_STUNNED) { Actor_ApplyDamage(&this->actor); EnMb_SetupStunned(this); @@ -1485,7 +1485,7 @@ void EnMb_Update(Actor* thisx, PlayState* play) { s32 pad; EnMb_CheckColliding(this, play); - if (thisx->colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { + if (thisx->colChkInfo.damageReaction != ENMB_DMG_REACT_FREEZE) { this->actionFunc(this, play); Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 40.0f, 40.0f, 70.0f, diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.h b/src/overlays/actors/ovl_En_Mb/z_en_mb.h index 776e7421e0..31b621b1bb 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.h +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.h @@ -23,7 +23,7 @@ typedef enum EnMbState { typedef struct EnMb { /* 0x0000 */ Actor actor; /* 0x014C */ Vec3s bodyPartsPos[10]; - /* 0x0188 */ u8 damageEffect; + /* 0x0188 */ u8 damageReaction; /* 0x018C */ SkelAnime skelAnime; /* 0x01D0 */ Vec3s jointTable[28]; /* 0x0278 */ Vec3s morphTable[28]; diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index be7fc69f09..172d8b912b 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -323,7 +323,7 @@ s32 EnNy_CollisionCheck(EnNy* this, PlayState* play) { effectPos.y = this->collider.elements[0].base.acDmgInfo.hitPos.y; effectPos.z = this->collider.elements[0].base.acDmgInfo.hitPos.z; if ((this->unk_1E0 == 0.25f) && (this->unk_1D4 == 0xFF)) { - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageReaction) { case 0xE: sp3F = 1; FALLTHROUGH; diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index b7063e0f00..f52ba1d54c 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -570,11 +570,11 @@ void EnOkuta_ColliderCheck(EnOkuta* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { Enemy_StartFinishingBlow(play, &this->actor); this->actor.colChkInfo.health = 0; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - if (this->actor.colChkInfo.damageEffect == 3) { + if (this->actor.colChkInfo.damageReaction == 3) { EnOkuta_SetupFreeze(this); } else { EnOkuta_SetupWaitToDie(this); diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 2246b3df16..ec59725c25 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -137,48 +137,48 @@ static ColliderQuadInit sQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum DamageEffect { - /* 00 */ PEAHAT_DMG_EFF_ATTACK = 0, - /* 06 */ PEAHAT_DMG_EFF_LIGHT_ICE_ARROW = 6, - /* 12 */ PEAHAT_DMG_EFF_FIRE = 12, - /* 13 */ PEAHAT_DMG_EFF_HOOKSHOT = 13, - /* 14 */ PEAHAT_DMG_EFF_BOOMERANG = 14, - /* 15 */ PEAHAT_DMG_EFF_NUT = 15 -} DamageEffect; +typedef enum EnPeehatDamageReaction { + /* 00 */ PEAHAT_DMG_REACT_ATTACK = 0, + /* 06 */ PEAHAT_DMG_REACT_LIGHT_ICE_ARROW = 6, + /* 12 */ PEAHAT_DMG_REACT_FIRE = 12, + /* 13 */ PEAHAT_DMG_REACT_HOOKSHOT = 13, + /* 14 */ PEAHAT_DMG_REACT_BOOMERANG = 14, + /* 15 */ PEAHAT_DMG_REACT_NUT = 15 +} EnPeehatDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, PEAHAT_DMG_EFF_NUT), - /* Deku stick */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Slingshot */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK), - /* Explosive */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Boomerang */ DMG_ENTRY(0, PEAHAT_DMG_EFF_BOOMERANG), - /* Normal arrow */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Hammer swing */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Hookshot */ DMG_ENTRY(2, PEAHAT_DMG_EFF_HOOKSHOT), - /* Kokiri sword */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK), - /* Master sword */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Giant's Knife */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), - /* Fire arrow */ DMG_ENTRY(4, PEAHAT_DMG_EFF_FIRE), - /* Ice arrow */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Light arrow */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Unk arrow 1 */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Unk arrow 2 */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Unk arrow 3 */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Fire magic */ DMG_ENTRY(3, PEAHAT_DMG_EFF_FIRE), - /* Ice magic */ DMG_ENTRY(0, PEAHAT_DMG_EFF_LIGHT_ICE_ARROW), - /* Light magic */ DMG_ENTRY(0, PEAHAT_DMG_EFF_LIGHT_ICE_ARROW), - /* Shield */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), - /* Mirror Ray */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), - /* Kokiri spin */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK), - /* Giant spin */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), - /* Master spin */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Kokiri jump */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), - /* Giant jump */ DMG_ENTRY(8, PEAHAT_DMG_EFF_ATTACK), - /* Master jump */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), - /* Unknown 1 */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), - /* Unblockable */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), - /* Hammer jump */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), - /* Unknown 2 */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), + /* Deku nut */ DMG_ENTRY(0, PEAHAT_DMG_REACT_NUT), + /* Deku stick */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Slingshot */ DMG_ENTRY(1, PEAHAT_DMG_REACT_ATTACK), + /* Explosive */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Boomerang */ DMG_ENTRY(0, PEAHAT_DMG_REACT_BOOMERANG), + /* Normal arrow */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Hammer swing */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Hookshot */ DMG_ENTRY(2, PEAHAT_DMG_REACT_HOOKSHOT), + /* Kokiri sword */ DMG_ENTRY(1, PEAHAT_DMG_REACT_ATTACK), + /* Master sword */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Giant's Knife */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK), + /* Fire arrow */ DMG_ENTRY(4, PEAHAT_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Light arrow */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Unk arrow 1 */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Unk arrow 2 */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Unk arrow 3 */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Fire magic */ DMG_ENTRY(3, PEAHAT_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(0, PEAHAT_DMG_REACT_LIGHT_ICE_ARROW), + /* Light magic */ DMG_ENTRY(0, PEAHAT_DMG_REACT_LIGHT_ICE_ARROW), + /* Shield */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK), + /* Mirror Ray */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK), + /* Kokiri spin */ DMG_ENTRY(1, PEAHAT_DMG_REACT_ATTACK), + /* Giant spin */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK), + /* Master spin */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Kokiri jump */ DMG_ENTRY(2, PEAHAT_DMG_REACT_ATTACK), + /* Giant jump */ DMG_ENTRY(8, PEAHAT_DMG_REACT_ATTACK), + /* Master jump */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK), + /* Unknown 1 */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK), + /* Unblockable */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK), + /* Hammer jump */ DMG_ENTRY(4, PEAHAT_DMG_REACT_ATTACK), + /* Unknown 2 */ DMG_ENTRY(0, PEAHAT_DMG_REACT_ATTACK), }; typedef enum PeahatState { @@ -902,13 +902,13 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) { } else if (this->colliderJntSph.base.acFlags & AC_HIT) { this->colliderJntSph.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->colliderJntSph, true); - if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_NUT || - this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_NUT || + this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_LIGHT_ICE_ARROW) { return; } - if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_HOOKSHOT) { + if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_HOOKSHOT) { this->actor.colChkInfo.health = 0; - } else if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_BOOMERANG) { + } else if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_BOOMERANG) { if (this->state != PEAHAT_STATE_STUNNED) { EnPeehat_SetStateBoomerangStunned(this); } @@ -919,7 +919,7 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_DAMAGE); } - if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_FIRE) { + if (this->actor.colChkInfo.damageReaction == PEAHAT_DMG_REACT_FIRE) { Vec3f pos; s32 i; for (i = 4; i >= 0; i--) { @@ -949,7 +949,7 @@ void EnPeehat_Update(Actor* thisx, PlayState* play) { if (thisx->params <= 0) { EnPeehat_Adult_CollisionCheck(this, play); } - if (thisx->colChkInfo.damageEffect != PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + if (thisx->colChkInfo.damageReaction != PEAHAT_DMG_REACT_LIGHT_ICE_ARROW) { if (thisx->speed != 0.0f || thisx->velocity.y != 0.0f) { Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 30218e20e5..83bd58ec90 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -744,7 +744,7 @@ void EnPoField_SoulInteract(EnPoField* this, PlayState* play) { void EnPoField_TestForDamage(EnPoField* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index ba165bd3ad..155a5625a3 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -1166,15 +1166,15 @@ void func_80ADC10C(EnPoSisters* this, PlayState* play) { Item_DropCollectible(play, &sp24, ITEM00_ARROWS_SMALL); } } else if (this->collider.base.colMaterial == COL_MATERIAL_METAL || - (this->actor.colChkInfo.damageEffect == 0 && this->actor.colChkInfo.damage == 0)) { + (this->actor.colChkInfo.damageReaction == 0 && this->actor.colChkInfo.damage == 0)) { if (this->unk_194 == 0) { this->actor.freezeTimer = 0; } - } else if (this->actor.colChkInfo.damageEffect == 0xF) { + } else if (this->actor.colChkInfo.damageReaction == 0xF) { this->actor.world.rot.y = this->actor.shape.rot.y; this->unk_199 |= 2; func_80AD98F4(this, play); - } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageEffect == 0xE && + } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageReaction == 0xE && this->actionFunc == func_80ADB770) { if (this->unk_19C == 0) { this->unk_19C = -45; diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index fceb18ef7c..930708bc24 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -880,7 +880,7 @@ void EnPoh_TalkComposer(EnPoh* this, PlayState* play) { void func_80AE032C(EnPoh* this, PlayState* play) { if (this->colliderCylinder.base.acFlags & AC_HIT) { this->colliderCylinder.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageReaction != 0 || this->actor.colChkInfo.damage != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index af9ed8f112..701ce5a5f3 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -108,48 +108,48 @@ static ColliderCylinderInit sCylinderInit = { { 20, 70, 0, { 0, 0, 0 } }, }; -typedef enum EnRdDamageEffect { - /* 0x0 */ REDEAD_DMGEFF_NONE, // Does not interact with the Gibdo/Redead at all - /* 0x1 */ REDEAD_DMGEFF_HOOKSHOT, // Stuns the Gibdo/Redead - /* 0x6 */ REDEAD_DMGEFF_ICE_MAGIC = 0x6, // Does not interact with the Gibdo/Redead at all - /* 0xD */ REDEAD_DMGEFF_LIGHT_MAGIC = 0xD, // Stuns the Gibdo/Redead - /* 0xE */ REDEAD_DMGEFF_FIRE_MAGIC, // Applies a fire effect - /* 0xF */ REDEAD_DMGEFF_DAMAGE // Deals damage without stunning or applying an effect -} EnRdDamageEffect; +typedef enum EnRdDamageReaction { + /* 0x0 */ REDEAD_DMG_REACT_NONE, // Does not interact with the Gibdo/Redead at all + /* 0x1 */ REDEAD_DMG_REACT_HOOKSHOT, // Stuns the Gibdo/Redead + /* 0x6 */ REDEAD_DMG_REACT_ICE_MAGIC = 0x6, // Does not interact with the Gibdo/Redead at all + /* 0xD */ REDEAD_DMG_REACT_LIGHT_MAGIC = 0xD, // Stuns the Gibdo/Redead + /* 0xE */ REDEAD_DMG_REACT_FIRE_MAGIC, // Applies a fire effect + /* 0xF */ REDEAD_DMG_REACT_DAMAGE // Deals damage without stunning or applying an effect +} EnRdDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Deku stick */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE), - /* Slingshot */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Explosive */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Normal arrow */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE), - /* Hookshot */ DMG_ENTRY(0, REDEAD_DMGEFF_HOOKSHOT), - /* Kokiri sword */ DMG_ENTRY(1, REDEAD_DMGEFF_DAMAGE), - /* Master sword */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE), - /* Giant's Knife */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE), - /* Fire arrow */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Ice arrow */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Light arrow */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Unk arrow 1 */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(4, REDEAD_DMGEFF_FIRE_MAGIC), - /* Ice magic */ DMG_ENTRY(0, REDEAD_DMGEFF_ICE_MAGIC), - /* Light magic */ DMG_ENTRY(3, REDEAD_DMGEFF_LIGHT_MAGIC), - /* Shield */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, REDEAD_DMGEFF_DAMAGE), - /* Giant spin */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE), - /* Master spin */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE), - /* Kokiri jump */ DMG_ENTRY(2, REDEAD_DMGEFF_DAMAGE), - /* Giant jump */ DMG_ENTRY(8, REDEAD_DMGEFF_DAMAGE), - /* Master jump */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE), - /* Unknown 1 */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, REDEAD_DMGEFF_DAMAGE), - /* Unknown 2 */ DMG_ENTRY(0, REDEAD_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Deku stick */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE), + /* Slingshot */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Explosive */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Normal arrow */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE), + /* Hookshot */ DMG_ENTRY(0, REDEAD_DMG_REACT_HOOKSHOT), + /* Kokiri sword */ DMG_ENTRY(1, REDEAD_DMG_REACT_DAMAGE), + /* Master sword */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE), + /* Giant's Knife */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE), + /* Fire arrow */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Ice arrow */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Light arrow */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Unk arrow 1 */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(4, REDEAD_DMG_REACT_FIRE_MAGIC), + /* Ice magic */ DMG_ENTRY(0, REDEAD_DMG_REACT_ICE_MAGIC), + /* Light magic */ DMG_ENTRY(3, REDEAD_DMG_REACT_LIGHT_MAGIC), + /* Shield */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, REDEAD_DMG_REACT_DAMAGE), + /* Giant spin */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE), + /* Master spin */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE), + /* Kokiri jump */ DMG_ENTRY(2, REDEAD_DMG_REACT_DAMAGE), + /* Giant jump */ DMG_ENTRY(8, REDEAD_DMG_REACT_DAMAGE), + /* Master jump */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE), + /* Unknown 1 */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, REDEAD_DMG_REACT_DAMAGE), + /* Unknown 2 */ DMG_ENTRY(0, REDEAD_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -768,7 +768,7 @@ void EnRd_SetupStunned(EnRd* this) { Actor_PlaySfx(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, COLORFILTER_INTENSITY_FLAG | 200, COLORFILTER_BUFFLAG_OPA, 255); - } else if (this->damageEffect == REDEAD_DMGEFF_HOOKSHOT) { + } else if (this->damageReaction == REDEAD_DMG_REACT_HOOKSHOT) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 200, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_PlaySfx(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT); @@ -835,7 +835,7 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageReaction = this->actor.colChkInfo.damageReaction; if (this->action != REDEAD_ACTION_RISE_FROM_COFFIN) { Actor_SetDropFlag(&this->actor, &this->collider.elem, true); @@ -843,9 +843,10 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { this->unk_31D = player->unk_845; } - if ((this->damageEffect != REDEAD_DMGEFF_NONE) && (this->damageEffect != REDEAD_DMGEFF_ICE_MAGIC)) { - if (((this->damageEffect == REDEAD_DMGEFF_HOOKSHOT) || - (this->damageEffect == REDEAD_DMGEFF_LIGHT_MAGIC)) && + if ((this->damageReaction != REDEAD_DMG_REACT_NONE) && + (this->damageReaction != REDEAD_DMG_REACT_ICE_MAGIC)) { + if (((this->damageReaction == REDEAD_DMG_REACT_HOOKSHOT) || + (this->damageReaction == REDEAD_DMG_REACT_LIGHT_MAGIC)) && (this->action != REDEAD_ACTION_STUNNED)) { Actor_ApplyDamage(&this->actor); EnRd_SetupStunned(this); @@ -855,7 +856,7 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { this->stunnedBySunsSong = false; this->sunsSongStunTimer = 0; - if (this->damageEffect == REDEAD_DMGEFF_FIRE_MAGIC) { + if (this->damageReaction == REDEAD_DMG_REACT_FIRE_MAGIC) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); this->fireTimer = 40; } else { @@ -887,8 +888,8 @@ void EnRd_Update(Actor* thisx, PlayState* play) { gSaveContext.sunsSongState = SUNSSONG_INACTIVE; } - if (this->damageEffect != REDEAD_DMGEFF_ICE_MAGIC && - ((this->action != REDEAD_ACTION_RISE_FROM_COFFIN) || (this->damageEffect != REDEAD_DMGEFF_FIRE_MAGIC))) { + if (this->damageReaction != REDEAD_DMG_REACT_ICE_MAGIC && + ((this->action != REDEAD_ACTION_RISE_FROM_COFFIN) || (this->damageReaction != REDEAD_DMG_REACT_FIRE_MAGIC))) { if (this->playerStunWaitTimer != 0) { this->playerStunWaitTimer--; } diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index 5e9f328dee..b2e9f3a271 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -71,7 +71,7 @@ typedef struct EnRd { /* 0x0319 */ u8 grabDamageTimer; /* 0x031A */ u8 fireTimer; /* 0x031B */ u8 action; - /* 0x031C */ u8 damageEffect; + /* 0x031C */ u8 damageReaction; /* 0x031D */ u8 unk_31D; // related to player->unk_845 /* 0x0320 */ ColliderCylinder collider; } EnRd; // size = 0x036C 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 b4cafe6817..f672e9c4c9 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -49,49 +49,49 @@ void EnReeba_Die(EnReeba* this, PlayState* play); void EnReeba_Stunned(EnReeba* this, PlayState* play); void EnReeba_StunDie(EnReeba* this, PlayState* play); -typedef enum LeeverDamageEffect { - /* 0x00 */ LEEVER_DMGEFF_NONE, // used by anything that cant kill the Leever - /* 0x01 */ LEEVER_DMGEFF_UNK, // used by "unknown 1" attack - /* 0x03 */ LEEVER_DMGEFF_ICE = 3, - /* 0x0B */ LEEVER_DMGEFF_UNUSED = 11, // not used in the damage table, but still checked for. - /* 0x0C */ LEEVER_DMGEFF_BOOMERANG, - /* 0x0D */ LEEVER_DMGEFF_HOOKSHOT, - /* 0x0E */ LEEVER_DMGEFF_OTHER -} LeeverDamageEffect; +typedef enum LeeverDamageReaction { + /* 0x00 */ LEEVER_DMG_REACT_NONE, // used by anything that cant kill the Leever + /* 0x01 */ LEEVER_DMG_REACT_UNK, // used by "unknown 1" attack + /* 0x03 */ LEEVER_DMG_REACT_ICE = 3, + /* 0x0B */ LEEVER_DMG_REACT_UNUSED = 11, // not used in the damage table, but still checked for. + /* 0x0C */ LEEVER_DMG_REACT_BOOMERANG, + /* 0x0D */ LEEVER_DMG_REACT_HOOKSHOT, + /* 0x0E */ LEEVER_DMG_REACT_OTHER +} LeeverDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), - /* Deku stick */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Slingshot */ DMG_ENTRY(1, LEEVER_DMGEFF_OTHER), - /* Explosive */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Boomerang */ DMG_ENTRY(1, LEEVER_DMGEFF_BOOMERANG), - /* Normal arrow */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Hammer swing */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Hookshot */ DMG_ENTRY(2, LEEVER_DMGEFF_HOOKSHOT), - /* Kokiri sword */ DMG_ENTRY(1, LEEVER_DMGEFF_OTHER), - /* Master sword */ DMG_ENTRY(4, LEEVER_DMGEFF_OTHER), - /* Giant's Knife */ DMG_ENTRY(6, LEEVER_DMGEFF_OTHER), - /* Fire arrow */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Ice arrow */ DMG_ENTRY(4, LEEVER_DMGEFF_ICE), - /* Light arrow */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Unk arrow 1 */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Unk arrow 2 */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Unk arrow 3 */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Fire magic */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), - /* Ice magic */ DMG_ENTRY(4, LEEVER_DMGEFF_ICE), - /* Light magic */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), - /* Shield */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Giant spin */ DMG_ENTRY(8, LEEVER_DMGEFF_OTHER), - /* Master spin */ DMG_ENTRY(4, LEEVER_DMGEFF_OTHER), - /* Kokiri jump */ DMG_ENTRY(2, LEEVER_DMGEFF_OTHER), - /* Giant jump */ DMG_ENTRY(8, LEEVER_DMGEFF_OTHER), - /* Master jump */ DMG_ENTRY(4, LEEVER_DMGEFF_OTHER), - /* Unknown 1 */ DMG_ENTRY(0, LEEVER_DMGEFF_UNK), - /* Unblockable */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, LEEVER_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), + /* Deku stick */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Slingshot */ DMG_ENTRY(1, LEEVER_DMG_REACT_OTHER), + /* Explosive */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Boomerang */ DMG_ENTRY(1, LEEVER_DMG_REACT_BOOMERANG), + /* Normal arrow */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Hammer swing */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Hookshot */ DMG_ENTRY(2, LEEVER_DMG_REACT_HOOKSHOT), + /* Kokiri sword */ DMG_ENTRY(1, LEEVER_DMG_REACT_OTHER), + /* Master sword */ DMG_ENTRY(4, LEEVER_DMG_REACT_OTHER), + /* Giant's Knife */ DMG_ENTRY(6, LEEVER_DMG_REACT_OTHER), + /* Fire arrow */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Ice arrow */ DMG_ENTRY(4, LEEVER_DMG_REACT_ICE), + /* Light arrow */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Unk arrow 1 */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Unk arrow 2 */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Unk arrow 3 */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Fire magic */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), + /* Ice magic */ DMG_ENTRY(4, LEEVER_DMG_REACT_ICE), + /* Light magic */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), + /* Shield */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Giant spin */ DMG_ENTRY(8, LEEVER_DMG_REACT_OTHER), + /* Master spin */ DMG_ENTRY(4, LEEVER_DMG_REACT_OTHER), + /* Kokiri jump */ DMG_ENTRY(2, LEEVER_DMG_REACT_OTHER), + /* Giant jump */ DMG_ENTRY(8, LEEVER_DMG_REACT_OTHER), + /* Master jump */ DMG_ENTRY(4, LEEVER_DMG_REACT_OTHER), + /* Unknown 1 */ DMG_ENTRY(0, LEEVER_DMG_REACT_UNK), + /* Unblockable */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, LEEVER_DMG_REACT_NONE), }; ActorProfile En_Reeba_Profile = { @@ -557,9 +557,9 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) { this->actor.shape.rot.x = this->actor.shape.rot.z = 0; this->stunType = LEEVER_STUN_NONE; - switch (this->actor.colChkInfo.damageEffect) { - case LEEVER_DMGEFF_UNUSED: - case LEEVER_DMGEFF_BOOMERANG: + switch (this->actor.colChkInfo.damageReaction) { + case LEEVER_DMG_REACT_UNUSED: + case LEEVER_DMG_REACT_BOOMERANG: if ((this->actor.colChkInfo.health > 1) && (this->stunType != LEEVER_STUN_OTHER)) { this->stunType = LEEVER_STUN_OTHER; Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); @@ -569,7 +569,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) { break; } FALLTHROUGH; - case LEEVER_DMGEFF_HOOKSHOT: + case LEEVER_DMG_REACT_HOOKSHOT: if ((this->actor.colChkInfo.health > 2) && (this->stunType != LEEVER_STUN_OTHER)) { this->stunType = LEEVER_STUN_OTHER; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, @@ -579,7 +579,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) { break; } FALLTHROUGH; - case LEEVER_DMGEFF_OTHER: + case LEEVER_DMG_REACT_OTHER: this->unkDamageField = 6; Actor_ApplyDamage(&this->actor); if (this->actor.colChkInfo.health == 0) { @@ -595,7 +595,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) { } break; - case LEEVER_DMGEFF_ICE: + case LEEVER_DMG_REACT_ICE: Actor_ApplyDamage(&this->actor); this->unkDamageField = 2; this->stunType = LEEVER_STUN_ICE; @@ -603,7 +603,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) { this->actionfunc = EnReeba_SetupStunned; break; - case LEEVER_DMGEFF_UNK: + case LEEVER_DMG_REACT_UNK: if (this->stunType != LEEVER_STUN_OTHER) { this->stunType = LEEVER_STUN_OTHER; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 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 ad19ebe447..b5bba141ba 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -45,18 +45,18 @@ typedef enum EnRrReachState { /* 5 */ REACH_CLOSE } EnRrReachState; -typedef enum EnRrDamageEffect { - /* 0x0 */ RR_DMG_NONE, - /* 0x1 */ RR_DMG_STUN, - /* 0x2 */ RR_DMG_FIRE, - /* 0x3 */ RR_DMG_ICE, - /* 0x4 */ RR_DMG_LIGHT_MAGIC, - /* 0xB */ RR_DMG_LIGHT_ARROW = 11, - /* 0xC */ RR_DMG_SHDW_ARROW, - /* 0xD */ RR_DMG_WIND_ARROW, - /* 0xE */ RR_DMG_SPRT_ARROW, - /* 0xF */ RR_DMG_NORMAL -} EnRrDamageEffect; +typedef enum EnRrDamageReaction { + /* 0x0 */ RR_DMG_REACT_NONE, + /* 0x1 */ RR_DMG_REACT_STUN, + /* 0x2 */ RR_DMG_REACT_FIRE, + /* 0x3 */ RR_DMG_REACT_ICE, + /* 0x4 */ RR_DMG_REACT_LIGHT_MAGIC, + /* 0xB */ RR_DMG_REACT_LIGHT_ARROW = 11, + /* 0xC */ RR_DMG_REACT_SHDW_ARROW, + /* 0xD */ RR_DMG_REACT_WIND_ARROW, + /* 0xE */ RR_DMG_REACT_SPRT_ARROW, + /* 0xF */ RR_DMG_REACT_NORMAL +} EnRrDamageReaction; typedef enum EnRrDropType { /* 0 */ RR_DROP_RANDOM_RUPEE, @@ -143,38 +143,38 @@ static ColliderCylinderInitType1 sCylinderInit2 = { }; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, RR_DMG_NONE), - /* Deku stick */ DMG_ENTRY(2, RR_DMG_NORMAL), - /* Slingshot */ DMG_ENTRY(1, RR_DMG_NORMAL), - /* Explosive */ DMG_ENTRY(2, RR_DMG_NORMAL), - /* Boomerang */ DMG_ENTRY(0, RR_DMG_STUN), - /* Normal arrow */ DMG_ENTRY(2, RR_DMG_NORMAL), - /* Hammer swing */ DMG_ENTRY(2, RR_DMG_NORMAL), - /* Hookshot */ DMG_ENTRY(0, RR_DMG_STUN), - /* Kokiri sword */ DMG_ENTRY(1, RR_DMG_NORMAL), - /* Master sword */ DMG_ENTRY(2, RR_DMG_NORMAL), - /* Giant's Knife */ DMG_ENTRY(4, RR_DMG_NORMAL), - /* Fire arrow */ DMG_ENTRY(4, RR_DMG_FIRE), - /* Ice arrow */ DMG_ENTRY(4, RR_DMG_ICE), - /* Light arrow */ DMG_ENTRY(15, RR_DMG_LIGHT_ARROW), - /* Unk arrow 1 */ DMG_ENTRY(4, RR_DMG_WIND_ARROW), - /* Unk arrow 2 */ DMG_ENTRY(15, RR_DMG_SHDW_ARROW), - /* Unk arrow 3 */ DMG_ENTRY(15, RR_DMG_SPRT_ARROW), - /* Fire magic */ DMG_ENTRY(4, RR_DMG_FIRE), - /* Ice magic */ DMG_ENTRY(3, RR_DMG_ICE), - /* Light magic */ DMG_ENTRY(10, RR_DMG_LIGHT_MAGIC), - /* Shield */ DMG_ENTRY(0, RR_DMG_NONE), - /* Mirror Ray */ DMG_ENTRY(0, RR_DMG_NONE), - /* Kokiri spin */ DMG_ENTRY(1, RR_DMG_NORMAL), - /* Giant spin */ DMG_ENTRY(4, RR_DMG_NORMAL), - /* Master spin */ DMG_ENTRY(2, RR_DMG_NORMAL), - /* Kokiri jump */ DMG_ENTRY(2, RR_DMG_NORMAL), - /* Giant jump */ DMG_ENTRY(8, RR_DMG_NORMAL), - /* Master jump */ DMG_ENTRY(4, RR_DMG_NORMAL), - /* Unknown 1 */ DMG_ENTRY(10, RR_DMG_SPRT_ARROW), - /* Unblockable */ DMG_ENTRY(0, RR_DMG_NONE), - /* Hammer jump */ DMG_ENTRY(0, RR_DMG_NONE), - /* Unknown 2 */ DMG_ENTRY(0, RR_DMG_NONE), + /* Deku nut */ DMG_ENTRY(0, RR_DMG_REACT_NONE), + /* Deku stick */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL), + /* Slingshot */ DMG_ENTRY(1, RR_DMG_REACT_NORMAL), + /* Explosive */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL), + /* Boomerang */ DMG_ENTRY(0, RR_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL), + /* Hammer swing */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL), + /* Hookshot */ DMG_ENTRY(0, RR_DMG_REACT_STUN), + /* Kokiri sword */ DMG_ENTRY(1, RR_DMG_REACT_NORMAL), + /* Master sword */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL), + /* Giant's Knife */ DMG_ENTRY(4, RR_DMG_REACT_NORMAL), + /* Fire arrow */ DMG_ENTRY(4, RR_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(4, RR_DMG_REACT_ICE), + /* Light arrow */ DMG_ENTRY(15, RR_DMG_REACT_LIGHT_ARROW), + /* Unk arrow 1 */ DMG_ENTRY(4, RR_DMG_REACT_WIND_ARROW), + /* Unk arrow 2 */ DMG_ENTRY(15, RR_DMG_REACT_SHDW_ARROW), + /* Unk arrow 3 */ DMG_ENTRY(15, RR_DMG_REACT_SPRT_ARROW), + /* Fire magic */ DMG_ENTRY(4, RR_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(3, RR_DMG_REACT_ICE), + /* Light magic */ DMG_ENTRY(10, RR_DMG_REACT_LIGHT_MAGIC), + /* Shield */ DMG_ENTRY(0, RR_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, RR_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, RR_DMG_REACT_NORMAL), + /* Giant spin */ DMG_ENTRY(4, RR_DMG_REACT_NORMAL), + /* Master spin */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL), + /* Kokiri jump */ DMG_ENTRY(2, RR_DMG_REACT_NORMAL), + /* Giant jump */ DMG_ENTRY(8, RR_DMG_REACT_NORMAL), + /* Master jump */ DMG_ENTRY(4, RR_DMG_REACT_NORMAL), + /* Unknown 1 */ DMG_ENTRY(10, RR_DMG_REACT_SPRT_ARROW), + /* Unblockable */ DMG_ENTRY(0, RR_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(0, RR_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, RR_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -449,30 +449,30 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { u8 dropType = RR_DROP_RANDOM_RUPEE; this->collider1.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0) { + if (this->actor.colChkInfo.damageReaction != 0) { hitPos.x = this->collider1.elem.acDmgInfo.hitPos.x; hitPos.y = this->collider1.elem.acDmgInfo.hitPos.y; hitPos.z = this->collider1.elem.acDmgInfo.hitPos.z; CollisionCheck_BlueBlood(play, NULL, &hitPos); } - switch (this->actor.colChkInfo.damageEffect) { - case RR_DMG_LIGHT_ARROW: + switch (this->actor.colChkInfo.damageReaction) { + case RR_DMG_REACT_LIGHT_ARROW: dropType++; // purple rupee FALLTHROUGH; - case RR_DMG_SHDW_ARROW: + case RR_DMG_REACT_SHDW_ARROW: dropType++; // flexible FALLTHROUGH; - case RR_DMG_WIND_ARROW: + case RR_DMG_REACT_WIND_ARROW: dropType++; // arrow FALLTHROUGH; - case RR_DMG_SPRT_ARROW: + case RR_DMG_REACT_SPRT_ARROW: dropType++; // magic jar FALLTHROUGH; - case RR_DMG_NORMAL: + case RR_DMG_REACT_NORMAL: PRINTF(VT_FGCOL(RED) T("いてっ( %d : LIFE %d : DAMAGE %d : %x )！！", "ouch ( %d : LIFE %d : DAMAGE %d : %x )!!") VT_RST "\n", this->frameCount, this->actor.colChkInfo.health, this->actor.colChkInfo.damage, - this->actor.colChkInfo.damageEffect); + this->actor.colChkInfo.damageReaction); this->stopScroll = false; Actor_ApplyDamage(&this->actor); this->invincibilityTimer = 40; @@ -487,7 +487,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { EnRr_SetupDeath(this); } return; - case RR_DMG_FIRE: // Fire Arrow and Din's Fire + case RR_DMG_REACT_FIRE: // Fire Arrow and Din's Fire Actor_ApplyDamage(&this->actor); if (this->actor.colChkInfo.health == 0) { this->dropType = RR_DROP_RANDOM_RUPEE; @@ -496,7 +496,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { this->effectTimer = 20; EnRr_SetupStunned(this); return; - case RR_DMG_ICE: // Ice Arrow and unused ice magic + case RR_DMG_REACT_ICE: // Ice Arrow and unused ice magic Actor_ApplyDamage(&this->actor); if (this->actor.colChkInfo.health == 0) { this->dropType = RR_DROP_RANDOM_RUPEE; @@ -513,7 +513,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { #endif EnRr_SetupStunned(this); return; - case RR_DMG_LIGHT_MAGIC: // Unused light magic + case RR_DMG_REACT_LIGHT_MAGIC: // Unused light magic Actor_ApplyDamage(&this->actor); if (this->actor.colChkInfo.health == 0) { this->dropType = RR_DROP_RUPEE_RED; @@ -521,7 +521,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_XLU, 80); EnRr_SetupStunned(this); return; - case RR_DMG_STUN: // Boomerang and Hookshot + case RR_DMG_REACT_STUN: // Boomerang and Hookshot Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_XLU, 80); EnRr_SetupStunned(this); 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 52e3134b6a..2a909207e9 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -393,7 +393,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) { tookDamage = false; this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageReaction) { case 14: // wind arrow hitByWindArrow = true; FALLTHROUGH; diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 52e521df9c..723f6f4836 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -472,11 +472,11 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } else if (this->actionState >= SKB_BEHAVIOR_ATTACKING) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 6) { - this->lastDamageEffect = this->actor.colChkInfo.damageEffect; + if (this->actor.colChkInfo.damageReaction != 6) { + this->lastDamageReaction = this->actor.colChkInfo.damageReaction; Actor_SetDropFlag(&this->actor, &this->collider.elements[1].base, true); this->setColliderAT = false; - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageReaction == 1) { if (this->actionState != SKB_BEHAVIOR_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); @@ -485,7 +485,7 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } } else { colorFilterDuration = 8; - if (this->actor.colChkInfo.damageEffect == 7) { + if (this->actor.colChkInfo.damageReaction == 7) { scale = this->actor.scale.y * 7500.0f; for (i = 4; i >= 0; i--) { flamePos = this->actor.world.pos; @@ -504,8 +504,8 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } player = GET_PLAYER(play); if (this->breakFlags == 0) { - if ((this->actor.colChkInfo.damageEffect == 0xD) || - ((this->actor.colChkInfo.damageEffect == 0xE) && + if ((this->actor.colChkInfo.damageReaction == 0xD) || + ((this->actor.colChkInfo.damageReaction == 0xE) && ((player->meleeWeaponAnimation >= PLAYER_MWA_RIGHT_SLASH_1H && player->meleeWeaponAnimation <= PLAYER_MWA_LEFT_COMBO_2H) || (player->meleeWeaponAnimation == PLAYER_MWA_BACKSLASH_RIGHT || diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index dd96d9e16e..eac534f2ff 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -15,7 +15,7 @@ typedef struct EnSkb { /* 0x0208 */ Vec3s morphTable[20]; /* 0x0280 */ u8 actionState; /* 0x0281 */ u8 setColliderAT; - /* 0x0282 */ u8 lastDamageEffect; + /* 0x0282 */ u8 lastDamageReaction; /* 0x0283 */ u8 breakFlags; /* 0x0284 */ EnSkbActionFunc actionFunc; /* 0x0288 */ s16 headlessYawOffset; 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 52b1c4ae3f..68ac8d2c41 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -606,7 +606,7 @@ s32 EnSkj_CollisionCheck(EnSkj* this, PlayState* play) { if (!((this->unk_2D3 == 0) || (D_80B01EA0 != 0) || !(this->collider.base.acFlags & AC_HIT))) { this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageReaction) { case 0xF: effectPos.x = this->collider.elem.acDmgInfo.hitPos.x; effectPos.y = this->collider.elem.acDmgInfo.hitPos.y; diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index d0e8f79ecc..1c40afeeb2 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -461,7 +461,7 @@ s32 EnSt_CheckHitBackside(EnSt* this, PlayState* play) { } this->invulnerableTimer = 8; - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageReaction == 1) { if (this->stunTimer == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->stunTimer = 120; diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 17a18d8a6a..aba5f6d564 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -212,48 +212,48 @@ static ColliderQuadInit sSwordColliderQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum StalfosDamageEffect { - /* 0x0 */ STALFOS_DMGEFF_NORMAL, - /* 0x1 */ STALFOS_DMGEFF_STUN, - /* 0x6 */ STALFOS_DMGEFF_FIREMAGIC = 6, - /* 0xD */ STALFOS_DMGEFF_SLING = 0xD, - /* 0xE */ STALFOS_DMGEFF_LIGHT, - /* 0xF */ STALFOS_DMGEFF_FREEZE -} StalfosDamageEffect; +typedef enum StalfosDamageReaction { + /* 0x0 */ STALFOS_DMG_REACT_NORMAL, + /* 0x1 */ STALFOS_DMG_REACT_STUN, + /* 0x6 */ STALFOS_DMG_REACT_FIREMAGIC = 6, + /* 0xD */ STALFOS_DMG_REACT_SLING = 0xD, + /* 0xE */ STALFOS_DMG_REACT_LIGHT, + /* 0xF */ STALFOS_DMG_REACT_FREEZE +} StalfosDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN), - /* Deku stick */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Slingshot */ DMG_ENTRY(1, STALFOS_DMGEFF_SLING), - /* Explosive */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Boomerang */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN), - /* Normal arrow */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Hammer swing */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Hookshot */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN), - /* Kokiri sword */ DMG_ENTRY(1, STALFOS_DMGEFF_NORMAL), - /* Master sword */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Giant's Knife */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), - /* Fire arrow */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Ice arrow */ DMG_ENTRY(4, STALFOS_DMGEFF_FREEZE), - /* Light arrow */ DMG_ENTRY(2, STALFOS_DMGEFF_LIGHT), - /* Unk arrow 1 */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Unk arrow 2 */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Unk arrow 3 */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Fire magic */ DMG_ENTRY(0, STALFOS_DMGEFF_FIREMAGIC), - /* Ice magic */ DMG_ENTRY(3, STALFOS_DMGEFF_FREEZE), - /* Light magic */ DMG_ENTRY(0, STALFOS_DMGEFF_LIGHT), - /* Shield */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), - /* Mirror Ray */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), - /* Kokiri spin */ DMG_ENTRY(1, STALFOS_DMGEFF_NORMAL), - /* Giant spin */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), - /* Master spin */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Kokiri jump */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), - /* Giant jump */ DMG_ENTRY(8, STALFOS_DMGEFF_NORMAL), - /* Master jump */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), - /* Unknown 1 */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), - /* Unblockable */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), - /* Hammer jump */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), - /* Unknown 2 */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), + /* Deku nut */ DMG_ENTRY(0, STALFOS_DMG_REACT_STUN), + /* Deku stick */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Slingshot */ DMG_ENTRY(1, STALFOS_DMG_REACT_SLING), + /* Explosive */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Boomerang */ DMG_ENTRY(0, STALFOS_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Hammer swing */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Hookshot */ DMG_ENTRY(0, STALFOS_DMG_REACT_STUN), + /* Kokiri sword */ DMG_ENTRY(1, STALFOS_DMG_REACT_NORMAL), + /* Master sword */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Giant's Knife */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL), + /* Fire arrow */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Ice arrow */ DMG_ENTRY(4, STALFOS_DMG_REACT_FREEZE), + /* Light arrow */ DMG_ENTRY(2, STALFOS_DMG_REACT_LIGHT), + /* Unk arrow 1 */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Unk arrow 2 */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Unk arrow 3 */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Fire magic */ DMG_ENTRY(0, STALFOS_DMG_REACT_FIREMAGIC), + /* Ice magic */ DMG_ENTRY(3, STALFOS_DMG_REACT_FREEZE), + /* Light magic */ DMG_ENTRY(0, STALFOS_DMG_REACT_LIGHT), + /* Shield */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL), + /* Mirror Ray */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL), + /* Kokiri spin */ DMG_ENTRY(1, STALFOS_DMG_REACT_NORMAL), + /* Giant spin */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL), + /* Master spin */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Kokiri jump */ DMG_ENTRY(2, STALFOS_DMG_REACT_NORMAL), + /* Giant jump */ DMG_ENTRY(8, STALFOS_DMG_REACT_NORMAL), + /* Master jump */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL), + /* Unknown 1 */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL), + /* Unblockable */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL), + /* Hammer jump */ DMG_ENTRY(4, STALFOS_DMG_REACT_NORMAL), + /* Unknown 2 */ DMG_ENTRY(0, STALFOS_DMG_REACT_NORMAL), }; static InitChainEntry sInitChain[] = { @@ -1313,12 +1313,12 @@ void EnTest_SetupStunned(EnTest* this) { this->skelAnime.playSpeed = 0.0f; this->actor.speed = -4.0f; - if (this->lastDamageEffect == STALFOS_DMGEFF_LIGHT) { + if (this->lastDamageReaction == STALFOS_DMG_REACT_LIGHT) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 120, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); - if (this->lastDamageEffect == STALFOS_DMGEFF_FREEZE) { + if (this->lastDamageReaction == STALFOS_DMG_REACT_FREEZE) { this->iceTimer = 36; } else { Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalfosFlinchFromHitFrontAnim, 0.0f); @@ -1678,9 +1678,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) { } else if (this->bodyCollider.base.acFlags & AC_HIT) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_SLING) && - (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC)) { - this->lastDamageEffect = this->actor.colChkInfo.damageEffect; + if ((this->actor.colChkInfo.damageReaction != STALFOS_DMG_REACT_SLING) && + (this->actor.colChkInfo.damageReaction != STALFOS_DMG_REACT_FIREMAGIC)) { + this->lastDamageReaction = this->actor.colChkInfo.damageReaction; if (this->swordState >= 1) { this->swordState = 0; } @@ -1689,9 +1689,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_STAL_WARAU); - if ((this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_FREEZE) || - (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_LIGHT)) { + if ((this->actor.colChkInfo.damageReaction == STALFOS_DMG_REACT_STUN) || + (this->actor.colChkInfo.damageReaction == STALFOS_DMG_REACT_FREEZE) || + (this->actor.colChkInfo.damageReaction == STALFOS_DMG_REACT_LIGHT)) { if (this->unk_7C8 != 0xB) { Actor_ApplyDamage(&this->actor); EnTest_SetupStunned(this); @@ -1723,7 +1723,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { EnTest_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC) { + if (this->actor.colChkInfo.damageReaction != STALFOS_DMG_REACT_FIREMAGIC) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h index 030fcf740f..28192142c5 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.h +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -90,7 +90,7 @@ typedef struct EnTest { /* 0x7DD */ char unk_7DD[0x1]; /* 0x7DE */ u8 unk_7DE; /* 0x7E0 */ s16 iceTimer; - /* 0x7E2 */ u8 lastDamageEffect; + /* 0x7E2 */ u8 lastDamageReaction; /* 0x7E4 */ s32 unk_7E4; /* 0x7E8 */ s32 timer; /* 0x7EC */ f32 unk_7EC; 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 71ea089bbd..fbdaf61bf4 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -696,7 +696,7 @@ void EnTite_SetupStunned(EnTite* this) { this->action = TEKTITE_STUNNED; this->actor.speed = -6.0f; this->actor.world.rot.y = this->actor.yawTowardsPlayer; - if (this->damageEffect == 0xF) { + if (this->damageReaction == 0xF) { this->spawnIceTimer = 48; } Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); @@ -867,11 +867,11 @@ void EnTite_CheckDamage(Actor* thisx, PlayState* play) { if ((this->collider.base.acFlags & AC_HIT) && (this->action >= TEKTITE_IDLE)) { this->collider.base.acFlags &= ~AC_HIT; - if (thisx->colChkInfo.damageEffect != 0xE) { // Immune to fire magic - this->damageEffect = thisx->colChkInfo.damageEffect; + if (thisx->colChkInfo.damageReaction != 0xE) { // Immune to fire magic + this->damageReaction = thisx->colChkInfo.damageReaction; Actor_SetDropFlag(thisx, &this->collider.elements[0].base, false); // Stun if Tektite hit by nut, boomerang, hookshot, ice arrow or ice magic - if ((thisx->colChkInfo.damageEffect == 1) || (thisx->colChkInfo.damageEffect == 0xF)) { + if ((thisx->colChkInfo.damageReaction == 1) || (thisx->colChkInfo.damageReaction == 0xF)) { if (this->action != TEKTITE_STUNNED) { Actor_SetColorFilter(thisx, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(thisx); @@ -917,7 +917,7 @@ void EnTite_Update(Actor* thisx, PlayState* play) { EnTite_CheckDamage(thisx, play); // Stay still if hit by immunity damage type this frame - if (thisx->colChkInfo.damageEffect != 0xE) { + if (thisx->colChkInfo.damageReaction != 0xE) { this->actionFunc(this, play); Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 40.0f, 20.0f, this->unk_2DC); diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h index d4ec9ab8dd..78de6938e7 100755 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -26,7 +26,7 @@ typedef struct EnTite { /* 0x02E0 */ s16 actionVar1; // Usage depends on current action function /* 0x02E2 */ u8 actionVar2; // Usage depends on current action function /* 0x02E3 */ u8 spawnIceTimer; - /* 0x02E4 */ u8 damageEffect; + /* 0x02E4 */ u8 damageReaction; /* 0x02E8 */ ColliderJntSph collider; /* 0x0308 */ ColliderJntSphElement colliderElements[1]; /* 0x0348 */ Vec3f frontLeftFootPos; diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index a02e9bc3bb..21ab44a0ff 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -612,7 +612,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { this->stateFlags3 &= ~PLAYER_STATE3_2; } else { func_800F5ACC(NA_BGM_MINI_BOSS); - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageReaction == 1) { if (sAlpha == 255) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index a1ce22995c..3b29e01601 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -95,46 +95,46 @@ static ColliderJntSphInit sJntSphInit = { sJntSphElementsInit, }; -typedef enum TailpasaranDamageEffect { - /* 00 */ TAILPASARAN_DMGEFF_NONE, - /* 01 */ TAILPASARAN_DMGEFF_DEKUNUT, - /* 14 */ TAILPASARAN_DMGEFF_SHOCKING = 14, // Kills the Tailpasaran but shocks Player - /* 15 */ TAILPASARAN_DMGEFF_INSULATING // Kills the Tailpasaran and does not shock Player -} TailpasaranDamageEffect; +typedef enum TailpasaranDamageReaction { + /* 00 */ TAILPASARAN_DMG_REACT_NONE, + /* 01 */ TAILPASARAN_DMG_REACT_DEKUNUT, + /* 14 */ TAILPASARAN_DMG_REACT_SHOCKING = 14, // Kills the Tailpasaran but shocks Player + /* 15 */ TAILPASARAN_DMG_REACT_INSULATING // Kills the Tailpasaran and does not shock Player +} TailpasaranDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_DEKUNUT), - /* Deku stick */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_INSULATING), - /* Slingshot */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Explosive */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(1, TAILPASARAN_DMGEFF_INSULATING), - /* Normal arrow */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING), - /* Hookshot */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Kokiri sword */ DMG_ENTRY(1, TAILPASARAN_DMGEFF_SHOCKING), - /* Master sword */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING), - /* Giant's Knife */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING), - /* Fire arrow */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Ice arrow */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Light arrow */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Unk arrow 1 */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Ice magic */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Light magic */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Shield */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, TAILPASARAN_DMGEFF_SHOCKING), - /* Giant spin */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING), - /* Master spin */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING), - /* Kokiri jump */ DMG_ENTRY(2, TAILPASARAN_DMGEFF_SHOCKING), - /* Giant jump */ DMG_ENTRY(8, TAILPASARAN_DMGEFF_SHOCKING), - /* Master jump */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING), - /* Unknown 1 */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, TAILPASARAN_DMGEFF_SHOCKING), - /* Unknown 2 */ DMG_ENTRY(0, TAILPASARAN_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_DEKUNUT), + /* Deku stick */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_INSULATING), + /* Slingshot */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Explosive */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(1, TAILPASARAN_DMG_REACT_INSULATING), + /* Normal arrow */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING), + /* Hookshot */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Kokiri sword */ DMG_ENTRY(1, TAILPASARAN_DMG_REACT_SHOCKING), + /* Master sword */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING), + /* Giant's Knife */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING), + /* Fire arrow */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Ice arrow */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Light arrow */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Unk arrow 1 */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Ice magic */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Light magic */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Shield */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, TAILPASARAN_DMG_REACT_SHOCKING), + /* Giant spin */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING), + /* Master spin */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING), + /* Kokiri jump */ DMG_ENTRY(2, TAILPASARAN_DMG_REACT_SHOCKING), + /* Giant jump */ DMG_ENTRY(8, TAILPASARAN_DMG_REACT_SHOCKING), + /* Master jump */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING), + /* Unknown 1 */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, TAILPASARAN_DMG_REACT_SHOCKING), + /* Unknown 2 */ DMG_ENTRY(0, TAILPASARAN_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -604,10 +604,10 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->collider, true); - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageReaction = this->actor.colChkInfo.damageReaction; - if (this->actor.colChkInfo.damageEffect != TAILPASARAN_DMGEFF_NONE) { - if (this->actor.colChkInfo.damageEffect == TAILPASARAN_DMGEFF_DEKUNUT) { + if (this->actor.colChkInfo.damageReaction != TAILPASARAN_DMG_REACT_NONE) { + if (this->actor.colChkInfo.damageReaction == TAILPASARAN_DMG_REACT_DEKUNUT) { phi_s4 = 1; } @@ -622,7 +622,7 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { if (head->actor.params <= TAILPASARAN_HEAD) { EnTp_SetupDie(head); - head->damageEffect = this->actor.colChkInfo.damageEffect; + head->damageReaction = this->actor.colChkInfo.damageReaction; head->actor.params = TAILPASARAN_HEAD_DYING; } } else { @@ -686,7 +686,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) { s16 yawToWall; if (player->stateFlags1 & PLAYER_STATE1_26) { // Shielding - this->damageEffect = TAILPASARAN_DMGEFF_NONE; + this->damageReaction = TAILPASARAN_DMG_REACT_NONE; } if (this->actor.colChkInfo.health != 0) { @@ -737,7 +737,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) { this->actor.focus.pos = this->actor.world.pos; - if (this->damageEffect == TAILPASARAN_DMGEFF_SHOCKING) { + if (this->damageReaction == TAILPASARAN_DMG_REACT_SHOCKING) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); } diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h index 71fdca8188..3c8fd5f15e 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h @@ -13,7 +13,7 @@ typedef struct EnTp { /* 0x014C */ s32 actionIndex; /* 0x0150 */ s32 unk_150; // Some kind of state indicator /* 0x0154 */ EnTpActionFunc actionFunc; - /* 0x0158 */ u8 damageEffect; // Used to propagate the effect to the other segments' actors + /* 0x0158 */ u8 damageReaction; // Used to propagate the reaction to the other segments' actors /* 0x015A */ s16 timer; /* 0x015C */ s16 unk_15C; // Multipurpose, used to change the horizontal position of tail segments /* 0x015E */ s16 alpha; // The dying types fade away diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 011b004b68..9a188bca56 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -97,48 +97,48 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 2, 18, 32, MASS_HEAVY }; -typedef enum BariDamageEffect { - /* 0x0 */ BARI_DMGEFF_NONE, - /* 0x1 */ BARI_DMGEFF_STUN, - /* 0x2 */ BARI_DMGEFF_FIRE, - /* 0x3 */ BARI_DMGEFF_ICE, - /* 0xE */ BARI_DMGEFF_SLINGSHOT = 0xE, - /* 0xF */ BARI_DMGEFF_SWORD -} BariDamageEffect; +typedef enum BariDamageReaction { + /* 0x0 */ BARI_DMG_REACT_NONE, + /* 0x1 */ BARI_DMG_REACT_STUN, + /* 0x2 */ BARI_DMG_REACT_FIRE, + /* 0x3 */ BARI_DMG_REACT_ICE, + /* 0xE */ BARI_DMG_REACT_SLINGSHOT = 0xE, + /* 0xF */ BARI_DMG_REACT_SWORD +} BariDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, BARI_DMGEFF_STUN), - /* Deku stick */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Slingshot */ DMG_ENTRY(0, BARI_DMGEFF_SLINGSHOT), - /* Explosive */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(0, BARI_DMGEFF_STUN), - /* Normal arrow */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Hookshot */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Kokiri sword */ DMG_ENTRY(1, BARI_DMGEFF_SWORD), - /* Master sword */ DMG_ENTRY(2, BARI_DMGEFF_SWORD), - /* Giant's Knife */ DMG_ENTRY(4, BARI_DMGEFF_SWORD), - /* Fire arrow */ DMG_ENTRY(4, BARI_DMGEFF_FIRE), - /* Ice arrow */ DMG_ENTRY(4, BARI_DMGEFF_ICE), - /* Light arrow */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Unk arrow 1 */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(4, BARI_DMGEFF_FIRE), - /* Ice magic */ DMG_ENTRY(4, BARI_DMGEFF_ICE), - /* Light magic */ DMG_ENTRY(0, BARI_DMGEFF_NONE), - /* Shield */ DMG_ENTRY(0, BARI_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, BARI_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, BARI_DMGEFF_NONE), - /* Giant spin */ DMG_ENTRY(4, BARI_DMGEFF_NONE), - /* Master spin */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Kokiri jump */ DMG_ENTRY(2, BARI_DMGEFF_NONE), - /* Giant jump */ DMG_ENTRY(8, BARI_DMGEFF_NONE), - /* Master jump */ DMG_ENTRY(4, BARI_DMGEFF_NONE), - /* Unknown 1 */ DMG_ENTRY(0, BARI_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, BARI_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, BARI_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, BARI_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, BARI_DMG_REACT_STUN), + /* Deku stick */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(0, BARI_DMG_REACT_SLINGSHOT), + /* Explosive */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(0, BARI_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Hookshot */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Kokiri sword */ DMG_ENTRY(1, BARI_DMG_REACT_SWORD), + /* Master sword */ DMG_ENTRY(2, BARI_DMG_REACT_SWORD), + /* Giant's Knife */ DMG_ENTRY(4, BARI_DMG_REACT_SWORD), + /* Fire arrow */ DMG_ENTRY(4, BARI_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(4, BARI_DMG_REACT_ICE), + /* Light arrow */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Unk arrow 1 */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(4, BARI_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(4, BARI_DMG_REACT_ICE), + /* Light magic */ DMG_ENTRY(0, BARI_DMG_REACT_NONE), + /* Shield */ DMG_ENTRY(0, BARI_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, BARI_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, BARI_DMG_REACT_NONE), + /* Giant spin */ DMG_ENTRY(4, BARI_DMG_REACT_NONE), + /* Master spin */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Kokiri jump */ DMG_ENTRY(2, BARI_DMG_REACT_NONE), + /* Giant jump */ DMG_ENTRY(8, BARI_DMG_REACT_NONE), + /* Master jump */ DMG_ENTRY(4, BARI_DMG_REACT_NONE), + /* Unknown 1 */ DMG_ENTRY(0, BARI_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, BARI_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, BARI_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, BARI_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -512,21 +512,21 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { this->bodyCollider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); - if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != BARI_DMG_REACT_NONE) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DEAD); Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - } else if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_STUN) && - (this->actor.colChkInfo.damageEffect != BARI_DMGEFF_SLINGSHOT)) { + } else if ((this->actor.colChkInfo.damageReaction != BARI_DMG_REACT_STUN) && + (this->actor.colChkInfo.damageReaction != BARI_DMG_REACT_SLINGSHOT)) { Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DAMAGE); } - if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_STUN) { + if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_STUN) { if (this->actionFunc != EnVali_Stunned) { EnVali_SetupStunned(this); } - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SWORD) { + } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_SWORD) { if (this->actionFunc != EnVali_Stunned) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 150, COLORFILTER_BUFFLAG_XLU, 30); this->actor.params = BARI_TYPE_SWORD_DAMAGE; @@ -534,11 +534,11 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { } else { EnVali_SetupRetaliate(this); } - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_FIRE) { + } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_FIRE) { EnVali_SetupBurnt(this); - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_ICE) { + } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_ICE) { EnVali_SetupFrozen(this); - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SLINGSHOT) { + } else if (this->actor.colChkInfo.damageReaction == BARI_DMG_REACT_SLINGSHOT) { if (this->slingshotReactionTimer == 0) { this->slingshotReactionTimer = 20; } diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index abb91c80b9..9c6a27e026 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -26,10 +26,6 @@ #define TIMER_SCALE ((f32)OS_CLOCK_RATE / 10000000000) -#define DAMAGE_EFFECT_BURN 2 -#define DAMAGE_EFFECT_STUN_WHITE 4 -#define DAMAGE_EFFECT_STUN_BLUE 1 - void EnWallmas_Init(Actor* thisx, PlayState* play); void EnWallmas_Destroy(Actor* thisx, PlayState* play); void EnWallmas_Update(Actor* thisx, PlayState* play); @@ -86,39 +82,46 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 4, 30, 40, 150 }; +typedef enum EnWallmasDamageReaction { + /* 0 */ WALLMAS_DMG_REACT_NONE, + /* 1 */ WALLMAS_DMG_REACT_STUN_BLUE, + /* 2 */ WALLMAS_DMG_REACT_BURN, + /* 4 */ WALLMAS_DMG_REACT_STUN_WHITE = 4 +} EnWallmasDamageReaction; + static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, 0x1), - /* Deku stick */ DMG_ENTRY(2, 0x0), - /* Slingshot */ DMG_ENTRY(1, 0x0), - /* Explosive */ DMG_ENTRY(2, 0x0), - /* Boomerang */ DMG_ENTRY(0, 0x1), - /* Normal arrow */ DMG_ENTRY(2, 0x0), - /* Hammer swing */ DMG_ENTRY(2, 0x0), - /* Hookshot */ DMG_ENTRY(0, 0x1), - /* Kokiri sword */ DMG_ENTRY(1, 0x0), - /* Master sword */ DMG_ENTRY(2, 0x0), - /* Giant's Knife */ DMG_ENTRY(4, 0x0), - /* Fire arrow */ DMG_ENTRY(4, 0x2), - /* Ice arrow */ DMG_ENTRY(2, 0x0), - /* Light arrow */ DMG_ENTRY(4, 0x4), - /* Unk arrow 1 */ DMG_ENTRY(4, 0x0), - /* Unk arrow 2 */ DMG_ENTRY(2, 0x0), - /* Unk arrow 3 */ DMG_ENTRY(2, 0x0), - /* Fire magic */ DMG_ENTRY(4, 0x2), - /* Ice magic */ DMG_ENTRY(0, 0x0), - /* Light magic */ DMG_ENTRY(4, 0x4), - /* Shield */ DMG_ENTRY(0, 0x0), - /* Mirror Ray */ DMG_ENTRY(0, 0x0), - /* Kokiri spin */ DMG_ENTRY(1, 0x0), - /* Giant spin */ DMG_ENTRY(4, 0x0), - /* Master spin */ DMG_ENTRY(2, 0x0), - /* Kokiri jump */ DMG_ENTRY(2, 0x0), - /* Giant jump */ DMG_ENTRY(8, 0x0), - /* Master jump */ DMG_ENTRY(4, 0x0), - /* Unknown 1 */ DMG_ENTRY(0, 0x0), - /* Unblockable */ DMG_ENTRY(0, 0x0), - /* Hammer jump */ DMG_ENTRY(4, 0x0), - /* Unknown 2 */ DMG_ENTRY(0, 0x0), + /* Deku nut */ DMG_ENTRY(0, WALLMAS_DMG_REACT_STUN_BLUE), + /* Deku stick */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(1, WALLMAS_DMG_REACT_NONE), + /* Explosive */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(0, WALLMAS_DMG_REACT_STUN_BLUE), + /* Normal arrow */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Hookshot */ DMG_ENTRY(0, WALLMAS_DMG_REACT_STUN_BLUE), + /* Kokiri sword */ DMG_ENTRY(1, WALLMAS_DMG_REACT_NONE), + /* Master sword */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Giant's Knife */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE), + /* Fire arrow */ DMG_ENTRY(4, WALLMAS_DMG_REACT_BURN), + /* Ice arrow */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Light arrow */ DMG_ENTRY(4, WALLMAS_DMG_REACT_STUN_WHITE), + /* Unk arrow 1 */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(4, WALLMAS_DMG_REACT_BURN), + /* Ice magic */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE), + /* Light magic */ DMG_ENTRY(4, WALLMAS_DMG_REACT_STUN_WHITE), + /* Shield */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, WALLMAS_DMG_REACT_NONE), + /* Giant spin */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE), + /* Master spin */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Kokiri jump */ DMG_ENTRY(2, WALLMAS_DMG_REACT_NONE), + /* Giant jump */ DMG_ENTRY(8, WALLMAS_DMG_REACT_NONE), + /* Master jump */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE), + /* Unknown 1 */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, WALLMAS_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, WALLMAS_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -292,7 +295,7 @@ void EnWallmas_SetupStun(EnWallmas* this) { Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f); this->actor.speed = 0.0f; - if (this->actor.colChkInfo.damageEffect == 4) { + if (this->actor.colChkInfo.damageReaction == 4) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -522,7 +525,7 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DEAD); @@ -533,13 +536,13 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) { } } - if ((this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_WHITE) || - (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) { + if ((this->actor.colChkInfo.damageReaction == WALLMAS_DMG_REACT_STUN_WHITE) || + (this->actor.colChkInfo.damageReaction == WALLMAS_DMG_REACT_STUN_BLUE)) { if (this->actionFunc != EnWallmas_Stun) { EnWallmas_SetupStun(this); } } else { - if (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_BURN) { + if (this->actor.colChkInfo.damageReaction == WALLMAS_DMG_REACT_BURN) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 40); } diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 2e19328961..4fa8370d0a 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -575,8 +575,8 @@ void func_80B3368C(EnWeiyer* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { - if (this->actor.colChkInfo.damageEffect == 1) { + if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->actor.colChkInfo.damageReaction == 1) { if (this->actionFunc != func_80B333B8) { func_80B32660(this); } 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 f7ae2db60b..6e86771d7a 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -163,48 +163,48 @@ static ColliderCylinderInit sTailCylinderInit = { { 15, 20, -15, { 0, 0, 0 } }, }; -typedef enum EnWfDamageEffect { - /* 0 */ ENWF_DMGEFF_NONE, - /* 1 */ ENWF_DMGEFF_STUN, - /* 6 */ ENWF_DMGEFF_ICE_MAGIC = 6, - /* 13 */ ENWF_DMGEFF_LIGHT_MAGIC = 13, - /* 14 */ ENWF_DMGEFF_FIRE, - /* 15 */ ENWF_DMGEFF_UNDEF // used like STUN in the code, but not in the table -} EnWfDamageEffect; +typedef enum EnWfDamageReaction { + /* 0 */ ENWF_DMG_REACT_NONE, + /* 1 */ ENWF_DMG_REACT_STUN, + /* 6 */ ENWF_DMG_REACT_ICE_MAGIC = 6, + /* 13 */ ENWF_DMG_REACT_LIGHT_MAGIC = 13, + /* 14 */ ENWF_DMG_REACT_FIRE, + /* 15 */ ENWF_DMG_REACT_UNDEF // used like STUN in the code, but not in the table +} EnWfDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, ENWF_DMGEFF_STUN), - /* Deku stick */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Slingshot */ DMG_ENTRY(1, ENWF_DMGEFF_NONE), - /* Explosive */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(0, ENWF_DMGEFF_STUN), - /* Normal arrow */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Hookshot */ DMG_ENTRY(0, ENWF_DMGEFF_STUN), - /* Kokiri sword */ DMG_ENTRY(1, ENWF_DMGEFF_NONE), - /* Master sword */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Giant's Knife */ DMG_ENTRY(4, ENWF_DMGEFF_NONE), - /* Fire arrow */ DMG_ENTRY(4, ENWF_DMGEFF_FIRE), - /* Ice arrow */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Light arrow */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Unk arrow 1 */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Unk arrow 2 */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Unk arrow 3 */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Fire magic */ DMG_ENTRY(4, ENWF_DMGEFF_FIRE), - /* Ice magic */ DMG_ENTRY(0, ENWF_DMGEFF_ICE_MAGIC), - /* Light magic */ DMG_ENTRY(3, ENWF_DMGEFF_LIGHT_MAGIC), - /* Shield */ DMG_ENTRY(0, ENWF_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, ENWF_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, ENWF_DMGEFF_NONE), - /* Giant spin */ DMG_ENTRY(4, ENWF_DMGEFF_NONE), - /* Master spin */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Kokiri jump */ DMG_ENTRY(2, ENWF_DMGEFF_NONE), - /* Giant jump */ DMG_ENTRY(8, ENWF_DMGEFF_NONE), - /* Master jump */ DMG_ENTRY(4, ENWF_DMGEFF_NONE), - /* Unknown 1 */ DMG_ENTRY(0, ENWF_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, ENWF_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, ENWF_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, ENWF_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, ENWF_DMG_REACT_STUN), + /* Deku stick */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(1, ENWF_DMG_REACT_NONE), + /* Explosive */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(0, ENWF_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Hookshot */ DMG_ENTRY(0, ENWF_DMG_REACT_STUN), + /* Kokiri sword */ DMG_ENTRY(1, ENWF_DMG_REACT_NONE), + /* Master sword */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Giant's Knife */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE), + /* Fire arrow */ DMG_ENTRY(4, ENWF_DMG_REACT_FIRE), + /* Ice arrow */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Light arrow */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Unk arrow 1 */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Unk arrow 2 */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Unk arrow 3 */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Fire magic */ DMG_ENTRY(4, ENWF_DMG_REACT_FIRE), + /* Ice magic */ DMG_ENTRY(0, ENWF_DMG_REACT_ICE_MAGIC), + /* Light magic */ DMG_ENTRY(3, ENWF_DMG_REACT_LIGHT_MAGIC), + /* Shield */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, ENWF_DMG_REACT_NONE), + /* Giant spin */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE), + /* Master spin */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Kokiri jump */ DMG_ENTRY(2, ENWF_DMG_REACT_NONE), + /* Giant jump */ DMG_ENTRY(8, ENWF_DMG_REACT_NONE), + /* Master jump */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE), + /* Unknown 1 */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, ENWF_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, ENWF_DMG_REACT_NONE), }; ActorProfile En_Wf_Profile = { @@ -1285,15 +1285,15 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) { this->bodyColliderCylinder.base.acFlags &= ~AC_HIT; this->tailColliderCylinder.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) { - this->damageEffect = this->actor.colChkInfo.damageEffect; + if (this->actor.colChkInfo.damageReaction != ENWF_DMG_REACT_ICE_MAGIC) { + this->damageReaction = this->actor.colChkInfo.damageReaction; Actor_SetDropFlag(&this->actor, &this->bodyColliderCylinder.elem, true); #if OOT_VERSION >= PAL_1_0 this->slashStatus = 0; #endif - if ((this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_UNDEF)) { + if ((this->actor.colChkInfo.damageReaction == ENWF_DMG_REACT_STUN) || + (this->actor.colChkInfo.damageReaction == ENWF_DMG_REACT_UNDEF)) { if (this->action != WOLFOS_ACTION_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); @@ -1303,7 +1303,7 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) { } else { // LIGHT_MAGIC, FIRE, NONE Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8); - if (this->damageEffect == ENWF_DMGEFF_FIRE) { + if (this->damageReaction == ENWF_DMG_REACT_FIRE) { this->fireTimer = 40; } @@ -1325,7 +1325,7 @@ void EnWf_Update(Actor* thisx, PlayState* play) { EnWf_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) { + if (this->actor.colChkInfo.damageReaction != ENWF_DMG_REACT_ICE_MAGIC) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 32.0f, 30.0f, 60.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h index afc18f7d01..38827154aa 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -63,7 +63,7 @@ typedef struct EnWf { /* 0x02E0 */ s16 unk_2E0; // Used, but has no effect /* 0x02E2 */ s16 unk_2E2; /* 0x02E4 */ s16 fireTimer; - /* 0x02E6 */ u8 damageEffect; + /* 0x02E6 */ u8 damageReaction; /* 0x02E8 */ s32 actionTimer; // Used to make an action last for a certain amount of time /* 0x02EC */ f32 runSpeed; /* 0x02F0 */ char unk_2F0[4]; diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index b49481e881..48f02b074e 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -169,47 +169,47 @@ static ColliderQuadInit sSwordQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum EnZfDamageEffect { - /* 0x0 */ ENZF_DMGEFF_NONE, - /* 0x1 */ ENZF_DMGEFF_STUN, - /* 0x6 */ ENZF_DMGEFF_IMMUNE = 6, // Skips damage code, but also skips the top half of Update - /* 0xD */ ENZF_DMGEFF_PROJECTILE = 0xD, // Projectiles that don't have another damageeffect - /* 0xF */ ENZF_DMGEFF_ICE = 0xF -} EnZfDamageEffect; +typedef enum EnZfDamageReaction { + /* 0x0 */ ENZF_DMG_REACT_NONE, + /* 0x1 */ ENZF_DMG_REACT_STUN, + /* 0x6 */ ENZF_DMG_REACT_IMMUNE = 6, // Skips damage code, but also skips the top half of Update + /* 0xD */ ENZF_DMG_REACT_PROJECTILE = 0xD, // Projectiles that don't have another damageeffect + /* 0xF */ ENZF_DMG_REACT_ICE = 0xF +} EnZfDamageReaction; static DamageTable sDamageTable = { - /* Deku nut */ DMG_ENTRY(0, ENZF_DMGEFF_STUN), - /* Deku stick */ DMG_ENTRY(2, ENZF_DMGEFF_NONE), - /* Slingshot */ DMG_ENTRY(1, ENZF_DMGEFF_PROJECTILE), - /* Explosive */ DMG_ENTRY(2, ENZF_DMGEFF_NONE), - /* Boomerang */ DMG_ENTRY(0, ENZF_DMGEFF_STUN), - /* Normal arrow */ DMG_ENTRY(2, ENZF_DMGEFF_NONE), - /* Hammer swing */ DMG_ENTRY(2, ENZF_DMGEFF_NONE), - /* Hookshot */ DMG_ENTRY(0, ENZF_DMGEFF_STUN), - /* Kokiri sword */ DMG_ENTRY(1, ENZF_DMGEFF_NONE), - /* Master sword */ DMG_ENTRY(2, ENZF_DMGEFF_NONE), - /* Giant's Knife */ DMG_ENTRY(4, ENZF_DMGEFF_NONE), - /* Fire arrow */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE), - /* Ice arrow */ DMG_ENTRY(4, ENZF_DMGEFF_ICE), - /* Light arrow */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE), - /* Unk arrow 1 */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE), - /* Unk arrow 2 */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE), - /* Unk arrow 3 */ DMG_ENTRY(2, ENZF_DMGEFF_PROJECTILE), - /* Fire magic */ DMG_ENTRY(0, ENZF_DMGEFF_IMMUNE), - /* Ice magic */ DMG_ENTRY(3, ENZF_DMGEFF_ICE), - /* Light magic */ DMG_ENTRY(0, ENZF_DMGEFF_IMMUNE), - /* Shield */ DMG_ENTRY(0, ENZF_DMGEFF_NONE), - /* Mirror Ray */ DMG_ENTRY(0, ENZF_DMGEFF_NONE), - /* Kokiri spin */ DMG_ENTRY(1, ENZF_DMGEFF_NONE), - /* Giant spin */ DMG_ENTRY(4, ENZF_DMGEFF_NONE), - /* Master spin */ DMG_ENTRY(2, ENZF_DMGEFF_NONE), - /* Kokiri jump */ DMG_ENTRY(2, ENZF_DMGEFF_NONE), - /* Giant jump */ DMG_ENTRY(8, ENZF_DMGEFF_NONE), - /* Master jump */ DMG_ENTRY(4, ENZF_DMGEFF_NONE), - /* Unknown 1 */ DMG_ENTRY(0, ENZF_DMGEFF_NONE), - /* Unblockable */ DMG_ENTRY(0, ENZF_DMGEFF_NONE), - /* Hammer jump */ DMG_ENTRY(4, ENZF_DMGEFF_NONE), - /* Unknown 2 */ DMG_ENTRY(0, ENZF_DMGEFF_NONE), + /* Deku nut */ DMG_ENTRY(0, ENZF_DMG_REACT_STUN), + /* Deku stick */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE), + /* Slingshot */ DMG_ENTRY(1, ENZF_DMG_REACT_PROJECTILE), + /* Explosive */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE), + /* Boomerang */ DMG_ENTRY(0, ENZF_DMG_REACT_STUN), + /* Normal arrow */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE), + /* Hammer swing */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE), + /* Hookshot */ DMG_ENTRY(0, ENZF_DMG_REACT_STUN), + /* Kokiri sword */ DMG_ENTRY(1, ENZF_DMG_REACT_NONE), + /* Master sword */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE), + /* Giant's Knife */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE), + /* Fire arrow */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE), + /* Ice arrow */ DMG_ENTRY(4, ENZF_DMG_REACT_ICE), + /* Light arrow */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE), + /* Unk arrow 1 */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE), + /* Unk arrow 2 */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE), + /* Unk arrow 3 */ DMG_ENTRY(2, ENZF_DMG_REACT_PROJECTILE), + /* Fire magic */ DMG_ENTRY(0, ENZF_DMG_REACT_IMMUNE), + /* Ice magic */ DMG_ENTRY(3, ENZF_DMG_REACT_ICE), + /* Light magic */ DMG_ENTRY(0, ENZF_DMG_REACT_IMMUNE), + /* Shield */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE), + /* Mirror Ray */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE), + /* Kokiri spin */ DMG_ENTRY(1, ENZF_DMG_REACT_NONE), + /* Giant spin */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE), + /* Master spin */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE), + /* Kokiri jump */ DMG_ENTRY(2, ENZF_DMG_REACT_NONE), + /* Giant jump */ DMG_ENTRY(8, ENZF_DMG_REACT_NONE), + /* Master jump */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE), + /* Unknown 1 */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE), + /* Unblockable */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE), + /* Hammer jump */ DMG_ENTRY(4, ENZF_DMG_REACT_NONE), + /* Unknown 2 */ DMG_ENTRY(0, ENZF_DMG_REACT_NONE), }; static InitChainEntry sInitChain[] = { @@ -1324,7 +1324,7 @@ void EnZf_SetupStunned(EnZf* this) { this->hopAnimIndex = 1; } - if (this->damageEffect == ENZF_DMGEFF_ICE) { + if (this->damageReaction == ENZF_DMG_REACT_ICE) { this->iceTimer = 36; } else { Animation_PlayOnceSetSpeed(&this->skelAnime, &gZfKnockedBackAnim, 0.0f); @@ -1685,7 +1685,7 @@ void EnZf_Damaged(EnZf* this, PlayState* play) { SkelAnime_Update(&this->skelAnime) && (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { if (D_80B4A1B4 != -1) { - if (this->damageEffect == ENZF_DMGEFF_PROJECTILE) { + if (this->damageReaction == ENZF_DMG_REACT_PROJECTILE) { D_80B4A1B0++; } else { this->actor.world.rot.y = this->actor.shape.rot.y; @@ -2028,12 +2028,12 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { if (((this->actor.params < ENZF_TYPE_LIZALFOS_MINIBOSS_A) /* not miniboss */ || (D_80B4A1B4 != this->actor.params)) && - (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE)) { - this->damageEffect = this->actor.colChkInfo.damageEffect; + (this->actor.colChkInfo.damageReaction != ENZF_DMG_REACT_IMMUNE)) { + this->damageReaction = this->actor.colChkInfo.damageReaction; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); - if ((this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_ICE)) { + if ((this->actor.colChkInfo.damageReaction == ENZF_DMG_REACT_STUN) || + (this->actor.colChkInfo.damageReaction == ENZF_DMG_REACT_ICE)) { if (this->action != ENZF_ACTION_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -2056,7 +2056,7 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { } else { if ((D_80B4A1B4 != -1) && ((this->actor.colChkInfo.health + this->actor.colChkInfo.damage) >= 4) && (this->actor.colChkInfo.health < 4)) { - this->damageEffect = ENZF_DMGEFF_PROJECTILE; + this->damageReaction = ENZF_DMG_REACT_PROJECTILE; } EnZf_SetupDamaged(this); @@ -2072,7 +2072,7 @@ void EnZf_Update(Actor* thisx, PlayState* play) { s32 pad2; EnZf_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE) { + if (this->actor.colChkInfo.damageReaction != ENZF_DMG_REACT_IMMUNE) { this->unk_3F8 = false; if ((this->hopAnimIndex != 1) && (this->action != ENZF_ACTION_HOP_AWAY)) { if (this->actor.speed != 0.0f) { diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.h b/src/overlays/actors/ovl_En_Zf/z_en_zf.h index 9dfb3119b9..1995b48943 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.h +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.h @@ -112,7 +112,7 @@ typedef struct EnZf { /* 0x0404 */ u8 alpha; /* 0x0408 */ f32 unk_408; // related to XZ speeds /* 0x040C */ f32 unk_40C; // related to y velocity - /* 0x0410 */ u8 damageEffect; + /* 0x0410 */ u8 damageReaction; /* 0x0414 */ s32 blureIndex; /* 0x0418 */ ColliderCylinder bodyCollider; /* 0x0464 */ ColliderQuad swordCollider; From 66f367e44948e98e937d0a29f86e321e2b549d27 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 02:30:44 +0200 Subject: [PATCH 16/42] Commit `g_pn_*.c` files (#2573) --- assets/textures/place_title_cards/g_pn_01.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_02.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_03.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_04.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_05.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_06.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_07.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_08.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_09.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_10.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_11.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_12.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_13.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_14.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_15.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_16.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_17.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_18.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_19.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_20.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_21.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_22.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_23.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_24.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_25.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_26.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_27.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_28.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_29.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_30.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_31.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_32.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_33.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_34.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_35.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_36.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_37.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_38.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_39.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_40.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_41.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_42.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_43.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_44.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_45.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_46.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_47.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_48.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_49.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_50.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_51.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_52.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_53.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_54.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_55.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_56.c | 24 ++++++++ assets/textures/place_title_cards/g_pn_57.c | 24 ++++++++ assets/xml/textures/place_title_cards.xml | 4 +- include/z64actor.h | 3 + src/code/z_demo.c | 3 +- .../actors/ovl_player_actor/z_player.c | 3 +- tools/assets/extract/write_source.txt | 57 ------------------- 62 files changed, 1377 insertions(+), 61 deletions(-) create mode 100644 assets/textures/place_title_cards/g_pn_01.c create mode 100644 assets/textures/place_title_cards/g_pn_02.c create mode 100644 assets/textures/place_title_cards/g_pn_03.c create mode 100644 assets/textures/place_title_cards/g_pn_04.c create mode 100644 assets/textures/place_title_cards/g_pn_05.c create mode 100644 assets/textures/place_title_cards/g_pn_06.c create mode 100644 assets/textures/place_title_cards/g_pn_07.c create mode 100644 assets/textures/place_title_cards/g_pn_08.c create mode 100644 assets/textures/place_title_cards/g_pn_09.c create mode 100644 assets/textures/place_title_cards/g_pn_10.c create mode 100644 assets/textures/place_title_cards/g_pn_11.c create mode 100644 assets/textures/place_title_cards/g_pn_12.c create mode 100644 assets/textures/place_title_cards/g_pn_13.c create mode 100644 assets/textures/place_title_cards/g_pn_14.c create mode 100644 assets/textures/place_title_cards/g_pn_15.c create mode 100644 assets/textures/place_title_cards/g_pn_16.c create mode 100644 assets/textures/place_title_cards/g_pn_17.c create mode 100644 assets/textures/place_title_cards/g_pn_18.c create mode 100644 assets/textures/place_title_cards/g_pn_19.c create mode 100644 assets/textures/place_title_cards/g_pn_20.c create mode 100644 assets/textures/place_title_cards/g_pn_21.c create mode 100644 assets/textures/place_title_cards/g_pn_22.c create mode 100644 assets/textures/place_title_cards/g_pn_23.c create mode 100644 assets/textures/place_title_cards/g_pn_24.c create mode 100644 assets/textures/place_title_cards/g_pn_25.c create mode 100644 assets/textures/place_title_cards/g_pn_26.c create mode 100644 assets/textures/place_title_cards/g_pn_27.c create mode 100644 assets/textures/place_title_cards/g_pn_28.c create mode 100644 assets/textures/place_title_cards/g_pn_29.c create mode 100644 assets/textures/place_title_cards/g_pn_30.c create mode 100644 assets/textures/place_title_cards/g_pn_31.c create mode 100644 assets/textures/place_title_cards/g_pn_32.c create mode 100644 assets/textures/place_title_cards/g_pn_33.c create mode 100644 assets/textures/place_title_cards/g_pn_34.c create mode 100644 assets/textures/place_title_cards/g_pn_35.c create mode 100644 assets/textures/place_title_cards/g_pn_36.c create mode 100644 assets/textures/place_title_cards/g_pn_37.c create mode 100644 assets/textures/place_title_cards/g_pn_38.c create mode 100644 assets/textures/place_title_cards/g_pn_39.c create mode 100644 assets/textures/place_title_cards/g_pn_40.c create mode 100644 assets/textures/place_title_cards/g_pn_41.c create mode 100644 assets/textures/place_title_cards/g_pn_42.c create mode 100644 assets/textures/place_title_cards/g_pn_43.c create mode 100644 assets/textures/place_title_cards/g_pn_44.c create mode 100644 assets/textures/place_title_cards/g_pn_45.c create mode 100644 assets/textures/place_title_cards/g_pn_46.c create mode 100644 assets/textures/place_title_cards/g_pn_47.c create mode 100644 assets/textures/place_title_cards/g_pn_48.c create mode 100644 assets/textures/place_title_cards/g_pn_49.c create mode 100644 assets/textures/place_title_cards/g_pn_50.c create mode 100644 assets/textures/place_title_cards/g_pn_51.c create mode 100644 assets/textures/place_title_cards/g_pn_52.c create mode 100644 assets/textures/place_title_cards/g_pn_53.c create mode 100644 assets/textures/place_title_cards/g_pn_54.c create mode 100644 assets/textures/place_title_cards/g_pn_55.c create mode 100644 assets/textures/place_title_cards/g_pn_56.c create mode 100644 assets/textures/place_title_cards/g_pn_57.c diff --git a/assets/textures/place_title_cards/g_pn_01.c b/assets/textures/place_title_cards/g_pn_01.c new file mode 100644 index 0000000000..2d4b469289 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_01.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gForestTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gForestTempleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gForestTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gForestTempleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gForestTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gForestTempleTitleCardGERTex.ia8.inc.c" +}; + +u64 gForestTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gForestTempleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_02.c b/assets/textures/place_title_cards/g_pn_02.c new file mode 100644 index 0000000000..6daba3a74a --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_02.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gShadowTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShadowTempleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gShadowTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShadowTempleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gShadowTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShadowTempleTitleCardGERTex.ia8.inc.c" +}; + +u64 gShadowTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShadowTempleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_03.c b/assets/textures/place_title_cards/g_pn_03.c new file mode 100644 index 0000000000..4ec8786845 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_03.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gFireTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFireTempleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gFireTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFireTempleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gFireTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFireTempleTitleCardGERTex.ia8.inc.c" +}; + +u64 gFireTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFireTempleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_04.c b/assets/textures/place_title_cards/g_pn_04.c new file mode 100644 index 0000000000..f09e7ef134 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_04.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gWaterTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gWaterTempleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gWaterTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gWaterTempleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gWaterTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gWaterTempleTitleCardGERTex.ia8.inc.c" +}; + +u64 gWaterTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gWaterTempleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_05.c b/assets/textures/place_title_cards/g_pn_05.c new file mode 100644 index 0000000000..cc47a408bc --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_05.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gSpiritTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSpiritTempleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gSpiritTempleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSpiritTempleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gSpiritTempleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSpiritTempleTitleCardGERTex.ia8.inc.c" +}; + +u64 gSpiritTempleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSpiritTempleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_06.c b/assets/textures/place_title_cards/g_pn_06.c new file mode 100644 index 0000000000..46b04b482d --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_06.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gDekuTreeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDekuTreeTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gDekuTreeTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDekuTreeTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gDekuTreeTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDekuTreeTitleCardGERTex.ia8.inc.c" +}; + +u64 gDekuTreeTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDekuTreeTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_07.c b/assets/textures/place_title_cards/g_pn_07.c new file mode 100644 index 0000000000..487159bbe2 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_07.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gJabuJabuTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gJabuJabuTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gJabuJabuTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gJabuJabuTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gJabuJabuTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gJabuJabuTitleCardGERTex.ia8.inc.c" +}; + +u64 gJabuJabuTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gJabuJabuTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_08.c b/assets/textures/place_title_cards/g_pn_08.c new file mode 100644 index 0000000000..90fdb1af4d --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_08.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gDodongosCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDodongosCavernTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gDodongosCavernTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDodongosCavernTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gDodongosCavernTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDodongosCavernTitleCardGERTex.ia8.inc.c" +}; + +u64 gDodongosCavernTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDodongosCavernTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_09.c b/assets/textures/place_title_cards/g_pn_09.c new file mode 100644 index 0000000000..f053c3e0ed --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_09.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gInsideGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gInsideGanonsCastleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gInsideGanonsCastleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardGERTex.ia8.inc.c" +}; + +u64 gInsideGanonsCastleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gInsideGanonsCastleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_10.c b/assets/textures/place_title_cards/g_pn_10.c new file mode 100644 index 0000000000..ab5b3ea897 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_10.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gIceCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gIceCavernTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gIceCavernTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gIceCavernTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gIceCavernTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gIceCavernTitleCardGERTex.ia8.inc.c" +}; + +u64 gIceCavernTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gIceCavernTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_11.c b/assets/textures/place_title_cards/g_pn_11.c new file mode 100644 index 0000000000..4a02cc6f80 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_11.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGERudoTrainingGroundTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGERudoTrainingGroundTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGERudoTrainingGroundTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardGERTex.ia8.inc.c" +}; + +u64 gGERudoTrainingGroundTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoTrainingGroundTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_12.c b/assets/textures/place_title_cards/g_pn_12.c new file mode 100644 index 0000000000..81f82b6dc5 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_12.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gCastleCourtyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gCastleCourtyardTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gCastleCourtyardTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardGERTex.ia8.inc.c" +}; + +u64 gCastleCourtyardTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gCastleCourtyardTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_13.c b/assets/textures/place_title_cards/g_pn_13.c new file mode 100644 index 0000000000..174ac38bea --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_13.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGreatFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGreatFairysFountainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGreatFairysFountainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardGERTex.ia8.inc.c" +}; + +u64 gGreatFairysFountainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGreatFairysFountainTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_14.c b/assets/textures/place_title_cards/g_pn_14.c new file mode 100644 index 0000000000..870549c936 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_14.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gChamberOfTheSagesTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gChamberOfTheSagesTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gChamberOfTheSagesTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardGERTex.ia8.inc.c" +}; + +u64 gChamberOfTheSagesTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gChamberOfTheSagesTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_15.c b/assets/textures/place_title_cards/g_pn_15.c new file mode 100644 index 0000000000..ed2e76edd8 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_15.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gShootingGalleryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShootingGalleryTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gShootingGalleryTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShootingGalleryTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gShootingGalleryTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShootingGalleryTitleCardGERTex.ia8.inc.c" +}; + +u64 gShootingGalleryTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gShootingGalleryTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_16.c b/assets/textures/place_title_cards/g_pn_16.c new file mode 100644 index 0000000000..f1088194d4 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_16.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gTempleOfTimeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gTempleOfTimeTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gTempleOfTimeTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardGERTex.ia8.inc.c" +}; + +u64 gTempleOfTimeTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTempleOfTimeTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_17.c b/assets/textures/place_title_cards/g_pn_17.c new file mode 100644 index 0000000000..3b9b845123 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_17.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gMarketTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gMarketTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gMarketTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gMarketTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gMarketTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gMarketTitleCardGERTex.ia8.inc.c" +}; + +u64 gMarketTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gMarketTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_18.c b/assets/textures/place_title_cards/g_pn_18.c new file mode 100644 index 0000000000..f4b19ba699 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_18.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gBackAlleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBackAlleyTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gBackAlleyTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBackAlleyTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gBackAlleyTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBackAlleyTitleCardGERTex.ia8.inc.c" +}; + +u64 gBackAlleyTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBackAlleyTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_19.c b/assets/textures/place_title_cards/g_pn_19.c new file mode 100644 index 0000000000..0cbbdad32c --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_19.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gKokiriShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriShopTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gKokiriShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriShopTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gKokiriShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriShopTitleCardGERTex.ia8.inc.c" +}; + +u64 gKokiriShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriShopTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_20.c b/assets/textures/place_title_cards/g_pn_20.c new file mode 100644 index 0000000000..44aa12c09b --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_20.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGoronShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronShopTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGoronShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronShopTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGoronShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronShopTitleCardGERTex.ia8.inc.c" +}; + +u64 gGoronShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronShopTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_21.c b/assets/textures/place_title_cards/g_pn_21.c new file mode 100644 index 0000000000..c5faa7d695 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_21.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gZoraShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZoraShopTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gZoraShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZoraShopTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gZoraShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZoraShopTitleCardGERTex.ia8.inc.c" +}; + +u64 gZoraShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZoraShopTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_22.c b/assets/textures/place_title_cards/g_pn_22.c new file mode 100644 index 0000000000..df6cfd28cb --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_22.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gHouseOfSkulltulaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gHouseOfSkulltulaTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gHouseOfSkulltulaTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardGERTex.ia8.inc.c" +}; + +u64 gHouseOfSkulltulaTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHouseOfSkulltulaTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_23.c b/assets/textures/place_title_cards/g_pn_23.c new file mode 100644 index 0000000000..ba70222123 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_23.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gBazaarTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBazaarTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gBazaarTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBazaarTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gBazaarTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBazaarTitleCardGERTex.ia8.inc.c" +}; + +u64 gBazaarTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBazaarTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_24.c b/assets/textures/place_title_cards/g_pn_24.c new file mode 100644 index 0000000000..8bf9f9f1b4 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_24.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gPotionShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gPotionShopTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gPotionShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gPotionShopTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gPotionShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gPotionShopTitleCardGERTex.ia8.inc.c" +}; + +u64 gPotionShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gPotionShopTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_25.c b/assets/textures/place_title_cards/g_pn_25.c new file mode 100644 index 0000000000..7356e050d1 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_25.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGravekeepersHutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGravekeepersHutTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGravekeepersHutTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardGERTex.ia8.inc.c" +}; + +u64 gGravekeepersHutTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGravekeepersHutTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_26.c b/assets/textures/place_title_cards/g_pn_26.c new file mode 100644 index 0000000000..abf67d83b4 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_26.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gLakesideLaboratoryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gLakesideLaboratoryTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gLakesideLaboratoryTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardGERTex.ia8.inc.c" +}; + +u64 gLakesideLaboratoryTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakesideLaboratoryTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_27.c b/assets/textures/place_title_cards/g_pn_27.c new file mode 100644 index 0000000000..826d96c95d --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_27.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gHyruleFieldTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleFieldTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gHyruleFieldTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleFieldTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gHyruleFieldTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleFieldTitleCardGERTex.ia8.inc.c" +}; + +u64 gHyruleFieldTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleFieldTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_28.c b/assets/textures/place_title_cards/g_pn_28.c new file mode 100644 index 0000000000..fbb228563b --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_28.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gKakarikoVillageTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gKakarikoVillageTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gKakarikoVillageTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardGERTex.ia8.inc.c" +}; + +u64 gKakarikoVillageTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKakarikoVillageTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_29.c b/assets/textures/place_title_cards/g_pn_29.c new file mode 100644 index 0000000000..51adaffea2 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_29.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGraveyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGraveyardTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGraveyardTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGraveyardTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGraveyardTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGraveyardTitleCardGERTex.ia8.inc.c" +}; + +u64 gGraveyardTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGraveyardTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_30.c b/assets/textures/place_title_cards/g_pn_30.c new file mode 100644 index 0000000000..5fd7622dd3 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_30.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gZorasRiverTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasRiverTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gZorasRiverTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasRiverTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gZorasRiverTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasRiverTitleCardGERTex.ia8.inc.c" +}; + +u64 gZorasRiverTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasRiverTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_31.c b/assets/textures/place_title_cards/g_pn_31.c new file mode 100644 index 0000000000..652d27da46 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_31.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gKokiriForestTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriForestTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gKokiriForestTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriForestTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gKokiriForestTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriForestTitleCardGERTex.ia8.inc.c" +}; + +u64 gKokiriForestTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gKokiriForestTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_32.c b/assets/textures/place_title_cards/g_pn_32.c new file mode 100644 index 0000000000..d0ca0abb63 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_32.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gLakeHyliaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakeHyliaTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gLakeHyliaTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakeHyliaTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gLakeHyliaTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakeHyliaTitleCardGERTex.ia8.inc.c" +}; + +u64 gLakeHyliaTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLakeHyliaTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_33.c b/assets/textures/place_title_cards/g_pn_33.c new file mode 100644 index 0000000000..05e67b78a8 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_33.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gZorasDomainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasDomainTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gZorasDomainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasDomainTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gZorasDomainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasDomainTitleCardGERTex.ia8.inc.c" +}; + +u64 gZorasDomainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasDomainTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_34.c b/assets/textures/place_title_cards/g_pn_34.c new file mode 100644 index 0000000000..2da3a05032 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_34.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gZorasFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasFountainTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gZorasFountainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasFountainTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gZorasFountainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasFountainTitleCardGERTex.ia8.inc.c" +}; + +u64 gZorasFountainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gZorasFountainTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_35.c b/assets/textures/place_title_cards/g_pn_35.c new file mode 100644 index 0000000000..8a0f49a6d1 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_35.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGERudoValleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoValleyTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGERudoValleyTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoValleyTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGERudoValleyTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoValleyTitleCardGERTex.ia8.inc.c" +}; + +u64 gGERudoValleyTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudoValleyTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_36.c b/assets/textures/place_title_cards/g_pn_36.c new file mode 100644 index 0000000000..781afb38b0 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_36.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gLostWoodsTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLostWoodsTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gLostWoodsTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLostWoodsTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gLostWoodsTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLostWoodsTitleCardGERTex.ia8.inc.c" +}; + +u64 gLostWoodsTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLostWoodsTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_37.c b/assets/textures/place_title_cards/g_pn_37.c new file mode 100644 index 0000000000..c0212c601a --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_37.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gHauntedWastelandTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gHauntedWastelandTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gHauntedWastelandTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardGERTex.ia8.inc.c" +}; + +u64 gHauntedWastelandTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHauntedWastelandTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_38.c b/assets/textures/place_title_cards/g_pn_38.c new file mode 100644 index 0000000000..ddb5302eec --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_38.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gHyruleCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleCastleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gHyruleCastleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleCastleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gHyruleCastleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleCastleTitleCardGERTex.ia8.inc.c" +}; + +u64 gHyruleCastleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHyruleCastleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_39.c b/assets/textures/place_title_cards/g_pn_39.c new file mode 100644 index 0000000000..e4977dec18 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_39.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gDeathMountainTrailTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gDeathMountainTrailTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gDeathMountainTrailTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardGERTex.ia8.inc.c" +}; + +u64 gDeathMountainTrailTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainTrailTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_40.c b/assets/textures/place_title_cards/g_pn_40.c new file mode 100644 index 0000000000..7762ffbff7 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_40.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gDeathMountainCraterTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gDeathMountainCraterTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gDeathMountainCraterTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardGERTex.ia8.inc.c" +}; + +u64 gDeathMountainCraterTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDeathMountainCraterTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_41.c b/assets/textures/place_title_cards/g_pn_41.c new file mode 100644 index 0000000000..418be49bc8 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_41.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGoronCityTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronCityTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGoronCityTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronCityTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGoronCityTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronCityTitleCardGERTex.ia8.inc.c" +}; + +u64 gGoronCityTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGoronCityTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_42.c b/assets/textures/place_title_cards/g_pn_42.c new file mode 100644 index 0000000000..488e4ba5ee --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_42.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gLonLonRanchTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLonLonRanchTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gLonLonRanchTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLonLonRanchTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gLonLonRanchTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLonLonRanchTitleCardGERTex.ia8.inc.c" +}; + +u64 gLonLonRanchTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gLonLonRanchTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_43.c b/assets/textures/place_title_cards/g_pn_43.c new file mode 100644 index 0000000000..6483d0c6c6 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_43.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGanonsCastleTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGanonsCastleTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGanonsCastleTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGanonsCastleTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGanonsCastleTitleCardGERTex.ia8.inc.c" +}; + +u64 gGanonsCastleTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGanonsCastleTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_44.c b/assets/textures/place_title_cards/g_pn_44.c new file mode 100644 index 0000000000..3a34bf7250 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_44.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gRoyalFamilysTombTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gRoyalFamilysTombTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gRoyalFamilysTombTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardGERTex.ia8.inc.c" +}; + +u64 gRoyalFamilysTombTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gRoyalFamilysTombTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_45.c b/assets/textures/place_title_cards/g_pn_45.c new file mode 100644 index 0000000000..e91fdebd18 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_45.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFairysFountainTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gFairysFountainTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFairysFountainTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gFairysFountainTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFairysFountainTitleCardGERTex.ia8.inc.c" +}; + +u64 gFairysFountainTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFairysFountainTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_46.c b/assets/textures/place_title_cards/g_pn_46.c new file mode 100644 index 0000000000..4f63e9288e --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_46.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gFishingPondTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFishingPondTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gFishingPondTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFishingPondTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gFishingPondTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFishingPondTitleCardGERTex.ia8.inc.c" +}; + +u64 gFishingPondTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gFishingPondTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_47.c b/assets/textures/place_title_cards/g_pn_47.c new file mode 100644 index 0000000000..b6d6181f50 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_47.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gBombchuBowlingAlleyCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gBombchuBowlingAlleyCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gBombchuBowlingAlleyCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardGERTex.ia8.inc.c" +}; + +u64 gBombchuBowlingAlleyCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuBowlingAlleyCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_48.c b/assets/textures/place_title_cards/g_pn_48.c new file mode 100644 index 0000000000..bd93f60067 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_48.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gStableTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gStableTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gStableTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gStableTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gStableTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gStableTitleCardGERTex.ia8.inc.c" +}; + +u64 gStableTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gStableTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_49.c b/assets/textures/place_title_cards/g_pn_49.c new file mode 100644 index 0000000000..47218558d9 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_49.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gThievesHideoutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gThievesHideoutTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gThievesHideoutTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gThievesHideoutTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gThievesHideoutTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gThievesHideoutTitleCardGERTex.ia8.inc.c" +}; + +u64 gThievesHideoutTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gThievesHideoutTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_50.c b/assets/textures/place_title_cards/g_pn_50.c new file mode 100644 index 0000000000..e26838c131 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_50.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gHappyMaskShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gHappyMaskShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gHappyMaskShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardGERTex.ia8.inc.c" +}; + +u64 gHappyMaskShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gHappyMaskShopTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_51.c b/assets/textures/place_title_cards/g_pn_51.c new file mode 100644 index 0000000000..796f0d6709 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_51.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gTreasureBoxShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gTreasureBoxShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gTreasureBoxShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardGERTex.ia8.inc.c" +}; + +u64 gTreasureBoxShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gTreasureBoxShopTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_52.c b/assets/textures/place_title_cards/g_pn_52.c new file mode 100644 index 0000000000..3dc2ccf7a0 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_52.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gSacredForestMeadowTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gSacredForestMeadowTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gSacredForestMeadowTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardGERTex.ia8.inc.c" +}; + +u64 gSacredForestMeadowTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gSacredForestMeadowTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_53.c b/assets/textures/place_title_cards/g_pn_53.c new file mode 100644 index 0000000000..ffb7d3b8b6 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_53.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gGERudosFortressTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudosFortressTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gGERudosFortressTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudosFortressTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gGERudosFortressTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudosFortressTitleCardGERTex.ia8.inc.c" +}; + +u64 gGERudosFortressTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gGERudosFortressTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_54.c b/assets/textures/place_title_cards/g_pn_54.c new file mode 100644 index 0000000000..6b9fb0e2b9 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_54.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gBottomOfTheWellTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gBottomOfTheWellTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gBottomOfTheWellTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardGERTex.ia8.inc.c" +}; + +u64 gBottomOfTheWellTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBottomOfTheWellTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_55.c b/assets/textures/place_title_cards/g_pn_55.c new file mode 100644 index 0000000000..7721518bc7 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_55.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gDesertColossusTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDesertColossusTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gDesertColossusTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDesertColossusTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gDesertColossusTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDesertColossusTitleCardGERTex.ia8.inc.c" +}; + +u64 gDesertColossusTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gDesertColossusTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_56.c b/assets/textures/place_title_cards/g_pn_56.c new file mode 100644 index 0000000000..2083b354b6 --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_56.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gBombchuShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuShopTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gBombchuShopTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuShopTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gBombchuShopTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuShopTitleCardGERTex.ia8.inc.c" +}; + +u64 gBombchuShopTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gBombchuShopTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/textures/place_title_cards/g_pn_57.c b/assets/textures/place_title_cards/g_pn_57.c new file mode 100644 index 0000000000..80f441b03e --- /dev/null +++ b/assets/textures/place_title_cards/g_pn_57.c @@ -0,0 +1,24 @@ +#include "ultra64.h" +#include "tex_len.h" +#include "versions.h" +#include "z64actor.h" + +#if OOT_NTSC +u64 gQuestionMarkTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gQuestionMarkTitleCardJPNTex.ia8.inc.c" +}; +#endif + +u64 gQuestionMarkTitleCardENGTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gQuestionMarkTitleCardENGTex.ia8.inc.c" +}; + +#if OOT_PAL +u64 gQuestionMarkTitleCardGERTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gQuestionMarkTitleCardGERTex.ia8.inc.c" +}; + +u64 gQuestionMarkTitleCardFRATex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { +#include "assets/textures/place_title_cards/gQuestionMarkTitleCardFRATex.ia8.inc.c" +}; +#endif diff --git a/assets/xml/textures/place_title_cards.xml b/assets/xml/textures/place_title_cards.xml index c9023bc4ee..b9392f7bca 100644 --- a/assets/xml/textures/place_title_cards.xml +++ b/assets/xml/textures/place_title_cards.xml @@ -184,8 +184,8 @@ - - + + diff --git a/include/z64actor.h b/include/z64actor.h index 30869fde47..14defad5ee 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -452,6 +452,9 @@ typedef enum AttentionRangeType { /* 10 */ ATTENTION_RANGE_MAX } AttentionRangeType; +#define PLACE_NAME_TEX_WIDTH 144 +#define PLACE_NAME_TEX_HEIGHT 24 + typedef struct TitleCardContext { /* 0x00 */ void* texture; /* 0x04 */ s16 x; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index d5135b99d1..ee6f23203c 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -388,7 +388,8 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { case CS_MISC_SHOW_TITLE_CARD: if (isFirstFrame) { - TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, player->giObjectSegment, 160, 120, 144, 24, 20); + TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, player->giObjectSegment, 160, 120, + PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 20); } break; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 8032614078..f6b765fee0 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -10776,7 +10776,8 @@ void Player_Init(Actor* thisx, PlayState* play2) { ((play->sceneId != SCENE_BOMBCHU_SHOP) || GET_EVENTCHKINF(EVENTCHKINF_25)) #endif ) { - TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120, 144, 24, 20); + TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120, + PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 20); } } diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index e687efff02..70d87a2ded 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -988,63 +988,6 @@ assets/textures/message_texture_static/message_texture_static.c assets/textures/nes_font_static/nes_font_static.c assets/textures/nintendo_rogo_static/nintendo_rogo_static.c assets/textures/parameter_static/parameter_static.c -assets/textures/place_title_cards/g_pn_01.c -assets/textures/place_title_cards/g_pn_02.c -assets/textures/place_title_cards/g_pn_03.c -assets/textures/place_title_cards/g_pn_04.c -assets/textures/place_title_cards/g_pn_05.c -assets/textures/place_title_cards/g_pn_06.c -assets/textures/place_title_cards/g_pn_07.c -assets/textures/place_title_cards/g_pn_08.c -assets/textures/place_title_cards/g_pn_09.c -assets/textures/place_title_cards/g_pn_10.c -assets/textures/place_title_cards/g_pn_11.c -assets/textures/place_title_cards/g_pn_12.c -assets/textures/place_title_cards/g_pn_13.c -assets/textures/place_title_cards/g_pn_14.c -assets/textures/place_title_cards/g_pn_15.c -assets/textures/place_title_cards/g_pn_16.c -assets/textures/place_title_cards/g_pn_17.c -assets/textures/place_title_cards/g_pn_18.c -assets/textures/place_title_cards/g_pn_19.c -assets/textures/place_title_cards/g_pn_20.c -assets/textures/place_title_cards/g_pn_21.c -assets/textures/place_title_cards/g_pn_22.c -assets/textures/place_title_cards/g_pn_23.c -assets/textures/place_title_cards/g_pn_24.c -assets/textures/place_title_cards/g_pn_25.c -assets/textures/place_title_cards/g_pn_26.c -assets/textures/place_title_cards/g_pn_27.c -assets/textures/place_title_cards/g_pn_28.c -assets/textures/place_title_cards/g_pn_29.c -assets/textures/place_title_cards/g_pn_30.c -assets/textures/place_title_cards/g_pn_31.c -assets/textures/place_title_cards/g_pn_32.c -assets/textures/place_title_cards/g_pn_33.c -assets/textures/place_title_cards/g_pn_34.c -assets/textures/place_title_cards/g_pn_35.c -assets/textures/place_title_cards/g_pn_36.c -assets/textures/place_title_cards/g_pn_37.c -assets/textures/place_title_cards/g_pn_38.c -assets/textures/place_title_cards/g_pn_39.c -assets/textures/place_title_cards/g_pn_40.c -assets/textures/place_title_cards/g_pn_41.c -assets/textures/place_title_cards/g_pn_42.c -assets/textures/place_title_cards/g_pn_43.c -assets/textures/place_title_cards/g_pn_44.c -assets/textures/place_title_cards/g_pn_45.c -assets/textures/place_title_cards/g_pn_46.c -assets/textures/place_title_cards/g_pn_47.c -assets/textures/place_title_cards/g_pn_48.c -assets/textures/place_title_cards/g_pn_49.c -assets/textures/place_title_cards/g_pn_50.c -assets/textures/place_title_cards/g_pn_51.c -assets/textures/place_title_cards/g_pn_52.c -assets/textures/place_title_cards/g_pn_53.c -assets/textures/place_title_cards/g_pn_54.c -assets/textures/place_title_cards/g_pn_55.c -assets/textures/place_title_cards/g_pn_56.c -assets/textures/place_title_cards/g_pn_57.c assets/textures/skyboxes/vr_cloud0_pal_static.c assets/textures/skyboxes/vr_cloud0_static.c assets/textures/skyboxes/vr_cloud1_pal_static.c From dec2c89c1034364c1ac5a0e1b299ee4b5cf85ad2 Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Tue, 3 Jun 2025 21:47:10 -0400 Subject: [PATCH 17/42] Child Ruto Part 8: Init branches (#2576) --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 31 +++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) 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 906928e25a..ceaea5935d 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -425,7 +425,7 @@ void func_80AEB3CC(EnRu1* this) { this->skelAnime.movementFlags &= ~ANIM_FLAG_UPDATE_XZ; } -void func_80AEB3DC(EnRu1* this, PlayState* play) { +void EnRu1_InitOutsideJabuJabu(EnRu1* this, PlayState* play) { func_80AEB264(this, &gRutoChildWaitHandsBehindBackAnim, 0, 0, 0); this->action = 0; this->drawConfig = 1; @@ -782,7 +782,7 @@ void func_80AEC2C0(EnRu1* this, PlayState* play) { func_80AEC070(this, play, something); } -void func_80AEC320(EnRu1* this, PlayState* play) { +void EnRu1_InitInJabuJabuHolesRoom(EnRu1* this, PlayState* play) { if (!GET_INFTABLE(INFTABLE_141)) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); this->action = 7; @@ -1027,7 +1027,7 @@ void func_80AECCB0(EnRu1* this, PlayState* play) { spawnY, spawnZ, 0, yawTowardsPlayer, 0, WARP_BLUE_RUTO); } -void func_80AECDA0(EnRu1* this, PlayState* play) { +void EnRu1_InitInBossRoom(EnRu1* this, PlayState* play) { func_80AEB264(this, &gRutoChildWaitHandsOnHipsAnim, 0, 0, 0); this->action = 15; this->actor.shape.yOffset = -10000.0f; @@ -1193,7 +1193,7 @@ void func_80AED414(EnRu1* this, PlayState* play) { EnRu1_UpdateSkelAnime(this); } -void func_80AED44C(EnRu1* this, PlayState* play) { +void EnRu1_InitInJabuJabuBasement(EnRu1* this, PlayState* play) { if (GET_INFTABLE(INFTABLE_141) && !GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_147)) { if (!func_80AEB020(this, play)) { @@ -2149,7 +2149,7 @@ void func_80AEFC24(EnRu1* this, PlayState* play) { func_80AEF99C(this, play); } -void func_80AEFC54(EnRu1* this, PlayState* play) { +void EnRu1_InitInSapphireRoom(EnRu1* this, PlayState* play) { if (GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_146)) { s32 pad; @@ -2172,7 +2172,7 @@ void func_80AEFCE8(EnRu1* this, PlayState* play) { } } -void func_80AEFD38(EnRu1* this, PlayState* play) { +void EnRu1_InitBesideKingZora(EnRu1* this, PlayState* play) { if (GET_EVENTCHKINF(EVENTCHKINF_37) && LINK_IS_CHILD) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; @@ -2233,7 +2233,10 @@ void func_80AEFF40(EnRu1* this, PlayState* play) { func_80AEFE9C(this, play); } -void func_80AEFF94(EnRu1* this, PlayState* play) { +/** + * Places Ruto beside the door switch outside the room with the map. + */ +void EnRu1_InitBesideDoorSwitch(EnRu1* this, PlayState* play) { s8 actorRoom; if (GET_INFTABLE(INFTABLE_141) && GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145) && @@ -2284,25 +2287,25 @@ void EnRu1_Init(Actor* thisx, PlayState* play) { func_80AEAD20(&this->actor, play); switch (func_80AEADF0(this)) { case 0: - func_80AECDA0(this, play); + EnRu1_InitInBossRoom(this, play); break; case 1: - func_80AEB3DC(this, play); + EnRu1_InitOutsideJabuJabu(this, play); break; case 2: - func_80AEC320(this, play); + EnRu1_InitInJabuJabuHolesRoom(this, play); break; case 3: - func_80AED44C(this, play); + EnRu1_InitInJabuJabuBasement(this, play); break; case 4: - func_80AEFC54(this, play); + EnRu1_InitInSapphireRoom(this, play); break; case 5: - func_80AEFD38(this, play); + EnRu1_InitBesideKingZora(this, play); break; case 6: - func_80AEFF94(this, play); + EnRu1_InitBesideDoorSwitch(this, play); break; #if DEBUG_FEATURES case 10: From aa00eb2c4d6eca30ac5ac9ff866b6a8b529cf57d Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 04:24:26 +0200 Subject: [PATCH 18/42] Add Vtx[] resources in xmls for (partially) documented assets 2 (#2565) * Add Vtx[] resources in xmls for (partially) documented assets 2 * non-pal too * Revert "non-pal too" This reverts commit ac8b38b3a827046cd33441b8c8c577e54a33bc4c. * fix * bss --- assets/xml/objects/gameplay_keep.xml | 309 ++++++++++++++++++++++ assets/xml/objects/gameplay_keep_pal.xml | 285 ++++++++++++++++++++ assets/xml/objects/object_ahg.xml | 55 +++- assets/xml/objects/object_bba.xml | 47 ++++ assets/xml/objects/object_bdoor.xml | 11 +- assets/xml/objects/object_bird.xml | 9 + assets/xml/objects/object_bji.xml | 50 ++++ assets/xml/objects/object_bl.xml | 11 + assets/xml/objects/object_bob.xml | 47 ++++ assets/xml/objects/object_boj.xml | 62 +++++ assets/xml/objects/object_bw.xml | 17 +- assets/xml/objects/object_cne.xml | 50 ++++ assets/xml/objects/object_cob.xml | 47 ++++ assets/xml/objects/object_dekubaba.xml | 23 +- assets/xml/objects/object_fish.xml | 159 +++++++++++ assets/xml/objects/object_ganon.xml | 81 ++++++ assets/xml/objects/object_ganon2.xml | 139 ++++++++++ assets/xml/objects/object_ganon2_pal.xml | 139 ++++++++++ assets/xml/objects/object_ganon_pal.xml | 81 ++++++ assets/xml/objects/object_gndd.xml | 71 ++++- assets/xml/objects/object_haka_door.xml | 15 ++ assets/xml/objects/object_human.xml | 45 ++++ assets/xml/objects/object_ice_objects.xml | 24 ++ assets/xml/objects/object_jya_iron.xml | 15 ++ assets/xml/objects/object_km1.xml | 3 + assets/xml/objects/object_os.xml | 26 ++ assets/xml/objects/object_po_composer.xml | 48 ++++ assets/xml/objects/object_po_field.xml | 45 ++++ assets/xml/objects/object_po_sisters.xml | 63 +++++ assets/xml/objects/object_poh.xml | 33 +++ assets/xml/objects/object_ps.xml | 33 +++ assets/xml/objects/object_rd.xml | 94 +++++++ assets/xml/objects/object_st.xml | 36 +++ assets/xml/objects/object_tk.xml | 63 +++++ assets/xml/objects/object_tp.xml | 11 +- assets/xml/objects/object_vali.xml | 41 +++ assets/xml/objects/object_warp1.xml | 24 ++ src/code/z_kankyo.c | 2 +- 38 files changed, 2307 insertions(+), 7 deletions(-) diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 2555cf68dc..0c90a35d5c 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -603,29 +603,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -638,17 +668,38 @@ + + + + + + + + + + + + + + + + + + + + + @@ -656,13 +707,28 @@ + + + + + + + + + + + + + + + @@ -670,30 +736,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -701,8 +809,20 @@ + + + + + + + + + + + + @@ -713,6 +833,9 @@ + + + @@ -723,6 +846,9 @@ + + + @@ -732,6 +858,9 @@ + + + @@ -758,6 +887,9 @@ + + + @@ -770,9 +902,18 @@ + + + + + + + + + @@ -782,6 +923,9 @@ + + + @@ -791,6 +935,9 @@ + + + @@ -800,6 +947,9 @@ + + + @@ -811,46 +961,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -858,47 +1050,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -913,6 +1177,9 @@ + + + @@ -925,6 +1192,9 @@ + + + @@ -948,15 +1218,33 @@ + + + + + + + + + + + + + + + + + + @@ -968,15 +1256,36 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml index 90bf296c85..f290314d5c 100644 --- a/assets/xml/objects/gameplay_keep_pal.xml +++ b/assets/xml/objects/gameplay_keep_pal.xml @@ -603,29 +603,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -638,25 +668,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -664,30 +727,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -695,8 +800,20 @@ + + + + + + + + + + + + @@ -707,6 +824,9 @@ + + + @@ -717,6 +837,9 @@ + + + @@ -726,6 +849,9 @@ + + + @@ -752,6 +878,9 @@ + + + @@ -764,9 +893,18 @@ + + + + + + + + + @@ -776,6 +914,9 @@ + + + @@ -785,6 +926,9 @@ + + + @@ -794,6 +938,9 @@ + + + @@ -805,46 +952,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -852,36 +1041,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -889,6 +1129,9 @@ + + + @@ -901,6 +1144,9 @@ + + + @@ -914,15 +1160,33 @@ + + + + + + + + + + + + + + + + + + @@ -934,15 +1198,36 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml index 8147abb75f..19b8876390 100644 --- a/assets/xml/objects/object_ahg.xml +++ b/assets/xml/objects/object_ahg.xml @@ -35,6 +35,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,7 +106,13 @@ - + + + + + + + diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml index f988d8fbe4..a0cc6812f7 100644 --- a/assets/xml/objects/object_bba.xml +++ b/assets/xml/objects/object_bba.xml @@ -30,6 +30,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml index e15f0f6294..6addd6e4f5 100644 --- a/assets/xml/objects/object_bdoor.xml +++ b/assets/xml/objects/object_bdoor.xml @@ -4,9 +4,18 @@ - + + + + + + + + + + diff --git a/assets/xml/objects/object_bird.xml b/assets/xml/objects/object_bird.xml index c0b5cac3e4..2c184e87fc 100644 --- a/assets/xml/objects/object_bird.xml +++ b/assets/xml/objects/object_bird.xml @@ -4,14 +4,23 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml index 8dd89dd875..b658cfe7f8 100644 --- a/assets/xml/objects/object_bji.xml +++ b/assets/xml/objects/object_bji.xml @@ -33,6 +33,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56,6 +103,9 @@ + + + diff --git a/assets/xml/objects/object_bl.xml b/assets/xml/objects/object_bl.xml index 1c2ef4ec63..6614aad836 100644 --- a/assets/xml/objects/object_bl.xml +++ b/assets/xml/objects/object_bl.xml @@ -5,6 +5,17 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml index ad59e56ea3..f3d0d55944 100644 --- a/assets/xml/objects/object_bob.xml +++ b/assets/xml/objects/object_bob.xml @@ -32,6 +32,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml index d43332de00..e25054fe23 100644 --- a/assets/xml/objects/object_boj.xml +++ b/assets/xml/objects/object_boj.xml @@ -34,6 +34,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,6 +109,21 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml index c2b76fd91e..8ee83090c7 100644 --- a/assets/xml/objects/object_bw.xml +++ b/assets/xml/objects/object_bw.xml @@ -3,11 +3,26 @@ - + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml index ecf151d641..c35805885e 100644 --- a/assets/xml/objects/object_cne.xml +++ b/assets/xml/objects/object_cne.xml @@ -30,6 +30,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52,6 +99,9 @@ + + + diff --git a/assets/xml/objects/object_cob.xml b/assets/xml/objects/object_cob.xml index b5047b4993..8135707021 100644 --- a/assets/xml/objects/object_cob.xml +++ b/assets/xml/objects/object_cob.xml @@ -8,6 +8,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dekubaba.xml b/assets/xml/objects/object_dekubaba.xml index 7202a833fc..fa587f3403 100644 --- a/assets/xml/objects/object_dekubaba.xml +++ b/assets/xml/objects/object_dekubaba.xml @@ -4,12 +4,30 @@ - + + + + + + + + + + + + + + + + + + + @@ -32,6 +50,9 @@ + + + diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml index 2ce27bac3a..c640a6bcd1 100644 --- a/assets/xml/objects/object_fish.xml +++ b/assets/xml/objects/object_fish.xml @@ -2,6 +2,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,30 +76,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88,6 +175,9 @@ + + + @@ -108,17 +198,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -152,29 +284,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml index 412acb66e0..4eb7dabcdb 100644 --- a/assets/xml/objects/object_ganon.xml +++ b/assets/xml/objects/object_ganon.xml @@ -1,6 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -58,6 +123,22 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon2.xml b/assets/xml/objects/object_ganon2.xml index cebdf819b5..7391787e9c 100644 --- a/assets/xml/objects/object_ganon2.xml +++ b/assets/xml/objects/object_ganon2.xml @@ -13,6 +13,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,6 +199,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon2_pal.xml b/assets/xml/objects/object_ganon2_pal.xml index 93f3a05e5e..bed3b0aa9b 100644 --- a/assets/xml/objects/object_ganon2_pal.xml +++ b/assets/xml/objects/object_ganon2_pal.xml @@ -13,6 +13,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,6 +199,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ganon_pal.xml b/assets/xml/objects/object_ganon_pal.xml index c5dd938235..17317d878e 100644 --- a/assets/xml/objects/object_ganon_pal.xml +++ b/assets/xml/objects/object_ganon_pal.xml @@ -1,6 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -58,6 +123,22 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gndd.xml b/assets/xml/objects/object_gndd.xml index 8bf5d770c4..103e9412da 100644 --- a/assets/xml/objects/object_gndd.xml +++ b/assets/xml/objects/object_gndd.xml @@ -17,12 +17,78 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,6 +106,9 @@ + + + diff --git a/assets/xml/objects/object_haka_door.xml b/assets/xml/objects/object_haka_door.xml index 1376d03569..ec8ca6a90a 100644 --- a/assets/xml/objects/object_haka_door.xml +++ b/assets/xml/objects/object_haka_door.xml @@ -1,12 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_human.xml b/assets/xml/objects/object_human.xml index 05795cb332..fcf015b312 100644 --- a/assets/xml/objects/object_human.xml +++ b/assets/xml/objects/object_human.xml @@ -76,75 +76,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ice_objects.xml b/assets/xml/objects/object_ice_objects.xml index d21164bc15..0c4abb6964 100644 --- a/assets/xml/objects/object_ice_objects.xml +++ b/assets/xml/objects/object_ice_objects.xml @@ -1,15 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_jya_iron.xml b/assets/xml/objects/object_jya_iron.xml index c6f6773c6a..3cd24c715e 100644 --- a/assets/xml/objects/object_jya_iron.xml +++ b/assets/xml/objects/object_jya_iron.xml @@ -1,10 +1,25 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_km1.xml b/assets/xml/objects/object_km1.xml index 4d17119251..2db9a8d119 100644 --- a/assets/xml/objects/object_km1.xml +++ b/assets/xml/objects/object_km1.xml @@ -34,6 +34,9 @@ + + + diff --git a/assets/xml/objects/object_os.xml b/assets/xml/objects/object_os.xml index d98b3a0f52..48c69ae276 100644 --- a/assets/xml/objects/object_os.xml +++ b/assets/xml/objects/object_os.xml @@ -3,6 +3,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml index 17c04fd18b..cb08b64b06 100644 --- a/assets/xml/objects/object_po_composer.xml +++ b/assets/xml/objects/object_po_composer.xml @@ -7,11 +7,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml index 43e1066e3b..7900b787ac 100644 --- a/assets/xml/objects/object_po_field.xml +++ b/assets/xml/objects/object_po_field.xml @@ -9,12 +9,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml index 7752843444..2ba750a2a2 100644 --- a/assets/xml/objects/object_po_sisters.xml +++ b/assets/xml/objects/object_po_sisters.xml @@ -7,22 +7,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_poh.xml b/assets/xml/objects/object_poh.xml index 33517945e8..b2dd07568d 100644 --- a/assets/xml/objects/object_poh.xml +++ b/assets/xml/objects/object_poh.xml @@ -7,8 +7,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml index 98f548db1b..e3a04685c6 100644 --- a/assets/xml/objects/object_ps.xml +++ b/assets/xml/objects/object_ps.xml @@ -2,6 +2,9 @@ + + + @@ -9,9 +12,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rd.xml b/assets/xml/objects/object_rd.xml index 22c7d33738..a0243a7359 100644 --- a/assets/xml/objects/object_rd.xml +++ b/assets/xml/objects/object_rd.xml @@ -5,6 +5,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,6 +119,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml index e374b4cb4a..d561363649 100644 --- a/assets/xml/objects/object_st.xml +++ b/assets/xml/objects/object_st.xml @@ -9,6 +9,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36,6 +66,12 @@ + + + + + + diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml index 5c9d0a0a6f..6ea256b875 100644 --- a/assets/xml/objects/object_tk.xml +++ b/assets/xml/objects/object_tk.xml @@ -10,11 +10,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tp.xml b/assets/xml/objects/object_tp.xml index 8ea908825e..5809bac6d1 100644 --- a/assets/xml/objects/object_tp.xml +++ b/assets/xml/objects/object_tp.xml @@ -1,8 +1,17 @@ - + + + + + + + + + + diff --git a/assets/xml/objects/object_vali.xml b/assets/xml/objects/object_vali.xml index 2bab5efaa6..e2c8f88159 100644 --- a/assets/xml/objects/object_vali.xml +++ b/assets/xml/objects/object_vali.xml @@ -7,6 +7,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_warp1.xml b/assets/xml/objects/object_warp1.xml index 1497d7a108..cc684029b3 100644 --- a/assets/xml/objects/object_warp1.xml +++ b/assets/xml/objects/object_warp1.xml @@ -1,10 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index c78fc5de87..41c7bf75d7 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -238,7 +238,7 @@ s16 sLightningFlashAlpha; s16 sSunDepthTestX; s16 sSunDepthTestY; -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:192 pal-1.1:192" LightNode* sNGameOverLightNode; From db2c08a51f65c0a441b5056e095067feedbe2537 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 04:59:59 +0200 Subject: [PATCH 19/42] Add Vtx[] resources in xmls for (partially) documented assets 3 (#2566) * Add Vtx[] resources in xmls for (partially) documented assets 3 * revert bombf --- assets/xml/objects/object_am.xml | 17 ++++++++ assets/xml/objects/object_ane.xml | 47 ++++++++++++++++++++++ assets/xml/objects/object_ani.xml | 46 +++++++++++++++++++++ assets/xml/objects/object_anubice.xml | 35 ++++++++++++++++ assets/xml/objects/object_aob.xml | 47 ++++++++++++++++++++++ assets/xml/objects/object_bdan_objects.xml | 47 ++++++++++++++++++++++ assets/xml/objects/object_bg.xml | 32 ++++++++++++++- assets/xml/objects/object_blkobj.xml | 12 +++++- assets/xml/objects/object_bowl.xml | 11 +++++ assets/xml/objects/object_box.xml | 28 +++++++++++++ assets/xml/objects/object_cow.xml | 32 +++++++++++++++ assets/xml/objects/object_crow.xml | 23 +++++++++++ assets/xml/objects/object_cs.xml | 46 +++++++++++++++++++++ assets/xml/objects/object_d_hsblock.xml | 7 ++++ assets/xml/objects/object_ddan_objects.xml | 17 ++++++++ assets/xml/objects/object_dekunuts.xml | 35 ++++++++++++++++ 16 files changed, 480 insertions(+), 2 deletions(-) diff --git a/assets/xml/objects/object_am.xml b/assets/xml/objects/object_am.xml index 2467baf6ab..c787a7b391 100644 --- a/assets/xml/objects/object_am.xml +++ b/assets/xml/objects/object_am.xml @@ -6,5 +6,22 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ane.xml b/assets/xml/objects/object_ane.xml index 1e29b351e0..d1c245308c 100644 --- a/assets/xml/objects/object_ane.xml +++ b/assets/xml/objects/object_ane.xml @@ -55,5 +55,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml index d83aa7656a..f0b09bba59 100644 --- a/assets/xml/objects/object_ani.xml +++ b/assets/xml/objects/object_ani.xml @@ -64,5 +64,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_anubice.xml b/assets/xml/objects/object_anubice.xml index 2140187e4e..7c3148d742 100644 --- a/assets/xml/objects/object_anubice.xml +++ b/assets/xml/objects/object_anubice.xml @@ -16,5 +16,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml index 74838f6af3..b3ef98f914 100644 --- a/assets/xml/objects/object_aob.xml +++ b/assets/xml/objects/object_aob.xml @@ -54,5 +54,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bdan_objects.xml b/assets/xml/objects/object_bdan_objects.xml index dcd56d3856..36f6541f03 100644 --- a/assets/xml/objects/object_bdan_objects.xml +++ b/assets/xml/objects/object_bdan_objects.xml @@ -57,5 +57,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml index 791226b71d..50d18c7187 100644 --- a/assets/xml/objects/object_bg.xml +++ b/assets/xml/objects/object_bg.xml @@ -45,6 +45,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_blkobj.xml b/assets/xml/objects/object_blkobj.xml index 9527292838..c8f3012bf4 100644 --- a/assets/xml/objects/object_blkobj.xml +++ b/assets/xml/objects/object_blkobj.xml @@ -3,13 +3,23 @@ + + + + + + + + - + + + diff --git a/assets/xml/objects/object_bowl.xml b/assets/xml/objects/object_bowl.xml index ffe6d43db7..d84a9598cd 100644 --- a/assets/xml/objects/object_bowl.xml +++ b/assets/xml/objects/object_bowl.xml @@ -14,5 +14,16 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml index 7ab9d9e7f4..8387130c94 100644 --- a/assets/xml/objects/object_box.xml +++ b/assets/xml/objects/object_box.xml @@ -9,19 +9,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml index 3cdad5ef93..d825f089c5 100644 --- a/assets/xml/objects/object_cow.xml +++ b/assets/xml/objects/object_cow.xml @@ -51,5 +51,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_crow.xml b/assets/xml/objects/object_crow.xml index 5304246a00..ee166346b3 100644 --- a/assets/xml/objects/object_crow.xml +++ b/assets/xml/objects/object_crow.xml @@ -7,5 +7,28 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml index 83804ccaf4..9c2443ce5d 100644 --- a/assets/xml/objects/object_cs.xml +++ b/assets/xml/objects/object_cs.xml @@ -17,6 +17,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_d_hsblock.xml b/assets/xml/objects/object_d_hsblock.xml index 4bb50c2b4f..b9a62acdfb 100644 --- a/assets/xml/objects/object_d_hsblock.xml +++ b/assets/xml/objects/object_d_hsblock.xml @@ -6,5 +6,12 @@ + + + + + + + diff --git a/assets/xml/objects/object_ddan_objects.xml b/assets/xml/objects/object_ddan_objects.xml index b7df6ed847..6eeb481eb3 100644 --- a/assets/xml/objects/object_ddan_objects.xml +++ b/assets/xml/objects/object_ddan_objects.xml @@ -28,5 +28,22 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml index 4a4508ee0b..8f1303fadb 100644 --- a/assets/xml/objects/object_dekunuts.xml +++ b/assets/xml/objects/object_dekunuts.xml @@ -28,5 +28,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f51e3e8ab2758f31bce636b0028f9e260c913f24 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 05:39:06 +0200 Subject: [PATCH 20/42] Add Vtx[] resources in xmls for (partially) documented assets 4 (#2567) --- assets/xml/objects/object_dnk.xml | 38 +++++++ assets/xml/objects/object_dns.xml | 45 +++++++- assets/xml/objects/object_dodongo.xml | 41 ++++++++ assets/xml/objects/object_door_gerudo.xml | 3 + assets/xml/objects/object_ds.xml | 14 +++ assets/xml/objects/object_dy_obj.xml | 91 +++++++++++++++++ assets/xml/objects/object_efc_doughnut.xml | 6 ++ assets/xml/objects/object_ei.xml | 35 +++++++ assets/xml/objects/object_fd2.xml | 113 +++++++++++++++++++++ assets/xml/objects/object_firefly.xml | 34 +++++++ assets/xml/objects/object_fu.xml | 46 +++++++++ assets/xml/objects/object_fw.xml | 95 +++++++++++++++++ assets/xml/objects/object_fz.xml | 19 ++++ assets/xml/objects/object_ge1.xml | 56 ++++++++++ assets/xml/objects/object_geldb.xml | 59 +++++++++++ assets/xml/objects/object_gjyo_objects.xml | 3 + assets/xml/objects/object_gla.xml | 55 ++++++++++ assets/xml/objects/object_gnd.xml | 55 ++++++++++ assets/xml/objects/object_gol.xml | 32 ++++++ 19 files changed, 839 insertions(+), 1 deletion(-) diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml index 1efec46aad..00b5da9157 100644 --- a/assets/xml/objects/object_dnk.xml +++ b/assets/xml/objects/object_dnk.xml @@ -22,6 +22,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml index e66a639874..5989afbc5f 100644 --- a/assets/xml/objects/object_dns.xml +++ b/assets/xml/objects/object_dns.xml @@ -23,6 +23,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30,6 +74,5 @@ - diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml index 779e20e9dc..e7b00e7d31 100644 --- a/assets/xml/objects/object_dodongo.xml +++ b/assets/xml/objects/object_dodongo.xml @@ -37,5 +37,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_door_gerudo.xml b/assets/xml/objects/object_door_gerudo.xml index 2f17262041..6f9ec37e45 100644 --- a/assets/xml/objects/object_door_gerudo.xml +++ b/assets/xml/objects/object_door_gerudo.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_ds.xml b/assets/xml/objects/object_ds.xml index b2fb1a5c26..2dea3f869b 100644 --- a/assets/xml/objects/object_ds.xml +++ b/assets/xml/objects/object_ds.xml @@ -34,5 +34,19 @@ + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml index 4c6eb5871d..63a200b102 100644 --- a/assets/xml/objects/object_dy_obj.xml +++ b/assets/xml/objects/object_dy_obj.xml @@ -117,5 +117,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_efc_doughnut.xml b/assets/xml/objects/object_efc_doughnut.xml index 7f12c56f53..e141c4ab4d 100644 --- a/assets/xml/objects/object_efc_doughnut.xml +++ b/assets/xml/objects/object_efc_doughnut.xml @@ -2,7 +2,13 @@ + + + + + + diff --git a/assets/xml/objects/object_ei.xml b/assets/xml/objects/object_ei.xml index cabad17ff8..c2f191deaf 100644 --- a/assets/xml/objects/object_ei.xml +++ b/assets/xml/objects/object_ei.xml @@ -52,5 +52,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fd2.xml b/assets/xml/objects/object_fd2.xml index 8d2b3dcdb6..e6c4d6cce8 100644 --- a/assets/xml/objects/object_fd2.xml +++ b/assets/xml/objects/object_fd2.xml @@ -38,5 +38,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml index 8c26a43418..e7de1cfc44 100644 --- a/assets/xml/objects/object_firefly.xml +++ b/assets/xml/objects/object_firefly.xml @@ -17,5 +17,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml index 3947e438c0..673472c973 100644 --- a/assets/xml/objects/object_fu.xml +++ b/assets/xml/objects/object_fu.xml @@ -51,5 +51,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml index 51462a3166..d18ac114a1 100644 --- a/assets/xml/objects/object_fw.xml +++ b/assets/xml/objects/object_fw.xml @@ -101,5 +101,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fz.xml b/assets/xml/objects/object_fz.xml index bbed88b106..bd01a38707 100644 --- a/assets/xml/objects/object_fz.xml +++ b/assets/xml/objects/object_fz.xml @@ -9,5 +9,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ge1.xml b/assets/xml/objects/object_ge1.xml index c3c3e0db39..d116d2098f 100644 --- a/assets/xml/objects/object_ge1.xml +++ b/assets/xml/objects/object_ge1.xml @@ -74,5 +74,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml index a1dbd18f40..4d23d80e8c 100644 --- a/assets/xml/objects/object_geldb.xml +++ b/assets/xml/objects/object_geldb.xml @@ -24,5 +24,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gjyo_objects.xml b/assets/xml/objects/object_gjyo_objects.xml index ea4f8444fb..44f3ba791b 100644 --- a/assets/xml/objects/object_gjyo_objects.xml +++ b/assets/xml/objects/object_gjyo_objects.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml index dbbfcb58ff..7e7f934f62 100644 --- a/assets/xml/objects/object_gla.xml +++ b/assets/xml/objects/object_gla.xml @@ -81,5 +81,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml index d073b8b973..e8b6937a8d 100644 --- a/assets/xml/objects/object_gnd.xml +++ b/assets/xml/objects/object_gnd.xml @@ -82,5 +82,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gol.xml b/assets/xml/objects/object_gol.xml index 7e04508cb6..0f096f58e8 100644 --- a/assets/xml/objects/object_gol.xml +++ b/assets/xml/objects/object_gol.xml @@ -55,5 +55,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7085b48483ef765cc6e69e295d243f584046271c Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Wed, 4 Jun 2025 00:39:19 -0400 Subject: [PATCH 21/42] Child Ruto Part 10: Head rotation (#2578) * Child Ruto Part 10: Head rotation * Rename head turn speed variable --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 44 +++++++++++------------ src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 6 ++-- 2 files changed, 25 insertions(+), 25 deletions(-) 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 ceaea5935d..e94723f58a 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1307,35 +1307,35 @@ void func_80AED83C(EnRu1* this) { Math_SmoothStepToS(&torsoRot->y, 0, 0x14, 0x1838, 0x64); } -void func_80AED8DC(EnRu1* this) { - s32 temp_hi; - s16* unk_2AC = &this->unk_2AC; +void EnRu1_UpdateHeadRotation(EnRu1* this) { + s32 headRotOffset; + s16* headRotTimer = &this->headRotTimer; s16* headRotY = &this->interactInfo.headRot.y; - s16* unk_29E = &this->unk_29E; + s16* headTurnSpeed = &this->headTurnSpeed; s32 pad[2]; - if (DECR(*unk_2AC) == 0) { - *unk_2AC = Rand_S16Offset(0xA, 0x19); - temp_hi = *unk_2AC % 5; - if (temp_hi == 0) { - this->unk_2B0 = 1; - } else if (temp_hi == 1) { - this->unk_2B0 = 2; + if (DECR(*headRotTimer) == 0) { + *headRotTimer = Rand_S16Offset(0xA, 0x19); + headRotOffset = *headRotTimer % 5; + if (headRotOffset == 0) { + this->headRotDirection = 1; + } else if (headRotOffset == 1) { + this->headRotDirection = 2; } else { - this->unk_2B0 = 0; + this->headRotDirection = 0; } - *unk_29E = 0; + *headTurnSpeed = 0; } - if (this->unk_2B0 == 0) { - Math_SmoothStepToS(unk_29E, 0 - *headRotY, 1, 0x190, 0x190); - Math_SmoothStepToS(headRotY, 0, 3, ABS(*unk_29E), 0x64); - } else if (this->unk_2B0 == 1) { - Math_SmoothStepToS(unk_29E, -0x2AAA - *headRotY, 1, 0x190, 0x190); - Math_SmoothStepToS(headRotY, -0x2AAA, 3, ABS(*unk_29E), 0x64); + if (this->headRotDirection == 0) { + Math_SmoothStepToS(headTurnSpeed, 0 - *headRotY, 1, 0x190, 0x190); + Math_SmoothStepToS(headRotY, 0, 3, ABS(*headTurnSpeed), 0x64); + } else if (this->headRotDirection == 1) { + Math_SmoothStepToS(headTurnSpeed, -0x2AAA - *headRotY, 1, 0x190, 0x190); + Math_SmoothStepToS(headRotY, -0x2AAA, 3, ABS(*headTurnSpeed), 0x64); } else { - Math_SmoothStepToS(unk_29E, 0x2AAA - *headRotY, 1, 0x190, 0x190); - Math_SmoothStepToS(headRotY, 0x2AAA, 3, ABS(*unk_29E), 0x64); + Math_SmoothStepToS(headTurnSpeed, 0x2AAA - *headRotY, 1, 0x190, 0x190); + Math_SmoothStepToS(headRotY, 0x2AAA, 3, ABS(*headTurnSpeed), 0x64); } } @@ -1784,7 +1784,7 @@ void func_80AEED58(EnRu1* this, PlayState* play) { } void func_80AEEDCC(EnRu1* this, PlayState* play) { - func_80AED8DC(this); + EnRu1_UpdateHeadRotation(this); EnRu1_UpdateSkelAnime(this); func_80AEAECC(this, play); func_80AEE2F8(this, play); diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 8778174ef5..7684a93fe0 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -38,12 +38,12 @@ typedef struct EnRu1 { /* 0x0294 */ char unk_294[0x4]; /* 0x0298 */ s32 unk_298; /* 0x029C */ char unk_29C[0x2]; - /* 0x029E */ s16 unk_29E; + /* 0x029E */ s16 headTurnSpeed; /* 0x02A0 */ char unk_2A0[0x4]; /* 0x02A4 */ f32 unk_2A4; /* 0x02A8 */ s32 alpha; - /* 0x02AC */ s16 unk_2AC; - /* 0x02B0 */ s32 unk_2B0; + /* 0x02AC */ s16 headRotTimer; + /* 0x02B0 */ s32 headRotDirection; /* 0x02B4 */ ColliderCylinder collider; /* 0x0300 */ ColliderCylinder collider2; /* 0x034C */ s32 unk_34C; From 4980836ba3a19d8a2603b47af9e4e8d342916cbc Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Wed, 4 Jun 2025 00:58:38 -0400 Subject: [PATCH 22/42] Child Ruto Part 11: Idle Carry Timer (#2579) * Child Ruto Part 11: Carry timer * Rename carry timer as suggested --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 24 +++++++++++------------ src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) 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 e94723f58a..2eb4c00dfd 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1655,10 +1655,10 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) { return false; } -void func_80AEE7C4(EnRu1* this, PlayState* play) { +void EnRu1_UpdateCarriedBehavior(EnRu1* this, PlayState* play) { s32 pad[9]; Player* player; - f32* unk_370 = &this->unk_370; + f32* carryIdleTimer = &this->carryIdleTimer; if (Actor_HasNoParent(&this->actor, play)) { f32 frameCount = Animation_GetLastFrame(&gRutoChildSittingAnim); @@ -1671,17 +1671,17 @@ void func_80AEE7C4(EnRu1* this, PlayState* play) { this->actor.gravity = -((kREG(23) * 0.01f) + 1.3f); func_80AED57C(this); this->action = 28; - *unk_370 = 0.0f; + *carryIdleTimer = 0.0f; } else if (func_80AEE6D0(this, play)) { s32 pad; - *unk_370 = 0.0f; + *carryIdleTimer = 0.0f; } else { player = GET_PLAYER(play); if (player->stateFlags2 & PLAYER_STATE2_IDLE_FIDGET) { - this->unk_370 += 1.0f; + this->carryIdleTimer += 1.0f; if (this->action != 32) { - if (*unk_370 > 30.0f) { + if (*carryIdleTimer > 30.0f) { if (Rand_S16Offset(0, 3) == 0) { f32 frameCount = Animation_GetLastFrame(&gRutoChildSquirmAnim); @@ -1690,23 +1690,23 @@ void func_80AEE7C4(EnRu1* this, PlayState* play) { func_80AED5DC(this); this->action = 32; } - *unk_370 = 0.0f; + *carryIdleTimer = 0.0f; } } else { - if (*unk_370 > 50.0f) { + if (*carryIdleTimer > 50.0f) { f32 frameCount = Animation_GetLastFrame(&gRutoChildSittingAnim); Animation_Change(&this->skelAnime, &gRutoChildSittingAnim, 1.0f, 0, frameCount, ANIMMODE_LOOP, -8.0f); this->action = 31; - *unk_370 = 0.0f; + *carryIdleTimer = 0.0f; } } } else { f32 frameCount = Animation_GetLastFrame(&gRutoChildSittingAnim); Animation_Change(&this->skelAnime, &gRutoChildSittingAnim, 1.0f, 0, frameCount, ANIMMODE_LOOP, -8.0f); - *unk_370 = 0.0f; + *carryIdleTimer = 0.0f; } } } @@ -1790,7 +1790,7 @@ void func_80AEEDCC(EnRu1* this, PlayState* play) { func_80AEE2F8(this, play); EnRu1_UpdateEyes(this); func_80AED6F8(play); - func_80AEE7C4(this, play); + EnRu1_UpdateCarriedBehavior(this, play); } void func_80AEEE34(EnRu1* this, PlayState* play) { @@ -1800,7 +1800,7 @@ void func_80AEEE34(EnRu1* this, PlayState* play) { func_80AEE2F8(this, play); EnRu1_UpdateEyes(this); func_80AED6F8(play); - func_80AEE7C4(this, play); + EnRu1_UpdateCarriedBehavior(this, play); } void func_80AEEE9C(EnRu1* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 7684a93fe0..6b495ccf7f 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -53,7 +53,7 @@ typedef struct EnRu1 { /* 0x035C */ s16 unk_35C; /* 0x0360 */ f32 unk_360; /* 0x0364 */ Vec3f unk_364; - /* 0x0370 */ f32 unk_370; + /* 0x0370 */ f32 carryIdleTimer; /* 0x0374 */ NpcInteractInfo interactInfo; } EnRu1; // size = 0x039C From c903555e832050e0150c7420c55c0719bab96803 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 13:44:10 +0200 Subject: [PATCH 23/42] Commit some assets/overlays/ (#2582) * Commit (inline) some assets/overlays/ * rm padding * ovl_file_choose --- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 25 +++- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 25 +++- .../actors/ovl_Arrow_Light/z_arrow_light.c | 25 +++- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 71 ++++++++- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 8 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 14 +- .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 46 ++++-- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 8 +- .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 55 ++++++- .../actors/ovl_En_Kanban/z_en_kanban.c | 8 +- src/overlays/actors/ovl_En_St/z_en_st.c | 8 +- .../actors/ovl_End_Title/z_end_title.c | 135 +++++++++++++++++- .../z_eff_ss_fhg_flash.c | 18 ++- .../gamestates/ovl_file_choose/file_select.h | 22 +++ .../ovl_file_choose/z_file_nameset.c | 1 - .../ovl_file_choose/z_file_nameset_data.c | 84 ++++++++++- tools/assets/extract/write_source.txt | 13 -- 17 files changed, 522 insertions(+), 44 deletions(-) diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index a92c226117..34095f9ddf 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -13,6 +13,7 @@ #include "ichain.h" #include "sfx.h" #include "sys_matrix.h" +#include "tex_len.h" #include "z_lib.h" #include "z64play.h" @@ -27,7 +28,29 @@ void ArrowFire_Charge(ArrowFire* this, PlayState* play); void ArrowFire_Fly(ArrowFire* this, PlayState* play); void ArrowFire_Hit(ArrowFire* this, PlayState* play); -#include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c" +#define s1Tex_WIDTH 32 +#define s1Tex_HEIGHT 64 +static u64 s1Tex[TEX_LEN(u64, s1Tex_WIDTH, s1Tex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Arrow_Fire/s1Tex.i8.inc.c" +}; + +#define s2Tex_WIDTH 32 +#define s2Tex_HEIGHT 64 +static u64 s2Tex[TEX_LEN(u64, s2Tex_WIDTH, s2Tex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Arrow_Fire/s2Tex.i8.inc.c" +}; + +static Vtx sVtx[] = { +#include "assets/overlays/ovl_Arrow_Fire/sVtx.inc.c" +}; + +static Gfx sMaterialDL[22] = { +#include "assets/overlays/ovl_Arrow_Fire/sMaterialDL.inc.c" +}; + +static Gfx sModelDL[24] = { +#include "assets/overlays/ovl_Arrow_Fire/sModelDL.inc.c" +}; ActorProfile Arrow_Fire_Profile = { /**/ ACTOR_ARROW_FIRE, diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 953e0a333c..8cc384f8c4 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -13,6 +13,7 @@ #include "ichain.h" #include "sfx.h" #include "sys_matrix.h" +#include "tex_len.h" #include "z_lib.h" #include "z64play.h" @@ -27,7 +28,29 @@ void ArrowIce_Charge(ArrowIce* this, PlayState* play); void ArrowIce_Fly(ArrowIce* this, PlayState* play); void ArrowIce_Hit(ArrowIce* this, PlayState* play); -#include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c" +#define s1Tex_WIDTH 32 +#define s1Tex_HEIGHT 64 +static u64 s1Tex[TEX_LEN(u64, s1Tex_WIDTH, s1Tex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Arrow_Ice/s1Tex.i8.inc.c" +}; + +#define s2Tex_WIDTH 32 +#define s2Tex_HEIGHT 64 +static u64 s2Tex[TEX_LEN(u64, s2Tex_WIDTH, s2Tex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Arrow_Ice/s2Tex.i8.inc.c" +}; + +static Vtx sVtx[] = { +#include "assets/overlays/ovl_Arrow_Ice/sVtx.inc.c" +}; + +static Gfx sMaterialDL[22] = { +#include "assets/overlays/ovl_Arrow_Ice/sMaterialDL.inc.c" +}; + +static Gfx sModelDL[24] = { +#include "assets/overlays/ovl_Arrow_Ice/sModelDL.inc.c" +}; ActorProfile Arrow_Ice_Profile = { /**/ ACTOR_ARROW_ICE, diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 100b8c20c1..2ddf4beea8 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -13,6 +13,7 @@ #include "ichain.h" #include "sfx.h" #include "sys_matrix.h" +#include "tex_len.h" #include "z_lib.h" #include "z64play.h" @@ -27,7 +28,29 @@ void ArrowLight_Charge(ArrowLight* this, PlayState* play); void ArrowLight_Fly(ArrowLight* this, PlayState* play); void ArrowLight_Hit(ArrowLight* this, PlayState* play); -#include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" +#define s1Tex_WIDTH 32 +#define s1Tex_HEIGHT 64 +static u64 s1Tex[TEX_LEN(u64, s1Tex_WIDTH, s1Tex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Arrow_Light/s1Tex.i8.inc.c" +}; + +#define s2Tex_WIDTH 32 +#define s2Tex_HEIGHT 64 +static u64 s2Tex[TEX_LEN(u64, s2Tex_WIDTH, s2Tex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Arrow_Light/s2Tex.i8.inc.c" +}; + +static Vtx sVtx[] = { +#include "assets/overlays/ovl_Arrow_Light/sVtx.inc.c" +}; + +static Gfx sMaterialDL[22] = { +#include "assets/overlays/ovl_Arrow_Light/sMaterialDL.inc.c" +}; + +static Gfx sModelDL[24] = { +#include "assets/overlays/ovl_Arrow_Light/sModelDL.inc.c" +}; ActorProfile Arrow_Light_Profile = { /**/ ACTOR_ARROW_LIGHT, 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 1df0e5b730..984f64a394 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 @@ -16,6 +16,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "tex_len.h" #include "z_lib.h" #include "z64effect.h" #include "z64play.h" @@ -76,7 +77,75 @@ static Vec3f sSideCenters[] = { static f32 sSideAngles[] = { M_PI / 2, -M_PI / 2, 0.0f, M_PI }; -#include "assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c" +#define sPlatformTex_WIDTH 32 +#define sPlatformTex_HEIGHT 32 +static u64 sPlatformTex[TEX_LEN(u64, sPlatformTex_WIDTH, sPlatformTex_HEIGHT, 16)] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformTex.rgba16.inc.c" +}; + +static u8 sZeros[8] = { 0 }; + +static Vtx sPlatformTopVtx[4] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformTopVtx.inc.c" +}; + +static Gfx sPlatformMaterialDL[17] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformMaterialDL.inc.c" +}; + +static Gfx sPlatformTopDL[3] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformTopDL.inc.c" +}; + +static Vtx sPlatformBottomVtx[4] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformBottomVtx.inc.c" +}; + +static Gfx sPlatformBottomDL[3] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformBottomDL.inc.c" +}; + +static Vtx sPlatformSideVtx[4] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformSideVtx.inc.c" +}; + +static Gfx sPlatformSideDL[3] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPlatformSideDL.inc.c" +}; + +#define sFlashTex_WIDTH 32 +#define sFlashTex_HEIGHT 64 +static u64 sFlashTex[TEX_LEN(u64, sFlashTex_WIDTH, sFlashTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sFlashTex.i8.inc.c" +}; + +static Vtx sFlashVtx[8] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sFlashVtx.inc.c" +}; + +static Gfx sFlashDL[22] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sFlashDL.inc.c" +}; + +static BgCamInfo sBgCamList[1] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sBgCamList.inc.c" +}; + +static SurfaceType sSurfaceTypes[2] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sSurfaceTypes.inc.c" +}; + +static CollisionPoly sPolyList[10] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sPolyList.inc.c" +}; + +static Vec3s sVtxList[8] = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sVtxList.inc.c" +}; + +static CollisionHeader sCol = { +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/sCol.inc.c" +}; void BgGanonOtyuka_Init(Actor* thisx, PlayState* play2) { BgGanonOtyuka* this = (BgGanonOtyuka*)thisx; 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 0a087d91d9..2f620df635 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 @@ -28,7 +28,13 @@ void func_80896950(BgJyaCobra* this, PlayState* play); void func_808969F8(BgJyaCobra* this, PlayState* play); void func_80896ABC(BgJyaCobra* this, PlayState* play); -#include "assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c" +static Vtx sShadowVtx[] = { +#include "assets/overlays/ovl_Bg_Jya_Cobra/sShadowVtx.inc.c" +}; + +static Gfx sShadowDL[7] = { +#include "assets/overlays/ovl_Bg_Jya_Cobra/sShadowDL.inc.c" +}; ActorProfile Bg_Jya_Cobra_Profile = { /**/ ACTOR_BG_JYA_COBRA, diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index bfc700c6dc..889dab02b7 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -15,6 +15,7 @@ #include "sequence.h" #include "sfx.h" #include "sys_matrix.h" +#include "tex_len.h" #include "z_lib.h" #include "z64effect.h" #include "z64play.h" @@ -69,7 +70,18 @@ ActorProfile Boss_Dodongo_Profile = { }; #include "z_boss_dodongo_data.inc.c" -#include "assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c" + +#define sLavaFloorLavaTex_WIDTH 64 +#define sLavaFloorLavaTex_HEIGHT 64 +static u64 sLavaFloorLavaTex[TEX_LEN(u64, sLavaFloorLavaTex_WIDTH, sLavaFloorLavaTex_HEIGHT, 16)] = { +#include "assets/overlays/ovl_Boss_Dodongo/sLavaFloorLavaTex.rgba16.inc.c" +}; + +#define sLavaFloorRockTex_WIDTH 32 +#define sLavaFloorRockTex_HEIGHT 64 +static u64 sLavaFloorRockTex[TEX_LEN(u64, sLavaFloorRockTex_WIDTH, sLavaFloorRockTex_HEIGHT, 16)] = { +#include "assets/overlays/ovl_Boss_Dodongo/sLavaFloorRockTex.rgba16.inc.c" +}; static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_5, ICHAIN_CONTINUE), diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index d40a9a446d..6f3156037f 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -12,6 +12,7 @@ #include "segmented_address.h" #include "sys_math.h" #include "sys_matrix.h" +#include "tex_len.h" #include "z_lib.h" #include "z64play.h" @@ -102,12 +103,39 @@ static u16 sVerticesMap[GANON_MANT_NUM_STRANDS * GANON_MANT_NUM_JOINTS] = { MAP_STRAND_TO_VTX(3), MAP_STRAND_TO_VTX(2), MAP_STRAND_TO_VTX(1), MAP_STRAND_TO_VTX(0), }; -#define MANT_TEX_WIDTH 32 -#define MANT_TEX_HEIGHT 64 - static u64 sForceAlignment = 0; -#include "assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.c" +#define gMantTex_WIDTH 32 +#define gMantTex_HEIGHT 64 +static u64 gMantTex[TEX_LEN(u64, gMantTex_WIDTH, gMantTex_HEIGHT, 16)] = { +#include "assets/overlays/ovl_En_Ganon_Mant/gMantTex.rgba16.inc.c" +}; + +#define gMantUnusedTex_WIDTH 32 +#define gMantUnusedTex_HEIGHT 32 +static u64 gMantUnusedTex[TEX_LEN(u64, gMantUnusedTex_WIDTH, gMantUnusedTex_HEIGHT, 16)] = { +#include "assets/overlays/ovl_En_Ganon_Mant/gMantUnusedTex.rgba16.inc.c" +}; + +static Vtx gMant1Vtx[] = { +#include "assets/overlays/ovl_En_Ganon_Mant/gMant1Vtx.inc.c" +}; + +static Gfx gMantMaterialDL[11] = { +#include "assets/overlays/ovl_En_Ganon_Mant/gMantMaterialDL.inc.c" +}; + +static Gfx gMantUnusedMaterialDL[11] = { +#include "assets/overlays/ovl_En_Ganon_Mant/gMantUnusedMaterialDL.inc.c" +}; + +static Gfx gMantDL[138] = { +#include "assets/overlays/ovl_En_Ganon_Mant/gMantDL.inc.c" +}; + +static Vtx gMant2Vtx[] = { +#include "assets/overlays/ovl_En_Ganon_Mant/gMant2Vtx.inc.c" +}; void EnGanonMant_Init(Actor* thisx, PlayState* play) { EnGanonMant* this = (EnGanonMant*)thisx; @@ -127,8 +155,8 @@ void EnGanonMant_Tear(EnGanonMant* this) { s16 areaX; s16 areaY; s16 texIdx; - f32 tx = Rand_ZeroFloat(MANT_TEX_WIDTH); - f32 ty = Rand_ZeroFloat(MANT_TEX_HEIGHT); + f32 tx = Rand_ZeroFloat(gMantTex_WIDTH); + f32 ty = Rand_ZeroFloat(gMantTex_HEIGHT); f32 tearAngle = Rand_ZeroFloat(2 * M_PI); f32 tearDirX = sinf(tearAngle); f32 tearDirY = cosf(tearAngle); @@ -137,11 +165,11 @@ void EnGanonMant_Tear(EnGanonMant* this) { s16* tearAreaSizes = shape->tearAreaSizes; for (i = 0; i < count; i++) { - if ((0 <= tx && tx < MANT_TEX_WIDTH) && (0 <= ty && ty < MANT_TEX_HEIGHT)) { + if ((0 <= tx && tx < gMantTex_WIDTH) && (0 <= ty && ty < gMantTex_HEIGHT)) { for (areaX = 0; areaX <= tearAreaSizes[i]; areaX++) { for (areaY = 0; areaY <= tearAreaSizes[i]; areaY++) { - texIdx = (s16)((s16)tx + ((s16)ty * MANT_TEX_WIDTH)) + ((s16)areaX + ((s16)areaY * MANT_TEX_WIDTH)); - if (texIdx >= MANT_TEX_WIDTH * MANT_TEX_HEIGHT) { + texIdx = (s16)((s16)tx + ((s16)ty * gMantTex_WIDTH)) + ((s16)areaX + ((s16)areaY * gMantTex_WIDTH)); + if (texIdx >= gMantTex_WIDTH * gMantTex_HEIGHT) { continue; } ((u16*)gMantTex)[texIdx] = 0; diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index c3f8fa40ad..98df8ae242 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -415,7 +415,13 @@ void EnHoll_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); } -#include "assets/overlays/ovl_En_Holl/ovl_En_Holl.c" +static Vtx sPlaneVtx[] = { +#include "assets/overlays/ovl_En_Holl/sPlaneVtx.inc.c" +}; + +static Gfx sPlaneDL[5] = { +#include "assets/overlays/ovl_En_Holl/sPlaneDL.inc.c" +}; void EnHoll_Draw(Actor* thisx, PlayState* play) { EnHoll* this = (EnHoll*)thisx; diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index fce6c4ef03..25e98efe6a 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -13,6 +13,7 @@ #include "segmented_address.h" #include "sys_math.h" #include "sys_matrix.h" +#include "tex_len.h" #include "z_lib.h" #include "z64play.h" #include "z64player.h" @@ -46,7 +47,59 @@ static Vec3s D_80A8EE10[0x90]; static s32 sUnused[2] = { 0, 0 }; -#include "assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c" +#define sCarpetTex_WIDTH 32 +#define sCarpetTex_HEIGHT 64 +static u64 sCarpetTex[TEX_LEN(u64, sCarpetTex_WIDTH, sCarpetTex_HEIGHT, 16)] = { +#include "assets/overlays/ovl_En_Jsjutan/sCarpetTex.rgba16.inc.c" +}; + +static Vtx gShadowOddVtx[] = { +#include "assets/overlays/ovl_En_Jsjutan/gShadowOddVtx.inc.c" +}; + +static Vtx sShadowEvenVtx[] = { +#include "assets/overlays/ovl_En_Jsjutan/sShadowEvenVtx.inc.c" +}; + +static Vtx sCarpetOddVtx[] = { +#include "assets/overlays/ovl_En_Jsjutan/sCarpetOddVtx.inc.c" +}; + +static Gfx sCarpetMaterialDL[16] = { +#include "assets/overlays/ovl_En_Jsjutan/sCarpetMaterialDL.inc.c" +}; + +static Gfx sShadowMaterialDL[14] = { +#include "assets/overlays/ovl_En_Jsjutan/sShadowMaterialDL.inc.c" +}; + +static Gfx sModelDL[134] = { +#include "assets/overlays/ovl_En_Jsjutan/sModelDL.inc.c" +}; + +static Vtx sCarpetEvenVtx[] = { +#include "assets/overlays/ovl_En_Jsjutan/sCarpetEvenVtx.inc.c" +}; + +static BgCamInfo sBgCamList[] = { +#include "assets/overlays/ovl_En_Jsjutan/sBgCamList.inc.c" +}; + +static SurfaceType sSurfaceTypes[] = { +#include "assets/overlays/ovl_En_Jsjutan/sSurfaceTypes.inc.c" +}; + +static CollisionPoly sPolyList[] = { +#include "assets/overlays/ovl_En_Jsjutan/sPolyList.inc.c" +}; + +static Vec3s sVtxList[] = { +#include "assets/overlays/ovl_En_Jsjutan/sVtxList.inc.c" +}; + +static CollisionHeader sCol = { +#include "assets/overlays/ovl_En_Jsjutan/sCol.inc.c" +}; void EnJsjutan_Init(Actor* thisx, PlayState* play) { EnJsjutan* this = (EnJsjutan*)thisx; 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 844a7ee2a8..67778ccfbd 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -824,7 +824,13 @@ static f32 sCutAngles[] = { static s32 sUnused[] = { 0, 0, 0 }; // Unused zero vector? -#include "assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c" +static Vtx sShadowVtx[] = { +#include "assets/overlays/ovl_En_Kanban/sShadowVtx.inc.c" +}; + +static Gfx sShadowDL[16] = { +#include "assets/overlays/ovl_En_Kanban/sShadowDL.inc.c" +}; void EnKanban_Draw(Actor* thisx, PlayState* play) { EnKanban* this = (EnKanban*)thisx; diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 1c40afeeb2..41ee2f3c73 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -36,7 +36,13 @@ void EnSt_Die(EnSt* this, PlayState* play); void EnSt_BounceAround(EnSt* this, PlayState* play); void EnSt_FinishBouncing(EnSt* this, PlayState* play); -#include "assets/overlays/ovl_En_St/ovl_En_St.c" +static Vtx sSkulltulaUnusedVtx[] = { +#include "assets/overlays/ovl_En_St/sSkulltulaUnusedVtx.inc.c" +}; + +static Gfx sSkulltulaUnusedDL[10] = { +#include "assets/overlays/ovl_En_St/sSkulltulaUnusedDL.inc.c" +}; ActorProfile En_St_Profile = { /**/ ACTOR_EN_ST, diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 3e2d26e509..289b82d1e9 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -9,6 +9,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" +#include "tex_len.h" #include "versions.h" #include "z64play.h" #include "z64player.h" @@ -33,7 +34,125 @@ ActorProfile End_Title_Profile = { /**/ EndTitle_DrawFull, }; -#include "assets/overlays/ovl_End_Title/ovl_End_Title.c" +#if OOT_VERSION != IQUE_CN + +#define sTheLegendOfZeldaTex_WIDTH 120 +#define sTheLegendOfZeldaTex_HEIGHT 24 +static u64 sTheLegendOfZeldaTex[TEX_LEN(u64, sTheLegendOfZeldaTex_WIDTH, sTheLegendOfZeldaTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sTheLegendOfZeldaTex.ia8.inc.c" +}; + +#define sOcarinaOfTimeTex_WIDTH 112 +#define sOcarinaOfTimeTex_HEIGHT 16 +static u64 sOcarinaOfTimeTex[TEX_LEN(u64, sOcarinaOfTimeTex_WIDTH, sOcarinaOfTimeTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sOcarinaOfTimeTex.ia8.inc.c" +}; + +#define sTheEndTex_WIDTH 80 +#define sTheEndTex_HEIGHT 24 +static u64 sTheEndTex[TEX_LEN(u64, sTheEndTex_WIDTH, sTheEndTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sTheEndTex.ia8.inc.c" +}; + +#else + +static Gfx sEmptyDL1[1] = { +#include "assets/overlays/ovl_End_Title/sEmptyDL1.inc.c" +}; + +#define sIQueTop_WIDTH 128 +#define sIQueTop_HEIGHT 24 +static u64 sIQueTop[TEX_LEN(u64, sIQueTop_WIDTH, sIQueTop_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sIQueTop.ia8.inc.c" +}; + +#define sIQueBottom_WIDTH 128 +#define sIQueBottom_HEIGHT 24 +static u64 sIQueBottom[TEX_LEN(u64, sIQueBottom_WIDTH, sIQueBottom_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sIQueBottom.ia8.inc.c" +}; + +static Gfx sEmptyDL2[1] = { +#include "assets/overlays/ovl_End_Title/sEmptyDL2.inc.c" +}; + +#endif + +#define sNintendoLeftTex_WIDTH 64 +#define sNintendoLeftTex_HEIGHT 48 +static u64 sNintendoLeftTex[TEX_LEN(u64, sNintendoLeftTex_WIDTH, sNintendoLeftTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sNintendoLeftTex.ia8.inc.c" +}; + +#if OOT_VERSION == IQUE_CN +static Gfx sEmptyDL3[1] = { +#include "assets/overlays/ovl_End_Title/sEmptyDL3.inc.c" +}; +#endif + +#define sNintendoRightTex_WIDTH 64 +#define sNintendoRightTex_HEIGHT 48 +static u64 sNintendoRightTex[TEX_LEN(u64, sNintendoRightTex_WIDTH, sNintendoRightTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sNintendoRightTex.ia8.inc.c" +}; + +#if OOT_VERSION == IQUE_CN +static Gfx sEmptyDL4[1] = { +#include "assets/overlays/ovl_End_Title/sEmptyDL4.inc.c" +}; +#endif + +#define sPresentedByTex_WIDTH 96 +#define sPresentedByTex_HEIGHT 16 +static u64 sPresentedByTex[TEX_LEN(u64, sPresentedByTex_WIDTH, sPresentedByTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sPresentedByTex.ia8.inc.c" +}; + +#if OOT_VERSION == IQUE_CN + +static Gfx sEmptyDL5[1] = { +#include "assets/overlays/ovl_End_Title/sEmptyDL5.inc.c" +}; + +#define sTheEndTex_WIDTH 80 +#define sTheEndTex_HEIGHT 24 +static u64 sTheEndTex[TEX_LEN(u64, sTheEndTex_WIDTH, sTheEndTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sTheEndTex.ia8.inc.c" +}; + +static Gfx sEmptyDL6[1] = { +#include "assets/overlays/ovl_End_Title/sEmptyDL6.inc.c" +}; + +#define sTheLegendOfZeldaTex_WIDTH 120 +#define sTheLegendOfZeldaTex_HEIGHT 24 +static u64 sTheLegendOfZeldaTex[TEX_LEN(u64, sTheLegendOfZeldaTex_WIDTH, sTheLegendOfZeldaTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sTheLegendOfZeldaTex.ia8.inc.c" +}; + +static Gfx sEmptyDL7[1] = { +#include "assets/overlays/ovl_End_Title/sEmptyDL7.inc.c" +}; + +#define sOcarinaOfTimeTex_WIDTH 112 +#define sOcarinaOfTimeTex_HEIGHT 16 +static u64 sOcarinaOfTimeTex[TEX_LEN(u64, sOcarinaOfTimeTex_WIDTH, sOcarinaOfTimeTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_End_Title/sOcarinaOfTimeTex.ia8.inc.c" +}; + +#endif + +static Vtx sTriforceVtx[] = { +#include "assets/overlays/ovl_End_Title/sTriforceVtx.inc.c" +}; + +static Gfx sTriforceDL[12] = { +#include "assets/overlays/ovl_End_Title/sTriforceDL.inc.c" +}; + +static Gfx sPresentedByNintendoDL[] = { +#include "assets/overlays/ovl_End_Title/sPresentedByNintendoDL.inc.c" +}; void EndTitle_Init(Actor* thisx, PlayState* play) { EndTitle* this = (EndTitle*)thisx; @@ -94,19 +213,21 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) { gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->endAlpha); - gDPLoadTextureTile(OVERLAY_DISP++, sTheEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 80, 24, 0, 0, 80, 24, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); + gDPLoadTextureTile(OVERLAY_DISP++, sTheEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, sTheEndTex_WIDTH, sTheEndTex_HEIGHT, 0, 0, + 80, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); gSPTextureRectangle(OVERLAY_DISP++, 120 << 2, 90 << 2, 200 << 2, 113 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); gDPPipeSync(OVERLAY_DISP++); gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha); - gDPLoadTextureTile(OVERLAY_DISP++, sTheLegendOfZeldaTex, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120, 24, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); + gDPLoadTextureTile(OVERLAY_DISP++, sTheLegendOfZeldaTex, G_IM_FMT_IA, G_IM_SIZ_8b, sTheLegendOfZeldaTex_WIDTH, + sTheLegendOfZeldaTex_HEIGHT, 0, 0, 120, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); gSPTextureRectangle(OVERLAY_DISP++, 100 << 2, 160 << 2, 220 << 2, 183 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); gDPPipeSync(OVERLAY_DISP++); gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->ootAlpha); - gDPLoadTextureTile(OVERLAY_DISP++, sOcarinaOfTimeTex, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0, 0, 112, 16, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); + gDPLoadTextureTile(OVERLAY_DISP++, sOcarinaOfTimeTex, G_IM_FMT_IA, G_IM_SIZ_8b, sOcarinaOfTimeTex_WIDTH, + sOcarinaOfTimeTex_HEIGHT, 0, 0, 112, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, + 0, 0, 0, 0); gSPTextureRectangle(OVERLAY_DISP++, 104 << 2, 177 << 2, 216 << 2, 192 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index a5b8a24d1b..fb074909a3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -39,8 +39,6 @@ EffectSsProfile Effect_Ss_Fhg_Flash_Profile = { EffectSsFhgFlash_Init, }; -// Should eventually come from assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.h -//! TODO: investigate having ZAPD forward declare static variables static Gfx sShockDL[15]; u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { @@ -216,4 +214,18 @@ void EffectSsFhgFlash_UpdateShock(PlayState* play, u32 index, EffectSs* this) { } } -#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.c" +static Vtx sShockVtx[] = { +#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/sShockVtx.inc.c" +}; + +#define sShockTex_WIDTH 32 +#define sShockTex_HEIGHT 32 +static u64 sShockTex[TEX_LEN(u64, sShockTex_WIDTH, sShockTex_HEIGHT, 8)]; + +static Gfx sShockDL[15] = { +#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/sShockDL.inc.c" +}; + +static u64 sShockTex[TEX_LEN(u64, sShockTex_WIDTH, sShockTex_HEIGHT, 8)] = { +#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/sShockTex.i8.inc.c" +}; diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h index 69d71f71d5..9c8527a1d6 100644 --- a/src/overlays/gamestates/ovl_file_choose/file_select.h +++ b/src/overlays/gamestates/ovl_file_choose/file_select.h @@ -225,4 +225,26 @@ void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx); extern s16 D_808124C0[]; #endif +extern Vtx gNameEntryVtx[]; +extern Vtx gOptionsMenuHeadersVtx[]; +extern Vtx gOptionsMenuSettingsVtx[]; +extern Vtx gOptionsDividerSoundVtx[]; +extern Vtx gOptionsDividerZTargetVtx[]; +extern Vtx gOptionsDividerBrightnessVtx[]; +extern s16 gCharPageEng[]; +#if OOT_NTSC +extern s16 gCharPageHira[]; +extern s16 gCharPageKata[]; +extern s16 gNextCharPage[]; +#endif +#if OOT_PAL && PLATFORM_N64 +extern Vtx gOptionsMenuBrightnessVtx[]; +extern Vtx gOptionsMenuLanguageVtx[]; +extern Vtx gOptionsDividerLanguageVtx[]; +#endif +#if OOT_PAL && PLATFORM_GC +extern Vtx gOptionsMenuHeadersGERVtx[]; +extern Vtx gOptionsMenuSettingsGERVtx[]; +#endif + #endif diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index c3042a2ce9..8e300baf02 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -18,7 +18,6 @@ #include "z64save.h" #include "assets/textures/title_static/title_static.h" -#include "assets/overlays/ovl_file_choose/ovl_file_choose.h" void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx) { OPEN_DISPS(gfxCtx, "../z_file_nameset_PAL.c", 110); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c index 2fc9670b89..b51fd2eceb 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c @@ -1 +1,83 @@ -#include "assets/overlays/ovl_file_choose/ovl_file_choose.c" +#include "file_select.h" + +#include "ultra64.h" +#include "gfx.h" +#include "versions.h" + +Vtx gNameEntryVtx[] = { +#include "assets/overlays/ovl_file_choose/gNameEntryVtx.inc.c" +}; + +#if OOT_NTSC +s16 gCharPageHira[] = { +#include "assets/overlays/ovl_file_choose/gCharPageHira.inc.c" +}; + +s16 gCharPageKata[] = { +#include "assets/overlays/ovl_file_choose/gCharPageKata.inc.c" +}; + +s16 gCharPageEng[] = { +#include "assets/overlays/ovl_file_choose/gCharPageEng.inc.c" +}; + +s16 gNextCharPage[] = { +#include "assets/overlays/ovl_file_choose/gNextCharPage.inc.c" +}; +#endif + +Vtx gOptionsMenuHeadersVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsMenuHeadersVtx.inc.c" +}; + +#if OOT_PAL && PLATFORM_GC +Vtx gOptionsMenuHeadersGERVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsMenuHeadersGERVtx.inc.c" +}; +#endif + +Vtx gOptionsMenuSettingsVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsMenuSettingsVtx.inc.c" +}; + +#if OOT_PAL && PLATFORM_GC +Vtx gOptionsMenuSettingsGERVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsMenuSettingsGERVtx.inc.c" +}; +#endif + +#if OOT_PAL && PLATFORM_N64 +Vtx gOptionsMenuBrightnessVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsMenuBrightnessVtx.inc.c" +}; + +Vtx gOptionsMenuLanguageVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsMenuLanguageVtx.inc.c" +}; + +u8 ovl_file_choose_zeros_000640[320] = { 0 }; +#endif + +Vtx gOptionsDividerSoundVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsDividerSoundVtx.inc.c" +}; + +Vtx gOptionsDividerZTargetVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsDividerZTargetVtx.inc.c" +}; + +Vtx gOptionsDividerBrightnessVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsDividerBrightnessVtx.inc.c" +}; + +#if OOT_PAL && PLATFORM_N64 +Vtx gOptionsDividerLanguageVtx[] = { +#include "assets/overlays/ovl_file_choose/gOptionsDividerLanguageVtx.inc.c" +}; +#endif + +#if OOT_PAL +s16 gCharPageEng[] = { +#include "assets/overlays/ovl_file_choose/gCharPageEng.inc.c" +}; +#endif diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 70d87a2ded..5d19b2a10a 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -382,32 +382,19 @@ assets/objects/object_zl2_anime2/object_zl2_anime2.c assets/objects/object_zl2/object_zl2.c assets/objects/object_zl4/object_zl4.c assets/objects/object_zo/object_zo.c -assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c -assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c -assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c -assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c -assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c -assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.c assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.c assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.c assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.c -assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.c assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.c assets/overlays/ovl_Elf_Msg/ovl_Elf_Msg.c assets/overlays/ovl_En_Bili/ovl_En_Bili.c assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c -assets/overlays/ovl_End_Title/ovl_End_Title.c -assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.c assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.c -assets/overlays/ovl_En_Holl/ovl_En_Holl.c -assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c -assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c assets/overlays/ovl_En_Mag/ovl_En_Mag.c assets/overlays/ovl_En_Sda/ovl_En_Sda.c assets/overlays/ovl_En_Ssh/ovl_En_Ssh.c assets/overlays/ovl_En_Sth/ovl_En_Sth.c -assets/overlays/ovl_En_St/ovl_En_St.c assets/overlays/ovl_file_choose/ovl_file_choose.c assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.c assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.c From e8b708a4480e568f409c8e53986c2e96595b9405 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 4 Jun 2025 19:15:01 +0200 Subject: [PATCH 24/42] T() macro loose ends 2 (#2564) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * More T() in niw_girl, ossan, rr, ta, tana, wall_tubo, yabusame_mark * Add and use LOG_STRING_T() * include debug.h in translation.h * Kyaaaaaa * bss * comment on Yabusame mato possible typo * Revert "Kyaaaaaa" This reverts commit 95097831fac62dd1f039b89cefca114c6a23b56e. * (Kuzu)hara * 原 -> "-Hara" from dev name, possibly --- include/translation.h | 4 +++ src/code/sys_math3d.c | 2 +- src/code/z_camera.c | 2 +- src/code/z_elf_message.c | 6 ++-- src/code/z_play.c | 4 +-- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 4 +-- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 4 +-- .../actors/ovl_Arrow_Light/z_arrow_light.c | 4 +-- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 5 ++-- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 5 ++-- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 8 +++--- .../ovl_En_Diving_Game/z_en_diving_game.c | 2 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 4 +-- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 15 +++++++--- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 2 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 28 +++++++++---------- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 7 ++--- .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 6 ++-- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 3 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 2 +- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 5 ++-- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 12 ++++---- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 17 +++++++---- .../actors/ovl_Magic_Wind/z_magic_wind.c | 10 ++----- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 3 +- 25 files changed, 87 insertions(+), 77 deletions(-) diff --git a/include/translation.h b/include/translation.h index 6583326701..51fb34f841 100644 --- a/include/translation.h +++ b/include/translation.h @@ -1,6 +1,8 @@ #ifndef TRANSLATION_H #define TRANSLATION_H +#include "libu64/debug.h" + /** * The "T" macro holds translations in English for original debug strings written in Japanese. * The translated strings are only direct translations. Certain names or terms may not reflect @@ -13,4 +15,6 @@ */ #define T(jp, en) jp +#define LOG_STRING_T(stringJP, stringEN, file, line) LOG(#stringJP, stringJP, "%s", file, line) + #endif diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 1ce651e9c9..f27ee6a34b 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -7,7 +7,7 @@ #include "z_lib.h" #include "z64math.h" -#pragma increment_block_number "gc-eu:77 gc-eu-mq:77 gc-jp:77 gc-jp-ce:77 gc-jp-mq:77 gc-us:77 gc-us-mq:77 ique-cn:67" \ +#pragma increment_block_number "gc-eu:76 gc-eu-mq:76 gc-jp:76 gc-jp-ce:76 gc-jp-mq:76 gc-us:76 gc-us-mq:76 ique-cn:66" \ "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, diff --git a/src/code/z_camera.c b/src/code/z_camera.c index cf5ed30730..e23e17a04e 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3661,7 +3661,7 @@ s32 Camera_KeepOn3(Camera* camera) { } #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ique-cn:128 ntsc-1.0:83 ntsc-1.1:83 ntsc-1.2:83 pal-1.0:83 pal-1.1:83" + "ique-cn:128 ntsc-1.0:82 ntsc-1.1:82 ntsc-1.2:82 pal-1.0:82 pal-1.1:82" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index bb93099363..c06248f265 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,5 +1,5 @@ -#include "libu64/debug.h" #include "rand.h" +#include "translation.h" #include "z64play.h" #include "z64player.h" #include "z64quest_hint.h" @@ -73,7 +73,7 @@ u32 QuestHint_CheckCondition(QuestHintCmd* hintCmd) { } } - LOG_STRING("企画外 条件", "../z_elf_message.c", 156); // "Unplanned conditions" + LOG_STRING_T("企画外 条件", "Unplanned conditions", "../z_elf_message.c", 156); ASSERT(0, "0", "../z_elf_message.c", 157); return false; @@ -170,7 +170,7 @@ u16 QuestHint_GetTextIdFromScript(QuestHintCmd* hintCmd) { return hintCmd->byte2 | 0x100; default: - LOG_STRING("企画外 条件", "../z_elf_message.c", 281); // "Unplanned conditions" + LOG_STRING_T("企画外 条件", "Unplanned conditions", "../z_elf_message.c", 281); ASSERT(0, "0", "../z_elf_message.c", 282); } diff --git a/src/code/z_play.c b/src/code/z_play.c index d4d28422c3..87d344b13f 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -895,8 +895,8 @@ void Play_Update(PlayState* this) { this->envCtx.sandstormState = SANDSTORM_DISSIPATE; this->envCtx.sandstormPrimA = 255; this->envCtx.sandstormEnvA = 255; - // "It's here!!!!!!!!!" - LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", 3471); + LOG_STRING_T("来た!!!!!!!!!!!!!!!!!!!!!", "It's here!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", + 3471); this->transitionMode = TRANS_MODE_SANDSTORM_END; } else { this->transitionMode = TRANS_MODE_SANDSTORM_INIT; diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 34095f9ddf..2ee5014bc2 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -7,13 +7,13 @@ #include "z_arrow_fire.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "libu64/debug.h" #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" #include "sfx.h" #include "sys_matrix.h" #include "tex_len.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" @@ -87,7 +87,7 @@ void ArrowFire_Init(Actor* thisx, PlayState* play) { void ArrowFire_Destroy(Actor* thisx, PlayState* play) { Magic_Reset(play); - LOG_STRING("消滅", "../z_arrow_fire.c", 421); // "Disappearance" + LOG_STRING_T("消滅", "Disappearance", "../z_arrow_fire.c", 421); } void ArrowFire_Charge(ArrowFire* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 8cc384f8c4..c1721920da 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -7,13 +7,13 @@ #include "z_arrow_ice.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "libu64/debug.h" #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" #include "sfx.h" #include "sys_matrix.h" #include "tex_len.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" @@ -87,7 +87,7 @@ void ArrowIce_Init(Actor* thisx, PlayState* play) { void ArrowIce_Destroy(Actor* thisx, PlayState* play) { Magic_Reset(play); - LOG_STRING("消滅", "../z_arrow_ice.c", 415); // "Disappearance" + LOG_STRING_T("消滅", "Disappearance", "../z_arrow_ice.c", 415); } void ArrowIce_Charge(ArrowIce* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 2ddf4beea8..0b483523b4 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -7,13 +7,13 @@ #include "z_arrow_light.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "libu64/debug.h" #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" #include "sfx.h" #include "sys_matrix.h" #include "tex_len.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" @@ -87,7 +87,7 @@ void ArrowLight_Init(Actor* thisx, PlayState* play) { void ArrowLight_Destroy(Actor* thisx, PlayState* play) { Magic_Reset(play); - LOG_STRING("消滅", "../z_arrow_light.c", 403); // "Disappearance" + LOG_STRING_T("消滅", "Disappearance", "../z_arrow_light.c", 403); } void ArrowLight_Charge(ArrowLight* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 2a79aef458..cd610f49e8 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -6,7 +6,6 @@ #include "z_demo_kekkai.h" -#include "libu64/debug.h" #include "gfx.h" #include "gfx_setupdl.h" #include "rand.h" @@ -14,6 +13,7 @@ #include "sequence.h" #include "sfx.h" #include "sys_matrix.h" +#include "translation.h" #include "z_lib.h" #include "z64audio.h" #include "z64effect.h" @@ -267,8 +267,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base); if (this->collider2.base.acFlags & AC_HIT) { Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); - // "I got it" - LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572); + LOG_STRING_T("当ったよ", "I got it", "../z_demo_kekkai.c", 572); this->actor.update = DemoKekkai_TrialBarrierDispel; this->timer = 0; play->csCtx.script = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]); 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 1c74a38432..a7d57a402b 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -6,7 +6,6 @@ #include "z_elf_msg.h" -#include "libu64/debug.h" #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" @@ -64,14 +63,14 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) { s32 ElfMsg_KillCheck(ElfMsg* this, PlayState* play) { if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && Flags_GetSwitch(play, this->actor.world.rot.y - 1)) { - LOG_STRING("共倒れ", "../z_elf_msg.c", 161); // "Mutual destruction" + LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg.c", 161); if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) { Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6)); } Actor_Kill(&this->actor); return 1; } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(play, this->actor.room)) { - LOG_STRING("共倒れ", "../z_elf_msg.c", 172); // "Mutual destruction" + LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg.c", 172); if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) { Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6)); } 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 f6beb6cc82..0ea7232a41 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -6,7 +6,6 @@ #include "z_elf_msg2.h" -#include "libu64/debug.h" #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" @@ -14,6 +13,7 @@ #include "regs.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z64play.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED @@ -61,14 +61,14 @@ void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) { s32 ElfMsg2_KillCheck(ElfMsg2* this, PlayState* play) { if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && Flags_GetSwitch(play, this->actor.world.rot.y - 1)) { - LOG_STRING("共倒れ", "../z_elf_msg2.c", 171); // "Mutual destruction" + LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg2.c", 171); if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) { Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6)); } Actor_Kill(&this->actor); return 1; } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(play, this->actor.room)) { - LOG_STRING("共倒れ２", "../z_elf_msg2.c", 182); // "Mutual destruction 2" + LOG_STRING_T("共倒れ２", "Mutual destruction 2", "../z_elf_msg2.c", 182); if (PARAMS_GET_U(this->actor.params, 8, 6) != 0x3F) { Flags_SetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6)); } @@ -77,7 +77,7 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, PlayState* play) { } else if (PARAMS_GET_U(this->actor.params, 8, 6) == 0x3F) { return 0; } else if (Flags_GetSwitch(play, PARAMS_GET_U(this->actor.params, 8, 6))) { - LOG_STRING("共倒れ", "../z_elf_msg2.c", 192); // "Mutual destruction" + LOG_STRING_T("共倒れ", "Mutual destruction", "../z_elf_msg2.c", 192); Actor_Kill(&this->actor); return 1; } 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 82c27f315e..2871a1c308 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 @@ -107,7 +107,7 @@ void EnDivingGame_Init(Actor* thisx, PlayState* play) { this->actor.scale.y = 0.012999999f; this->actor.scale.z = 0.0139999995f; if (D_809EF0B0) { - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara ☆☆☆☆☆ \n") VT_RST); this->unk_31F = 1; Actor_Kill(&this->actor); } else { 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 71cc497e10..e7a908bff2 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -155,7 +155,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (sLowerRiverSpawned) { Actor_Kill(&this->actor); PRINTF(VT_FGCOL(YELLOW) - T("☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.1 ☆☆☆☆☆ \n") VT_RST); + T("☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara Ver.1 ☆☆☆☆☆ \n") VT_RST); return; } sLowerRiverSpawned = true; @@ -167,7 +167,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (sUpperRiverSpawned) { Actor_Kill(&this->actor); PRINTF(VT_FGCOL(YELLOW) - T("☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.2 ☆☆☆☆☆ \n") VT_RST); + T("☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara Ver.2 ☆☆☆☆☆ \n") VT_RST); return; } sUpperRiverSpawned = true; 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 6a2468f93f..fbbe63dca8 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 @@ -15,6 +15,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" #include "z64player.h" @@ -90,15 +91,21 @@ void EnNiwGirl_Init(Actor* thisx, PlayState* play) { &play->actorCtx, &this->actor, play, ACTOR_EN_NIW, this->actor.world.pos.x + vec2.x, this->actor.world.pos.y + vec2.y, this->actor.world.pos.z + vec2.z, 0, this->actor.world.rot.y, 0, 0xA); if (this->chasedEnNiw != NULL) { - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n" VT_RST, this->path); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n", + "☆☆☆☆☆ That's so mean! Punpun ☆☆☆☆☆ %d\n") VT_RST, + this->actor.params); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Kyahahahaha, wait ☆☆☆☆☆ %d\n") + VT_RST, + this->path); PRINTF("\n\n"); this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->actionFunc = EnNiwGirl_Talk; } else { PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n" VT_RST, this->path); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n", + "☆☆☆☆☆ For some reason, I can't set it up ☆☆☆☆☆ %d\n") VT_RST, + this->actor.params); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Language ☆☆☆☆☆ %d\n") VT_RST, this->path); PRINTF("\n\n"); Actor_Kill(&this->actor); } 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 430540c659..eb2b9e5ec2 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 @@ -229,7 +229,7 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) { break; default: PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n", - "☆☆☆☆☆ Ocarina Invisible-kun demo start check error source ☆☆☆☆☆ %d\n") + "☆☆☆☆☆ Ocarina Invisible-kun demo start check error -Hara ☆☆☆☆☆ %d\n") VT_RST, this->type); Actor_Kill(&this->actor); 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 25f881cf99..c96cdb270b 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1203,7 +1203,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe s32 d; if (!EnOssan_ReturnItemToShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2152); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2152); this->delayTimer = 3; return; } @@ -1262,7 +1262,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play prevIndex = this->cursorIndex; if (!EnOssan_ReturnItemToShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2244); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2244); this->delayTimer = 3; return; } @@ -1327,7 +1327,7 @@ void EnOssan_State_LookFromShelfToShopkeeper(EnOssan* this, PlayState* play, Pla void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, PlayState* play, Player* player) { if (!EnOssan_ReturnItemToShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2355); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2355); return; } Math_ApproachF(&this->cameraFaceAngle, 0.0f, 0.5f, 10.0f); @@ -1344,7 +1344,7 @@ void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, PlayState* play, Player* void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) { Player* player = GET_PLAYER(play); - PRINTF("\n" VT_FGCOL(YELLOW) "初めて手にいれた！！" VT_RST "\n\n"); + PRINTF("\n" VT_FGCOL(YELLOW) T("初めて手にいれた！！", "I got it for the first time!!") VT_RST "\n\n"); Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f); play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; play->msgCtx.stateTimer = 4; @@ -1354,7 +1354,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) { this->drawCursor = 0; EnOssan_UpdateCameraDirection(this, play, 0.0f); this->stateFlag = OSSAN_STATE_GIVE_ITEM_FANFARE; - PRINTF(VT_FGCOL(YELLOW) "持ち上げ開始！！" VT_RST "\n\n"); + PRINTF(VT_FGCOL(YELLOW) T("持ち上げ開始！！", "Start lifting!!") VT_RST "\n\n"); } void EnOssan_SetStateCantGetItem(PlayState* play, EnOssan* this, u16 textId) { @@ -1506,7 +1506,7 @@ void EnOssan_State_ItemSelected(EnOssan* this, PlayState* play2, Player* player) PlayState* play = play2; // Necessary for OKs if (!EnOssan_TakeItemOffShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2654); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2654); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && @@ -1527,7 +1527,7 @@ void EnOssan_State_SelectMilkBottle(EnOssan* this, PlayState* play2, Player* pla PlayState* play = play2; // Need for OK if (!EnOssan_TakeItemOffShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2693); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2693); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && @@ -1548,7 +1548,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play2, Player* playe PlayState* play = play2; // Needed for OK if (!EnOssan_TakeItemOffShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2732); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2732); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && @@ -1567,7 +1567,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play2, Player* playe void EnOssan_State_SelectUnimplementedItem(EnOssan* this, PlayState* play, Player* player) { if (!EnOssan_TakeItemOffShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2771); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2771); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT && Message_ShouldAdvance(play)) { @@ -1578,10 +1578,10 @@ void EnOssan_State_SelectUnimplementedItem(EnOssan* this, PlayState* play, Playe void EnOssan_State_SelectBombs(EnOssan* this, PlayState* play, Player* player) { if (!EnOssan_TakeItemOffShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2798); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2798); return; } - PRINTF("店主の依頼 ( %d )\n", GET_INFTABLE(INFTABLE_FC)); + PRINTF(T("店主の依頼 ( %d )\n", "Shopkeeper's request ( %d )\n"), GET_INFTABLE(INFTABLE_FC)); if (this->actor.params != OSSAN_TYPE_GORON) { EnOssan_State_ItemSelected(this, play, player); return; @@ -1605,7 +1605,7 @@ void EnOssan_State_SelectMaskItem(EnOssan* this, PlayState* play, Player* player EnGirlA* item = this->shelfSlots[this->cursorIndex]; if (!EnOssan_TakeItemOffShelf(this)) { - PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2845); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) T("ズーム中！！", "Zooming!!") VT_RST "\n", "../z_en_oB1.c", 2845); return; } if (talkState == TEXT_STATE_EVENT) { @@ -1722,7 +1722,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player switch (play->msgCtx.choiceIndex) { case 0: - PRINTF(VT_FGCOL(YELLOW) "★★★ 続けるよ！！ ★★★" VT_RST "\n"); + PRINTF(VT_FGCOL(YELLOW) T("★★★ 続けるよ！！ ★★★", "★★★ I will continue!! ★★★") VT_RST "\n"); player->actor.shape.rot.y += 0x8000; player->stateFlags2 |= PLAYER_STATE2_29; Play_SetViewpoint(play, VIEWPOINT_PIVOT); @@ -1732,7 +1732,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player break; case 1: default: - PRINTF(VT_FGCOL(YELLOW) "★★★ やめるよ！！ ★★★" VT_RST "\n"); + PRINTF(VT_FGCOL(YELLOW) T("★★★ やめるよ！！ ★★★", "★★★ I'm quitting!! ★★★") VT_RST "\n"); EnOssan_EndInteraction(play, this); break; } 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 b5bba141ba..346a3168ba 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -99,8 +99,8 @@ ActorProfile En_Rr_Profile = { #if DEBUG_FEATURES static char* sDropNames[] = { - // "type 7", "small magic jar", "arrow", "fairy", "20 rupees", "50 rupees" - "タイプ７ ", "魔法の壷小", "矢 ", "妖精 ", "20ルピー ", "50ルピー ", + T("タイプ７ ", "Type 7 "), T("魔法の壷小", "Small magic jar"), T("矢 ", "Arrow "), + T("妖精 ", "Fairy "), T("20ルピー ", "20 rupees "), T("50ルピー ", "50 rupees "), }; #endif @@ -438,8 +438,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { if (this->collider2.base.acFlags & AC_HIT) { this->collider2.base.acFlags &= ~AC_HIT; - // "Kakin" (not sure what this means) - PRINTF(VT_FGCOL(GREEN) "カキン(%d)！！" VT_RST "\n", this->frameCount); + PRINTF(VT_FGCOL(GREEN) T("カキン(%d)！！", "Kakin (%d)!!") VT_RST "\n", this->frameCount); hitPos.x = this->collider2.elem.acDmgInfo.hitPos.x; hitPos.y = this->collider2.elem.acDmgInfo.hitPos.y; hitPos.z = this->collider2.elem.acDmgInfo.hitPos.z; 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 0dc3434660..623fc8ad62 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 @@ -86,7 +86,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) { this->man = (EnSyatekiMan*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SYATEKI_MAN, 140.0f, 0.0f, 255.0f, 0, -0x4000, 0, 0); if (this->man == NULL) { - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ エラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Spawn error ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ エラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Error -Hara ☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } @@ -94,7 +94,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) { this->markers[i] = (EnExRuppy*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_RUPPY, sRupeePos[i].x, sRupeePos[i].y, sRupeePos[i].z, 0, 0, 0, 4); if (this->markers[i] == NULL) { - PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n", "☆☆☆☆☆ Second spawn error ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n", "☆☆☆☆☆ Second error -Hara ☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } @@ -245,7 +245,7 @@ void EnSyatekiItm_SpawnTargets(EnSyatekiItm* this, PlayState* play) { &play->actorCtx, &this->actor, play, ACTOR_EN_G_SWITCH, this->targetHome[i].x, this->targetHome[i].y, this->targetHome[i].z, 0, 0, 0, (ENGSWITCH_TARGET_RUPEE << 0xC) | 0x3F); if (this->targets[i] == NULL) { - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Rupee spawn error ☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n", "☆☆☆☆☆ Rupee error -Hara ☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } 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 fd4f5b91c1..3dea1af351 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -231,7 +231,8 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { this->actor.shape.shadowScale = 54.0f; } } else if (play->sceneId == SCENE_LON_LON_BUILDINGS) { - PRINTF(VT_FGCOL(CYAN) " ロンロン牧場の倉庫 の タロン\n" VT_RST); + PRINTF(VT_FGCOL(CYAN) T(" ロンロン牧場の倉庫 の タロン\n", " Talon in the warehouse at Lon Lon Ranch\n") + VT_RST); if (!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { Actor_Kill(&this->actor); } else if (LINK_IS_ADULT) { 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 994f01478f..0a918999c4 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 @@ -57,7 +57,7 @@ void EnTakaraMan_Init(Actor* thisx, PlayState* play) { if (sTakaraIsInitialized) { Actor_Kill(&this->actor); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ I'm already here -Hara ☆☆☆☆☆ \n") VT_RST); return; } diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index ddb9e8d8d9..1bb9841482 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -11,6 +11,7 @@ #include "printf.h" #include "segmented_address.h" #include "sys_matrix.h" +#include "translation.h" #include "z64play.h" #include "assets/objects/object_shop_dungen/object_shop_dungen.h" @@ -40,8 +41,8 @@ ActorProfile En_Tana_Profile = { //! next data entry will be dereferenced and print garbage, stopping any future printing. //! In a non-matching context, this can cause a crash if the next item isn't a valid pointer. static const char* sShelfTypes[] = { - "木の棚", // "Wooden Shelves" - "石の棚", // "Stone Shelves" + T("木の棚", "Wooden shelf"), + T("石の棚", "Stone shelf"), #ifdef AVOID_UB "", #endif 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 d54a570d2a..f60e224f40 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 @@ -135,12 +135,12 @@ void EnWallTubo_SetWallFall(EnWallTubo* this, PlayState* play) { if ((wall != NULL) && (wall->dyna.actor.update != NULL)) { wall->isHit = true; - // "You did it field!" (repeated 5 times) - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(BLUE) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); + // "Hara" may stand for the developer name Kuzuhara + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(BLUE) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆ やった原！ ☆☆☆☆☆ \n", "☆☆☆☆ I did it! -Hara ☆☆☆☆☆ \n") VT_RST); } Actor_Kill(&this->actor); 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 e5f75d60df..e84716c110 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 @@ -11,6 +11,7 @@ #include "sequence.h" #include "sfx.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64audio.h" #include "z64debug_display.h" @@ -90,11 +91,14 @@ void EnYabusameMark_Init(Actor* thisx, PlayState* play) { EnYabusameMark* this = (EnYabusameMark*)thisx; PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + // "まと" could be a typo for "まこ", in which case this could be "Yabusame mark" + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Yabusame mato ☆☆☆☆☆ %x\n") VT_RST, + this->actor.params); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->typeIndex = this->actor.params; this->actor.attentionRangeType = ATTENTION_RANGE_5; - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 種類インデックス \t ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 種類インデックス \t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type index \t ☆☆☆☆☆ %d\n") VT_RST, + this->typeIndex); switch (this->typeIndex) { case 0: this->subTypeIndex = 0; @@ -120,8 +124,9 @@ void EnYabusameMark_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); return; } - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex); - PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n" VT_RST, this->subTypeIndex); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type ☆☆☆☆☆ %d\n") VT_RST, this->typeIndex); + PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Further classification ☆☆☆☆☆ %d\n") VT_RST, + this->subTypeIndex); this->actionFunc = func_80B42F74; } @@ -177,8 +182,8 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play) { PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＸ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].x); PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＹ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].y); PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＺ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].z); - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 小 ☆☆☆☆☆ %f\n" VT_RST, scoreDistance100); - PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 大 ☆☆☆☆☆ %f\n" VT_RST, scoreDistance60); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 小 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ small ☆☆☆☆☆ %f\n") VT_RST, scoreDistance100); + PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 大 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ large ☆☆☆☆☆ %f\n") VT_RST, scoreDistance60); PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ point ☆☆☆☆☆ %d\n" VT_RST, scoreIndex); PRINTF("\n\n"); diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 2dca261b93..ec09e1c89b 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -6,7 +6,6 @@ #include "z_magic_wind.h" -#include "libu64/debug.h" #include "array_count.h" #include "gfx.h" #include "gfx_setupdl.h" @@ -69,8 +68,7 @@ void MagicWind_Init(Actor* thisx, PlayState* play) { case 1: SkelCurve_SetAnim(&this->skelCurve, &sAnim, 60.0f, 0.0f, 60.0f, -1.0f); MagicWind_SetupAction(this, MagicWind_Shrink); - // "Means start" - LOG_STRING("表示開始", "../z_magic_wind.c", 486); + LOG_STRING_T("表示開始", "Start displaying", "../z_magic_wind.c", 486); Player_PlaySfx(player, NA_SE_PL_MAGIC_WIND_WARP); break; } @@ -80,8 +78,7 @@ void MagicWind_Destroy(Actor* thisx, PlayState* play) { MagicWind* this = (MagicWind*)thisx; SkelCurve_Destroy(play, &this->skelCurve); Magic_Reset(play); - // "wipe out" - LOG_STRING("消滅", "../z_magic_wind.c", 505); + LOG_STRING_T("消滅", "Disappearance", "../z_magic_wind.c", 505); } void MagicWind_UpdateAlpha(f32 alpha) { @@ -100,8 +97,7 @@ void MagicWind_WaitForTimer(MagicWind* this, PlayState* play) { return; } - // "Means start" - LOG_STRING("表示開始", "../z_magic_wind.c", 539); + LOG_STRING_T("表示開始", "Start displaying", "../z_magic_wind.c", 539); Player_PlaySfx(player, NA_SE_PL_MAGIC_WIND_NORMAL); MagicWind_UpdateAlpha(1.0f); MagicWind_SetupAction(this, MagicWind_Grow); diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index b89838083f..3f9d04843c 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -186,8 +186,7 @@ void MirRay_Init(Actor* thisx, PlayState* play) { LOG_NUM("this->actor.arg_data", this->actor.params, "../z_mir_ray.c", 518); if (this->actor.params >= 0xA) { - // "Reflected light generation failure" - LOG_STRING("反射光 発生失敗", "../z_mir_ray.c", 521); + LOG_STRING_T("反射光 発生失敗", "Reflected light generation failure", "../z_mir_ray.c", 521); Actor_Kill(&this->actor); } From 28cc9d68cfe4a037eb232d5465b84a943539bca3 Mon Sep 17 00:00:00 2001 From: fig02 Date: Wed, 4 Jun 2025 14:38:33 -0400 Subject: [PATCH 25/42] Remove "z64" prefix from all headers (#2518) * z64 - a * z64 - b * z64 - c * z64 - d * z64 - e * z64 - f * z64 - g * z64 - h * z64 - i * z64 - l * z64 - m * z64 - o * z64 - p * z64 - q * z64 - r * z64 - s * z64 - t * z64 - v * restore file * fix merge * fix merge --------- Co-authored-by: Dragorn421 --- .../objects/object_link_boy/object_link_boy.c | 2 +- .../objects/object_link_boy/object_link_boy.h | 2 +- .../object_link_child/object_link_child.c | 2 +- .../object_link_child/object_link_child.h | 2 +- .../icon_item_24_static/icon_item_24_static.h | 2 +- .../icon_item_static/icon_item_static.h | 2 +- .../item_name_static/item_name_static.h | 2 +- assets/textures/place_title_cards/g_pn_01.c | 2 +- assets/textures/place_title_cards/g_pn_02.c | 2 +- assets/textures/place_title_cards/g_pn_03.c | 2 +- assets/textures/place_title_cards/g_pn_04.c | 2 +- assets/textures/place_title_cards/g_pn_05.c | 2 +- assets/textures/place_title_cards/g_pn_06.c | 2 +- assets/textures/place_title_cards/g_pn_07.c | 2 +- assets/textures/place_title_cards/g_pn_08.c | 2 +- assets/textures/place_title_cards/g_pn_09.c | 2 +- assets/textures/place_title_cards/g_pn_10.c | 2 +- assets/textures/place_title_cards/g_pn_11.c | 2 +- assets/textures/place_title_cards/g_pn_12.c | 2 +- assets/textures/place_title_cards/g_pn_13.c | 2 +- assets/textures/place_title_cards/g_pn_14.c | 2 +- assets/textures/place_title_cards/g_pn_15.c | 2 +- assets/textures/place_title_cards/g_pn_16.c | 2 +- assets/textures/place_title_cards/g_pn_17.c | 2 +- assets/textures/place_title_cards/g_pn_18.c | 2 +- assets/textures/place_title_cards/g_pn_19.c | 2 +- assets/textures/place_title_cards/g_pn_20.c | 2 +- assets/textures/place_title_cards/g_pn_21.c | 2 +- assets/textures/place_title_cards/g_pn_22.c | 2 +- assets/textures/place_title_cards/g_pn_23.c | 2 +- assets/textures/place_title_cards/g_pn_24.c | 2 +- assets/textures/place_title_cards/g_pn_25.c | 2 +- assets/textures/place_title_cards/g_pn_26.c | 2 +- assets/textures/place_title_cards/g_pn_27.c | 2 +- assets/textures/place_title_cards/g_pn_28.c | 2 +- assets/textures/place_title_cards/g_pn_29.c | 2 +- assets/textures/place_title_cards/g_pn_30.c | 2 +- assets/textures/place_title_cards/g_pn_31.c | 2 +- assets/textures/place_title_cards/g_pn_32.c | 2 +- assets/textures/place_title_cards/g_pn_33.c | 2 +- assets/textures/place_title_cards/g_pn_34.c | 2 +- assets/textures/place_title_cards/g_pn_35.c | 2 +- assets/textures/place_title_cards/g_pn_36.c | 2 +- assets/textures/place_title_cards/g_pn_37.c | 2 +- assets/textures/place_title_cards/g_pn_38.c | 2 +- assets/textures/place_title_cards/g_pn_39.c | 2 +- assets/textures/place_title_cards/g_pn_40.c | 2 +- assets/textures/place_title_cards/g_pn_41.c | 2 +- assets/textures/place_title_cards/g_pn_42.c | 2 +- assets/textures/place_title_cards/g_pn_43.c | 2 +- assets/textures/place_title_cards/g_pn_44.c | 2 +- assets/textures/place_title_cards/g_pn_45.c | 2 +- assets/textures/place_title_cards/g_pn_46.c | 2 +- assets/textures/place_title_cards/g_pn_47.c | 2 +- assets/textures/place_title_cards/g_pn_48.c | 2 +- assets/textures/place_title_cards/g_pn_49.c | 2 +- assets/textures/place_title_cards/g_pn_50.c | 2 +- assets/textures/place_title_cards/g_pn_51.c | 2 +- assets/textures/place_title_cards/g_pn_52.c | 2 +- assets/textures/place_title_cards/g_pn_53.c | 2 +- assets/textures/place_title_cards/g_pn_54.c | 2 +- assets/textures/place_title_cards/g_pn_55.c | 2 +- assets/textures/place_title_cards/g_pn_56.c | 2 +- assets/textures/place_title_cards/g_pn_57.c | 2 +- include/{z64actor.h => actor.h} | 12 ++--- .../{z64actor_profile.h => actor_profile.h} | 4 +- include/{z64animation.h => animation.h} | 8 ++-- ...4animation_legacy.h => animation_legacy.h} | 6 +-- include/{z64audio.h => audio.h} | 6 +-- include/audio/soundfont_file.h | 2 +- include/audiomgr.h | 2 +- include/{z64bgcheck.h => bgcheck.h} | 6 +-- include/{z64camera.h => camera.h} | 8 ++-- ...z64collision_check.h => collision_check.h} | 6 +-- include/console_logo_state.h | 6 +-- include/{z64curve.h => curve.h} | 4 +- include/{z64cutscene.h => cutscene.h} | 6 +-- ...utscene_commands.h => cutscene_commands.h} | 6 +-- .../{z64cutscene_flags.h => cutscene_flags.h} | 4 +- ...z64cutscene_spline.h => cutscene_spline.h} | 6 +-- include/db_camera.h | 4 +- include/{z64debug.h => debug.h} | 4 +- .../{z64debug_display.h => debug_display.h} | 6 +-- include/{z64dma.h => dma.h} | 4 +- include/{z64draw.h => draw.h} | 4 +- include/{z64effect.h => effect.h} | 8 ++-- include/{z64environment.h => environment.h} | 10 ++--- .../{z64face_reaction.h => face_reaction.h} | 4 +- include/file_select_state.h | 12 ++--- include/{z64font.h => font.h} | 4 +- .../{z64frame_advance.h => frame_advance.h} | 4 +- include/{z64game.h => game.h} | 4 +- include/{z64game_over.h => game_over.h} | 4 +- include/{z64horse.h => horse.h} | 6 +-- include/{z64interface.h => interface.h} | 8 ++-- include/{z64inventory.h => inventory.h} | 6 +-- include/{z64item.h => item.h} | 4 +- include/{z64lifemeter.h => lifemeter.h} | 4 +- include/{z64light.h => light.h} | 6 +-- include/{z64map_mark.h => map_mark.h} | 4 +- include/map_select_state.h | 4 +- include/{z64message.h => message.h} | 8 ++-- include/message_data_fmt.h | 4 +- include/n64dd.h | 6 +-- include/{z64object.h => object.h} | 6 +-- include/{z64ocarina.h => ocarina.h} | 4 +- include/{z64olib.h => olib.h} | 6 +-- include/{z64path.h => path.h} | 6 +-- include/{z64pause.h => pause.h} | 10 ++--- include/{z64play.h => play_state.h} | 44 +++++++++---------- include/{z64player.h => player.h} | 6 +-- include/prenmi_state.h | 2 +- include/quake.h | 4 +- include/{z64quest_hint.h => quest_hint.h} | 4 +- ..._hint_commands.h => quest_hint_commands.h} | 4 +- include/{z64room.h => room.h} | 8 ++-- include/sample_state.h | 4 +- include/{z64save.h => save.h} | 8 ++-- include/{z64scene.h => scene.h} | 14 +++--- include/setup_state.h | 2 +- include/sfx.h | 2 +- include/{z64sfx_source.h => sfx_source.h} | 6 +-- include/{z64skin.h => skin.h} | 6 +-- include/{z64skin_matrix.h => skin_matrix.h} | 6 +-- include/{z64skybox.h => skybox.h} | 6 +-- include/{z64sram.h => sram.h} | 4 +- include/{z64ss_sram.h => ss_sram.h} | 4 +- include/sys_math3d.h | 2 +- include/sys_matrix.h | 2 +- include/{z64thread.h => thread.h} | 4 +- include/title_setup_state.h | 4 +- include/{z64transition.h => transition.h} | 6 +-- ...ion_instances.h => transition_instances.h} | 4 +- include/{z64view.h => view.h} | 6 +-- include/{z64vis.h => vis.h} | 4 +- include/z_actor_dlftbls.h | 2 +- include/z_en_a_obj.h | 2 +- include/z_en_item00.h | 2 +- include/z_lib.h | 2 +- include/{z64math.h => z_math.h} | 6 ++- src/audio/game/data.c | 2 +- src/audio/game/general.c | 4 +- src/audio/game/sequence.c | 2 +- src/audio/game/session_config.c | 2 +- src/audio/game/session_init.c | 2 +- src/audio/game/sfx.c | 2 +- src/audio/internal/data.c | 2 +- src/audio/internal/effects.c | 2 +- src/audio/internal/heap.c | 2 +- src/audio/internal/load.c | 2 +- src/audio/internal/os.c | 2 +- src/audio/internal/playback.c | 2 +- src/audio/internal/seqplayer.c | 2 +- src/audio/internal/synthesis.c | 2 +- src/audio/internal/thread.c | 2 +- src/audio/tables/samplebank_table.c | 2 +- src/audio/tables/sequence_table.c | 2 +- src/audio/tables/soundfont_table.c | 2 +- src/boot/boot_main.c | 2 +- src/boot/idle.c | 4 +- src/boot/inflate.c | 2 +- src/boot/yaz0.c | 2 +- src/boot/z_std_dma.c | 4 +- src/code/audio_thread_manager.c | 2 +- src/code/code_n64dd_800AD410.c | 2 +- src/code/code_n64dd_800AD4C0.c | 6 +-- src/code/db_camera.c | 16 +++---- src/code/fault_gc.c | 2 +- src/code/fault_n64.c | 2 +- src/code/flg_set.c | 4 +- src/code/game.c | 10 ++--- src/code/graph.c | 6 +-- src/code/irqmgr.c | 2 +- src/code/main.c | 4 +- src/code/object_table.c | 2 +- src/code/sched.c | 2 +- src/code/speed_meter.c | 4 +- src/code/sys_math3d.c | 2 +- src/code/sys_math3d_draw.c | 2 +- src/code/sys_math_atan.c | 2 +- src/code/sys_matrix.c | 4 +- src/code/title_setup.c | 2 +- src/code/z_actor.c | 16 +++---- src/code/z_bg_collect.c | 8 ++-- src/code/z_bg_item.c | 6 +-- src/code/z_bgcheck.c | 8 ++-- src/code/z_camera.c | 14 +++--- src/code/z_cheap_proc.inc.c | 2 +- src/code/z_collision_btltbls.c | 2 +- src/code/z_collision_check.c | 8 ++-- src/code/z_common_data.c | 6 +-- src/code/z_construct.c | 10 ++--- src/code/z_cutscene_spline.c | 6 +-- src/code/z_debug.c | 2 +- src/code/z_debug_display.c | 4 +- src/code/z_demo.c | 16 +++---- src/code/z_draw.c | 4 +- src/code/z_eff_blure.c | 4 +- src/code/z_eff_shield_particle.c | 8 ++-- src/code/z_eff_spark.c | 6 +-- src/code/z_eff_ss_dead.c | 2 +- src/code/z_effect.c | 6 +-- src/code/z_effect_soft_sprite.c | 6 +-- src/code/z_effect_soft_sprite_dlftbls.c | 2 +- src/code/z_effect_soft_sprite_old_init.c | 8 ++-- src/code/z_elf_message.c | 10 ++--- src/code/z_en_a_keep.c | 2 +- src/code/z_en_item00.c | 12 ++--- src/code/z_env_flags.c | 4 +- src/code/z_face_reaction.c | 4 +- src/code/z_fbdemo.c | 4 +- src/code/z_fbdemo_circle.c | 2 +- src/code/z_fbdemo_fade.c | 4 +- src/code/z_fbdemo_triforce.c | 4 +- src/code/z_fbdemo_wipe1.c | 4 +- src/code/z_fcurve_data.c | 2 +- src/code/z_fcurve_data_skelanime.c | 6 +-- src/code/z_frame_advance.c | 2 +- src/code/z_game_dlftbls.c | 2 +- src/code/z_game_over.c | 6 +-- src/code/z_horse.c | 8 ++-- src/code/z_inventory.c | 6 +-- src/code/z_kaleido_manager.c | 2 +- src/code/z_kaleido_scope_call.c | 2 +- src/code/z_kaleido_setup.c | 6 +-- src/code/z_kanfont.c | 6 +-- src/code/z_kankyo.c | 14 +++--- src/code/z_lifemeter.c | 8 ++-- src/code/z_lights.c | 4 +- src/code/z_map_data.c | 2 +- src/code/z_map_exp.c | 8 ++-- src/code/z_map_mark.c | 6 +-- src/code/z_message.c | 10 ++--- src/code/z_olib.c | 4 +- src/code/z_onepointdemo.c | 8 ++-- src/code/z_parameter.c | 14 +++--- src/code/z_path.c | 6 +-- src/code/z_play.c | 20 ++++----- src/code/z_player_call.c | 8 ++-- src/code/z_player_lib.c | 12 ++--- src/code/z_quake.c | 4 +- src/code/z_rcp.c | 2 +- src/code/z_room.c | 12 ++--- src/code/z_rumble.c | 2 +- src/code/z_sample.c | 4 +- src/code/z_scene.c | 8 ++-- src/code/z_scene_table.c | 8 ++-- src/code/z_sfx_source.c | 6 +-- src/code/z_skelanime.c | 6 +-- src/code/z_skin.c | 8 ++-- src/code/z_skin_awb.c | 8 ++-- src/code/z_skin_matrix.c | 2 +- src/code/z_sram.c | 18 ++++---- src/code/z_ss_sram.c | 2 +- src/code/z_view.c | 2 +- src/code/z_viscvg.c | 2 +- src/code/z_vismono.c | 2 +- src/code/z_viszbuf.c | 2 +- src/code/z_vr_box.c | 10 ++--- src/code/z_vr_box_draw.c | 2 +- src/dmadata/dmadata.c | 2 +- src/elf_message/elf_message_field.c | 4 +- src/elf_message/elf_message_ydan.c | 2 +- src/libc64/math64.c | 2 +- src/libc64/qrand.c | 2 +- src/libu64/load_gc.c | 2 +- src/libu64/loadfragment2_n64.c | 2 +- src/libultra/gu/cosf.c | 2 +- src/libultra/gu/lookat.c | 2 +- src/libultra/gu/normalize.c | 2 +- src/libultra/gu/sinf.c | 2 +- src/n64dd/z_n64dd.c | 4 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 4 +- .../actors/ovl_Arms_Hook/z_arms_hook.h | 4 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.h | 2 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 2 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.h | 2 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 2 +- .../actors/ovl_Arrow_Light/z_arrow_light.h | 2 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 8 ++-- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h | 2 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 4 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h | 2 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h | 2 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 2 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.h | 2 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 4 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h | 2 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 6 +-- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.h | 2 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 2 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h | 2 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 2 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h | 2 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 6 +-- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.h | 2 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 8 ++-- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h | 2 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 6 +-- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h | 2 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 4 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h | 2 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 6 +-- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h | 2 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 2 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h | 2 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 4 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h | 2 +- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 6 +-- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h | 2 +- .../ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c | 2 +- .../ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h | 2 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 4 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h | 2 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 6 +-- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h | 2 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 4 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h | 2 +- .../actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c | 6 +-- .../actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h | 2 +- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 2 +- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.h | 2 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 2 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h | 2 +- .../ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c | 6 +-- .../ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h | 2 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 4 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h | 2 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 8 ++-- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h | 2 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 4 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h | 2 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 2 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.h | 2 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 4 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h | 2 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 6 +-- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.h | 2 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 4 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h | 2 +- .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 6 +-- .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h | 2 +- .../z_bg_hidan_firewall.c | 4 +- .../z_bg_hidan_firewall.h | 2 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 2 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h | 2 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 6 +-- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h | 2 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 2 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h | 2 +- .../ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c | 2 +- .../ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h | 2 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 2 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h | 2 +- .../z_bg_hidan_kowarerukabe.c | 4 +- .../z_bg_hidan_kowarerukabe.h | 2 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 6 +-- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h | 2 +- .../z_bg_hidan_rsekizou.c | 2 +- .../z_bg_hidan_rsekizou.h | 2 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 4 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h | 2 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 4 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h | 2 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 2 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h | 2 +- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 6 +-- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.h | 2 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 4 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h | 2 +- .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c | 2 +- .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h | 2 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 4 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.h | 2 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 4 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.h | 2 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 4 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.h | 2 +- .../z_bg_jya_amishutter.c | 2 +- .../z_bg_jya_amishutter.h | 2 +- .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 2 +- .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h | 2 +- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 6 +-- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.h | 2 +- .../z_bg_jya_bombchuiwa.c | 4 +- .../z_bg_jya_bombchuiwa.h | 2 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 4 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h | 2 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 4 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h | 2 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 4 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h | 2 +- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 4 +- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h | 2 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 4 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h | 2 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 2 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h | 2 +- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 2 +- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h | 2 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 4 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.h | 2 +- .../z_bg_jya_zurerukabe.c | 4 +- .../z_bg_jya_zurerukabe.h | 2 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 2 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h | 2 +- .../z_bg_menkuri_kaiten.c | 2 +- .../z_bg_menkuri_kaiten.h | 2 +- .../z_bg_menkuri_nisekabe.c | 2 +- .../z_bg_menkuri_nisekabe.h | 2 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 2 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h | 2 +- .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c | 2 +- .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h | 2 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 2 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h | 2 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c | 4 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h | 2 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 2 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.h | 2 +- src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c | 2 +- src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h | 2 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 4 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h | 2 +- .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 6 +-- .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h | 2 +- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 2 +- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h | 2 +- .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 2 +- .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h | 2 +- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 6 +-- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h | 2 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 2 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h | 2 +- .../z_bg_mori_kaitenkabe.c | 4 +- .../z_bg_mori_kaitenkabe.h | 2 +- .../z_bg_mori_rakkatenjo.c | 4 +- .../z_bg_mori_rakkatenjo.h | 2 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 8 ++-- .../actors/ovl_Bg_Po_Event/z_bg_po_event.h | 2 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 4 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h | 4 +- .../actors/ovl_Bg_Pushbox/z_bg_pushbox.c | 2 +- .../actors/ovl_Bg_Pushbox/z_bg_pushbox.h | 2 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 10 ++--- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.h | 2 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 4 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.h | 2 +- .../z_bg_spot00_hanebasi.c | 10 ++--- .../z_bg_spot00_hanebasi.h | 4 +- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c | 6 +-- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h | 2 +- .../z_bg_spot01_idohashira.c | 6 +-- .../z_bg_spot01_idohashira.h | 2 +- .../z_bg_spot01_idomizu.c | 4 +- .../z_bg_spot01_idomizu.h | 2 +- .../z_bg_spot01_idosoko.c | 4 +- .../z_bg_spot01_idosoko.h | 2 +- .../z_bg_spot01_objects2.c | 4 +- .../z_bg_spot01_objects2.h | 2 +- .../z_bg_spot02_objects.c | 8 ++-- .../z_bg_spot02_objects.h | 2 +- .../ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c | 4 +- .../ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h | 2 +- .../ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c | 4 +- .../ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h | 2 +- .../z_bg_spot06_objects.c | 6 +-- .../z_bg_spot06_objects.h | 2 +- .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 4 +- .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h | 2 +- .../z_bg_spot08_bakudankabe.c | 4 +- .../z_bg_spot08_bakudankabe.h | 2 +- .../z_bg_spot08_iceblock.c | 6 +-- .../z_bg_spot08_iceblock.h | 2 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 4 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h | 2 +- .../z_bg_spot11_bakudankabe.c | 4 +- .../z_bg_spot11_bakudankabe.h | 2 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 8 ++-- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h | 2 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 2 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h | 2 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 2 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h | 2 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 6 +-- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h | 2 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 4 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h | 2 +- .../z_bg_spot16_bombstone.c | 8 ++-- .../z_bg_spot16_bombstone.h | 2 +- .../z_bg_spot16_doughnut.c | 4 +- .../z_bg_spot16_doughnut.h | 2 +- .../z_bg_spot17_bakudankabe.c | 4 +- .../z_bg_spot17_bakudankabe.h | 2 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 2 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h | 2 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 6 +-- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h | 2 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 2 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h | 2 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 6 +-- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h | 2 +- .../z_bg_spot18_shutter.c | 4 +- .../z_bg_spot18_shutter.h | 2 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 4 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h | 2 +- .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 4 +- .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h | 2 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 8 ++-- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h | 2 +- .../z_bg_toki_swd_cutscene_data_1.c | 4 +- .../z_bg_toki_swd_cutscene_data_2.c | 4 +- .../z_bg_toki_swd_cutscene_data_3.c | 4 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 8 ++-- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.h | 2 +- .../z_bg_treemouth_cutscene_data.c | 4 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 4 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.h | 2 +- .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 4 +- .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h | 2 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 2 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h | 2 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 2 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h | 2 +- .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 6 +-- .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h | 2 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 2 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 8 ++-- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.h | 2 +- .../z_boss_dodongo_data.inc.c | 2 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 8 ++-- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h | 2 +- .../actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c | 2 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 4 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h | 2 +- .../ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c | 2 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 8 ++-- .../actors/ovl_Boss_Ganon/z_boss_ganon.h | 2 +- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 8 ++-- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.h | 2 +- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 8 ++-- .../ovl_Boss_Ganondrof/z_boss_ganondrof.h | 4 +- .../actors/ovl_Boss_Goma/z_boss_goma.c | 10 ++--- .../actors/ovl_Boss_Goma/z_boss_goma.h | 2 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 12 ++--- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h | 2 +- .../actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c | 2 +- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 10 ++--- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h | 2 +- .../ovl_Boss_Sst/z_boss_sst_colchk.inc.c | 2 +- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 8 ++-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h | 2 +- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 8 ++-- src/overlays/actors/ovl_Boss_Va/z_boss_va.h | 2 +- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 10 ++--- src/overlays/actors/ovl_Demo_6K/z_demo_6k.h | 4 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 8 ++-- src/overlays/actors/ovl_Demo_Du/z_demo_du.h | 2 +- .../ovl_Demo_Du/z_demo_du_cutscene_data.inc.c | 4 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 4 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h | 2 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 14 +++--- .../actors/ovl_Demo_Effect/z_demo_effect.h | 4 +- src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c | 4 +- src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h | 2 +- .../actors/ovl_Demo_Geff/z_demo_geff.c | 2 +- .../actors/ovl_Demo_Geff/z_demo_geff.h | 2 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 10 ++--- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h | 2 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 4 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.h | 2 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 10 ++--- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h | 2 +- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 4 +- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h | 2 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 6 +-- src/overlays/actors/ovl_Demo_Im/z_demo_im.h | 2 +- .../ovl_Demo_Im/z_demo_im_cutscene_data.inc.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 14 +++--- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.h | 2 +- .../z_demo_kankyo_cutscene_data1.c | 2 +- .../z_demo_kankyo_cutscene_data2.c | 2 +- .../z_demo_kankyo_cutscene_data3.c | 2 +- .../z_demo_kankyo_cutscene_data4.c | 2 +- .../z_demo_kankyo_cutscene_data5.c | 2 +- .../z_demo_kankyo_cutscene_data6.c | 2 +- .../z_demo_kankyo_cutscene_data7.c | 2 +- .../z_demo_kankyo_cutscene_data8.c | 2 +- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 8 ++-- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.h | 2 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 6 +-- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h | 2 +- .../ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 4 +- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h | 2 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 6 +-- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h | 4 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 8 ++-- src/overlays/actors/ovl_Door_Ana/z_door_ana.h | 2 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 6 +-- .../actors/ovl_Door_Gerudo/z_door_gerudo.h | 2 +- .../actors/ovl_Door_Killer/z_door_killer.c | 6 +-- .../actors/ovl_Door_Killer/z_door_killer.h | 2 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 8 ++-- .../actors/ovl_Door_Shutter/z_door_shutter.h | 2 +- .../actors/ovl_Door_Toki/z_door_toki.c | 4 +- .../actors/ovl_Door_Toki/z_door_toki.h | 2 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 8 ++-- .../actors/ovl_Door_Warp1/z_door_warp1.h | 4 +- .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 6 +-- .../actors/ovl_Efc_Erupc/z_efc_erupc.h | 2 +- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 4 +- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h | 2 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 4 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h | 2 +- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 2 +- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 6 +-- src/overlays/actors/ovl_En_Am/z_en_am.h | 2 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 6 +-- src/overlays/actors/ovl_En_Ani/z_en_ani.h | 2 +- .../actors/ovl_En_Anubice/z_en_anubice.c | 6 +-- .../actors/ovl_En_Anubice/z_en_anubice.h | 2 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 6 +-- .../ovl_En_Anubice_Fire/z_en_anubice_fire.h | 2 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.c | 4 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.h | 2 +- .../actors/ovl_En_Arow_Trap/z_en_arow_trap.c | 2 +- .../actors/ovl_En_Arow_Trap/z_en_arow_trap.h | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 4 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.h | 4 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 6 +-- .../ovl_En_Attack_Niw/z_en_attack_niw.h | 2 +- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 6 +-- src/overlays/actors/ovl_En_Ba/z_en_ba.h | 2 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 6 +-- src/overlays/actors/ovl_En_Bb/z_en_bb.h | 2 +- .../actors/ovl_En_Bdfire/z_en_bdfire.c | 6 +-- .../actors/ovl_En_Bdfire/z_en_bdfire.h | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 8 ++-- .../actors/ovl_En_Bigokuta/z_en_bigokuta.h | 2 +- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 4 +- src/overlays/actors/ovl_En_Bili/z_en_bili.h | 2 +- src/overlays/actors/ovl_En_Bird/z_en_bird.c | 2 +- src/overlays/actors/ovl_En_Bird/z_en_bird.h | 2 +- .../actors/ovl_En_Blkobj/z_en_blkobj.c | 4 +- .../actors/ovl_En_Blkobj/z_en_blkobj.h | 2 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 6 +-- src/overlays/actors/ovl_En_Bom/z_en_bom.h | 2 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 8 ++-- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h | 2 +- .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c | 6 +-- .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h | 2 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 6 +-- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.h | 2 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 6 +-- src/overlays/actors/ovl_En_Bombf/z_en_bombf.h | 2 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 4 +- src/overlays/actors/ovl_En_Boom/z_en_boom.h | 4 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 14 +++--- src/overlays/actors/ovl_En_Box/z_en_box.h | 2 +- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 4 +- src/overlays/actors/ovl_En_Brob/z_en_brob.h | 2 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 4 +- .../actors/ovl_En_Bubble/z_en_bubble.h | 2 +- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 4 +- src/overlays/actors/ovl_En_Butte/z_en_butte.h | 2 +- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 6 +-- src/overlays/actors/ovl_En_Bw/z_en_bw.h | 2 +- src/overlays/actors/ovl_En_Bx/z_en_bx.c | 6 +-- src/overlays/actors/ovl_En_Bx/z_en_bx.h | 2 +- .../actors/ovl_En_Changer/z_en_changer.c | 6 +-- .../actors/ovl_En_Changer/z_en_changer.h | 2 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 4 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.h | 2 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 8 ++-- src/overlays/actors/ovl_En_Cow/z_en_cow.h | 2 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 6 +-- src/overlays/actors/ovl_En_Crow/z_en_crow.h | 2 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 8 ++-- src/overlays/actors/ovl_En_Cs/z_en_cs.h | 2 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 8 ++-- src/overlays/actors/ovl_En_Daiku/z_en_daiku.h | 2 +- .../z_en_daiku_kakariko.c | 8 ++-- .../z_en_daiku_kakariko.h | 2 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 8 ++-- .../actors/ovl_En_Dekubaba/z_en_dekubaba.h | 2 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 4 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.h | 2 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 10 ++--- src/overlays/actors/ovl_En_Dh/z_en_dh.h | 2 +- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 6 +-- src/overlays/actors/ovl_En_Dha/z_en_dha.h | 2 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 12 ++--- .../ovl_En_Diving_Game/z_en_diving_game.h | 2 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 8 ++-- src/overlays/actors/ovl_En_Dns/z_en_dns.h | 2 +- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 10 ++--- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h | 2 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 8 ++-- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h | 2 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 8 ++-- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h | 2 +- .../actors/ovl_En_Dodojr/z_en_dodojr.c | 6 +-- .../actors/ovl_En_Dodojr/z_en_dodojr.h | 2 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 6 +-- .../actors/ovl_En_Dodongo/z_en_dodongo.h | 2 +- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 +- src/overlays/actors/ovl_En_Dog/z_en_dog.h | 2 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 8 ++-- src/overlays/actors/ovl_En_Door/z_en_door.h | 2 +- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 6 +-- src/overlays/actors/ovl_En_Ds/z_en_ds.h | 2 +- src/overlays/actors/ovl_En_Du/z_en_du.c | 12 ++--- src/overlays/actors/ovl_En_Du/z_en_du.h | 2 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 2 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.h | 2 +- src/overlays/actors/ovl_En_Eg/z_en_eg.c | 4 +- src/overlays/actors/ovl_En_Eg/z_en_eg.h | 2 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 6 +-- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h | 2 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 14 +++--- src/overlays/actors/ovl_En_Elf/z_en_elf.h | 4 +- .../actors/ovl_En_Encount1/z_en_encount1.c | 8 ++-- .../actors/ovl_En_Encount1/z_en_encount1.h | 2 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 6 +-- .../actors/ovl_En_Encount2/z_en_encount2.h | 2 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 8 ++-- .../actors/ovl_En_Ex_Item/z_en_ex_item.h | 2 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 6 +-- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h | 2 +- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 6 +-- src/overlays/actors/ovl_En_Fd/z_en_fd.h | 2 +- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 4 +- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.h | 2 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 6 +-- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h | 4 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 8 ++-- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.h | 2 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 6 +-- .../actors/ovl_En_Firefly/z_en_firefly.h | 2 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 6 +-- src/overlays/actors/ovl_En_Fish/z_en_fish.h | 2 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 8 ++-- .../actors/ovl_En_Floormas/z_en_floormas.h | 2 +- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 16 +++---- src/overlays/actors/ovl_En_Fr/z_en_fr.h | 4 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 10 ++--- src/overlays/actors/ovl_En_Fu/z_en_fu.h | 2 +- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 4 +- src/overlays/actors/ovl_En_Fw/z_en_fw.h | 2 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 4 +- src/overlays/actors/ovl_En_Fz/z_en_fz.h | 2 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 12 ++--- .../actors/ovl_En_G_Switch/z_en_g_switch.h | 2 +- .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 2 +- .../ovl_En_Ganon_Mant/z_en_ganon_mant.h | 2 +- .../ovl_En_Ganon_Organ/z_en_ganon_organ.c | 2 +- .../ovl_En_Ganon_Organ/z_en_ganon_organ.h | 2 +- src/overlays/actors/ovl_En_Gb/z_en_gb.c | 8 ++-- src/overlays/actors/ovl_En_Gb/z_en_gb.h | 4 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 10 ++--- src/overlays/actors/ovl_En_Ge1/z_en_ge1.h | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 10 ++--- src/overlays/actors/ovl_En_Ge2/z_en_ge2.h | 2 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 6 +-- src/overlays/actors/ovl_En_Ge3/z_en_ge3.h | 2 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 10 ++--- src/overlays/actors/ovl_En_GeldB/z_en_geldb.h | 2 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 6 +-- src/overlays/actors/ovl_En_GirlA/z_en_girla.h | 2 +- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 6 +-- src/overlays/actors/ovl_En_Gm/z_en_gm.h | 2 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 6 +-- src/overlays/actors/ovl_En_Go/z_en_go.h | 2 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 10 ++--- src/overlays/actors/ovl_En_Go2/z_en_go2.h | 2 +- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 6 +-- src/overlays/actors/ovl_En_Goma/z_en_goma.h | 2 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 6 +-- .../actors/ovl_En_Goroiwa/z_en_goroiwa.h | 2 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 8 ++-- src/overlays/actors/ovl_En_Gs/z_en_gs.h | 2 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 6 +-- src/overlays/actors/ovl_En_Guest/z_en_guest.h | 2 +- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 2 +- src/overlays/actors/ovl_En_Hata/z_en_hata.h | 2 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 10 ++--- .../actors/ovl_En_Heishi1/z_en_heishi1.h | 2 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 8 ++-- .../actors/ovl_En_Heishi2/z_en_heishi2.h | 2 +- .../actors/ovl_En_Heishi3/z_en_heishi3.c | 6 +-- .../actors/ovl_En_Heishi3/z_en_heishi3.h | 2 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 8 ++-- .../actors/ovl_En_Heishi4/z_en_heishi4.h | 2 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 2 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.h | 2 +- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 6 +-- src/overlays/actors/ovl_En_Holl/z_en_holl.h | 2 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 6 +-- .../actors/ovl_En_Honotrap/z_en_honotrap.h | 2 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 14 +++--- src/overlays/actors/ovl_En_Horse/z_en_horse.h | 4 +- .../z_en_horse_game_check.c | 6 +-- .../z_en_horse_game_check.h | 2 +- .../ovl_En_Horse_Ganon/z_en_horse_ganon.c | 6 +-- .../ovl_En_Horse_Ganon/z_en_horse_ganon.h | 4 +- .../z_en_horse_link_child.c | 12 ++--- .../z_en_horse_link_child.h | 4 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 8 ++-- .../ovl_En_Horse_Normal/z_en_horse_normal.h | 4 +- .../ovl_En_Horse_Zelda/z_en_horse_zelda.c | 4 +- .../ovl_En_Horse_Zelda/z_en_horse_zelda.h | 4 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 6 +-- src/overlays/actors/ovl_En_Hs/z_en_hs.h | 2 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 4 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.h | 2 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 10 ++--- src/overlays/actors/ovl_En_Hy/z_en_hy.h | 2 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 8 ++-- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.h | 4 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 12 ++--- src/overlays/actors/ovl_En_Ik/z_en_ik.h | 2 +- src/overlays/actors/ovl_En_In/z_en_in.c | 10 ++--- src/overlays/actors/ovl_En_In/z_en_in.h | 2 +- .../actors/ovl_En_Insect/z_en_insect.c | 8 ++-- .../actors/ovl_En_Insect/z_en_insect.h | 2 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 6 +-- src/overlays/actors/ovl_En_Ishi/z_en_ishi.h | 2 +- src/overlays/actors/ovl_En_It/z_en_it.c | 2 +- src/overlays/actors/ovl_En_It/z_en_it.h | 2 +- src/overlays/actors/ovl_En_Jj/z_en_jj.c | 6 +-- src/overlays/actors/ovl_En_Jj/z_en_jj.h | 2 +- .../ovl_En_Jj/z_en_jj_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 4 +- src/overlays/actors/ovl_En_Js/z_en_js.h | 2 +- .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 6 +-- .../actors/ovl_En_Jsjutan/z_en_jsjutan.h | 2 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 8 ++-- .../actors/ovl_En_Kakasi/z_en_kakasi.h | 2 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 10 ++--- .../actors/ovl_En_Kakasi2/z_en_kakasi2.h | 2 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 8 ++-- .../actors/ovl_En_Kakasi3/z_en_kakasi3.h | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 10 ++--- .../actors/ovl_En_Kanban/z_en_kanban.h | 2 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 8 ++-- .../actors/ovl_En_Karebaba/z_en_karebaba.h | 2 +- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 8 ++-- src/overlays/actors/ovl_En_Ko/z_en_ko.h | 2 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 4 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.h | 2 +- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 8 ++-- src/overlays/actors/ovl_En_Kz/z_en_kz.h | 2 +- src/overlays/actors/ovl_En_Light/z_en_light.c | 6 +-- src/overlays/actors/ovl_En_Light/z_en_light.h | 4 +- .../actors/ovl_En_Lightbox/z_en_lightbox.c | 2 +- .../actors/ovl_En_Lightbox/z_en_lightbox.h | 2 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.c | 2 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.h | 2 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 10 ++--- .../actors/ovl_En_M_Thunder/z_en_m_thunder.h | 4 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 12 ++--- src/overlays/actors/ovl_En_Ma1/z_en_ma1.h | 2 +- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 12 ++--- src/overlays/actors/ovl_En_Ma2/z_en_ma2.h | 2 +- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 8 ++-- src/overlays/actors/ovl_En_Ma3/z_en_ma3.h | 2 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 10 ++--- src/overlays/actors/ovl_En_Mag/z_en_mag.h | 4 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 6 +-- src/overlays/actors/ovl_En_Mb/z_en_mb.h | 2 +- src/overlays/actors/ovl_En_Md/z_en_md.c | 10 ++--- src/overlays/actors/ovl_En_Md/z_en_md.h | 2 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 8 ++-- src/overlays/actors/ovl_En_Mk/z_en_mk.h | 2 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 8 ++-- src/overlays/actors/ovl_En_Mm/z_en_mm.h | 2 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 4 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.h | 2 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 6 +-- src/overlays/actors/ovl_En_Ms/z_en_ms.h | 2 +- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 6 +-- src/overlays/actors/ovl_En_Mu/z_en_mu.h | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 8 ++-- src/overlays/actors/ovl_En_Nb/z_en_nb.h | 2 +- .../ovl_En_Nb/z_en_nb_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 8 ++-- src/overlays/actors/ovl_En_Niw/z_en_niw.h | 2 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 6 +-- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.h | 2 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 8 ++-- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.h | 2 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 8 ++-- .../actors/ovl_En_Nutsball/z_en_nutsball.h | 2 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 2 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.h | 2 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 4 +- src/overlays/actors/ovl_En_Ny/z_en_ny.h | 2 +- src/overlays/actors/ovl_En_OE2/z_en_oe2.c | 2 +- src/overlays/actors/ovl_En_OE2/z_en_oe2.h | 2 +- .../z_en_okarina_effect.c | 12 ++--- .../z_en_okarina_effect.h | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 12 ++--- .../ovl_En_Okarina_Tag/z_en_okarina_tag.h | 2 +- .../z_en_okarina_tag_cutscene_data.c | 4 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 8 ++-- src/overlays/actors/ovl_En_Okuta/z_en_okuta.h | 2 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 6 +-- src/overlays/actors/ovl_En_Ossan/z_en_ossan.h | 2 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 8 ++-- src/overlays/actors/ovl_En_Owl/z_en_owl.h | 2 +- src/overlays/actors/ovl_En_Part/z_en_part.c | 6 +-- src/overlays/actors/ovl_En_Part/z_en_part.h | 2 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 8 ++-- .../actors/ovl_En_Peehat/z_en_peehat.h | 2 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 4 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.h | 4 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 10 ++--- .../actors/ovl_En_Po_Field/z_en_po_field.h | 4 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 10 ++--- .../actors/ovl_En_Po_Relay/z_en_po_relay.h | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 10 ++--- .../ovl_En_Po_Sisters/z_en_po_sisters.h | 4 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 10 ++--- src/overlays/actors/ovl_En_Poh/z_en_poh.h | 4 +- .../actors/ovl_En_Pu_box/z_en_pu_box.c | 2 +- .../actors/ovl_En_Pu_box/z_en_pu_box.h | 2 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 8 ++-- src/overlays/actors/ovl_En_Rd/z_en_rd.h | 2 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 8 ++-- src/overlays/actors/ovl_En_Reeba/z_en_reeba.h | 2 +- .../ovl_En_River_Sound/z_en_river_sound.c | 8 ++-- .../ovl_En_River_Sound/z_en_river_sound.h | 2 +- src/overlays/actors/ovl_En_Rl/z_en_rl.c | 6 +-- src/overlays/actors/ovl_En_Rl/z_en_rl.h | 2 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 8 ++-- src/overlays/actors/ovl_En_Rr/z_en_rr.h | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 10 ++--- src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 2 +- .../ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 8 ++-- src/overlays/actors/ovl_En_Ru2/z_en_ru2.h | 2 +- .../ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 8 ++-- src/overlays/actors/ovl_En_Sa/z_en_sa.h | 2 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 4 +- src/overlays/actors/ovl_En_Sb/z_en_sb.h | 2 +- .../ovl_En_Scene_Change/z_en_scene_change.c | 2 +- .../ovl_En_Scene_Change/z_en_scene_change.h | 2 +- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 4 +- src/overlays/actors/ovl_En_Sda/z_en_sda.h | 2 +- .../actors/ovl_En_Shopnuts/z_en_shopnuts.c | 4 +- .../actors/ovl_En_Shopnuts/z_en_shopnuts.h | 2 +- src/overlays/actors/ovl_En_Si/z_en_si.c | 10 ++--- src/overlays/actors/ovl_En_Si/z_en_si.h | 2 +- .../actors/ovl_En_Siofuki/z_en_siofuki.c | 8 ++-- .../actors/ovl_En_Siofuki/z_en_siofuki.h | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 8 ++-- src/overlays/actors/ovl_En_Skb/z_en_skb.h | 2 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 16 +++---- src/overlays/actors/ovl_En_Skj/z_en_skj.h | 2 +- .../actors/ovl_En_Skjneedle/z_en_skjneedle.c | 2 +- .../actors/ovl_En_Skjneedle/z_en_skjneedle.h | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 10 ++--- src/overlays/actors/ovl_En_Ssh/z_en_ssh.h | 2 +- src/overlays/actors/ovl_En_St/z_en_st.c | 6 +-- src/overlays/actors/ovl_En_St/z_en_st.h | 2 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 4 +- src/overlays/actors/ovl_En_Sth/z_en_sth.h | 2 +- .../actors/ovl_En_Stream/z_en_stream.c | 4 +- .../actors/ovl_En_Stream/z_en_stream.h | 2 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 8 ++-- src/overlays/actors/ovl_En_Sw/z_en_sw.h | 2 +- .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 8 ++-- .../ovl_En_Syateki_Itm/z_en_syateki_itm.h | 2 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 6 +-- .../ovl_En_Syateki_Man/z_en_syateki_man.h | 2 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 8 ++-- .../ovl_En_Syateki_Niw/z_en_syateki_niw.h | 2 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 10 ++--- src/overlays/actors/ovl_En_Ta/z_en_ta.h | 2 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 4 +- .../ovl_En_Takara_Man/z_en_takara_man.h | 2 +- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 2 +- src/overlays/actors/ovl_En_Tana/z_en_tana.h | 2 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 8 ++-- src/overlays/actors/ovl_En_Test/z_en_test.h | 2 +- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 4 +- src/overlays/actors/ovl_En_Tg/z_en_tg.h | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 6 +-- src/overlays/actors/ovl_En_Tite/z_en_tite.h | 2 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 6 +-- src/overlays/actors/ovl_En_Tk/z_en_tk.h | 2 +- src/overlays/actors/ovl_En_Torch/z_en_torch.c | 4 +- src/overlays/actors/ovl_En_Torch/z_en_torch.h | 2 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 10 ++--- .../actors/ovl_En_Torch2/z_en_torch2.h | 4 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 8 ++-- src/overlays/actors/ovl_En_Toryo/z_en_toryo.h | 2 +- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 6 +-- src/overlays/actors/ovl_En_Tp/z_en_tp.h | 2 +- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 6 +-- src/overlays/actors/ovl_En_Tr/z_en_tr.h | 2 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 4 +- src/overlays/actors/ovl_En_Trap/z_en_trap.h | 2 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 8 ++-- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h | 2 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 4 +- src/overlays/actors/ovl_En_Vali/z_en_vali.h | 2 +- src/overlays/actors/ovl_En_Vase/z_en_vase.c | 2 +- src/overlays/actors/ovl_En_Vase/z_en_vase.h | 2 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 4 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.h | 2 +- .../actors/ovl_En_Viewer/z_en_viewer.c | 8 ++-- .../actors/ovl_En_Viewer/z_en_viewer.h | 4 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 6 +-- src/overlays/actors/ovl_En_Vm/z_en_vm.h | 2 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 6 +-- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 8 ++-- .../actors/ovl_En_Wallmas/z_en_wallmas.h | 2 +- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 8 ++-- .../ovl_En_Weather_Tag/z_en_weather_tag.h | 2 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 6 +-- .../actors/ovl_En_Weiyer/z_en_weiyer.h | 2 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 8 ++-- src/overlays/actors/ovl_En_Wf/z_en_wf.h | 2 +- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 6 +-- .../ovl_En_Wonder_Item/z_en_wonder_item.h | 2 +- .../ovl_En_Wonder_Talk/z_en_wonder_talk.c | 6 +-- .../ovl_En_Wonder_Talk/z_en_wonder_talk.h | 2 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 8 ++-- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.h | 2 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 6 +-- .../actors/ovl_En_Wood02/z_en_wood02.h | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 10 ++--- src/overlays/actors/ovl_En_Xc/z_en_xc.h | 2 +- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 10 ++--- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.h | 2 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 4 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.h | 2 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 8 ++-- src/overlays/actors/ovl_En_Zf/z_en_zf.h | 2 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 8 ++-- src/overlays/actors/ovl_En_Zl1/z_en_zl1.h | 2 +- .../ovl_En_Zl1/z_en_zl1_camera_data.inc.c | 2 +- .../ovl_En_Zl1/z_en_zl1_cutscene_data.c | 4 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 8 ++-- src/overlays/actors/ovl_En_Zl2/z_en_zl2.h | 2 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 10 ++--- src/overlays/actors/ovl_En_Zl3/z_en_zl3.h | 4 +- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 10 ++--- src/overlays/actors/ovl_En_Zl4/z_en_zl4.h | 2 +- .../ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 8 ++-- src/overlays/actors/ovl_En_Zo/z_en_zo.h | 2 +- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 8 ++-- src/overlays/actors/ovl_En_fHG/z_en_fhg.h | 4 +- .../actors/ovl_End_Title/z_end_title.c | 4 +- .../actors/ovl_End_Title/z_end_title.h | 2 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 10 ++--- src/overlays/actors/ovl_Fishing/z_fishing.h | 4 +- .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 4 +- .../actors/ovl_Item_B_Heart/z_item_b_heart.h | 2 +- .../ovl_Item_Etcetera/z_item_etcetera.c | 8 ++-- .../ovl_Item_Etcetera/z_item_etcetera.h | 2 +- .../actors/ovl_Item_Inbox/z_item_inbox.c | 4 +- .../actors/ovl_Item_Inbox/z_item_inbox.h | 2 +- .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 8 ++-- .../actors/ovl_Item_Ocarina/z_item_ocarina.h | 2 +- .../actors/ovl_Item_Shield/z_item_shield.c | 8 ++-- .../actors/ovl_Item_Shield/z_item_shield.h | 2 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 6 +-- .../actors/ovl_Magic_Dark/z_magic_dark.h | 2 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 4 +- .../actors/ovl_Magic_Fire/z_magic_fire.h | 2 +- .../actors/ovl_Magic_Wind/z_magic_wind.c | 6 +-- .../actors/ovl_Magic_Wind/z_magic_wind.h | 4 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 6 +-- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h | 4 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 8 ++-- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h | 2 +- .../ovl_Obj_Blockstop/z_obj_blockstop.c | 2 +- .../ovl_Obj_Blockstop/z_obj_blockstop.h | 2 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 4 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h | 2 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 4 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h | 2 +- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 4 +- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.h | 2 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 2 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.h | 2 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 4 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.h | 2 +- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 4 +- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.h | 2 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 4 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h | 2 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 6 +-- .../actors/ovl_Obj_Kibako/z_obj_kibako.h | 2 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 4 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.h | 2 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 4 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h | 2 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 4 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.h | 2 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 4 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.h | 2 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 2 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h | 2 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 2 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h | 2 +- .../actors/ovl_Obj_Mure2/z_obj_mure2.c | 2 +- .../actors/ovl_Obj_Mure2/z_obj_mure2.h | 2 +- .../actors/ovl_Obj_Mure3/z_obj_mure3.c | 2 +- .../actors/ovl_Obj_Mure3/z_obj_mure3.h | 2 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 4 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h | 2 +- .../ovl_Obj_Roomtimer/z_obj_roomtimer.c | 4 +- .../ovl_Obj_Roomtimer/z_obj_roomtimer.h | 2 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 4 +- .../actors/ovl_Obj_Switch/z_obj_switch.h | 2 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 2 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.h | 4 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 8 ++-- .../ovl_Obj_Timeblock/z_obj_timeblock.h | 2 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 8 ++-- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.h | 2 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 6 +-- .../ovl_Obj_Warp2block/z_obj_warp2block.h | 2 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 8 ++-- .../ovl_Object_Kankyo/z_object_kankyo.h | 2 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 10 ++--- .../actors/ovl_Oceff_Spot/z_oceff_spot.h | 4 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 6 +-- .../actors/ovl_Oceff_Storm/z_oceff_storm.h | 2 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 6 +-- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.h | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 6 +-- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 6 +-- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 10 ++--- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h | 2 +- .../actors/ovl_player_actor/z_player.c | 16 +++---- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 4 +- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.h | 2 +- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 6 +-- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h | 2 +- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 6 +-- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h | 2 +- .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c | 4 +- .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h | 2 +- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 6 +-- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h | 2 +- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 6 +-- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h | 2 +- .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 6 +-- .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h | 2 +- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 4 +- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h | 2 +- .../z_eff_ss_dead_sound.c | 4 +- .../z_eff_ss_dead_sound.h | 2 +- .../z_eff_ss_dt_bubble.c | 4 +- .../z_eff_ss_dt_bubble.h | 2 +- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 6 +-- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.h | 2 +- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 4 +- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h | 2 +- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 4 +- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h | 2 +- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 4 +- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.h | 2 +- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 4 +- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h | 2 +- .../z_eff_ss_fhg_flash.c | 8 ++-- .../z_eff_ss_fhg_flash.h | 2 +- .../z_eff_ss_fire_tail.c | 6 +-- .../z_eff_ss_fire_tail.h | 2 +- .../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c | 4 +- .../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h | 2 +- .../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c | 4 +- .../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h | 2 +- .../z_eff_ss_g_magma2.c | 4 +- .../z_eff_ss_g_magma2.h | 2 +- .../z_eff_ss_g_ripple.c | 6 +-- .../z_eff_ss_g_ripple.h | 2 +- .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 6 +-- .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h | 2 +- .../z_eff_ss_g_splash.c | 4 +- .../z_eff_ss_g_splash.h | 2 +- .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 6 +-- .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h | 2 +- .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 6 +-- .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h | 2 +- .../z_eff_ss_ice_piece.c | 4 +- .../z_eff_ss_ice_piece.h | 2 +- .../z_eff_ss_ice_smoke.c | 4 +- .../z_eff_ss_ice_smoke.h | 2 +- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 4 +- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h | 2 +- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 6 +-- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h | 2 +- .../z_eff_ss_kirakira.c | 6 +-- .../z_eff_ss_kirakira.h | 2 +- .../z_eff_ss_lightning.c | 6 +-- .../z_eff_ss_lightning.h | 2 +- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 6 +-- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h | 2 +- .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c | 4 +- .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h | 2 +- .../z_eff_ss_solder_srch_ball.c | 8 ++-- .../z_eff_ss_solder_srch_ball.h | 2 +- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 8 ++-- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.h | 2 +- .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 6 +-- .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h | 2 +- .../gamestates/ovl_file_choose/file_select.h | 2 +- .../ovl_file_choose/z_file_choose.c | 16 +++---- .../ovl_file_choose/z_file_copy_erase.c | 4 +- .../ovl_file_choose/z_file_nameset.c | 4 +- .../gamestates/ovl_opening/z_opening.c | 10 ++--- src/overlays/gamestates/ovl_select/z_select.c | 6 +-- src/overlays/gamestates/ovl_title/z_title.c | 6 +-- .../ovl_kaleido_scope/z_kaleido_collect.c | 6 +-- .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 4 +- .../ovl_kaleido_scope/z_kaleido_equipment.c | 6 +-- .../misc/ovl_kaleido_scope/z_kaleido_item.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_map.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_prompt.c | 2 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 10 ++--- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 4 +- .../misc/ovl_kaleido_scope/z_lmap_mark.c | 2 +- .../misc/ovl_map_mark_data/z_map_mark_data.c | 2 +- .../ovl_map_mark_data/z_map_mark_data_mq.c | 2 +- .../assets/extract/extase/cdata_resources.py | 2 +- .../extase_oot64/animation_resources.py | 4 +- .../extase_oot64/collision_resources.py | 16 +++---- .../extract/extase_oot64/misc_resources.py | 8 ++-- .../extase_oot64/playeranim_resources.py | 4 +- .../extase_oot64/room_shape_resources.py | 16 +++---- .../extase_oot64/scene_commands_resource.py | 8 ++-- .../extase_oot64/scene_rooms_resources.py | 16 +++---- .../skelanime_legacy_resources.py | 8 ++-- .../extase_oot64/skelcurve_resources.py | 10 ++--- .../extase_oot64/skeleton_resources.py | 8 ++-- .../extase_oot64/skeleton_skin_resources.py | 10 ++--- 1255 files changed, 2596 insertions(+), 2594 deletions(-) rename include/{z64actor.h => actor.h} (99%) rename include/{z64actor_profile.h => actor_profile.h} (96%) rename include/{z64animation.h => animation.h} (99%) rename include/{z64animation_legacy.h => animation_legacy.h} (92%) rename include/{z64audio.h => audio.h} (99%) rename include/{z64bgcheck.h => bgcheck.h} (99%) rename include/{z64camera.h => camera.h} (99%) rename include/{z64collision_check.h => collision_check.h} (99%) rename include/{z64curve.h => curve.h} (98%) rename include/{z64cutscene.h => cutscene.h} (99%) rename include/{z64cutscene_commands.h => cutscene_commands.h} (99%) rename include/{z64cutscene_flags.h => cutscene_flags.h} (83%) rename include/{z64cutscene_spline.h => cutscene_spline.h} (78%) rename include/{z64debug.h => debug.h} (90%) rename include/{z64debug_display.h => debug_display.h} (90%) rename include/{z64dma.h => dma.h} (98%) rename include/{z64draw.h => draw.h} (73%) rename include/{z64effect.h => effect.h} (99%) rename include/{z64environment.h => environment.h} (99%) 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%) rename include/{z64game.h => game.h} (98%) rename include/{z64game_over.h => game_over.h} (95%) rename include/{z64horse.h => horse.h} (85%) rename include/{z64interface.h => interface.h} (99%) rename include/{z64inventory.h => inventory.h} (90%) rename include/{z64item.h => item.h} (99%) rename include/{z64lifemeter.h => lifemeter.h} (86%) rename include/{z64light.h => light.h} (98%) rename include/{z64map_mark.h => map_mark.h} (95%) rename include/{z64message.h => message.h} (99%) rename include/{z64object.h => object.h} (96%) rename include/{z64ocarina.h => ocarina.h} (99%) rename include/{z64olib.h => olib.h} (88%) rename include/{z64path.h => path.h} (88%) rename include/{z64pause.h => pause.h} (99%) rename include/{z64play.h => play_state.h} (93%) rename include/{z64player.h => player.h} (99%) rename include/{z64quest_hint.h => quest_hint.h} (76%) rename include/{z64quest_hint_commands.h => quest_hint_commands.h} (98%) rename include/{z64room.h => room.h} (98%) rename include/{z64save.h => save.h} (99%) rename include/{z64scene.h => scene.h} (99%) rename include/{z64sfx_source.h => sfx_source.h} (86%) rename include/{z64skin.h => skin.h} (98%) rename include/{z64skin_matrix.h => skin_matrix.h} (94%) rename include/{z64skybox.h => skybox.h} (97%) rename include/{z64sram.h => sram.h} (97%) rename include/{z64ss_sram.h => ss_sram.h} (89%) rename include/{z64thread.h => thread.h} (95%) rename include/{z64transition.h => transition.h} (97%) rename include/{z64transition_instances.h => transition_instances.h} (74%) rename include/{z64view.h => view.h} (98%) rename include/{z64vis.h => vis.h} (98%) rename include/{z64math.h => z_math.h} (97%) diff --git a/assets/objects/object_link_boy/object_link_boy.c b/assets/objects/object_link_boy/object_link_boy.c index 276e6b2b34..ea6fe8c9f2 100644 --- a/assets/objects/object_link_boy/object_link_boy.c +++ b/assets/objects/object_link_boy/object_link_boy.c @@ -3,7 +3,7 @@ #include "array_count.h" #include "gfx.h" -#include "z64player.h" +#include "player.h" // Eyes textures diff --git a/assets/objects/object_link_boy/object_link_boy.h b/assets/objects/object_link_boy/object_link_boy.h index 8fadf32923..349c36adeb 100644 --- a/assets/objects/object_link_boy/object_link_boy.h +++ b/assets/objects/object_link_boy/object_link_boy.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "tex_len.h" -#include "z64animation.h" +#include "animation.h" #define LINK_ADULT_EYES_TEX_WIDTH 64 #define LINK_ADULT_EYES_TEX_HEIGHT 32 diff --git a/assets/objects/object_link_child/object_link_child.c b/assets/objects/object_link_child/object_link_child.c index 035cbedb30..30411ab0b4 100644 --- a/assets/objects/object_link_child/object_link_child.c +++ b/assets/objects/object_link_child/object_link_child.c @@ -3,7 +3,7 @@ #include "array_count.h" #include "gfx.h" -#include "z64player.h" +#include "player.h" // Eyes textures diff --git a/assets/objects/object_link_child/object_link_child.h b/assets/objects/object_link_child/object_link_child.h index 7efc576808..0641714080 100644 --- a/assets/objects/object_link_child/object_link_child.h +++ b/assets/objects/object_link_child/object_link_child.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "tex_len.h" -#include "z64animation.h" +#include "animation.h" #define LINK_CHILD_EYES_TEX_WIDTH 64 #define LINK_CHILD_EYES_TEX_HEIGHT 32 diff --git a/assets/textures/icon_item_24_static/icon_item_24_static.h b/assets/textures/icon_item_24_static/icon_item_24_static.h index dbfa9c40e0..2b9a1bc88b 100644 --- a/assets/textures/icon_item_24_static/icon_item_24_static.h +++ b/assets/textures/icon_item_24_static/icon_item_24_static.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "tex_len.h" -#include "z64interface.h" +#include "interface.h" extern u64 gQuestIconMedallionForestTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; extern u64 gQuestIconMedallionFireTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)]; diff --git a/assets/textures/icon_item_static/icon_item_static.h b/assets/textures/icon_item_static/icon_item_static.h index 74c837280f..e8aff38236 100644 --- a/assets/textures/icon_item_static/icon_item_static.h +++ b/assets/textures/icon_item_static/icon_item_static.h @@ -5,7 +5,7 @@ #include "src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" #include "tex_len.h" #include "versions.h" -#include "z64interface.h" +#include "interface.h" extern u64 gItemIconDekuStickTex[TEX_LEN(u64, ITEM_ICON_WIDTH, ITEM_ICON_HEIGHT, 32)]; extern u64 gItemIconDekuNutTex[TEX_LEN(u64, ITEM_ICON_WIDTH, ITEM_ICON_HEIGHT, 32)]; diff --git a/assets/textures/item_name_static/item_name_static.h b/assets/textures/item_name_static/item_name_static.h index 7a4c6cf7b7..22806a4670 100644 --- a/assets/textures/item_name_static/item_name_static.h +++ b/assets/textures/item_name_static/item_name_static.h @@ -4,7 +4,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64item.h" +#include "item.h" #if OOT_NTSC diff --git a/assets/textures/place_title_cards/g_pn_01.c b/assets/textures/place_title_cards/g_pn_01.c index 2d4b469289..e91c30dd8c 100644 --- a/assets/textures/place_title_cards/g_pn_01.c +++ b/assets/textures/place_title_cards/g_pn_01.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gForestTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_02.c b/assets/textures/place_title_cards/g_pn_02.c index 6daba3a74a..f7a0153764 100644 --- a/assets/textures/place_title_cards/g_pn_02.c +++ b/assets/textures/place_title_cards/g_pn_02.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gShadowTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_03.c b/assets/textures/place_title_cards/g_pn_03.c index 4ec8786845..8f56f98522 100644 --- a/assets/textures/place_title_cards/g_pn_03.c +++ b/assets/textures/place_title_cards/g_pn_03.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gFireTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_04.c b/assets/textures/place_title_cards/g_pn_04.c index f09e7ef134..e7844ff898 100644 --- a/assets/textures/place_title_cards/g_pn_04.c +++ b/assets/textures/place_title_cards/g_pn_04.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gWaterTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_05.c b/assets/textures/place_title_cards/g_pn_05.c index cc47a408bc..70dfa83325 100644 --- a/assets/textures/place_title_cards/g_pn_05.c +++ b/assets/textures/place_title_cards/g_pn_05.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gSpiritTempleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_06.c b/assets/textures/place_title_cards/g_pn_06.c index 46b04b482d..4d1dfadc06 100644 --- a/assets/textures/place_title_cards/g_pn_06.c +++ b/assets/textures/place_title_cards/g_pn_06.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gDekuTreeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_07.c b/assets/textures/place_title_cards/g_pn_07.c index 487159bbe2..0eab2f3868 100644 --- a/assets/textures/place_title_cards/g_pn_07.c +++ b/assets/textures/place_title_cards/g_pn_07.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gJabuJabuTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_08.c b/assets/textures/place_title_cards/g_pn_08.c index 90fdb1af4d..bb5b3617b9 100644 --- a/assets/textures/place_title_cards/g_pn_08.c +++ b/assets/textures/place_title_cards/g_pn_08.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gDodongosCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_09.c b/assets/textures/place_title_cards/g_pn_09.c index f053c3e0ed..37116ca729 100644 --- a/assets/textures/place_title_cards/g_pn_09.c +++ b/assets/textures/place_title_cards/g_pn_09.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gInsideGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_10.c b/assets/textures/place_title_cards/g_pn_10.c index ab5b3ea897..9b183245f4 100644 --- a/assets/textures/place_title_cards/g_pn_10.c +++ b/assets/textures/place_title_cards/g_pn_10.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gIceCavernTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_11.c b/assets/textures/place_title_cards/g_pn_11.c index 4a02cc6f80..d24673a514 100644 --- a/assets/textures/place_title_cards/g_pn_11.c +++ b/assets/textures/place_title_cards/g_pn_11.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGERudoTrainingGroundTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_12.c b/assets/textures/place_title_cards/g_pn_12.c index 81f82b6dc5..e362af21c7 100644 --- a/assets/textures/place_title_cards/g_pn_12.c +++ b/assets/textures/place_title_cards/g_pn_12.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gCastleCourtyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_13.c b/assets/textures/place_title_cards/g_pn_13.c index 174ac38bea..57b78e009c 100644 --- a/assets/textures/place_title_cards/g_pn_13.c +++ b/assets/textures/place_title_cards/g_pn_13.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGreatFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_14.c b/assets/textures/place_title_cards/g_pn_14.c index 870549c936..cd8bff53f4 100644 --- a/assets/textures/place_title_cards/g_pn_14.c +++ b/assets/textures/place_title_cards/g_pn_14.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gChamberOfTheSagesTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_15.c b/assets/textures/place_title_cards/g_pn_15.c index ed2e76edd8..8b16867359 100644 --- a/assets/textures/place_title_cards/g_pn_15.c +++ b/assets/textures/place_title_cards/g_pn_15.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gShootingGalleryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_16.c b/assets/textures/place_title_cards/g_pn_16.c index f1088194d4..02346a9235 100644 --- a/assets/textures/place_title_cards/g_pn_16.c +++ b/assets/textures/place_title_cards/g_pn_16.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gTempleOfTimeTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_17.c b/assets/textures/place_title_cards/g_pn_17.c index 3b9b845123..e87e0a86a0 100644 --- a/assets/textures/place_title_cards/g_pn_17.c +++ b/assets/textures/place_title_cards/g_pn_17.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gMarketTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_18.c b/assets/textures/place_title_cards/g_pn_18.c index f4b19ba699..5be4bc5d40 100644 --- a/assets/textures/place_title_cards/g_pn_18.c +++ b/assets/textures/place_title_cards/g_pn_18.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gBackAlleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_19.c b/assets/textures/place_title_cards/g_pn_19.c index 0cbbdad32c..dc051b288f 100644 --- a/assets/textures/place_title_cards/g_pn_19.c +++ b/assets/textures/place_title_cards/g_pn_19.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gKokiriShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_20.c b/assets/textures/place_title_cards/g_pn_20.c index 44aa12c09b..dc682320ca 100644 --- a/assets/textures/place_title_cards/g_pn_20.c +++ b/assets/textures/place_title_cards/g_pn_20.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGoronShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_21.c b/assets/textures/place_title_cards/g_pn_21.c index c5faa7d695..e856049995 100644 --- a/assets/textures/place_title_cards/g_pn_21.c +++ b/assets/textures/place_title_cards/g_pn_21.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gZoraShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_22.c b/assets/textures/place_title_cards/g_pn_22.c index df6cfd28cb..6ae7e0e81d 100644 --- a/assets/textures/place_title_cards/g_pn_22.c +++ b/assets/textures/place_title_cards/g_pn_22.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gHouseOfSkulltulaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_23.c b/assets/textures/place_title_cards/g_pn_23.c index ba70222123..dd086ab4e1 100644 --- a/assets/textures/place_title_cards/g_pn_23.c +++ b/assets/textures/place_title_cards/g_pn_23.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gBazaarTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_24.c b/assets/textures/place_title_cards/g_pn_24.c index 8bf9f9f1b4..580b545955 100644 --- a/assets/textures/place_title_cards/g_pn_24.c +++ b/assets/textures/place_title_cards/g_pn_24.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gPotionShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_25.c b/assets/textures/place_title_cards/g_pn_25.c index 7356e050d1..de6c8e8bb1 100644 --- a/assets/textures/place_title_cards/g_pn_25.c +++ b/assets/textures/place_title_cards/g_pn_25.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGravekeepersHutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_26.c b/assets/textures/place_title_cards/g_pn_26.c index abf67d83b4..f0d9adaaf9 100644 --- a/assets/textures/place_title_cards/g_pn_26.c +++ b/assets/textures/place_title_cards/g_pn_26.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gLakesideLaboratoryTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_27.c b/assets/textures/place_title_cards/g_pn_27.c index 826d96c95d..e7608e08dd 100644 --- a/assets/textures/place_title_cards/g_pn_27.c +++ b/assets/textures/place_title_cards/g_pn_27.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gHyruleFieldTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_28.c b/assets/textures/place_title_cards/g_pn_28.c index fbb228563b..905ab306b0 100644 --- a/assets/textures/place_title_cards/g_pn_28.c +++ b/assets/textures/place_title_cards/g_pn_28.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gKakarikoVillageTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_29.c b/assets/textures/place_title_cards/g_pn_29.c index 51adaffea2..80833d7586 100644 --- a/assets/textures/place_title_cards/g_pn_29.c +++ b/assets/textures/place_title_cards/g_pn_29.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGraveyardTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_30.c b/assets/textures/place_title_cards/g_pn_30.c index 5fd7622dd3..d4122a403a 100644 --- a/assets/textures/place_title_cards/g_pn_30.c +++ b/assets/textures/place_title_cards/g_pn_30.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gZorasRiverTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_31.c b/assets/textures/place_title_cards/g_pn_31.c index 652d27da46..94096efe1f 100644 --- a/assets/textures/place_title_cards/g_pn_31.c +++ b/assets/textures/place_title_cards/g_pn_31.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gKokiriForestTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_32.c b/assets/textures/place_title_cards/g_pn_32.c index d0ca0abb63..b0405f6584 100644 --- a/assets/textures/place_title_cards/g_pn_32.c +++ b/assets/textures/place_title_cards/g_pn_32.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gLakeHyliaTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_33.c b/assets/textures/place_title_cards/g_pn_33.c index 05e67b78a8..2437fba398 100644 --- a/assets/textures/place_title_cards/g_pn_33.c +++ b/assets/textures/place_title_cards/g_pn_33.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gZorasDomainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_34.c b/assets/textures/place_title_cards/g_pn_34.c index 2da3a05032..ebfc794a55 100644 --- a/assets/textures/place_title_cards/g_pn_34.c +++ b/assets/textures/place_title_cards/g_pn_34.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gZorasFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_35.c b/assets/textures/place_title_cards/g_pn_35.c index 8a0f49a6d1..3884e64722 100644 --- a/assets/textures/place_title_cards/g_pn_35.c +++ b/assets/textures/place_title_cards/g_pn_35.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGERudoValleyTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_36.c b/assets/textures/place_title_cards/g_pn_36.c index 781afb38b0..d3cef30a4e 100644 --- a/assets/textures/place_title_cards/g_pn_36.c +++ b/assets/textures/place_title_cards/g_pn_36.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gLostWoodsTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_37.c b/assets/textures/place_title_cards/g_pn_37.c index c0212c601a..b71c93c778 100644 --- a/assets/textures/place_title_cards/g_pn_37.c +++ b/assets/textures/place_title_cards/g_pn_37.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gHauntedWastelandTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_38.c b/assets/textures/place_title_cards/g_pn_38.c index ddb5302eec..a44641fe76 100644 --- a/assets/textures/place_title_cards/g_pn_38.c +++ b/assets/textures/place_title_cards/g_pn_38.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gHyruleCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_39.c b/assets/textures/place_title_cards/g_pn_39.c index e4977dec18..c17a329fc0 100644 --- a/assets/textures/place_title_cards/g_pn_39.c +++ b/assets/textures/place_title_cards/g_pn_39.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gDeathMountainTrailTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_40.c b/assets/textures/place_title_cards/g_pn_40.c index 7762ffbff7..8ee973d9fa 100644 --- a/assets/textures/place_title_cards/g_pn_40.c +++ b/assets/textures/place_title_cards/g_pn_40.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gDeathMountainCraterTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_41.c b/assets/textures/place_title_cards/g_pn_41.c index 418be49bc8..a4303898e5 100644 --- a/assets/textures/place_title_cards/g_pn_41.c +++ b/assets/textures/place_title_cards/g_pn_41.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGoronCityTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_42.c b/assets/textures/place_title_cards/g_pn_42.c index 488e4ba5ee..ab396dae5e 100644 --- a/assets/textures/place_title_cards/g_pn_42.c +++ b/assets/textures/place_title_cards/g_pn_42.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gLonLonRanchTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_43.c b/assets/textures/place_title_cards/g_pn_43.c index 6483d0c6c6..2e76c15aac 100644 --- a/assets/textures/place_title_cards/g_pn_43.c +++ b/assets/textures/place_title_cards/g_pn_43.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGanonsCastleTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_44.c b/assets/textures/place_title_cards/g_pn_44.c index 3a34bf7250..e00b852631 100644 --- a/assets/textures/place_title_cards/g_pn_44.c +++ b/assets/textures/place_title_cards/g_pn_44.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gRoyalFamilysTombTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_45.c b/assets/textures/place_title_cards/g_pn_45.c index e91fdebd18..a900502094 100644 --- a/assets/textures/place_title_cards/g_pn_45.c +++ b/assets/textures/place_title_cards/g_pn_45.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gFairysFountainTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_46.c b/assets/textures/place_title_cards/g_pn_46.c index 4f63e9288e..23f91cde98 100644 --- a/assets/textures/place_title_cards/g_pn_46.c +++ b/assets/textures/place_title_cards/g_pn_46.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gFishingPondTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_47.c b/assets/textures/place_title_cards/g_pn_47.c index b6d6181f50..83feefdec6 100644 --- a/assets/textures/place_title_cards/g_pn_47.c +++ b/assets/textures/place_title_cards/g_pn_47.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gBombchuBowlingAlleyCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_48.c b/assets/textures/place_title_cards/g_pn_48.c index bd93f60067..e73e110171 100644 --- a/assets/textures/place_title_cards/g_pn_48.c +++ b/assets/textures/place_title_cards/g_pn_48.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gStableTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_49.c b/assets/textures/place_title_cards/g_pn_49.c index 47218558d9..3459eb447f 100644 --- a/assets/textures/place_title_cards/g_pn_49.c +++ b/assets/textures/place_title_cards/g_pn_49.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gThievesHideoutTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_50.c b/assets/textures/place_title_cards/g_pn_50.c index e26838c131..fc96b5b4d4 100644 --- a/assets/textures/place_title_cards/g_pn_50.c +++ b/assets/textures/place_title_cards/g_pn_50.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gHappyMaskShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_51.c b/assets/textures/place_title_cards/g_pn_51.c index 796f0d6709..19eec8cbae 100644 --- a/assets/textures/place_title_cards/g_pn_51.c +++ b/assets/textures/place_title_cards/g_pn_51.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gTreasureBoxShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_52.c b/assets/textures/place_title_cards/g_pn_52.c index 3dc2ccf7a0..29b2515037 100644 --- a/assets/textures/place_title_cards/g_pn_52.c +++ b/assets/textures/place_title_cards/g_pn_52.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gSacredForestMeadowTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_53.c b/assets/textures/place_title_cards/g_pn_53.c index ffb7d3b8b6..028a643edf 100644 --- a/assets/textures/place_title_cards/g_pn_53.c +++ b/assets/textures/place_title_cards/g_pn_53.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gGERudosFortressTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_54.c b/assets/textures/place_title_cards/g_pn_54.c index 6b9fb0e2b9..63a0d22755 100644 --- a/assets/textures/place_title_cards/g_pn_54.c +++ b/assets/textures/place_title_cards/g_pn_54.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gBottomOfTheWellTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_55.c b/assets/textures/place_title_cards/g_pn_55.c index 7721518bc7..1f2c654cf5 100644 --- a/assets/textures/place_title_cards/g_pn_55.c +++ b/assets/textures/place_title_cards/g_pn_55.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gDesertColossusTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_56.c b/assets/textures/place_title_cards/g_pn_56.c index 2083b354b6..ba0e77af02 100644 --- a/assets/textures/place_title_cards/g_pn_56.c +++ b/assets/textures/place_title_cards/g_pn_56.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gBombchuShopTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/assets/textures/place_title_cards/g_pn_57.c b/assets/textures/place_title_cards/g_pn_57.c index 80f441b03e..7318f30fb7 100644 --- a/assets/textures/place_title_cards/g_pn_57.c +++ b/assets/textures/place_title_cards/g_pn_57.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "tex_len.h" #include "versions.h" -#include "z64actor.h" +#include "actor.h" #if OOT_NTSC u64 gQuestionMarkTitleCardJPNTex[TEX_LEN(u64, PLACE_NAME_TEX_WIDTH, PLACE_NAME_TEX_HEIGHT, 8)] = { diff --git a/include/z64actor.h b/include/actor.h similarity index 99% rename from include/z64actor.h rename to include/actor.h index 14defad5ee..985f32abb3 100644 --- a/include/z64actor.h +++ b/include/actor.h @@ -1,11 +1,11 @@ -#ifndef Z64ACTOR_H -#define Z64ACTOR_H +#ifndef ACTOR_H +#define ACTOR_H #include "color.h" -#include "z64actor_profile.h" -#include "z64animation.h" -#include "z64math.h" -#include "z64collision_check.h" +#include "actor_profile.h" +#include "animation.h" +#include "z_math.h" +#include "collision_check.h" #define ACTOR_NUMBER_MAX 200 diff --git a/include/z64actor_profile.h b/include/actor_profile.h similarity index 96% rename from include/z64actor_profile.h rename to include/actor_profile.h index 82ec9f957b..d02ce03cf2 100644 --- a/include/z64actor_profile.h +++ b/include/actor_profile.h @@ -1,5 +1,5 @@ -#ifndef Z64ACTOR_PROFILE_H -#define Z64ACTOR_PROFILE_H +#ifndef ACTOR_PROFILE_H +#define ACTOR_PROFILE_H #include "ultra64.h" diff --git a/include/z64animation.h b/include/animation.h similarity index 99% rename from include/z64animation.h rename to include/animation.h index a085da5ddd..fdf14843b9 100644 --- a/include/z64animation.h +++ b/include/animation.h @@ -1,10 +1,10 @@ -#ifndef Z64_ANIMATION_H -#define Z64_ANIMATION_H +#ifndef ANIMATION_H +#define ANIMATION_H #include "avoid_ub.h" #include "ultra64.h" -#include "z64dma.h" -#include "z64math.h" +#include "dma.h" +#include "z_math.h" struct PlayState; struct Actor; diff --git a/include/z64animation_legacy.h b/include/animation_legacy.h similarity index 92% rename from include/z64animation_legacy.h rename to include/animation_legacy.h index 066a8faa33..5b5c0399ff 100644 --- a/include/z64animation_legacy.h +++ b/include/animation_legacy.h @@ -1,8 +1,8 @@ -#ifndef Z64_ANIMATION_LEGACY_H -#define Z64_ANIMATION_LEGACY_H +#ifndef ANIMATION_LEGACY_H +#define ANIMATION_LEGACY_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct LegacyLimb { /* 0x000 */ Gfx* dList; diff --git a/include/z64audio.h b/include/audio.h similarity index 99% rename from include/z64audio.h rename to include/audio.h index 308c220d7a..2dbf107501 100644 --- a/include/z64audio.h +++ b/include/audio.h @@ -1,9 +1,9 @@ -#ifndef Z64_AUDIO_H -#define Z64_AUDIO_H +#ifndef AUDIO_H +#define AUDIO_H #include "ultra64.h" #include "sequence.h" -#include "z64math.h" +#include "z_math.h" struct GfxPrint; diff --git a/include/audio/soundfont_file.h b/include/audio/soundfont_file.h index 9456429774..3de4595090 100644 --- a/include/audio/soundfont_file.h +++ b/include/audio/soundfont_file.h @@ -4,7 +4,7 @@ #include "stdbool.h" #include "alignment.h" #include "attributes.h" -#include "z64audio.h" +#include "audio.h" // Envelope definitions diff --git a/include/audiomgr.h b/include/audiomgr.h index b518c976a5..66a9050266 100644 --- a/include/audiomgr.h +++ b/include/audiomgr.h @@ -2,7 +2,7 @@ #define AUDIOMGR_H #include "sched.h" -#include "z64audio.h" +#include "audio.h" typedef enum AudioMgrDebugLevel { /* 0 */ AUDIOMGR_DEBUG_LEVEL_NONE, diff --git a/include/z64bgcheck.h b/include/bgcheck.h similarity index 99% rename from include/z64bgcheck.h rename to include/bgcheck.h index eb7e9155d0..13b8570582 100644 --- a/include/z64bgcheck.h +++ b/include/bgcheck.h @@ -1,8 +1,8 @@ -#ifndef Z64BGCHECK_H -#define Z64BGCHECK_H +#ifndef BGCHECK_H +#define BGCHECK_H #include "ultra64/ultratypes.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; struct Actor; diff --git a/include/z64camera.h b/include/camera.h similarity index 99% rename from include/z64camera.h rename to include/camera.h index 2fcbffdf5a..9d4783de06 100644 --- a/include/z64camera.h +++ b/include/camera.h @@ -1,9 +1,9 @@ -#ifndef Z64CAMERA_H -#define Z64CAMERA_H +#ifndef CAMERA_H +#define CAMERA_H #include "ultra64.h" -#include "z64cutscene.h" -#include "z64math.h" +#include "cutscene.h" +#include "z_math.h" struct CollisionContext; struct View; diff --git a/include/z64collision_check.h b/include/collision_check.h similarity index 99% rename from include/z64collision_check.h rename to include/collision_check.h index 4a15431acc..ddcafb24e9 100644 --- a/include/z64collision_check.h +++ b/include/collision_check.h @@ -1,8 +1,8 @@ -#ifndef Z64COLLISION_CHECK_H -#define Z64COLLISION_CHECK_H +#ifndef COLLISION_CHECK_H +#define COLLISION_CHECK_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" #define COLLISION_CHECK_AT_MAX 50 #define COLLISION_CHECK_AC_MAX 60 diff --git a/include/console_logo_state.h b/include/console_logo_state.h index 09b7d66546..da9509b72d 100644 --- a/include/console_logo_state.h +++ b/include/console_logo_state.h @@ -2,9 +2,9 @@ #define CONSOLE_LOGO_STATE_H #include "ultra64.h" -#include "z64game.h" -#include "z64sram.h" -#include "z64view.h" +#include "game.h" +#include "sram.h" +#include "view.h" typedef struct ConsoleLogoState { /* 0x0000 */ GameState state; diff --git a/include/z64curve.h b/include/curve.h similarity index 98% rename from include/z64curve.h rename to include/curve.h index 3ca0eac132..8779b04b47 100644 --- a/include/z64curve.h +++ b/include/curve.h @@ -1,5 +1,5 @@ -#ifndef Z64_CURVE_H -#define Z64_CURVE_H +#ifndef CURVE_H +#define CURVE_H #include "ultra64.h" diff --git a/include/z64cutscene.h b/include/cutscene.h similarity index 99% rename from include/z64cutscene.h rename to include/cutscene.h index f8aed368d4..e3bf4a1c84 100644 --- a/include/z64cutscene.h +++ b/include/cutscene.h @@ -1,8 +1,8 @@ -#ifndef Z64CUTSCENE_H -#define Z64CUTSCENE_H +#ifndef CUTSCENE_H +#define CUTSCENE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; diff --git a/include/z64cutscene_commands.h b/include/cutscene_commands.h similarity index 99% rename from include/z64cutscene_commands.h rename to include/cutscene_commands.h index f0c8146cd1..14ec25c496 100644 --- a/include/z64cutscene_commands.h +++ b/include/cutscene_commands.h @@ -1,8 +1,8 @@ -#ifndef Z64CUTSCENE_COMMANDS_H -#define Z64CUTSCENE_COMMANDS_H +#ifndef CUTSCENE_COMMANDS_H +#define CUTSCENE_COMMANDS_H #include "command_macros_base.h" -#include "z64cutscene.h" +#include "cutscene.h" /** * Cutscene scripts are arrays of `CutsceneData` words, including bit-packed integers and floats. diff --git a/include/z64cutscene_flags.h b/include/cutscene_flags.h similarity index 83% rename from include/z64cutscene_flags.h rename to include/cutscene_flags.h index 5a3c7c2a7a..a6e34762af 100644 --- a/include/z64cutscene_flags.h +++ b/include/cutscene_flags.h @@ -1,5 +1,5 @@ -#ifndef Z64CUTSCENE_FLAGS_H -#define Z64CUTSCENE_FLAGS_H +#ifndef CUTSCENE_FLAGS_H +#define CUTSCENE_FLAGS_H #include "ultra64.h" diff --git a/include/z64cutscene_spline.h b/include/cutscene_spline.h similarity index 78% rename from include/z64cutscene_spline.h rename to include/cutscene_spline.h index 3a73949453..00a815a614 100644 --- a/include/z64cutscene_spline.h +++ b/include/cutscene_spline.h @@ -1,8 +1,8 @@ -#ifndef Z64CUTSCENE_SPLINE_H -#define Z64CUTSCENE_SPLINE_H +#ifndef CUTSCENE_SPLINE_H +#define CUTSCENE_SPLINE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" union CutsceneCameraPoint; diff --git a/include/db_camera.h b/include/db_camera.h index 81d8515d0b..fd11f56fdb 100644 --- a/include/db_camera.h +++ b/include/db_camera.h @@ -2,8 +2,8 @@ #define DB_CAMERA_H #include "ultra64.h" -#include "z64cutscene.h" -#include "z64math.h" +#include "cutscene.h" +#include "z_math.h" struct Camera; diff --git a/include/z64debug.h b/include/debug.h similarity index 90% rename from include/z64debug.h rename to include/debug.h index 0e2c7334ee..9c12f82429 100644 --- a/include/z64debug.h +++ b/include/debug.h @@ -1,5 +1,5 @@ -#ifndef Z64DEBUG_H -#define Z64DEBUG_H +#ifndef DEBUG_H +#define DEBUG_H #include "ultra64.h" diff --git a/include/z64debug_display.h b/include/debug_display.h similarity index 90% rename from include/z64debug_display.h rename to include/debug_display.h index 9cb1198067..0623224fef 100644 --- a/include/z64debug_display.h +++ b/include/debug_display.h @@ -1,8 +1,8 @@ -#ifndef Z64_DEBUG_DISPLAY_H -#define Z64_DEBUG_DISPLAY_H +#ifndef DEBUG_DISPLAY_H +#define DEBUG_DISPLAY_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" #include "color.h" struct GraphicsContext; diff --git a/include/z64dma.h b/include/dma.h similarity index 98% rename from include/z64dma.h rename to include/dma.h index 10968517bc..83a79619c8 100755 --- a/include/z64dma.h +++ b/include/dma.h @@ -1,5 +1,5 @@ -#ifndef Z64_DMA_H -#define Z64_DMA_H +#ifndef DMA_H +#define DMA_H #include "ultra64.h" #include "alignment.h" diff --git a/include/z64draw.h b/include/draw.h similarity index 73% rename from include/z64draw.h rename to include/draw.h index 95c5aa2340..66658817e2 100644 --- a/include/z64draw.h +++ b/include/draw.h @@ -1,5 +1,5 @@ -#ifndef Z64_DRAW_H -#define Z64_DRAW_H +#ifndef DRAW_H +#define DRAW_H #include "ultra64.h" diff --git a/include/z64effect.h b/include/effect.h similarity index 99% rename from include/z64effect.h rename to include/effect.h index 0c07cc5124..060b6cd090 100644 --- a/include/z64effect.h +++ b/include/effect.h @@ -1,10 +1,10 @@ -#ifndef Z64EFFECT_H -#define Z64EFFECT_H +#ifndef EFFECT_H +#define EFFECT_H #include "color.h" #include "romfile.h" -#include "z64light.h" -#include "z64math.h" +#include "light.h" +#include "z_math.h" struct Actor; struct GraphicsContext; diff --git a/include/z64environment.h b/include/environment.h similarity index 99% rename from include/z64environment.h rename to include/environment.h index 4c4bc770cd..6c23dfb336 100644 --- a/include/z64environment.h +++ b/include/environment.h @@ -1,9 +1,9 @@ -#ifndef _Z64ENVIRONMENT_H_ -#define _Z64ENVIRONMENT_H_ +#ifndef ENVIRONMENT_H_ +#define ENVIRONMENT_H_ -#include "z64math.h" -#include "z64light.h" -#include "z64dma.h" +#include "z_math.h" +#include "light.h" +#include "dma.h" struct GameOverContext; struct MessageContext; 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/file_select_state.h b/include/file_select_state.h index 0a831caa0f..6dc7cfadcb 100644 --- a/include/file_select_state.h +++ b/include/file_select_state.h @@ -2,12 +2,12 @@ #define FILE_SELECT_STATE_H #include "ultra64.h" -#include "z64environment.h" -#include "z64game.h" -#include "z64message.h" -#include "z64skybox.h" -#include "z64sram.h" -#include "z64view.h" +#include "environment.h" +#include "game.h" +#include "message.h" +#include "skybox.h" +#include "sram.h" +#include "view.h" typedef struct FileSelectState { /* 0x00000 */ GameState state; 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/z64game.h b/include/game.h similarity index 98% rename from include/z64game.h rename to include/game.h index aaf70be321..d15a3fcdc0 100644 --- a/include/z64game.h +++ b/include/game.h @@ -1,5 +1,5 @@ -#ifndef Z64GAME_H -#define Z64GAME_H +#ifndef GAME_H +#define GAME_H // This file is named "game" after game.c for now, this may change later with the system name #include "ultra64/ultratypes.h" diff --git a/include/z64game_over.h b/include/game_over.h similarity index 95% rename from include/z64game_over.h rename to include/game_over.h index 03697c1f50..e91ad0413a 100644 --- a/include/z64game_over.h +++ b/include/game_over.h @@ -1,5 +1,5 @@ -#ifndef Z64GAME_OVER_H -#define Z64GAME_OVER_H +#ifndef GAME_OVER_H +#define GAME_OVER_H #include "ultra64.h" diff --git a/include/z64horse.h b/include/horse.h similarity index 85% rename from include/z64horse.h rename to include/horse.h index d58de4b6d4..e3e5502a81 100644 --- a/include/z64horse.h +++ b/include/horse.h @@ -1,8 +1,8 @@ -#ifndef Z64HORSE_H -#define Z64HORSE_H +#ifndef HORSE_H +#define HORSE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; struct Actor; diff --git a/include/z64interface.h b/include/interface.h similarity index 99% rename from include/z64interface.h rename to include/interface.h index bfa3bffeb3..84834b3df6 100644 --- a/include/z64interface.h +++ b/include/interface.h @@ -1,9 +1,9 @@ -#ifndef Z64INTERFACE_H -#define Z64INTERFACE_H +#ifndef INTERFACE_H +#define INTERFACE_H #include "ultra64.h" -#include "z64dma.h" -#include "z64view.h" +#include "dma.h" +#include "view.h" struct PlayState; diff --git a/include/z64inventory.h b/include/inventory.h similarity index 90% rename from include/z64inventory.h rename to include/inventory.h index 8c1a5a90d8..3ad5c1bbbd 100644 --- a/include/z64inventory.h +++ b/include/inventory.h @@ -1,8 +1,8 @@ -#ifndef Z64INVENTORY_H -#define Z64INVENTORY_H +#ifndef INVENTORY_H +#define INVENTORY_H #include "ultra64.h" -#include "z64item.h" +#include "item.h" struct PlayState; diff --git a/include/z64item.h b/include/item.h similarity index 99% rename from include/z64item.h rename to include/item.h index 60344f326c..f5d4a530af 100644 --- a/include/z64item.h +++ b/include/item.h @@ -1,5 +1,5 @@ -#ifndef Z64ITEM_H -#define Z64ITEM_H +#ifndef ITEM_H +#define ITEM_H // Note that z_kaleido_scope.c assumes that the dimensions and texture format here also matches the dimensions and // texture format for MAP_NAME_TEX1_* diff --git a/include/z64lifemeter.h b/include/lifemeter.h similarity index 86% rename from include/z64lifemeter.h rename to include/lifemeter.h index 29b2656b88..d88ae6902d 100644 --- a/include/z64lifemeter.h +++ b/include/lifemeter.h @@ -1,5 +1,5 @@ -#ifndef Z64LIFEMETER_H -#define Z64LIFEMETER_H +#ifndef LIFEMETER_H +#define LIFEMETER_H #include "ultra64/ultratypes.h" diff --git a/include/z64light.h b/include/light.h similarity index 98% rename from include/z64light.h rename to include/light.h index ff6f732e12..fa4a306b64 100644 --- a/include/z64light.h +++ b/include/light.h @@ -1,9 +1,9 @@ -#ifndef Z64LIGHT_H -#define Z64LIGHT_H +#ifndef LIGHT_H +#define LIGHT_H #include "ultra64.h" #include "ultra64/gbi.h" -#include "z64math.h" +#include "z_math.h" struct GraphicsContext; struct PlayState; diff --git a/include/z64map_mark.h b/include/map_mark.h similarity index 95% rename from include/z64map_mark.h rename to include/map_mark.h index b566491118..2f22ee0f5b 100644 --- a/include/z64map_mark.h +++ b/include/map_mark.h @@ -1,5 +1,5 @@ -#ifndef Z64MAP_MARK_H -#define Z64MAP_MARK_H +#ifndef MAP_MARK_H +#define MAP_MARK_H #include "ultra64.h" diff --git a/include/map_select_state.h b/include/map_select_state.h index d2a6b43d19..01e57dd1d0 100644 --- a/include/map_select_state.h +++ b/include/map_select_state.h @@ -2,8 +2,8 @@ #define MAP_SELECT_STATE_H #include "ultra64.h" -#include "z64game.h" -#include "z64view.h" +#include "game.h" +#include "view.h" struct MapSelectState; diff --git a/include/z64message.h b/include/message.h similarity index 99% rename from include/z64message.h rename to include/message.h index 3dfa196d97..3948f2dd09 100644 --- a/include/z64message.h +++ b/include/message.h @@ -1,9 +1,9 @@ -#ifndef Z64MESSAGE_H -#define Z64MESSAGE_H +#ifndef MESSAGE_H +#define MESSAGE_H -#include "z64view.h" +#include "view.h" #include "versions.h" -#include "z64font.h" +#include "font.h" struct OcarinaStaff; struct Actor; diff --git a/include/message_data_fmt.h b/include/message_data_fmt.h index ac798d9346..375ac281e6 100644 --- a/include/message_data_fmt.h +++ b/include/message_data_fmt.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_DATA_FMT_H #define MESSAGE_DATA_FMT_H -#include "z64save.h" // For highscores -#include "z64item.h" // For item ids +#include "save.h" // For highscores +#include "item.h" // For item ids #include "sfx.h" // For sfx ids /* diff --git a/include/n64dd.h b/include/n64dd.h index 6a353c3172..f7a3f649ca 100644 --- a/include/n64dd.h +++ b/include/n64dd.h @@ -3,9 +3,9 @@ #include "ultra64.h" #include "ultra64/leo.h" -#include "z64pause.h" -#include "z64scene.h" -#include "z64map_mark.h" +#include "pause.h" +#include "scene.h" +#include "map_mark.h" #include "versions.h" struct Font; diff --git a/include/z64object.h b/include/object.h similarity index 96% rename from include/z64object.h rename to include/object.h index 016eda00d7..e40e671120 100644 --- a/include/z64object.h +++ b/include/object.h @@ -1,8 +1,8 @@ -#ifndef Z64OBJECT_H -#define Z64OBJECT_H +#ifndef OBJECT_H +#define OBJECT_H #include "ultra64.h" -#include "z64dma.h" +#include "dma.h" struct PlayState; diff --git a/include/z64ocarina.h b/include/ocarina.h similarity index 99% rename from include/z64ocarina.h rename to include/ocarina.h index d00ef01f2b..b3d502836a 100644 --- a/include/z64ocarina.h +++ b/include/ocarina.h @@ -1,5 +1,5 @@ -#ifndef Z64OCARINA_H -#define Z64OCARINA_H +#ifndef OCARINA_H +#define OCARINA_H #include "ultra64.h" diff --git a/include/z64olib.h b/include/olib.h similarity index 88% rename from include/z64olib.h rename to include/olib.h index 1b704b0e69..88b918987d 100644 --- a/include/z64olib.h +++ b/include/olib.h @@ -1,7 +1,7 @@ -#ifndef Z64OLIB_H -#define Z64OLIB_H +#ifndef OLIB_H +#define OLIB_H -#include "z64math.h" +#include "z_math.h" f32 OLib_Vec3fDist(Vec3f* a, Vec3f* b); f32 OLib_Vec3fDistXZ(Vec3f* a, Vec3f* b); diff --git a/include/z64path.h b/include/path.h similarity index 88% rename from include/z64path.h rename to include/path.h index 0f9243974a..56918762d7 100644 --- a/include/z64path.h +++ b/include/path.h @@ -1,8 +1,8 @@ -#ifndef Z64PATH_H -#define Z64PATH_H +#ifndef PATH_H +#define PATH_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; struct Actor; diff --git a/include/z64pause.h b/include/pause.h similarity index 99% rename from include/z64pause.h rename to include/pause.h index 24f53a93d8..f8a54fc5dd 100644 --- a/include/z64pause.h +++ b/include/pause.h @@ -1,9 +1,9 @@ -#ifndef Z64PAUSE_H -#define Z64PAUSE_H +#ifndef PAUSE_H +#define PAUSE_H -#include "z64animation.h" -#include "z64message.h" -#include "z64view.h" +#include "animation.h" +#include "message.h" +#include "view.h" struct OcarinaStaff; struct PlayState; diff --git a/include/z64play.h b/include/play_state.h similarity index 93% rename from include/z64play.h rename to include/play_state.h index 4853ac8f47..fa5e4839f3 100644 --- a/include/z64play.h +++ b/include/play_state.h @@ -1,30 +1,30 @@ -#ifndef Z64PLAY_H -#define Z64PLAY_H +#ifndef PLAY_STATE_H +#define PLAY_STATE_H #include "ultra64.h" #include "prerender.h" #include "transition_tile.h" -#include "z64actor.h" -#include "z64bgcheck.h" -#include "z64camera.h" -#include "z64cutscene.h" -#include "z64environment.h" -#include "z64frame_advance.h" -#include "z64game.h" -#include "z64game_over.h" -#include "z64interface.h" -#include "z64light.h" -#include "z64message.h" -#include "z64object.h" -#include "z64pause.h" -#include "z64room.h" -#include "z64scene.h" -#include "z64sfx_source.h" -#include "z64skybox.h" -#include "z64sram.h" -#include "z64transition.h" -#include "z64view.h" +#include "actor.h" +#include "bgcheck.h" +#include "camera.h" +#include "cutscene.h" +#include "environment.h" +#include "frame_advance.h" +#include "game.h" +#include "game_over.h" +#include "interface.h" +#include "light.h" +#include "message.h" +#include "object.h" +#include "pause.h" +#include "room.h" +#include "scene.h" +#include "sfx_source.h" +#include "skybox.h" +#include "sram.h" +#include "transition.h" +#include "view.h" union Color_RGBA8_u32; struct Path; diff --git a/include/z64player.h b/include/player.h similarity index 99% rename from include/z64player.h rename to include/player.h index fdc8fa1354..74a129a254 100644 --- a/include/z64player.h +++ b/include/player.h @@ -1,7 +1,7 @@ -#ifndef Z64PLAYER_H -#define Z64PLAYER_H +#ifndef PLAYER_H +#define PLAYER_H -#include "z64actor.h" +#include "actor.h" #include "alignment.h" #include "face_change.h" diff --git a/include/prenmi_state.h b/include/prenmi_state.h index 3710425ca9..950eb94dea 100644 --- a/include/prenmi_state.h +++ b/include/prenmi_state.h @@ -2,7 +2,7 @@ #define PRENMI_STATE_H #include "ultra64.h" -#include "z64game.h" +#include "game.h" typedef struct PreNMIState { /* 0x00 */ GameState state; diff --git a/include/quake.h b/include/quake.h index 0d97a5bf45..c6259c7675 100644 --- a/include/quake.h +++ b/include/quake.h @@ -1,8 +1,8 @@ #ifndef QUAKE_H #define QUAKE_H -#include "z64camera.h" -#include "z64math.h" +#include "camera.h" +#include "z_math.h" typedef struct ShakeInfo { /* 0x00 */ Vec3f atOffset; diff --git a/include/z64quest_hint.h b/include/quest_hint.h similarity index 76% rename from include/z64quest_hint.h rename to include/quest_hint.h index b592a07c34..71d909b3f3 100644 --- a/include/z64quest_hint.h +++ b/include/quest_hint.h @@ -1,5 +1,5 @@ -#ifndef Z64QUEST_HINT_H -#define Z64QUEST_HINT_H +#ifndef QUEST_HINT_H +#define QUEST_HINT_H #include "ultra64.h" diff --git a/include/z64quest_hint_commands.h b/include/quest_hint_commands.h similarity index 98% rename from include/z64quest_hint_commands.h rename to include/quest_hint_commands.h index 8b99510160..8ce19aa7dd 100644 --- a/include/z64quest_hint_commands.h +++ b/include/quest_hint_commands.h @@ -1,5 +1,5 @@ -#ifndef Z64QUEST_HINT_COMMANDS_H -#define Z64QUEST_HINT_COMMANDS_H +#ifndef QUEST_HINT_COMMANDS_H +#define QUEST_HINT_COMMANDS_H #include "ultra64.h" diff --git a/include/z64room.h b/include/room.h similarity index 98% rename from include/z64room.h rename to include/room.h index 72c6f0982b..836b94b31e 100644 --- a/include/z64room.h +++ b/include/room.h @@ -1,9 +1,9 @@ -#ifndef Z64ROOM_H -#define Z64ROOM_H +#ifndef ROOM_H +#define ROOM_H #include "ultra64.h" -#include "z64dma.h" -#include "z64math.h" +#include "dma.h" +#include "z_math.h" struct Input; struct PlayState; diff --git a/include/sample_state.h b/include/sample_state.h index b568a83f95..adf9e2a466 100644 --- a/include/sample_state.h +++ b/include/sample_state.h @@ -2,8 +2,8 @@ #define SAMPLE_STATE_H #include "ultra64.h" -#include "z64game.h" -#include "z64view.h" +#include "game.h" +#include "view.h" typedef struct SampleState { /* 0x0000 */ GameState state; diff --git a/include/z64save.h b/include/save.h similarity index 99% rename from include/z64save.h rename to include/save.h index 71b1414052..a4e99546fb 100644 --- a/include/z64save.h +++ b/include/save.h @@ -1,10 +1,10 @@ -#ifndef Z64SAVE_H -#define Z64SAVE_H +#ifndef SAVE_H +#define SAVE_H #include "ultra64.h" #include "versions.h" -#include "z64inventory.h" -#include "z64math.h" +#include "inventory.h" +#include "z_math.h" typedef enum ZTargetSetting { /* 0 */ Z_TARGET_SETTING_SWITCH, diff --git a/include/z64scene.h b/include/scene.h similarity index 99% rename from include/z64scene.h rename to include/scene.h index 09b342c047..8e5b1a100c 100644 --- a/include/z64scene.h +++ b/include/scene.h @@ -1,13 +1,13 @@ -#ifndef Z64SCENE_H -#define Z64SCENE_H +#ifndef SCENE_H +#define SCENE_H #include "avoid_ub.h" #include "ultra64.h" -#include "z64bgcheck.h" -#include "z64environment.h" -#include "z64light.h" -#include "z64math.h" -#include "z64path.h" +#include "bgcheck.h" +#include "environment.h" +#include "light.h" +#include "z_math.h" +#include "path.h" #include "command_macros_base.h" diff --git a/include/setup_state.h b/include/setup_state.h index 863b71401e..2ec4c1000b 100644 --- a/include/setup_state.h +++ b/include/setup_state.h @@ -1,7 +1,7 @@ #ifndef SETUP_STATE_H #define SETUP_STATE_H -#include "z64game.h" +#include "game.h" typedef struct SetupState { /* 0x00 */ GameState state; diff --git a/include/sfx.h b/include/sfx.h index f7d86d87ac..91f24c1c84 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "versions.h" -#include "z64math.h" +#include "z_math.h" #include "assert.h" #define MAX_CHANNELS_PER_BANK 3 diff --git a/include/z64sfx_source.h b/include/sfx_source.h similarity index 86% rename from include/z64sfx_source.h rename to include/sfx_source.h index 0034bc90aa..62011872ef 100644 --- a/include/z64sfx_source.h +++ b/include/sfx_source.h @@ -1,8 +1,8 @@ -#ifndef Z64SFX_SOURCE_H -#define Z64SFX_SOURCE_H +#ifndef SFX_SOURCE_H +#define SFX_SOURCE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; diff --git a/include/z64skin.h b/include/skin.h similarity index 98% rename from include/z64skin.h rename to include/skin.h index 641a980925..8843e5a230 100644 --- a/include/z64skin.h +++ b/include/skin.h @@ -1,7 +1,7 @@ -#ifndef Z64_SKIN_H -#define Z64_SKIN_H +#ifndef SKIN_H +#define SKIN_H -#include "z64animation.h" +#include "animation.h" struct Actor; struct GraphicsContext; diff --git a/include/z64skin_matrix.h b/include/skin_matrix.h similarity index 94% rename from include/z64skin_matrix.h rename to include/skin_matrix.h index 647790abff..a2ba0255fb 100644 --- a/include/z64skin_matrix.h +++ b/include/skin_matrix.h @@ -1,8 +1,8 @@ -#ifndef Z64SKIN_MATRIX_H -#define Z64SKIN_MATRIX_H +#ifndef SKIN_MATRIX_H +#define SKIN_MATRIX_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct GraphicsContext; diff --git a/include/z64skybox.h b/include/skybox.h similarity index 97% rename from include/z64skybox.h rename to include/skybox.h index 60b3bbb7d3..1e1b3f12c1 100644 --- a/include/z64skybox.h +++ b/include/skybox.h @@ -1,11 +1,11 @@ -#ifndef Z64_SKYBOX_H -#define Z64_SKYBOX_H +#ifndef SKYBOX_H +#define SKYBOX_H #include "ultra64/ultratypes.h" #include "ultra64/gbi.h" #include "romfile.h" -#include "z64math.h" +#include "z_math.h" struct GameState; struct GraphicsContext; diff --git a/include/z64sram.h b/include/sram.h similarity index 97% rename from include/z64sram.h rename to include/sram.h index f1d05b7775..f683be8a03 100644 --- a/include/z64sram.h +++ b/include/sram.h @@ -1,5 +1,5 @@ -#ifndef Z64SRAM_H -#define Z64SRAM_H +#ifndef SRAM_H +#define SRAM_H #include "ultra64/ultratypes.h" diff --git a/include/z64ss_sram.h b/include/ss_sram.h similarity index 89% rename from include/z64ss_sram.h rename to include/ss_sram.h index 4168446263..7a87c90fd5 100644 --- a/include/z64ss_sram.h +++ b/include/ss_sram.h @@ -1,5 +1,5 @@ -#ifndef Z64SS_SRAM_H -#define Z64SS_SRAM_H +#ifndef SS_SRAM_H +#define SS_SRAM_H #include "stddef.h" #include "ultra64/ultratypes.h" diff --git a/include/sys_math3d.h b/include/sys_math3d.h index deeb093f4e..11f699c17f 100644 --- a/include/sys_math3d.h +++ b/include/sys_math3d.h @@ -2,7 +2,7 @@ #define SYS_MATH3D_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; diff --git a/include/sys_matrix.h b/include/sys_matrix.h index 2708af81ee..3af75a18de 100644 --- a/include/sys_matrix.h +++ b/include/sys_matrix.h @@ -1,7 +1,7 @@ #ifndef SYS_MATRIX_H #define SYS_MATRIX_H -#include "z64math.h" +#include "z_math.h" struct GraphicsContext; struct GameState; diff --git a/include/z64thread.h b/include/thread.h similarity index 95% rename from include/z64thread.h rename to include/thread.h index c4ab827b42..c3e52a407a 100644 --- a/include/z64thread.h +++ b/include/thread.h @@ -1,5 +1,5 @@ -#ifndef Z64THREAD_H -#define Z64THREAD_H +#ifndef THREAD_H +#define THREAD_H #include "ultra64.h" diff --git a/include/title_setup_state.h b/include/title_setup_state.h index 30219872a8..3d6a52445f 100644 --- a/include/title_setup_state.h +++ b/include/title_setup_state.h @@ -1,8 +1,8 @@ #ifndef TITLE_SETUP_STATE_H #define TITLE_SETUP_STATE_H -#include "z64game.h" -#include "z64view.h" +#include "game.h" +#include "view.h" typedef struct TitleSetupState { /* 0x0000 */ GameState state; diff --git a/include/z64transition.h b/include/transition.h similarity index 97% rename from include/z64transition.h rename to include/transition.h index f867aed09a..ae7d329514 100644 --- a/include/z64transition.h +++ b/include/transition.h @@ -1,5 +1,5 @@ -#ifndef Z64TRANSITION_H -#define Z64TRANSITION_H +#ifndef TRANSITION_H +#define TRANSITION_H #include "ultra64/ultratypes.h" #include "ultra64/gbi.h" @@ -7,7 +7,7 @@ #include "transition_fade.h" #include "transition_triforce.h" #include "transition_wipe.h" -#include "z64transition_instances.h" +#include "transition_instances.h" #define TRANS_TRIGGER_OFF 0 // transition is not active #define TRANS_TRIGGER_START 20 // start transition (exiting an area) diff --git a/include/z64transition_instances.h b/include/transition_instances.h similarity index 74% rename from include/z64transition_instances.h rename to include/transition_instances.h index cc35add03c..08e4672712 100644 --- a/include/z64transition_instances.h +++ b/include/transition_instances.h @@ -1,5 +1,5 @@ -#ifndef Z64TRANSITION_INSTANCES_H -#define Z64TRANSITION_INSTANCES_H +#ifndef TRANSITION_INSTANCES_H +#define TRANSITION_INSTANCES_H typedef enum TransitionInstanceType { /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1, diff --git a/include/z64view.h b/include/view.h similarity index 98% rename from include/z64view.h rename to include/view.h index 83bdf0fe84..b2dadd3db4 100644 --- a/include/z64view.h +++ b/include/view.h @@ -1,9 +1,9 @@ -#ifndef Z64VIEW_H -#define Z64VIEW_H +#ifndef VIEW_H +#define VIEW_H #include "avoid_ub.h" #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct GraphicsContext; diff --git a/include/z64vis.h b/include/vis.h similarity index 98% rename from include/z64vis.h rename to include/vis.h index 86e286c325..52b1f0a690 100644 --- a/include/z64vis.h +++ b/include/vis.h @@ -1,5 +1,5 @@ -#ifndef Z64_VIS_H -#define Z64_VIS_H +#ifndef VIS_H +#define VIS_H #include "ultra64.h" #include "color.h" diff --git a/include/z_actor_dlftbls.h b/include/z_actor_dlftbls.h index e9e2dc7d93..cabfc91916 100644 --- a/include/z_actor_dlftbls.h +++ b/include/z_actor_dlftbls.h @@ -2,7 +2,7 @@ #define Z_ACTOR_DLFTBLS_H #include "romfile.h" -#include "z64actor_profile.h" +#include "actor_profile.h" /** * @see ACTOROVL_ALLOC_ABSOLUTE diff --git a/include/z_en_a_obj.h b/include/z_en_a_obj.h index bd65f88f13..7db18aaf92 100644 --- a/include/z_en_a_obj.h +++ b/include/z_en_a_obj.h @@ -2,7 +2,7 @@ #define Z_EN_A_OBJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" // Only A_OBJ_SIGNPOST_OBLONG and A_OBJ_SIGNPOST_ARROW are used in room files. typedef enum AObjType { diff --git a/include/z_en_item00.h b/include/z_en_item00.h index 483f666f5f..4eb1ae735b 100644 --- a/include/z_en_item00.h +++ b/include/z_en_item00.h @@ -2,7 +2,7 @@ #define Z_EN_ITEM00_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum Item00Type { /* 0x00 */ ITEM00_RUPEE_GREEN, diff --git a/include/z_lib.h b/include/z_lib.h index 24fa806914..c2e36e7cc3 100644 --- a/include/z_lib.h +++ b/include/z_lib.h @@ -3,7 +3,7 @@ #include "stddef.h" #include "libu64/pad.h" -#include "z64math.h" +#include "z_math.h" #include "color.h" void Lib_MemSet(u8* dest, size_t len, u8 val); diff --git a/include/z64math.h b/include/z_math.h similarity index 97% rename from include/z64math.h rename to include/z_math.h index 187d95b250..ebe364d886 100644 --- a/include/z64math.h +++ b/include/z_math.h @@ -1,5 +1,7 @@ -#ifndef Z64MATH_H -#define Z64MATH_H +#ifndef Z_MATH_H +#define Z_MATH_H + +// This file has a z_ prefix to indicate that it is the game-side math header, not libc #include "math.h" #include "ultra64.h" diff --git a/src/audio/game/data.c b/src/audio/game/data.c index 6c5528f347..213c53dbbf 100644 --- a/src/audio/game/data.c +++ b/src/audio/game/data.c @@ -1,7 +1,7 @@ #include "array_count.h" #include "sfx.h" #include "ultra64.h" -#include "z64audio.h" +#include "audio.h" // sSfxRequests ring buffer endpoints. read index <= write index, wrapping around mod 256. u8 gSfxRequestWriteIndex = 0; diff --git a/src/audio/game/general.c b/src/audio/game/general.c index f04f203a1f..0e1ca6df5c 100644 --- a/src/audio/game/general.c +++ b/src/audio/game/general.c @@ -10,8 +10,8 @@ #include "sfx.h" #include "ultra64.h" #include "versions.h" -#include "z64audio.h" -#include "z64ocarina.h" +#include "audio.h" +#include "ocarina.h" #define ABS_ALT(x) ((x) < 0 ? -(x) : (x)) diff --git a/src/audio/game/sequence.c b/src/audio/game/sequence.c index a311e4e73d..ec9a36e299 100644 --- a/src/audio/game/sequence.c +++ b/src/audio/game/sequence.c @@ -23,7 +23,7 @@ #include "sfx.h" #include "ultra64.h" #include "ultra64/abi.h" -#include "z64audio.h" +#include "audio.h" // Direct audio command (skips the queueing system) #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume) \ diff --git a/src/audio/game/session_config.c b/src/audio/game/session_config.c index c21a79c725..6530901ef0 100644 --- a/src/audio/game/session_config.c +++ b/src/audio/game/session_config.c @@ -1,4 +1,4 @@ -#include "z64audio.h" +#include "audio.h" AudioContext gAudioCtx; AudioCustomUpdateFunction gAudioCustomUpdateFunction; diff --git a/src/audio/game/session_init.c b/src/audio/game/session_init.c index b8bc1924c2..ebac33b4a8 100644 --- a/src/audio/game/session_init.c +++ b/src/audio/game/session_init.c @@ -1,7 +1,7 @@ #include "alignment.h" #include "array_count.h" #include "buffers.h" -#include "z64audio.h" +#include "audio.h" #include "assets/audio/sequence_sizes.h" #include "assets/audio/soundfont_sizes.h" diff --git a/src/audio/game/sfx.c b/src/audio/game/sfx.c index 65309942a6..aef0a8eb58 100644 --- a/src/audio/game/sfx.c +++ b/src/audio/game/sfx.c @@ -4,7 +4,7 @@ #include "sfx.h" #include "terminal.h" #include "ultra64.h" -#include "z64audio.h" +#include "audio.h" typedef struct SfxRequest { /* 0x00 */ u16 sfxId; diff --git a/src/audio/internal/data.c b/src/audio/internal/data.c index f2f1b2c94e..d95b05fc9a 100644 --- a/src/audio/internal/data.c +++ b/src/audio/internal/data.c @@ -1,6 +1,6 @@ #include "alignment.h" #include "ultra64.h" -#include "z64audio.h" +#include "audio.h" // clang-format off ALIGNED(16) s16 gSawtoothWaveSample[] = { diff --git a/src/audio/internal/effects.c b/src/audio/internal/effects.c index 7e3d01d3a7..162b72ce6b 100644 --- a/src/audio/internal/effects.c +++ b/src/audio/internal/effects.c @@ -1,6 +1,6 @@ #include "ultra64.h" #include "attributes.h" -#include "z64audio.h" +#include "audio.h" void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculateVolume, s32 applyBend) { f32 channelVolume; diff --git a/src/audio/internal/heap.c b/src/audio/internal/heap.c index e78787027b..36674ded24 100644 --- a/src/audio/internal/heap.c +++ b/src/audio/internal/heap.c @@ -1,7 +1,7 @@ #include "alignment.h" #include "ultra64.h" #include "versions.h" -#include "z64audio.h" +#include "audio.h" void AudioHeap_InitSampleCaches(u32 persistentSampleCacheSize, u32 temporarySampleCacheSize); SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(u32 size); diff --git a/src/audio/internal/load.c b/src/audio/internal/load.c index 91c25fabf7..9989d14075 100644 --- a/src/audio/internal/load.c +++ b/src/audio/internal/load.c @@ -9,7 +9,7 @@ #include "segment_symbols.h" #include "ultra64.h" #include "versions.h" -#include "z64audio.h" +#include "audio.h" #define MK_ASYNC_MSG(retData, tableType, id, loadStatus) \ (((retData) << 24) | ((tableType) << 16) | ((id) << 8) | (loadStatus)) diff --git a/src/audio/internal/os.c b/src/audio/internal/os.c index 4bbb0d2fdb..384588959a 100644 --- a/src/audio/internal/os.c +++ b/src/audio/internal/os.c @@ -3,7 +3,7 @@ */ #include "ultra64.h" -#include "z64audio.h" +#include "audio.h" void Audio_InvalDCache(void* buf, s32 size) { OSIntMask prevMask = osSetIntMask(OS_IM_NONE); diff --git a/src/audio/internal/playback.c b/src/audio/internal/playback.c index 327e271d06..0329f0ec16 100644 --- a/src/audio/internal/playback.c +++ b/src/audio/internal/playback.c @@ -1,5 +1,5 @@ #include "ultra64.h" -#include "z64audio.h" +#include "audio.h" void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) { f32 volLeft; diff --git a/src/audio/internal/seqplayer.c b/src/audio/internal/seqplayer.c index 1d6fb7c0a6..083acf8899 100644 --- a/src/audio/internal/seqplayer.c +++ b/src/audio/internal/seqplayer.c @@ -19,7 +19,7 @@ #include "assert.h" #include "attributes.h" #include "ultra64.h" -#include "z64audio.h" +#include "audio.h" static_assert(MML_VERSION == MML_VERSION_OOT, "This file implements the OoT version of the MML"); diff --git a/src/audio/internal/synthesis.c b/src/audio/internal/synthesis.c index c7c3eefb04..e01fbcc96c 100644 --- a/src/audio/internal/synthesis.c +++ b/src/audio/internal/synthesis.c @@ -1,6 +1,6 @@ #include "alignment.h" #include "ultra64.h" -#include "z64audio.h" +#include "audio.h" // DMEM Addresses for the RSP #define DMEM_TEMP 0x3C0 diff --git a/src/audio/internal/thread.c b/src/audio/internal/thread.c index 2e2d0630e1..d021c4386b 100644 --- a/src/audio/internal/thread.c +++ b/src/audio/internal/thread.c @@ -6,7 +6,7 @@ #include "audiothread_cmd.h" #include "ultra64.h" #include "versions.h" -#include "z64audio.h" +#include "audio.h" #define SAMPLES_TO_OVERPRODUCE 0x10 #define EXTRA_BUFFERED_AI_SAMPLES_TARGET 0x80 diff --git a/src/audio/tables/samplebank_table.c b/src/audio/tables/samplebank_table.c index d26d9d5bcb..1e0983d772 100644 --- a/src/audio/tables/samplebank_table.c +++ b/src/audio/tables/samplebank_table.c @@ -1,5 +1,5 @@ #include "attributes.h" -#include "z64audio.h" +#include "audio.h" // Symbol definition diff --git a/src/audio/tables/sequence_table.c b/src/audio/tables/sequence_table.c index 8235cd674b..c7ab5c0555 100644 --- a/src/audio/tables/sequence_table.c +++ b/src/audio/tables/sequence_table.c @@ -1,5 +1,5 @@ #include "attributes.h" -#include "z64audio.h" +#include "audio.h" #include "versions.h" // Symbol definition diff --git a/src/audio/tables/soundfont_table.c b/src/audio/tables/soundfont_table.c index 779be397ba..046f049bb1 100644 --- a/src/audio/tables/soundfont_table.c +++ b/src/audio/tables/soundfont_table.c @@ -1,5 +1,5 @@ #include "attributes.h" -#include "z64audio.h" +#include "audio.h" // Symbol definition diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 2f948b9d6a..cfe011ac33 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -10,7 +10,7 @@ #include "cic6105.h" #endif #include "z_locale.h" -#include "z64thread.h" +#include "thread.h" #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128" diff --git a/src/boot/idle.c b/src/boot/idle.c index 743219d94c..648ce48cf7 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -11,8 +11,8 @@ #include "translation.h" #include "versions.h" #include "vi_mode.h" -#include "z64thread.h" -#include "z64dma.h" +#include "thread.h" +#include "dma.h" #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" diff --git a/src/boot/inflate.c b/src/boot/inflate.c index d9fc7c3f8d..188c3f235a 100644 --- a/src/boot/inflate.c +++ b/src/boot/inflate.c @@ -102,7 +102,7 @@ #include "stdint.h" #include "alignment.h" #include "attributes.h" -#include "z64dma.h" +#include "dma.h" typedef u8 uch; typedef u16 ush; diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index eb3ce23317..601d5145eb 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -2,7 +2,7 @@ #include "alignment.h" #include "ultra64.h" -#include "z64dma.h" +#include "dma.h" #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128" \ "pal-1.1:128" diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 7678168549..6ab0c87f3c 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -42,8 +42,8 @@ #if !PLATFORM_IQUE #include "yaz0.h" #endif -#include "z64dma.h" -#include "z64thread.h" +#include "dma.h" +#include "thread.h" #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:82" \ "pal-1.0:80 pal-1.1:80" diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c index 57f530a4b8..01b0072d9b 100644 --- a/src/code/audio_thread_manager.c +++ b/src/code/audio_thread_manager.c @@ -11,7 +11,7 @@ #include "regs.h" #include "speed_meter.h" #include "translation.h" -#include "z64dma.h" +#include "dma.h" void AudioMgr_NotifyTaskDone(AudioMgr* audioMgr) { AudioTask* task = audioMgr->rspTask; diff --git a/src/code/code_n64dd_800AD410.c b/src/code/code_n64dd_800AD410.c index 979a95afbb..1509b7223b 100644 --- a/src/code/code_n64dd_800AD410.c +++ b/src/code/code_n64dd_800AD410.c @@ -1,5 +1,5 @@ #include "ultra64.h" -#include "z64dma.h" +#include "dma.h" #include "segment_symbols.h" #include "n64dd.h" diff --git a/src/code/code_n64dd_800AD4C0.c b/src/code/code_n64dd_800AD4C0.c index 4c4e0db0e3..4b2d17e72c 100644 --- a/src/code/code_n64dd_800AD4C0.c +++ b/src/code/code_n64dd_800AD4C0.c @@ -2,9 +2,9 @@ #include "n64dd.h" #include "regs.h" #include "segmented_address.h" -#include "z64actor.h" -#include "z64cutscene.h" -#include "z64save.h" +#include "actor.h" +#include "cutscene.h" +#include "save.h" n64ddStruct_800FEE70_pointers D_800FEE70 = { func_801C7C1C, diff --git a/src/code/db_camera.c b/src/code/db_camera.c index a275cae523..34599c9a1c 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -10,14 +10,14 @@ #include "regs.h" #include "sfx.h" #include "z_lib.h" -#include "z64camera.h" -#include "z64cutscene.h" -#include "z64cutscene_spline.h" -#include "z64debug.h" -#include "z64debug_display.h" -#include "z64olib.h" -#include "z64play.h" -#include "z64save.h" +#include "camera.h" +#include "cutscene.h" +#include "cutscene_spline.h" +#include "debug.h" +#include "debug_display.h" +#include "olib.h" +#include "play_state.h" +#include "save.h" #define DEBUG_CAM_CONTROLLER_PORT 2 diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index b2bb9d13d4..e7afa4ec81 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -56,7 +56,7 @@ #include "stackcheck.h" #include "terminal.h" #include "translation.h" -#include "z64thread.h" +#include "thread.h" void Fault_Init(void); void Fault_SetOsSyncPrintfEnabled(u32 enabled); diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index 75fc704b91..2d31b0f323 100644 --- a/src/code/fault_n64.c +++ b/src/code/fault_n64.c @@ -10,7 +10,7 @@ #include "stack.h" #include "stackcheck.h" #include "terminal.h" -#include "z64thread.h" +#include "thread.h" #include "translation.h" #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144" diff --git a/src/code/flg_set.c b/src/code/flg_set.c index efc044074a..f102d702c8 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -5,8 +5,8 @@ #include "gfx.h" #include "gfxalloc.h" #include "controller.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" typedef struct FlagSetEntry { /* 0x00 */ u16* value; diff --git a/src/code/game.c b/src/code/game.c index 5b80355cbb..1f4ff8cdbf 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -26,11 +26,11 @@ #include "versions.h" #include "vi_mode.h" #include "zelda_arena.h" -#include "z64debug.h" -#include "z64dma.h" -#include "z64game.h" -#include "z64play.h" -#include "z64vis.h" +#include "debug.h" +#include "dma.h" +#include "game.h" +#include "play_state.h" +#include "vis.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" diff --git a/src/code/graph.c b/src/code/graph.c index 8a4646808f..56fc7af60c 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -26,9 +26,9 @@ #include "versions.h" #include "vi_mode.h" #include "z_game_dlftbls.h" -#include "z64audio.h" -#include "z64save.h" -#include "z64play.h" +#include "audio.h" +#include "save.h" +#include "play_state.h" #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index ced883f7a0..bb9fc7841e 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -40,7 +40,7 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64thread.h" +#include "thread.h" vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE; volatile OSTime sIrqMgrResetTime = 0; diff --git a/src/code/main.c b/src/code/main.c index 902e624aa6..e137cff750 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -40,8 +40,8 @@ extern struct IrqMgr gIrqMgr; #include "cic6105.h" #include "n64dd.h" #endif -#include "z64debug.h" -#include "z64thread.h" +#include "debug.h" +#include "thread.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ique-cn:0 ntsc-1.0:51 ntsc-1.1:51 ntsc-1.2:51 pal-1.0:49 pal-1.1:49" diff --git a/src/code/object_table.c b/src/code/object_table.c index 9ed6a1f44d..3bb45a0073 100644 --- a/src/code/object_table.c +++ b/src/code/object_table.c @@ -2,7 +2,7 @@ #include "segment_symbols.h" #include "romfile.h" #include "ultra64.h" -#include "z64object.h" +#include "object.h" s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD }; diff --git a/src/code/sched.c b/src/code/sched.c index c573bf97f6..fe1d14a0c2 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -52,7 +52,7 @@ #include "translation.h" #include "versions.h" #include "vi_mode.h" -#include "z64thread.h" +#include "thread.h" #define RSP_DONE_MSG 667 #define RDP_DONE_MSG 668 diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index bb3624fa86..0216275f17 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -9,8 +9,8 @@ #include "speed_meter.h" #include "terminal.h" #include "zelda_arena.h" -#include "z64game.h" -#include "z64view.h" +#include "game.h" +#include "view.h" /** * How much time the audio update on the audio thread (`AudioThread_Update`) took in total, between scheduling the last diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index f27ee6a34b..5f41973ffe 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -5,7 +5,7 @@ #include "translation.h" #include "ultra64.h" #include "z_lib.h" -#include "z64math.h" +#include "z_math.h" #pragma increment_block_number "gc-eu:76 gc-eu-mq:76 gc-jp:76 gc-jp-ce:76 gc-jp-mq:76 gc-us:76 gc-us-mq:76 ique-cn:66" \ "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" diff --git a/src/code/sys_math3d_draw.c b/src/code/sys_math3d_draw.c index 7781a79e2e..2b8776ec68 100644 --- a/src/code/sys_math3d_draw.c +++ b/src/code/sys_math3d_draw.c @@ -1,5 +1,5 @@ #include "sys_math3d.h" -#include "z64play.h" +#include "play_state.h" void Math3D_DrawSphere(PlayState* play, Sphere16* sph) { } diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c index 0c99eaced4..2e344d3910 100644 --- a/src/code/sys_math_atan.c +++ b/src/code/sys_math_atan.c @@ -1,6 +1,6 @@ #include "array_count.h" #include "sys_math.h" -#include "z64math.h" +#include "z_math.h" static u16 sAtan2Tbl[] = { 0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 2ca4882601..b773d20e47 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -7,8 +7,8 @@ #include "sys_matrix.h" #include "ultra64.h" #include "z_lib.h" -#include "z64game.h" -#include "z64skin_matrix.h" +#include "game.h" +#include "skin_matrix.h" // clang-format off Mtx gIdentityMtx = gdSPDefMtx( diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 0272022474..c4020bbd14 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -2,7 +2,7 @@ #include "setup_state.h" #include "printf.h" #include "translation.h" -#include "z64save.h" +#include "save.h" void Setup_InitImpl(SetupState* this) { PRINTF(T("ゼルダ共通データ初期化\n", "Zelda common data initialization\n")); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 15138b3e5a..5a0fe9b1c3 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -19,14 +19,14 @@ #include "z_actor_dlftbls.h" #include "z_lib.h" #include "zelda_arena.h" -#include "z64actor.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64horse.h" -#include "z64play.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "actor.h" +#include "audio.h" +#include "effect.h" +#include "light.h" +#include "horse.h" +#include "play_state.h" +#include "save.h" +#include "skin_matrix.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_bg_collect.c b/src/code/z_bg_collect.c index 68966b74fc..01114d835a 100644 --- a/src/code/z_bg_collect.c +++ b/src/code/z_bg_collect.c @@ -2,10 +2,10 @@ #include "terminal.h" #include "translation.h" #include "ultra64.h" -#include "z64actor.h" -#include "z64bgcheck.h" -#include "z64player.h" -#include "z64skin_matrix.h" +#include "actor.h" +#include "bgcheck.h" +#include "player.h" +#include "skin_matrix.h" /** * Update the `carriedActor`'s position based on the dynapoly actor identified by `bgId`. diff --git a/src/code/z_bg_item.c b/src/code/z_bg_item.c index 43c32eb558..33cb0fbe82 100644 --- a/src/code/z_bg_item.c +++ b/src/code/z_bg_item.c @@ -1,7 +1,7 @@ #include "z_lib.h" -#include "z64actor.h" -#include "z64bgcheck.h" -#include "z64play.h" +#include "actor.h" +#include "bgcheck.h" +#include "play_state.h" /** * @param transformFlags How other actors standing on the dynapoly actor's collision move when the dynapoly actor moves. diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 65ff40ee46..9e71fa6287 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -9,10 +9,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64bgcheck.h" -#include "z64play.h" -#include "z64player.h" -#include "z64skin_matrix.h" +#include "bgcheck.h" +#include "play_state.h" +#include "player.h" +#include "skin_matrix.h" #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index e23e17a04e..36c3f0b15f 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -17,13 +17,13 @@ #include "ultra64.h" #include "z_lib.h" #include "zelda_arena.h" -#include "z64audio.h" -#include "z64cutscene_spline.h" -#include "z64debug.h" -#include "z64olib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "cutscene_spline.h" +#include "debug.h" +#include "olib.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ diff --git a/src/code/z_cheap_proc.inc.c b/src/code/z_cheap_proc.inc.c index e922c0832c..2daaa97601 100644 --- a/src/code/z_cheap_proc.inc.c +++ b/src/code/z_cheap_proc.inc.c @@ -1,7 +1,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist) { OPEN_DISPS(play->state.gfxCtx, "../z_cheap_proc.c", 214); diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index 5c2a210bcc..5b305764e6 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -1,7 +1,7 @@ #include "array_count.h" #include "printf.h" #include "translation.h" -#include "z64collision_check.h" +#include "collision_check.h" static DamageTable sDamageTablePresets[] = { { { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 283a9b2fb0..158948a2eb 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -7,11 +7,11 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64collision_check.h" -#include "z64effect.h" -#include "z64frame_advance.h" +#include "collision_check.h" +#include "effect.h" +#include "frame_advance.h" #include "zelda_arena.h" -#include "z64play.h" +#include "play_state.h" #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" #include "z_lib.h" diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 18bfafbc3a..1dfd4d2419 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -3,9 +3,9 @@ #include "sequence.h" #include "versions.h" #include "z_locale.h" -#include "z64environment.h" -#include "z64save.h" -#include "z64transition.h" +#include "environment.h" +#include "save.h" +#include "transition.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" diff --git a/src/code/z_construct.c b/src/code/z_construct.c index aa92850b37..fd34ce6733 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -4,11 +4,11 @@ #include "segment_symbols.h" #include "translation.h" #include "versions.h" -#include "z64lifemeter.h" -#include "z64interface.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64save.h" +#include "lifemeter.h" +#include "interface.h" +#include "ocarina.h" +#include "play_state.h" +#include "save.h" void Interface_Destroy(PlayState* play) { Map_Destroy(play); diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c index 137f9f544c..6ff03fdf91 100644 --- a/src/code/z_cutscene_spline.c +++ b/src/code/z_cutscene_spline.c @@ -1,7 +1,7 @@ #include "ultra64.h" -#include "z64math.h" -#include "z64camera.h" -#include "z64cutscene_spline.h" +#include "z_math.h" +#include "camera.h" +#include "cutscene_spline.h" // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement diff --git a/src/code/z_debug.c b/src/code/z_debug.c index d5804cd7ee..6de85056c2 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -9,7 +9,7 @@ #include "regs.h" #include "rumble.h" #include "ultra64.h" -#include "z64debug.h" +#include "debug.h" typedef struct DebugCamTextBufferEntry { /* 0x0 */ u8 x; diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 9d15663a67..1481e22fe7 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -1,8 +1,8 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64debug_display.h" +#include "play_state.h" +#include "debug_display.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_demo.c b/src/code/z_demo.c index ee6f23203c..5adc6ca48a 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -21,14 +21,14 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64camera.h" -#include "z64cutscene.h" -#include "z64cutscene_flags.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "camera.h" +#include "cutscene.h" +#include "cutscene_flags.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 4cb14f017a..f2c600f6a2 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -1,8 +1,8 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64draw.h" -#include "z64play.h" +#include "draw.h" +#include "play_state.h" #include "assets/objects/object_gi_key/object_gi_key.h" #include "assets/objects/object_gi_jewel/object_gi_jewel.h" diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 6e2023b67d..a5df803229 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -6,8 +6,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 865bd8ec93..051731fd87 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -5,10 +5,10 @@ #include "printf.h" #include "terminal.h" #include "translation.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 57ce3d9ba1..ae6a84c47d 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -5,9 +5,9 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index c752738725..b29cb0a32f 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -1,6 +1,6 @@ #include "gfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" void func_80026230(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) { f32 cos; diff --git a/src/code/z_effect.c b/src/code/z_effect.c index c0a39cc4bd..a725cd3172 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -1,9 +1,9 @@ #include "gfx.h" #include "printf.h" #include "translation.h" -#include "z64effect.h" -#include "z64frame_advance.h" -#include "z64play.h" +#include "effect.h" +#include "frame_advance.h" +#include "play_state.h" EffectContext sEffectContext; diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 061b6d70da..363367a85c 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -5,9 +5,9 @@ #include "terminal.h" #include "translation.h" #include "zelda_arena.h" -#include "z64frame_advance.h" -#include "z64effect.h" -#include "z64play.h" +#include "frame_advance.h" +#include "effect.h" +#include "play_state.h" EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info" diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c index 7c9e228f63..7a5f7e4e49 100644 --- a/src/code/z_effect_soft_sprite_dlftbls.c +++ b/src/code/z_effect_soft_sprite_dlftbls.c @@ -1,5 +1,5 @@ #include "segment_symbols.h" -#include "z64effect.h" +#include "effect.h" // Linker symbol declarations (used in the table below) #define DEFINE_EFFECT_SS(name, _1) DECLARE_OVERLAY_SEGMENT(name) diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 1654ab3d0d..fea0102140 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -7,10 +7,10 @@ #include "segmented_address.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "skin_matrix.h" #include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h" #include "overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h" diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index c06248f265..9eef37ef6c 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,10 +1,10 @@ #include "rand.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" -#include "z64quest_hint.h" -#include "z64quest_hint_commands.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "quest_hint.h" +#include "quest_hint_commands.h" +#include "save.h" QuestHintCmd sChildSariaQuestHints[] = { QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3), diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 9b2bf7c0b7..12d31b4f0a 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -4,7 +4,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.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_en_item00.c b/src/code/z_en_item00.c index f0c627b250..43668baebb 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -12,12 +12,12 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64draw.h" -#include "z64effect.h" -#include "z64item.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "draw.h" +#include "effect.h" +#include "item.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c index 164ff1dde4..858061d4f5 100644 --- a/src/code/z_env_flags.c +++ b/src/code/z_env_flags.c @@ -1,7 +1,7 @@ #include "array_count.h" #include "ultra64.h" -#include "z64cutscene_flags.h" -#include "z64play.h" +#include "cutscene_flags.h" +#include "play_state.h" void CutsceneFlags_UnsetAll(PlayState* play) { u8 i; diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c index ea6313a762..470c454b7d 100644 --- a/src/code/z_face_reaction.c +++ b/src/code/z_face_reaction.c @@ -1,6 +1,6 @@ #include "ultra64.h" -#include "z64face_reaction.h" -#include "z64player.h" +#include "face_reaction.h" +#include "player.h" u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = { // MASK_REACTION_SET_CARPENTER_BOSS diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 2621f1c129..b37c4aeb39 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -16,8 +16,8 @@ #include "libu64/debug.h" #include "gfx.h" #include "printf.h" -#include "z64math.h" -#include "z64transition_instances.h" +#include "z_math.h" +#include "transition_instances.h" // color framebuffer extern u16 D_0F000000[]; diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index d8aa81df06..0a7dabdd6b 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -3,7 +3,7 @@ #include "color.h" #include "gfx.h" #include "sfx.h" -#include "z64transition.h" +#include "transition.h" typedef enum TransitionCircleDirection { /* 0 */ TRANS_CIRCLE_DIR_IN, diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index 1be97d5f51..4798a225a8 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -6,8 +6,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64save.h" -#include "z64transition_instances.h" +#include "save.h" +#include "transition_instances.h" typedef enum TransitionFadeDirection { /* 0 */ TRANS_FADE_DIR_IN, diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 6624a4373c..b1a5b2e679 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -1,8 +1,8 @@ #include "transition_triforce.h" #include "printf.h" -#include "z64math.h" -#include "z64transition_instances.h" +#include "z_math.h" +#include "transition_instances.h" #include "assets/code/fbdemo_triforce/code.c" diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index 25b45e7e2c..6a5dd62e5c 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -1,8 +1,8 @@ #include "transition_wipe.h" #include "gfx.h" -#include "z64save.h" -#include "z64transition_instances.h" +#include "save.h" +#include "transition_instances.h" typedef enum TransitionWipeDirection { /* 0 */ TRANS_WIPE_DIR_IN, diff --git a/src/code/z_fcurve_data.c b/src/code/z_fcurve_data.c index a1950a568b..774f4137f7 100644 --- a/src/code/z_fcurve_data.c +++ b/src/code/z_fcurve_data.c @@ -2,7 +2,7 @@ * File: z_fcurve_data.c * Description: Interpolation functions for use with Curve SkelAnime */ -#include "z64curve.h" +#include "curve.h" #define FCURVE_INTERP_CUBIC 0 // Interpolate using a Hermite cubic spline #define FCURVE_INTERP_NONE 1 // Return the value at the left endpoint instead of interpolating diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index e5d1f1fbb3..da1325ee17 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -32,9 +32,9 @@ #include "sys_matrix.h" #include "translation.h" #include "zelda_arena.h" -#include "z64actor.h" -#include "z64curve.h" -#include "z64play.h" +#include "actor.h" +#include "curve.h" +#include "play_state.h" void SkelCurve_Clear(SkelCurve* skelCurve) { skelCurve->limbCount = 0; 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_game_dlftbls.c b/src/code/z_game_dlftbls.c index 57efe90dfc..84fca6ba63 100644 --- a/src/code/z_game_dlftbls.c +++ b/src/code/z_game_dlftbls.c @@ -5,7 +5,7 @@ #include "setup_state.h" #include "title_setup_state.h" #include "z_game_dlftbls.h" -#include "z64play.h" +#include "play_state.h" // Linker symbol declarations (used in the table below) #define DEFINE_GAMESTATE(typeName, enumName, name) DECLARE_OVERLAY_SEGMENT(name) diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index f73616116d..12d94eaa3a 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -4,9 +4,9 @@ #include "rumble.h" #include "sequence.h" #include "versions.h" -#include "z64game_over.h" -#include "z64play.h" -#include "z64save.h" +#include "game_over.h" +#include "play_state.h" +#include "save.h" void GameOver_Init(PlayState* play) { play->gameOverCtx.state = GAMEOVER_INACTIVE; diff --git a/src/code/z_horse.c b/src/code/z_horse.c index d61af32e7e..ab556c3d13 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -4,10 +4,10 @@ #include "printf.h" #include "regs.h" #include "translation.h" -#include "z64horse.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "horse.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" /** diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c index c31d4d926f..8ae2bcbf20 100644 --- a/src/code/z_inventory.c +++ b/src/code/z_inventory.c @@ -1,9 +1,9 @@ #include "ultra64.h" #include "printf.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/textures/icon_item_static/icon_item_static.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index d9bca732e5..63bc6e0fdc 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -6,7 +6,7 @@ #include "segment_symbols.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #define KALEIDO_OVERLAY(name, nameString) \ { NULL, ROM_FILE(ovl_##name), _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, 0, nameString, } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 1e225eb670..73d3b20dbf 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -8,7 +8,7 @@ #include "regs.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" void (*sKaleidoScopeUpdateFunc)(PlayState* play); void (*sKaleidoScopeDrawFunc)(PlayState* play); diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 6401f3fef3..b3ef531649 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -5,9 +5,9 @@ #endif #include "printf.h" #include "regs.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "save.h" /* * The following three arrays are effectively unused. diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 89f5bbd3b7..280bfa3df8 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -4,9 +4,9 @@ #include "segment_symbols.h" #include "translation.h" #include "versions.h" -#include "z64dma.h" -#include "z64font.h" -#include "z64message.h" +#include "dma.h" +#include "font.h" +#include "message.h" /** * Loads a texture from kanji for the requested `character` into the character texture buffer diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 41c7bf75d7..bdb35093b2 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -24,13 +24,13 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64cutscene.h" -#include "z64frame_advance.h" -#include "z64environment.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "cutscene.h" +#include "frame_advance.h" +#include "environment.h" +#include "play_state.h" +#include "player.h" +#include "save.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_lifemeter.c b/src/code/z_lifemeter.c index cab9737ff7..8ebefa7e62 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -3,10 +3,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64lifemeter.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "lifemeter.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_lights.c b/src/code/z_lights.c index d0b003f77c..4059faacaa 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -3,8 +3,8 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64light.h" -#include "z64play.h" +#include "light.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c index 502eb43c3c..f2c204c07f 100644 --- a/src/code/z_map_data.c +++ b/src/code/z_map_data.c @@ -1,5 +1,5 @@ #include "map.h" -#include "z64save.h" +#include "save.h" static s16 sFloorTexIndexOffset[10][8] = { { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 }, diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index e46c70bd10..ba6cb77f0a 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -12,10 +12,10 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64map_mark.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "map_mark.h" +#include "play_state.h" +#include "player.h" +#include "save.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 402d942d66..5abc554de4 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -10,9 +10,9 @@ #include "segment_symbols.h" #include "terminal.h" #include "translation.h" -#include "z64map_mark.h" -#include "z64play.h" -#include "z64save.h" +#include "map_mark.h" +#include "play_state.h" +#include "save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_message.c b/src/code/z_message.c index 1d6fee156b..1fc06d7407 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -18,11 +18,11 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_olib.c b/src/code/z_olib.c index 66c767f68b..1ee420025b 100644 --- a/src/code/z_olib.c +++ b/src/code/z_olib.c @@ -1,6 +1,6 @@ -#include "z64math.h" +#include "z_math.h" #include "libc64/math64.h" -#include "z64olib.h" +#include "olib.h" #include "z_lib.h" /** diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 94c3bc9e11..12dc2d2568 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -9,10 +9,10 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" -#include "z64olib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "olib.h" +#include "play_state.h" +#include "player.h" +#include "save.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 6ae3959c86..7c97802888 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -17,13 +17,13 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64lifemeter.h" -#include "z64horse.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "lifemeter.h" +#include "horse.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/do_action_static/do_action_static.h" diff --git a/src/code/z_path.c b/src/code/z_path.c index 29b51a8f17..f025f04499 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -1,9 +1,9 @@ #include "ultra64.h" #include "libc64/math64.h" #include "segmented_address.h" -#include "z64actor.h" -#include "z64path.h" -#include "z64play.h" +#include "actor.h" +#include "path.h" +#include "play_state.h" Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) { Path* path; diff --git a/src/code/z_play.c b/src/code/z_play.c index 87d344b13f..590680da25 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -36,16 +36,16 @@ #include "versions.h" #include "z_actor_dlftbls.h" #include "zelda_arena.h" -#include "z64audio.h" -#include "z64cutscene_flags.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64frame_advance.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64vis.h" +#include "audio.h" +#include "cutscene_flags.h" +#include "debug_display.h" +#include "effect.h" +#include "frame_advance.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "vis.h" #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:224" \ "ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240" diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index eb52aff798..5838188ab6 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -1,8 +1,8 @@ #include "kaleido_manager.h" -#include "z64actor.h" -#include "z64actor_profile.h" -#include "z64play.h" -#include "z64player.h" +#include "actor.h" +#include "actor_profile.h" +#include "play_state.h" +#include "player.h" #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 3ce2143c5b..7358db96d5 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -6,12 +6,12 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64draw.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "draw.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_link_boy/object_link_boy.h" diff --git a/src/code/z_quake.c b/src/code/z_quake.c index d3ba17810d..18ebfbcc38 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -4,8 +4,8 @@ #include "quake.h" #include "terminal.h" #include "z_lib.h" -#include "z64olib.h" -#include "z64play.h" +#include "olib.h" +#include "play_state.h" typedef struct QuakeRequest { /* 0x00 */ s16 index; diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 6228b51cf1..135ffa8876 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -5,7 +5,7 @@ #include "letterbox.h" #include "main.h" #include "regs.h" -#include "z64play.h" +#include "play_state.h" Gfx sSetupDL[SETUPDL_MAX][6] = { { diff --git a/src/code/z_room.c b/src/code/z_room.c index 7bc9e4801d..5549922b6a 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -19,12 +19,12 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64room.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "room.h" +#include "save.h" +#include "skin_matrix.h" Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/code/z_rumble.c b/src/code/z_rumble.c index fc811cfccb..fcc39adee8 100644 --- a/src/code/z_rumble.c +++ b/src/code/z_rumble.c @@ -13,7 +13,7 @@ */ #include "rumble.h" #include "padmgr.h" -#include "z64math.h" +#include "z_math.h" static s32 sUnused[4]; RumbleMgr sRumbleMgr; diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 63e0836bbc..dc7c4836b0 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -4,8 +4,8 @@ #include "regs.h" #include "sample_state.h" #include "segment_symbols.h" -#include "z64dma.h" -#include "z64play.h" +#include "dma.h" +#include "play_state.h" void Sample_HandleStateChange(SampleState* this) { if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) { diff --git a/src/code/z_scene.c b/src/code/z_scene.c index feef5ffc62..65503d0ccb 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -11,10 +11,10 @@ #include "versions.h" #include "z_actor_dlftbls.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64scene.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "scene.h" SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX]; RomFile sNaviQuestHintFiles[]; diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 5e096a262e..97741c50b6 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -11,10 +11,10 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64frame_advance.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "frame_advance.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h" #include "assets/scenes/indoors/souko/souko_scene.h" diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c index 785afcde35..2aaadeb365 100644 --- a/src/code/z_sfx_source.c +++ b/src/code/z_sfx_source.c @@ -1,9 +1,9 @@ -#include "z64sfx_source.h" +#include "sfx_source.h" #include "array_count.h" #include "sfx.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "play_state.h" +#include "skin_matrix.h" void SfxSource_InitAll(PlayState* play) { SfxSource* sources = &play->sfxSources[0]; diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 4e4fd97e9a..10e0df1a44 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -10,9 +10,9 @@ #include "translation.h" #include "z_lib.h" #include "zelda_arena.h" -#include "z64animation.h" -#include "z64animation_legacy.h" -#include "z64play.h" +#include "animation.h" +#include "animation_legacy.h" +#include "play_state.h" #define ANIM_INTERP 1 diff --git a/src/code/z_skin.c b/src/code/z_skin.c index 7861acb897..e5ddf71f46 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -1,10 +1,10 @@ #include "gfx.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64math.h" -#include "z64play.h" -#include "z64skin.h" -#include "z64skin_matrix.h" +#include "z_math.h" +#include "play_state.h" +#include "skin.h" +#include "skin_matrix.h" MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index 196ce9aae4..c6ddc1a793 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -1,10 +1,10 @@ #include "array_count.h" #include "segmented_address.h" #include "zelda_arena.h" -#include "z64actor.h" -#include "z64play.h" -#include "z64skin.h" -#include "z64skin_matrix.h" +#include "actor.h" +#include "play_state.h" +#include "skin.h" +#include "skin_matrix.h" #include "overlays/actors/ovl_En_fHG/z_en_fhg.h" diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 36d7a02791..1dbb9a26b0 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -1,4 +1,4 @@ -#include "z64skin_matrix.h" +#include "skin_matrix.h" #include "gfx.h" #include "printf.h" diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 2eef6db036..17bfb5baa4 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -1,4 +1,4 @@ -#include "z64sram.h" +#include "sram.h" #include "array_count.h" #include "file_select_state.h" @@ -8,14 +8,14 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64game.h" -#include "z64interface.h" -#include "z64message.h" -#include "z64ocarina.h" -#include "z64save.h" -#include "z64scene.h" -#include "z64ss_sram.h" +#include "audio.h" +#include "game.h" +#include "interface.h" +#include "message.h" +#include "ocarina.h" +#include "save.h" +#include "scene.h" +#include "ss_sram.h" #define SLOT_SIZE (sizeof(SaveContext) + 0x28) #define CHECKSUM_SIZE (sizeof(Save) / 2) diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c index 94e97639aa..de13b321d2 100644 --- a/src/code/z_ss_sram.c +++ b/src/code/z_ss_sram.c @@ -1,6 +1,6 @@ #include "ultra64.h" #include "printf.h" -#include "z64ss_sram.h" +#include "ss_sram.h" typedef struct SsSramContext { /* 0x00 */ OSPiHandle piHandle; diff --git a/src/code/z_view.c b/src/code/z_view.c index 6fe82aaeb3..4c37194cfd 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -1,4 +1,4 @@ -#include "z64view.h" +#include "view.h" #include "libc64/malloc.h" #include "libu64/debug.h" diff --git a/src/code/z_viscvg.c b/src/code/z_viscvg.c index 51fc6f8e5d..1616b661c0 100644 --- a/src/code/z_viscvg.c +++ b/src/code/z_viscvg.c @@ -21,7 +21,7 @@ */ #include "gfx.h" -#include "z64vis.h" +#include "vis.h" /** * Draws only coverage: does not retain any of the original pixel RGB, primColor is used as background color. diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index 517f2ada60..632d00a6e7 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -13,7 +13,7 @@ #include "attributes.h" #include "gfx.h" #include "gfxalloc.h" -#include "z64vis.h" +#include "vis.h" // Height of the fragments the color frame buffer (CFB) is split into. // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c index 431d7f6d9a..aa72289742 100644 --- a/src/code/z_viszbuf.c +++ b/src/code/z_viszbuf.c @@ -33,7 +33,7 @@ */ #include "gfx.h" -#include "z64vis.h" +#include "vis.h" // Height of the fragments the z-buffer is split into. // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into TMEM. diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 2fa2122acf..3387db500f 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -1,14 +1,14 @@ -#include "z64skybox.h" +#include "skybox.h" #include "array_count.h" #include "printf.h" #include "segment_symbols.h" #include "terminal.h" #include "ultra64.h" -#include "z64environment.h" -#include "z64game.h" -#include "z64play.h" -#include "z64save.h" +#include "environment.h" +#include "game.h" +#include "play_state.h" +#include "save.h" typedef struct SkyboxFaceParams { /* 0x000 */ s32 xStart; diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index aa7fa1dae0..46c38291f6 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -1,7 +1,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64skybox.h" +#include "skybox.h" Mtx* sSkyboxDrawMatrix; diff --git a/src/dmadata/dmadata.c b/src/dmadata/dmadata.c index 93ea2b4d33..eff05f171b 100644 --- a/src/dmadata/dmadata.c +++ b/src/dmadata/dmadata.c @@ -1,4 +1,4 @@ -#include "z64dma.h" +#include "dma.h" // Linker symbol declarations (used in the table below) #define DEFINE_DMA_ENTRY(name, _1) \ diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c index 8c672ad50b..5488c7d3e5 100644 --- a/src/elf_message/elf_message_field.c +++ b/src/elf_message/elf_message_field.c @@ -1,5 +1,5 @@ -#include "z64quest_hint_commands.h" -#include "z64save.h" +#include "quest_hint_commands.h" +#include "save.h" QuestHintCmd gOverworldNaviQuestHints[] = { QUEST_HINT_FLAG(CHECK, EVENTCHKINF_05, false, 0x40), diff --git a/src/elf_message/elf_message_ydan.c b/src/elf_message/elf_message_ydan.c index cde6410b22..4ba3559021 100644 --- a/src/elf_message/elf_message_ydan.c +++ b/src/elf_message/elf_message_ydan.c @@ -1,4 +1,4 @@ -#include "z64quest_hint_commands.h" +#include "quest_hint_commands.h" QuestHintCmd gDungeonNaviQuestHints[] = { QUEST_HINT_END(0x5F), diff --git a/src/libc64/math64.c b/src/libc64/math64.c index b51eb333ed..964dc3c8a4 100644 --- a/src/libc64/math64.c +++ b/src/libc64/math64.c @@ -1,5 +1,5 @@ #include "libc64/math64.h" -#include "z64math.h" +#include "z_math.h" #if !PLATFORM_N64 s32 gUseAtanContFrac; diff --git a/src/libc64/qrand.c b/src/libc64/qrand.c index 69bfa11d72..dafddc864f 100644 --- a/src/libc64/qrand.c +++ b/src/libc64/qrand.c @@ -42,7 +42,7 @@ * @note Original name: qrand.c */ #include "libc64/qrand.h" -#include "z64math.h" +#include "z_math.h" #define RAND_MULTIPLIER 1664525 #define RAND_INCREMENT 1013904223 diff --git a/src/libu64/load_gc.c b/src/libu64/load_gc.c index 340780a130..e99c83d1df 100644 --- a/src/libu64/load_gc.c +++ b/src/libu64/load_gc.c @@ -2,7 +2,7 @@ #include "ultra64.h" #include "printf.h" #include "translation.h" -#include "z64dma.h" +#include "dma.h" size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr) { s32 pad[3]; diff --git a/src/libu64/loadfragment2_n64.c b/src/libu64/loadfragment2_n64.c index be0e5295d9..72ecabaf37 100644 --- a/src/libu64/loadfragment2_n64.c +++ b/src/libu64/loadfragment2_n64.c @@ -9,7 +9,7 @@ #include "libc64/malloc.h" #include "libu64/overlay.h" #include "translation.h" -#include "z64dma.h" +#include "dma.h" s32 gOverlayLogSeverity = 2; diff --git a/src/libultra/gu/cosf.c b/src/libultra/gu/cosf.c index f217eec13a..4d4f13fbe8 100644 --- a/src/libultra/gu/cosf.c +++ b/src/libultra/gu/cosf.c @@ -1,5 +1,5 @@ #include "ultra64.h" -#include "z64math.h" // TODO: libultra should not have access to game-side headers +#include "z_math.h" // TODO: libultra should not have access to game-side headers static const du P[] = { { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c index 8d1df6bbe1..c30a259bf1 100644 --- a/src/libultra/gu/lookat.c +++ b/src/libultra/gu/lookat.c @@ -1,5 +1,5 @@ #include "ultra64.h" -#include "z64math.h" // TODO: libultra should not have access to game-side headers +#include "z_math.h" // TODO: libultra should not have access to game-side headers void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) { f32 length; diff --git a/src/libultra/gu/normalize.c b/src/libultra/gu/normalize.c index 8b20110c8c..b954069f96 100644 --- a/src/libultra/gu/normalize.c +++ b/src/libultra/gu/normalize.c @@ -1,5 +1,5 @@ #include "ultra64.h" -#include "z64math.h" // TODO: libultra should not have access to game-side headers +#include "z_math.h" // TODO: libultra should not have access to game-side headers void guNormalize(f32* x, f32* y, f32* z) { f32 m = 1 / sqrtf(SQ(*x) + SQ(*y) + SQ(*z)); diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c index 23013731c4..64f850efbd 100644 --- a/src/libultra/gu/sinf.c +++ b/src/libultra/gu/sinf.c @@ -1,5 +1,5 @@ #include "ultra64.h" -#include "z64math.h" // TODO: libultra should not have access to game-side headers +#include "z_math.h" // TODO: libultra should not have access to game-side headers static const du P[] = { { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c index 4b750514df..ea1b73249e 100644 --- a/src/n64dd/z_n64dd.c +++ b/src/n64dd/z_n64dd.c @@ -13,8 +13,8 @@ #include "stackcheck.h" #include "sys_freeze.h" #include "versions.h" -#include "z64audio.h" -#include "z64thread.h" +#include "audio.h" +#include "thread.h" #pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 9ca642d4e9..62594850af 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -7,8 +7,8 @@ #include "sfx.h" #include "sys_math.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z_lib.h" #include "assets/objects/object_link_boy/object_link_boy.h" diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h index ad50194506..d06019f040 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -2,8 +2,8 @@ #define Z_ARMS_HOOK_H #include "ultra64.h" -#include "z64actor.h" -#include "z64player.h" +#include "actor.h" +#include "player.h" struct ArmsHook; diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 2ee5014bc2..664e00223b 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -15,7 +15,7 @@ #include "tex_len.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h index a04b496a11..395946c6f6 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h @@ -2,7 +2,7 @@ #define Z_ARROW_FIRE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ArrowFire; diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index c1721920da..b8a064f9b9 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -15,7 +15,7 @@ #include "tex_len.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h index 7494aefa9d..f0094550c6 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h @@ -2,7 +2,7 @@ #define Z_ARROW_ICE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ArrowIce; diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 0b483523b4..51e3fdb42b 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -15,7 +15,7 @@ #include "tex_len.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h index ee4b678961..516469d5cb 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h @@ -2,7 +2,7 @@ #define Z_ARROW_LIGHT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ArrowLight; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index f8529bb775..047ad13ba0 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h index e8729bb983..72f2b7103c 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h @@ -2,7 +2,7 @@ #define Z_BG_BDAN_OBJECTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgBdanObjects; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 0dcb302eaa..a27bb69c1f 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h index f86ef79e3e..8020a212b9 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h @@ -2,7 +2,7 @@ #define Z_BG_BDAN_SWITCH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum BgBdanSwitchType { /* 0x00 */ BLUE, 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 bee0e2484c..a7ae0f3cc6 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 @@ -11,7 +11,7 @@ #include "regs.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bowl/object_bowl.h" diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h index 47e167de8a..707027f443 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h @@ -2,7 +2,7 @@ #define Z_BG_BOM_GUARD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgBomGuard; diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 6db143bdf8..a40a29242a 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h index 8cd1bb879f..f2714e062a 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h @@ -2,7 +2,7 @@ #define Z_BG_BOMBWALL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgBombwall; 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 e0c0e1c4fd..7900504f7f 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 @@ -18,8 +18,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_bowl/object_bowl.h" diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h index ac743fe7f1..c108447575 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h @@ -2,7 +2,7 @@ #define Z_BG_BOWL_WALL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" struct BgBowlWall; diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index f36d251f45..c12522fe52 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -15,9 +15,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/scenes/dungeons/ddan/ddan_scene.h" #include "assets/objects/object_bwall/object_bwall.h" diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h index 02ab43a5fc..eff2fbeec2 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h @@ -2,7 +2,7 @@ #define Z_BG_BREAKWALL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgBreakwall; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index fb910b56fd..71f37f61a5 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -11,7 +11,7 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h index 48e695b47d..a8073e1498 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h @@ -2,7 +2,7 @@ #define Z_BG_DDAN_JD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgDdanJd; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 9a8669e535..81012e657a 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -14,7 +14,7 @@ #include "rumble.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h index fca0119052..46b4105b81 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h @@ -2,7 +2,7 @@ #define Z_BG_DDAN_KD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgDdanKd; diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 55dd43407b..f2e50dcb61 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -18,9 +18,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h index 9f361a3ccb..9c16d9eb1f 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h @@ -2,7 +2,7 @@ #define Z_BG_DODOAGO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum BgDodoagoEye { /* 0 */ BGDODOAGO_EYE_LEFT, 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 006deb893e..233368d438 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 @@ -21,10 +21,10 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_dy_obj/object_dy_obj.h" #include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h" diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h index f799bf9278..0b07024b17 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -2,7 +2,7 @@ #define Z_BG_DY_YOSEIZO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.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 984f64a394..b43241f1bd 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 @@ -18,9 +18,9 @@ #include "terminal.h" #include "tex_len.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h index 9d0c4bcfaf..14744529e6 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h @@ -2,7 +2,7 @@ #define Z_BG_GANON_OTYUKA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define OTYUKA_SIDE_EAST (1 << 0) #define OTYUKA_SIDE_WEST (1 << 1) 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 c263ed5e3a..6e9821d64f 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 @@ -14,8 +14,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h index 6f9f53a546..1b89840088 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h @@ -2,7 +2,7 @@ #define Z_BG_GATE_SHUTTER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgGateShutter; diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 6c0f01b322..3cf1b45e31 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -11,9 +11,9 @@ #include "ichain.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_gjyo_objects/object_gjyo_objects.h" #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h" diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h index 312dcdee72..3cec2c7a6b 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h @@ -2,7 +2,7 @@ #define Z_BG_GJYO_BRIDGE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgGjyoBridge; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index b05734104c..d3f3ccae8b 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -9,7 +9,7 @@ #include "gfx.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h index 3124be292e..9ff0f6294f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h @@ -2,7 +2,7 @@ #define Z_BG_GND_DARKMEIRO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgGndDarkmeiro; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index c49697f627..441870154f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -11,8 +11,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h index bebb77303f..a6092c9364 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h @@ -2,7 +2,7 @@ #define Z_BG_GND_FIREMEIRO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgGndFiremeiro; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 8b026839f7..2e587cde55 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -12,9 +12,9 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h index 86e3aa4f62..23b4ff6af5 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h @@ -2,7 +2,7 @@ #define Z_BG_GND_ICEBLOCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgGndIceblock; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 98824a94e0..3a6aa26abb 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -6,7 +6,7 @@ #include "z_bg_gnd_nisekabe.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h index 291a0e4ea1..5145c02b6b 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h @@ -2,7 +2,7 @@ #define Z_BG_GND_NISEKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgGndNisekabe; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 889d4f9551..acb2bd4f80 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h index d2e039c8ad..110c53d9bf 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h @@ -2,7 +2,7 @@ #define Z_BG_GND_SOULMEIRO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgGndSoulmeiro; diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index f20af0b9f8..b487e1280d 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -12,9 +12,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_haka/object_haka.h" diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h index b95f5c0f8e..1bad32c14b 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHaka; diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index a209637949..cdda12ba15 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h index 6c926d4354..cc718d095d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_GATE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaGate; diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 63ef8e5153..4e6d67df94 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -14,9 +14,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h index e1ce3a0946..3d691f3fad 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_HUTA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaHuta; diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index a09195d6fe..a0c3e37a58 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -7,7 +7,7 @@ #include "z_bg_haka_megane.h" #include "ichain.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h index bb7711c7b5..a50a74a27f 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_MEGANE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaMegane; diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 7b06abe5ab..061cdaf5d5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h index 4a11b26b7d..47342beb78 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_MEGANEBG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaMeganeBG; diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index d72cb56d0b..cf90fc6a68 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -9,9 +9,9 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h index a5019eb84f..4d94f0ac1e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_SGAMI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaSgami; diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 126dcc7ee1..667f1f309b 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h index e6ede3d2b3..28337fb437 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_SHIP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaShip; diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index e9ec138a8e..250f4ce32a 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -11,10 +11,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "skin_matrix.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h index cfcceaa3e2..a75c877ed3 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_TRAP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum HakaTrapType { /* 0x00 */ HAKA_TRAP_GUILLOTINE_SLOW, diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index df7c95b0e9..d4b20752d5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h index a0caba8c23..ad9fd87703 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_TUBO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaTubo; diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 581af06120..8143404e10 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h index a34a043590..9cf3685710 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_WATER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaWater; diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 8064cae2d4..5be3889889 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -12,8 +12,8 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h index 2c8f9a4834..1d4c4798d6 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h @@ -2,7 +2,7 @@ #define Z_BG_HAKA_ZOU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHakaZou; 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 90aeee4b87..88b063ae2c 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 @@ -22,9 +22,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_heavy_object/object_heavy_object.h" diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h index a93f5cc3a0..765a05a968 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h @@ -2,7 +2,7 @@ #define Z_BG_HEAVY_BLOCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHeavyBlock; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 0f0f99da70..fbb2b4be30 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h index 14502cba68..89f43762d3 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_CURTAIN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanCurtain; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 885967c2bb..412b2a5426 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -11,9 +11,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h index 83cabfaab4..50165babbe 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_DALM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanDalm; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 9394d4017b..9ca446025c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h index 35e643279e..a407018592 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_FIREWALL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanFirewall; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 2616f14ace..b8d10809f8 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -9,7 +9,7 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h index e21de9fca2..1f810b1c04 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_FSLIFT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanFslift; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 47849aa850..0a01e35dcd 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -15,9 +15,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h index ce1f016125..495c9abc3d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_FWBIG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanFwbig; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index d20bccdb71..3f2e87ed3f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -20,7 +20,7 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h index faf1db7577..2a643b568d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_HAMSTEP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanHamstep; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index a4fd5fab33..64159da59a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -10,7 +10,7 @@ #include "rumble.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h index 955ddd5dfc..8f00335b03 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_HROCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanHrock; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 8148f8ca0d..3559b572fb 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h index 112b8dc09a..cb051c3bd0 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_KOUSI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanKousi; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 7663c13aa0..ff71d16fc0 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h index 7257a210f1..3f1b848d7b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_KOWARERUKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanKowarerukabe; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index bf5bc52317..872ed0608c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -14,9 +14,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64skin_matrix.h" +#include "play_state.h" +#include "player.h" +#include "skin_matrix.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h index aa8d6ca874..d2651e157f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_ROCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanRock; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 8a7e68700c..df5936d41e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h index 82725e4fc1..7810d0f411 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_RSEKIZOU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanRsekizou; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 452c88f5f4..bb7cf7edf5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h index c898f9d934..ebf8d5738a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_SEKIZOU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanSekizou; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index f166f9f4d8..a44cfa3491 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h index dd64b556b0..14d461898e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_SIMA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanSima; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index d21b1e8212..a540872b96 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h index 2ce3fbfd4e..6b169810c8 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h @@ -2,7 +2,7 @@ #define Z_BG_HIDAN_SYOKU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgHidanSyoku; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 6bfd39e4e5..7398d9e8e0 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -11,9 +11,9 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h index 364b087852..95ff43009f 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h @@ -2,7 +2,7 @@ #define Z_BG_ICE_OBJECTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgIceObjects; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 102e2e3ba5..cc8f46a982 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h index 30286a64d1..401fb7096f 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h @@ -2,7 +2,7 @@ #define Z_BG_ICE_SHELTER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgIceShelter; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 20176f2758..8933b3c7a1 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h index aad63d435b..5d246aab9e 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h @@ -2,7 +2,7 @@ #define Z_BG_ICE_SHUTTER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgIceShutter; diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 8fb200aca5..8f619e0ed2 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -11,8 +11,8 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h index 46a78eb738..c8779247cb 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h @@ -2,7 +2,7 @@ #define Z_BG_ICE_TURARA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgIceTurara; diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index e46139117c..61ea3e0e4c 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_ingate/object_ingate.h" diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h index c9f46446ab..32eedc24b6 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -2,7 +2,7 @@ #define Z_BG_INGATE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgInGate; diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 58cd7278ad..1fa0559484 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -11,8 +11,8 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h index 8d772757bf..b909470829 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_1FLIFT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJya1flift; diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index ee9487d2ef..1147ed7e6f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h index 1dad4c1543..439bc41ae1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_AMISHUTTER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaAmishutter; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index f2955f3050..66cc92b98c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -12,7 +12,7 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h index 56b6d8db07..15bc7f83e4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BIGMIRROR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define BIGMIR_PUZZLE_COBRA1_SOLVED (1 << 0) #define BIGMIR_PUZZLE_COBRA2_SOLVED (1 << 1) diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index 946db1b05c..261bb07fb5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -11,9 +11,9 @@ #include "ichain.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h index 641141945a..53c72f03fc 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BLOCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaBlock; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 73108e43d0..6d524848e4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -11,8 +11,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_ATTENTION_ENABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h index ad9b9c33db..04d81c1e7f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BOMBCHUIWA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaBombchuiwa; 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 5a01066a3c..5e231d5414 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 @@ -13,8 +13,8 @@ #include "sfx.h" #include "terminal.h" #include "translation.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h index 9f06d9a1d6..8888d372d6 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BOMBIWA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaBombiwa; 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 2f620df635..26402414d9 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 @@ -11,8 +11,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h index 32266e2ac4..9f2a9d9f36 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_COBRA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaCobra; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 6d6b13efb8..fb25354ccd 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -10,8 +10,8 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h index 35f4c971c9..3b24569f51 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_GOROIWA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaGoroiwa; diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index b9350da300..dd514e850b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -12,8 +12,8 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h index 2da7d3673f..ba4af700bf 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_HAHENIRON_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaHaheniron; diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index 93ca5a2360..cf13895832 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -14,8 +14,8 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h index 9768aec2a5..3857918e31 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_IRONOBJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaIronobj; diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 354c17b94b..6c5bc7cc66 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h index a125e8ef53..892a7354d1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_KANAAMI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaKanaami; diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index dd8b162bd7..83e58b79b8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h index ea9abac2bf..85db1a0969 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_LIFT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaLift; typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, struct PlayState*); diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index a72f245e22..da22420786 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -17,8 +17,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h index e297ebb63a..013fac982d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_MEGAMI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaMegami; 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 e9cfd701a2..810b3ff9e1 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 @@ -13,8 +13,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h index d9d920f57b..ebbcf35c7e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_ZURERUKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgJyaZurerukabe; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 9a53c837ff..b130738664 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h index 69f1e32eab..212623d2ac 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_EYE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMenkuriEye; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index ee3f35a1db..1b17110214 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h index 5bcdbf8ec4..cd1f5a7457 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_KAITEN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMenkuriKaiten; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index ff13454557..43a922bd33 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -6,7 +6,7 @@ #include "z_bg_menkuri_nisekabe.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h index 54cce56eff..7f462a5e44 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_NISEKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMenkuriNisekabe; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 672a54b440..22ccbff60d 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h index aacbf321a5..f56773d9ae 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_BWALL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMizuBwall; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index ae1dd32bc6..98de021dab 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h index 75a50e864e..0b527e59c4 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_MOVEBG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum BgMizuMovebgType { /* 0 */ MIZUMOVEBG_TYPE_FLOATING_PLATFORM_OUTSIDE_CENTER_PILLAR, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index ed8fae2784..c8c325298c 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -8,7 +8,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h index bcba73f531..a3f172393a 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_SHUTTER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define BGMIZUSHUTTER_GET_SIZE(thisx) PARAMS_GET_U((u16)(thisx)->params, 12, 4) #define BGMIZUSHUTTER_GET_TIMER(thisx) PARAMS_GET_U((u16)(thisx)->params, 6, 6) diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 3072207ece..03d4ac5628 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -8,8 +8,8 @@ #include "ichain.h" #include "sfx.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h index f8fe16ccd7..f415d0d4d9 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_UZU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMizuUzu; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 2b5be14285..8bad01b034 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h index 26eb33d0d8..6f0122ae69 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_WATER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMizuWater; diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index bf00812fc6..cd9fc555c7 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mjin/object_mjin.h" #include "assets/objects/object_mjin_wind/object_mjin_wind.h" diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h index 1ed19aa2a4..63601a13ff 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h @@ -2,7 +2,7 @@ #define Z_BG_MJIN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMjin; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index c0b7314bcb..697b1f72c9 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h index f37499b2f7..772ee02e31 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_BIGST_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriBigst; diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 028606443f..8532ce180b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -8,9 +8,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "translation.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h index 42e45d56fc..14932fe534 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_ELEVATOR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriElevator; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 6bd947c3a0..a2b1193c30 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h index e14aec45e1..99fd9f035e 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_HASHIGO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriHashigo; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 21b561a770..f1ae962844 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h index e4ab5a2d85..627126d379 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_HASHIRA4_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriHashira4; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 92fc3c57a8..e06abd1114 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -14,9 +14,9 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64curve.h" -#include "z64play.h" -#include "z64player.h" +#include "curve.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_box/object_box.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h index b9a29df504..2761ab4f6b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_HINERI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriHineri; diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index eaeb6afc3e..7c68aa1b69 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h index 4348622425..3f8c327a59 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_IDOMIZU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriIdomizu; diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index c47a01879f..3f41bf1e79 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h index 91c0d65a80..6e7272cee1 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_KAITENKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriKaitenkabe; diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index dccddcf49a..4c11347b9e 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -17,8 +17,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h index 657baefc53..07feeefd74 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h @@ -2,7 +2,7 @@ #define Z_BG_MORI_RAKKATENJO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgMoriRakkatenjo; diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 2622c43204..30f2044980 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -15,10 +15,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h index 78fe7fc966..4f299fa3c8 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h @@ -2,7 +2,7 @@ #define Z_BG_PO_EVENT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgPoEvent; diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index e5b8edea9d..cf9c454583 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -12,8 +12,8 @@ #include "ichain.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64light.h" -#include "z64play.h" +#include "light.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h index a6186dcbe7..3c50d66794 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h @@ -2,8 +2,8 @@ #define Z_BG_PO_SYOKUDAI_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct BgPoSyokudai; diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index 3392a15f60..49f017a0f9 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_pu_box/object_pu_box.h" diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h index 38cd6857d9..267e141a5c 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h @@ -2,7 +2,7 @@ #define Z_BG_PUSHBOX_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgPushbox; diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 37591ae020..52f858a343 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -10,11 +10,11 @@ #include "rumble.h" #include "sfx.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64cutscene_flags.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "cutscene_flags.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_relay_objects/object_relay_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h index 25db5cc5f6..caa91b1567 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h @@ -2,7 +2,7 @@ #define Z_BG_RELAY_OBJECTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgRelayObjects; diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index 4a3a760d92..248043de43 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -7,8 +7,8 @@ #include "z_bg_spot00_break.h" #include "ichain.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot00_break/object_spot00_break.h" diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h index 17e45aa918..0597a30085 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT00_BREAK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot00Break; diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index c305635b83..8b6ab5ac96 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -13,11 +13,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64cutscene_flags.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "cutscene_flags.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_spot00_objects/object_spot00_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h index 7780bea692..93b43331fa 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h @@ -2,8 +2,8 @@ #define Z_BG_SPOT00_HANEBASI_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct BgSpot00Hanebasi; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 413e0a49e0..36a2c78c32 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -12,9 +12,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h index e232c6a907..434f5f11ba 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT01_FUSYA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot01Fusya; 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 e43acd7a1d..4f65271474 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 @@ -16,9 +16,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h index 8d177d3317..c6632d7f37 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT01_IDOHASHIRA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot01Idohashira; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 5329d2e0f6..ebeffcc2fb 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h index 3d4ff68a6f..20b4a5ef73 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT01_IDOMIZU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot01Idomizu; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 6dbdd910d5..b68a23208f 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h index 44981abc07..6e187712ca 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT01_IDOSOKO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot01Idosoko; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index af7dec9c5d..3f50e2e866 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -10,8 +10,8 @@ #include "printf.h" #include "segmented_address.h" #include "translation.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h index 7ffc3094fe..39fdf213a8 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT01_OBJECTS2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot01Objects2; diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 795df90151..ffe4ee021a 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -14,10 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_spot02_objects/object_spot02_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h index 42d4e45b08..32ed8bca35 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT02_OBJECTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot02Objects; diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 501a677359..e77823866c 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -12,8 +12,8 @@ #include "one_point_cutscene.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64audio.h" -#include "z64play.h" +#include "audio.h" +#include "play_state.h" #include "assets/objects/object_spot03_object/object_spot03_object.h" diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h index 45ad4de4f2..3fd0960883 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT03_TAKI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum BgSpot03TakiState { WATERFALL_CLOSED, diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index edb253568d..1303fad735 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -10,8 +10,8 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot05_objects/object_spot05_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h index 1aae818797..bc5602264d 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT05_SOKO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot05Soko; diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 7c6c943aa7..c3c94063c5 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -15,9 +15,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot06_objects/object_spot06_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h index cbdc1054f8..c0c555f771 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT06_OBJECTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot06Objects; diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index afb9d02972..bc054e20b9 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -11,8 +11,8 @@ #include "ichain.h" #include "sys_matrix.h" #include "versions.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot07_object/object_spot07_object.h" diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h index 30872233ad..1e2a79737a 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT07_TAKI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot07Taki; diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index aa8d28b960..ce59f55d04 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -12,8 +12,8 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_spot08_obj/object_spot08_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h index a0436ea9ea..2f423b5645 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT08_BAKUDANKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot08Bakudankabe; diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 17d9385b00..12ab1abe17 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -14,9 +14,9 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_spot08_obj/object_spot08_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h index 1a3f920c3e..45c5976f37 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT08_ICEBLOCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot08Iceblock; diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 57b76c4147..e7e55f52ba 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -13,8 +13,8 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot09_obj/object_spot09_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h index 491d7380c2..c0a60964f7 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT09_OBJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot09Obj; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index f86d76a2fc..42dcc0ee73 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h index 5dedab77d5..a4a4910f33 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT11_BAKUDANKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot11Bakudankabe; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 574c2533d0..d4a2be3391 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -17,10 +17,10 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64cutscene_flags.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "cutscene_flags.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h index 0f0ed97e6e..c869405f51 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT11_OASIS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot11Oasis; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index c4fc3fcdc4..190f964943 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot12_obj/object_spot12_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h index bb9ef25cf5..5c8e101db3 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT12_GATE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot12Gate; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index f9a5253cea..48752674a0 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot12_obj/object_spot12_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h index 7ed7751ede..6c37ec6d97 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT12_SAKU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot12Saku; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index eb89d5f06a..fb07391ebe 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -13,9 +13,9 @@ #include "sys_math3d.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_spot15_obj/object_spot15_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h index d0534e1e73..a55d5c82cc 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT15_RRBOX_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot15Rrbox; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index c053a6c2d1..a95f92eba9 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot15_obj/object_spot15_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h index 35fcbee90e..6111804318 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT15_SAKU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot15Saku; diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 759d2184e3..446177325f 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_spot16_obj/object_spot16_obj.h" #include "assets/objects/object_bombiwa/object_bombiwa.h" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h index 577bd3863b..74cf8db05f 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT16_BOMBSTONE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot16Bombstone; 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 3ea3dd67ad..7acb1fc100 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 @@ -13,8 +13,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_efc_doughnut/object_efc_doughnut.h" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h index 3b7008ef2d..c453dd1cd0 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT16_DOUGHNUT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot16Doughnut; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 03f7b4514b..7c5546156c 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_spot17_obj/object_spot17_obj.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h index fd88416ddf..618682b608 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT17_BAKUDANKABE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot17Bakudankabe; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index b03edd8aae..2d32d0199b 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -12,7 +12,7 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot17_obj/object_spot17_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h index 737719ea28..086d55c449 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT17_FUNEN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot17Funen; 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 66d8e2d509..4f79fc5f39 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 @@ -11,9 +11,9 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h index 460a56fb12..6b4c85bceb 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT18_BASKET_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot18Basket; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 21bc50671c..9a30eb90df 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h index ff0c2cf8ac..a24b60f093 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT18_FUTA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot18Futa; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index d44a14de50..c1ebb465a0 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -14,9 +14,9 @@ #include "sys_math3d.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h index bfa758afd7..c523ae383e 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT18_OBJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot18Obj; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index a92e53a4f2..b6eacf13f4 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -10,8 +10,8 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h index 737d30bdbb..d95dc8fbbc 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h @@ -2,7 +2,7 @@ #define Z_BG_SPOT18_SHUTTER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSpot18Shutter; diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 1ddffb6c98..f2dfdc363f 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_sst/object_sst.h" diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h index eb4abfa662..7ef76380f5 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h @@ -2,7 +2,7 @@ #define Z_BG_SST_FLOOR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgSstFloor; diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index 47550f22bd..f11e24ef52 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h index 3c49b61cca..62f668f842 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h @@ -2,7 +2,7 @@ #define Z_BG_TOKI_HIKARI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgTokiHikari; diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index a3a3856969..144388d38e 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -13,10 +13,10 @@ #include "sequence.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64cutscene_flags.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "cutscene_flags.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h index 5fdb9e0692..6ecaa26884 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h @@ -2,7 +2,7 @@ #define Z_BG_TOKI_SWD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgTokiSwd; diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c index 123a797a73..efc039ced4 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c @@ -1,5 +1,5 @@ -#include "z64cutscene_commands.h" -#include "z64player.h" +#include "cutscene_commands.h" +#include "player.h" // clang-format off CutsceneData gPullMasterSwordCs[] = { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c index 3e27901701..4de0284695 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c @@ -1,5 +1,5 @@ -#include "z64cutscene_commands.h" -#include "z64player.h" +#include "cutscene_commands.h" +#include "player.h" // clang-format off CutsceneData gPlaceMasterSwordCs[] = { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c index 3e5ccb4ea6..9d40cf7b01 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c @@ -1,5 +1,5 @@ -#include "z64cutscene_commands.h" -#include "z64player.h" +#include "cutscene_commands.h" +#include "player.h" // clang-format off CutsceneData gRevealMasterSwordCs[] = { diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 5a544c3015..5ac35592bd 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -14,10 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "versions.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_spot04_objects/object_spot04_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h index 7fea6f8e77..78f7d633c3 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h @@ -2,7 +2,7 @@ #define Z_BG_TREEMOUTH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgTreemouth; diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c index c254318d42..fda53b3d9c 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c @@ -1,6 +1,6 @@ #include "sequence.h" -#include "z64cutscene_commands.h" -#include "z64player.h" +#include "cutscene_commands.h" +#include "player.h" // clang-format off CutsceneData gDekuTreeMeetingCs[] = { diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 63a73aaf4e..ce538ce9b4 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -8,8 +8,8 @@ #include "ichain.h" #include "regs.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_umajump/object_umajump.h" diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h index 067b5195c8..620350f4c4 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h @@ -2,7 +2,7 @@ #define Z_BG_UMAJUMP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgUmaJump; diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 679519f1be..a3ef2197eb 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_fd/object_fd.h" diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h index 1dcee1b596..9371f91521 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h @@ -2,7 +2,7 @@ #define Z_BG_VB_SIMA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgVbSima; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index f759a98148..1d563eda76 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h index a308c6ebc0..6f938f887b 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h @@ -2,7 +2,7 @@ #define Z_BG_YDAN_HASI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgYdanHasi; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index e338635846..8d683a9422 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h index 450c550b3a..6fb6724364 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h @@ -2,7 +2,7 @@ #define Z_BG_YDAN_MARUTA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgYdanMaruta; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index d6b7fcf476..9e6fca4b52 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -16,9 +16,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h index 467ec18383..300fb42cfc 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h @@ -2,7 +2,7 @@ #define Z_BG_YDAN_SP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgYdanSp; 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 7a12637b9d..f607fb4150 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_zg/object_zg.h" diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h index c7f1add3a5..7791107db3 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h @@ -2,7 +2,7 @@ #define Z_BG_ZG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BgZg; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 889dab02b7..56db81767b 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -17,10 +17,10 @@ #include "sys_matrix.h" #include "tex_len.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" #include "assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h" diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h index 191487f13f..3dbd41cd5e 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h @@ -2,7 +2,7 @@ #define Z_BOSS_DODONGO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossDodongo; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c index 3d0061bb35..ce2d694b11 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static u8 D_808C7000[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 3b80c5804c..5643da5d98 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -25,10 +25,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fd/object_fd.h" diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h index 1ec72040c9..99bd75c6d6 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h @@ -2,7 +2,7 @@ #define Z_BOSS_FD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossFd; diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c index 1012117e52..edd02bd7d9 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[19] = { { 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 856f9e34ea..efc154e97f 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -23,8 +23,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_fd2/object_fd2.h" diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h index d9fbde0ada..2c9fbf6b81 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h @@ -2,7 +2,7 @@ #define Z_BOSS_FD2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossFd2; diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c index 3a432692fe..2323528180 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[9] = { { diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 139d684deb..c9e41de7d7 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -21,10 +21,10 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h" #include "assets/objects/object_ganon/object_ganon.h" diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h index eb7fc2e2bf..4864087bc6 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h @@ -2,7 +2,7 @@ #define Z_BOSS_GANON_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossGanon; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index e2742e3bef..efe3f9583f 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -19,10 +19,10 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ganon/object_ganon.h" #include "assets/objects/object_ganon2/object_ganon2.h" diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h index c72fbd1e25..0258746798 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h @@ -2,7 +2,7 @@ #define Z_BOSS_GANON2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossGanon2; diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 848707f002..09f84081de 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -26,10 +26,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_gnd/object_gnd.h" diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h index 1fed43e428..df76f54750 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h @@ -2,8 +2,8 @@ #define Z_BOSS_GANONDROF_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct BossGanondrof; diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index bfd115b535..0d83b2b4a3 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -25,11 +25,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64environment.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "environment.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_goma/object_goma.h" diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h index 4e4c8ea955..7d8a3c9387 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h @@ -2,7 +2,7 @@ #define Z_BOSS_GOMA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossGoma; 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 c12ca1e950..4a1b0acbba 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -28,12 +28,12 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_mo/object_mo.h" diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h index 88867ceeda..54e95a74e7 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h @@ -2,7 +2,7 @@ #define Z_BOSS_MO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossMo; diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c index 1148cf1a99..8063245fa3 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[19] = { { diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index ccd825ad52..fd18b10ece 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -23,11 +23,11 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/objects/object_sst/object_sst.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h index caf4891ccb..1cd1f7663b 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h @@ -2,7 +2,7 @@ #define Z_BOSS_SST_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossSst; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c index 0016ff93d5..cb0e5012c1 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInitHand[11] = { { diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 85309e6e6b..79eb682a76 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -18,10 +18,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tw/object_tw.h" diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h index df62aeff37..17ce1ae4ca 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h @@ -2,7 +2,7 @@ #define Z_BOSS_TW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossTw; diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index f9e617573c..7cbbff4c3e 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -21,10 +21,10 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_bv/object_bv.h" diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h index 628831ad2f..60a35dd61c 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h @@ -2,7 +2,7 @@ #define Z_BOSS_VA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct BossVa; 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 1673a99601..076c395093 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -17,11 +17,11 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_demo_6k/object_demo_6k.h" diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h index 5849ccc236..3e88fb50ed 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h @@ -2,8 +2,8 @@ #define Z_DEMO_6K_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct Demo6K; 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 d3d275de9e..4bd2cf54e3 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -12,10 +12,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_du/object_du.h" diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h index ede2756e05..fbd557a6f7 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h @@ -2,7 +2,7 @@ #define Z_DEMO_DU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoDu; diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c index ad83a24185..1f8e223ba1 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c @@ -1,6 +1,6 @@ #include "sequence.h" -#include "z64cutscene_commands.h" -#include "z64player.h" +#include "cutscene_commands.h" +#include "player.h" // clang-format off static CutsceneData gFireMedallionCs[] = { 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 c2c86d8a04..817234eea7 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -14,8 +14,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_zo/object_zo.h" #include "assets/objects/object_ec/object_ec.h" diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h index 494338b27d..b850b071ac 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h @@ -2,7 +2,7 @@ #define Z_DEMO_EC_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoEc; 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 9eac9a59f6..b0594e2e53 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -16,13 +16,13 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64curve.h" -#include "z64draw.h" -#include "z64cutscene_flags.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "curve.h" +#include "draw.h" +#include "cutscene_flags.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_efc_crystal_light/object_efc_crystal_light.h" diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h index 12b22a1ad5..05747ff8dd 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h @@ -2,8 +2,8 @@ #define Z_DEMO_EFFECT_H #include "ultra64.h" -#include "z64actor.h" -#include "z64curve.h" +#include "actor.h" +#include "curve.h" struct DemoEffect; 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 8720d49df2..e4a944a0a2 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" -#include "z64skin.h" +#include "play_state.h" +#include "skin.h" #include "assets/objects/object_fhg/object_fhg.h" diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h index 2eadc4af69..e34a059d50 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h @@ -2,7 +2,7 @@ #define Z_DEMO_EXT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoExt; 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 5446d622fb..fe2fd1a13d 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_geff/object_geff.h" diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h index 03c6110fae..a70c72f593 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h @@ -2,7 +2,7 @@ #define Z_DEMO_GEFF_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoGeff; 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 3445287f34..03d2fdbf89 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -20,11 +20,11 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64draw.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "draw.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_gj/object_gj.h" diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h index 313788893f..a26987eb34 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h @@ -2,7 +2,7 @@ #define Z_DEMO_GJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h" 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 4ea8f4b685..2266a7c61e 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -15,8 +15,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h index 9abd5ed41c..9d68200c8d 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h @@ -2,7 +2,7 @@ #define Z_DEMO_GO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoGo; 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 006a9267d3..444e683285 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -14,11 +14,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64frame_advance.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "frame_advance.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_gt/object_gt.h" #include "assets/objects/object_geff/object_geff.h" diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h index 910c265939..0826a7bd81 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h @@ -2,7 +2,7 @@ #define Z_DEMO_GT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoGt; 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 a5dff0d4a3..ef3da8a40d 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -8,8 +8,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_ik/object_ik.h" diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h index b4f2ca74ea..4571fff288 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h @@ -2,7 +2,7 @@ #define Z_DEMO_IK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoIk; 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 508128f7be..81667318e8 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -18,9 +18,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" #include "assets/objects/object_im/object_im.h" diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h index 9477c21d8f..ac3e06250c 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h @@ -2,7 +2,7 @@ #define Z_DEMO_IM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoIm; diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c index 7a9a0dde84..210fcdc5b7 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "sequence.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gShadowMedallionCs[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 5518ce754e..60d023f6b8 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -10,13 +10,13 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64cutscene_commands.h" -#include "z64cutscene_flags.h" -#include "z64cutscene_spline.h" -#include "z64olib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "cutscene_commands.h" +#include "cutscene_flags.h" +#include "cutscene_spline.h" +#include "olib.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h index 06501904ac..1899cc05ba 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -2,7 +2,7 @@ #define Z_DEMO_KANKYO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoKankyo; diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c index 4e17a4a53c..1a082a9cbc 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c @@ -1,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpInCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c index 2a6e3f3e5d..439f78e05d 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpOutCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c index e742384ec2..d7d091cc55 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpInToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c index 53f2b5133a..731e9e286e 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpOutToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c index e1092b34dd..d9b6df92cb 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpInCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c index 9e8a7c6bc6..69b239655c 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpOutCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c index 3a718366c3..f4c06dbbc0 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpInToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c index 84e12ec7a8..740639ab29 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpOutToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index cd610f49e8..3ba0504137 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #include "assets/scenes/dungeons/ganontika/ganontika_scene.h" diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h index 182b1d587c..f800075019 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h @@ -2,7 +2,7 @@ #define Z_DEMO_KEKKAI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoKekkai; 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 5831c44b06..fb44ec0376 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -18,9 +18,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_sa/object_sa.h" diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h index 639d50a634..e9c0d5dc2e 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h @@ -2,7 +2,7 @@ #define Z_DEMO_SA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoSa; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c index 67edd6cb9f..5440aabf98 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_demo_sa.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gForestMedallionCs[] = { diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 549daf0db7..1c6ea8559b 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "sequence.h" #include "sys_matrix.h" -#include "z64audio.h" -#include "z64play.h" +#include "audio.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h index eb62a3983f..c8bdb04ded 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h @@ -2,7 +2,7 @@ #define Z_DEMO_SHD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DemoShd; diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 992417b888..ece0958ad2 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -6,9 +6,9 @@ #include "printf.h" #include "sfx.h" #include "translation.h" -#include "z64curve.h" -#include "z64play.h" -#include "z64save.h" +#include "curve.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_box/object_box.h" diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h index 47f6c35642..5b4947575b 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h @@ -2,8 +2,8 @@ #define Z_DEMO_TRE_LGT_H #include "ultra64.h" -#include "z64actor.h" -#include "z64curve.h" +#include "actor.h" +#include "curve.h" struct DemoTreLgt; diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 4034dafc91..80c94c19b1 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -11,10 +11,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64cutscene_flags.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "cutscene_flags.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h index 0092bd8f1a..2a8fa0eb38 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h @@ -2,7 +2,7 @@ #define Z_DOOR_ANA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DoorAna; diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 2f9f4e1183..5483a07db7 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -12,9 +12,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_door_gerudo/object_door_gerudo.h" diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h index efd2959767..5e9a5e5f35 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h @@ -2,7 +2,7 @@ #define Z_DOOR_GERUDO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DoorGerudo; diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 15d92cb18a..dc016d34b6 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -13,9 +13,9 @@ #include "segmented_address.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h index 32eaaeb014..e431e5337b 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h @@ -2,7 +2,7 @@ #define Z_DOOR_KILLER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" /* * Associated switch flag: (params >> 8) & 0x3F diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 05eec20ffa..3d0b9603dd 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -20,10 +20,10 @@ #include "quake.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_gnd/object_gnd.h" diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h index 8ab1c8a4c7..ac2706acdf 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h @@ -2,7 +2,7 @@ #define Z_DOOR_SHUTTER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" /** * Actor Parameters diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index ceef1f93f6..c4c9d2f25e 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -7,8 +7,8 @@ #include "z_door_toki.h" #include "ichain.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h index 8e276c56bd..fd0d8105b1 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h @@ -2,7 +2,7 @@ #define Z_DOOR_TOKI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct DoorToki; diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 1ec17157c9..dd99eb63c0 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -11,10 +11,10 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_warp1/object_warp1.h" diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h index ff8a89d9b1..b7a07cf20c 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -2,8 +2,8 @@ #define Z_DOOR_WARP1_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct DoorWarp1; diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 677458f186..53790dd7f4 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -7,9 +7,9 @@ #include "sequence.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_efc_erupc/object_efc_erupc.h" diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h index 888d9580ef..bf97f8e395 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h @@ -2,7 +2,7 @@ #define Z_EFC_ERUPC_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EfcErupc; diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index e8f9f26841..10875e547b 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -14,8 +14,8 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h index 153b6d4e2a..b107e82dd8 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h @@ -2,7 +2,7 @@ #define Z_EFF_DUST_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EffDust; 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 a7d57a402b..fd54803e25 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h index c95cbb527f..14412b5310 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h @@ -2,7 +2,7 @@ #define Z_ELF_MSG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ElfMsg; 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 0ea7232a41..11a01bc4b8 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h index 5a0a693415..70ae86801e 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h @@ -2,7 +2,7 @@ #define Z_ELF_MSG2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ElfMsg2; diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 507e29ba8f..6b382ca364 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -16,9 +16,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_am/object_am.h" diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h index a8335c5ad3..ce91429227 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.h +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -2,7 +2,7 @@ #define Z_EN_AM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnAm; 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..17d4eb62f2 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -13,9 +13,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_ani/object_ani.h" diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h index 454a7bd8d2..024f4310d1 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h @@ -2,7 +2,7 @@ #define Z_EN_ANI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnAni; 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 dca62ddf43..e6a697b21c 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -20,9 +20,9 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_anubice/object_anubice.h" diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h index 0ad49e2eb3..51b143fa1e 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h @@ -2,7 +2,7 @@ #define Z_EN_ANUBICE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnAnubice; diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 480940dc44..39cc72c383 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -14,9 +14,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_anubice/object_anubice.h" diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h index 34072a43b5..9e916c090a 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h @@ -2,7 +2,7 @@ #define Z_EN_ANUBICE_FIRE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnAnubiceFire; 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 2e05395897..6fe71f26ff 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 @@ -12,8 +12,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64play.h" +#include "debug_display.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h index 026d4d0199..afbc61970b 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h @@ -2,7 +2,7 @@ #define Z_EN_ANUBICE_TAG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnAnubiceTag; diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c index d4de5191ef..56b949ce7e 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c @@ -7,7 +7,7 @@ #include "z_en_arow_trap.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h index ba91505088..48252407a7 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h @@ -2,7 +2,7 @@ #define Z_EN_AROW_TRAP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnArowTrap; diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 3f0f7b66a5..c4a90bec05 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -17,8 +17,8 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index ba974c2105..e5d80928cd 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -2,8 +2,8 @@ #define Z_EN_ARROW_H #include "ultra64.h" -#include "z64actor.h" -#include "z64player.h" +#include "actor.h" +#include "player.h" struct EnArrow; diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 4a3a32663a..a7fd550149 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -15,9 +15,9 @@ #include "sfx.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h index a4d361542d..d460a43d9f 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h @@ -2,7 +2,7 @@ #define Z_EN_ATTACK_NIW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnAttackNiw; diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index a149d3c63d..462e8a5f1d 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -15,9 +15,9 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bxa/object_bxa.h" diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.h b/src/overlays/actors/ovl_En_Ba/z_en_ba.h index dc3b8cb3f6..3cb9b3582d 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.h +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.h @@ -2,7 +2,7 @@ #define Z_EN_BA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBa; diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 86b167bcae..0c055c9be9 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -17,9 +17,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_Bb/object_Bb.h" diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h index 0b7e85c461..8f5591dc78 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h @@ -2,7 +2,7 @@ #define Z_EN_BB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBb; diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 9c9d7bacfa..76462af1de 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -15,9 +15,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" +#include "light.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h index 876a790d71..9becdade1a 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h @@ -2,8 +2,8 @@ #define Z_EN_BDFIRE_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnBdfire; diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 7760866ae5..1ab5979a3c 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -12,10 +12,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bigokuta/object_bigokuta.h" diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h index c04da49c86..434cb521e7 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h @@ -2,7 +2,7 @@ #define Z_EN_BIGOKUTA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBigokuta; diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 7a6b7fd78b..0e7c532efb 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -17,8 +17,8 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_bl/object_bl.h" diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.h b/src/overlays/actors/ovl_En_Bili/z_en_bili.h index 3199639c9d..b0e58c4679 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.h +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.h @@ -2,7 +2,7 @@ #define Z_EN_BILI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBili; diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index c93d682ee1..771ee7dd15 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bird/object_bird.h" diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.h b/src/overlays/actors/ovl_En_Bird/z_en_bird.h index beaf60a3d4..8c9a2eb774 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.h +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.h @@ -2,7 +2,7 @@ #define Z_EN_BIRD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBird; diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 1d8d606cf3..813f16ce12 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_blkobj/object_blkobj.h" diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h index babddb4e5d..d8be8fb21f 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h @@ -2,7 +2,7 @@ #define Z_EN_BLKOBJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBlkobj; diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 31acad8cec..bf1c9ee479 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -14,9 +14,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h index 88c8feef5c..1dfee46406 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h @@ -2,7 +2,7 @@ #define Z_EN_BOM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBom; 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 435b0d4838..2fff5313e5 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 @@ -11,10 +11,10 @@ #include "sfx.h" #include "terminal.h" #include "translation.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_bg/object_bg.h" diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h index ffc4ae9efc..2b85ab84ac 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h @@ -2,7 +2,7 @@ #define Z_EN_BOM_BOWL_MAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" #include "overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.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 74d7ef5292..43207a9992 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 @@ -7,9 +7,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h index 711518848f..a75f4a9f72 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h @@ -2,7 +2,7 @@ #define Z_EN_BOM_BOWL_PIT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" struct EnBomBowlPit; diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 7ce476d4ef..6e9dc91695 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -11,9 +11,9 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h index 38ca8d20c6..dad96a02ea 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h @@ -2,7 +2,7 @@ #define Z_EN_BOM_CHU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBomChu; diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index ed1d7eed79..117343703e 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -15,9 +15,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bombf/object_bombf.h" diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h index 840da79c19..e805ae0ac1 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h @@ -2,7 +2,7 @@ #define Z_EN_BOMBF_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBombf; diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index b9dcbacb76..d70422b1d0 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 7a211880a4..f62edc7654 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -2,8 +2,8 @@ #define Z_EN_BOOM_H #include "ultra64.h" -#include "z64actor.h" -#include "z64player.h" +#include "actor.h" +#include "player.h" struct EnBoom; diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index c4ef15919a..23c9321356 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -12,13 +12,13 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64curve.h" -#include "z64effect.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "curve.h" +#include "effect.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_box/object_box.h" diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h index 1604b0d1bc..7bea0c4787 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.h +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -2,7 +2,7 @@ #define Z_EN_BOX_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define ENBOX_TREASURE_FLAG_UNK_MIN 20 #define ENBOX_TREASURE_FLAG_UNK_MAX 32 diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 436f4740c5..1dc0ea5e6e 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -11,8 +11,8 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_brob/object_brob.h" diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.h b/src/overlays/actors/ovl_En_Brob/z_en_brob.h index 02516f4e9b..1d3b785508 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.h +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.h @@ -2,7 +2,7 @@ #define Z_EN_BROB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBrob; diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 79860d7f7f..30de9c5bbb 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -8,8 +8,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_bubble/object_bubble.h" diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h index 9b183ae2bc..e90efefb29 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -2,7 +2,7 @@ #define Z_EN_BUBBLE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBubble; diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 2ec5e260f8..58a5392306 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -18,8 +18,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h index 1a1764520c..1a18cb681b 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h @@ -2,7 +2,7 @@ #define Z_EN_BUTTE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnButte; diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 3e82fd07cd..7f6b4ae99e 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -19,9 +19,9 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_bw/object_bw.h" diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.h b/src/overlays/actors/ovl_En_Bw/z_en_bw.h index fdcf31765f..fe9f8ef90a 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.h +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.h @@ -2,7 +2,7 @@ #define Z_EN_BW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBw; typedef void (*EnBwActionFunc)(struct EnBw*, struct PlayState*); diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 51896cbb7d..942cfdd6fb 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -14,9 +14,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bxa/object_bxa.h" diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.h b/src/overlays/actors/ovl_En_Bx/z_en_bx.h index 077def413d..be5872d959 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.h +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.h @@ -2,7 +2,7 @@ #define Z_EN_BX_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnBx; 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 a0b1e03921..ea951a0726 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -14,9 +14,9 @@ #include "regs.h" #include "terminal.h" #include "translation.h" -#include "z64debug_display.h" -#include "z64play.h" -#include "z64save.h" +#include "debug_display.h" +#include "play_state.h" +#include "save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.h b/src/overlays/actors/ovl_En_Changer/z_en_changer.h index 6807287787..45f8799a5f 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.h +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.h @@ -2,7 +2,7 @@ #define Z_EN_CHANGER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnChanger; diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 6bcbd62323..f3b7f3dc19 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -10,8 +10,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h index 6978941868..bd9b0c2a1a 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h @@ -2,7 +2,7 @@ #define Z_EN_CLEAR_TAG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnClearTag; diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index d459c93f6f..2c27b88f2c 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -13,10 +13,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h index e5602967e1..0ffd8529dd 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h @@ -2,7 +2,7 @@ #define Z_EN_COW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "assets/objects/object_cow/object_cow.h" #define COW_FLAG_PLAYER_NEARBY (1 << 1) diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 5fa951f44e..0182ad038f 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -7,9 +7,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_crow/object_crow.h" diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h index fb13e7bca6..058bef6e90 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h @@ -2,7 +2,7 @@ #define Z_EN_CROW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnCrow; 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..ce9f69f5cd 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -8,10 +8,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_cs/object_cs.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.h b/src/overlays/actors/ovl_En_Cs/z_en_cs.h index 8e1d665f54..304a1e443f 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.h +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.h @@ -2,7 +2,7 @@ #define Z_EN_CS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnCs; diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 98a09bb25e..628e7de831 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -10,10 +10,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_daiku/object_daiku.h" diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h index b191c1d79f..8b1e36786f 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h @@ -2,7 +2,7 @@ #define Z_EN_DAIKU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDaiku; 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..7401a84e38 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,10 +15,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_daiku/object_daiku.h" diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h index 1395b6e259..72ed1c7e3e 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h @@ -2,7 +2,7 @@ #define Z_EN_DAIKU_KAKARIKO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDaikuKakariko; diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index f9bb260404..d30784b4c1 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -9,10 +9,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_dekubaba/object_dekubaba.h" diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h index 46a8b8dbdf..f1cce28c07 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -2,7 +2,7 @@ #define Z_EN_DEKUBABA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDekubaba; diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 800ddacca6..dac88693bc 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_dekunuts/object_dekunuts.h" diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h index 76f23bdecf..a072dc2aa4 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h @@ -2,7 +2,7 @@ #define Z_EN_DEKUNUTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDekunuts; diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 4e9b399cfa..7870669259 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -18,11 +18,11 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_dh/object_dh.h" diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.h b/src/overlays/actors/ovl_En_Dh/z_en_dh.h index 0feb3069b5..d923144a73 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.h +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.h @@ -2,7 +2,7 @@ #define Z_EN_DH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDh; diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 9be8d65d94..559e4a7213 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -16,9 +16,9 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_dh/object_dh.h" diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.h b/src/overlays/actors/ovl_En_Dha/z_en_dha.h index f7cbd78d7b..9c6f0f7d18 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.h +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.h @@ -2,7 +2,7 @@ #define Z_EN_DHA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDha; 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 2871a1c308..bcb49b9250 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 @@ -19,12 +19,12 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_zo/object_zo.h" diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h index ccc211dc8b..f5e9c1cc77 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h @@ -2,7 +2,7 @@ #define Z_EN_DIVING_GAME_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDivingGame; 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 399f417aa1..8dd85d8c2e 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -15,10 +15,10 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h index 3a91a5362a..251cc4192b 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -2,7 +2,7 @@ #define Z_EN_DNS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" #define DNS_GET_TYPE(thisx) ((thisx)->params) 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 d851c96a08..53dc831f86 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 @@ -19,11 +19,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64debug_display.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "debug_display.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h index 29c302aed2..0fab1534e7 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h @@ -2,7 +2,7 @@ #define Z_EN_DNT_DEMO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDntDemo; 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 c89aa0d67f..dfaa49be28 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 @@ -23,10 +23,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_dns/object_dns.h" diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h index 540a8951a3..6272f8d916 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h @@ -2,7 +2,7 @@ #define Z_EN_DNT_JIJI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDntJiji; 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 ab5a70d82f..353f42e63c 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 @@ -24,10 +24,10 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_dnk/object_dnk.h" #include "assets/objects/object_hintnuts/object_hintnuts.h" diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h index 21f77798a0..8f8626a28a 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h @@ -2,7 +2,7 @@ #define Z_EN_DNT_NOMAL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDntNomal; diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index dba63237b4..2f276b25f4 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -14,9 +14,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_dodojr/object_dodojr.h" diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h index 615304cb01..c90c5be548 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h @@ -2,7 +2,7 @@ #define Z_EN_DODOJR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDodojr; diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 602e879afb..c7446c4f19 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -12,9 +12,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_dodongo/object_dodongo.h" diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h index bbaab19f82..4196409607 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -2,7 +2,7 @@ #define Z_EN_DODONGO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDodongo; diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 0255b01626..4f25c38d08 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_dog/object_dog.h" diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h index c3cdfd913b..7595d752ae 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h @@ -2,7 +2,7 @@ #define Z_EN_DOG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDog; diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 9f5bd8723e..b4bdd073f4 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -13,10 +13,10 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h index 4b4f95c466..60ed932eac 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.h +++ b/src/overlays/actors/ovl_En_Door/z_en_door.h @@ -2,7 +2,7 @@ #define Z_EN_DOOR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" /** * Actor Parameters diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 3c879ee1ac..1568736109 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -11,9 +11,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ds/object_ds.h" diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.h b/src/overlays/actors/ovl_En_Ds/z_en_ds.h index 9c7df969c6..40adaa8c47 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.h +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.h @@ -2,7 +2,7 @@ #define Z_EN_DS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDs; 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 1f716b977d..a89c572a83 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -7,12 +7,12 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_du/object_du.h" #include "assets/scenes/overworld/spot18/spot18_scene.h" diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.h b/src/overlays/actors/ovl_En_Du/z_en_du.h index 9e3ecb8805..e832b32071 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.h +++ b/src/overlays/actors/ovl_En_Du/z_en_du.h @@ -2,7 +2,7 @@ #define Z_EN_DU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDu; 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 804e04ad84..a3ae11bf61 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 @@ -15,7 +15,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_dy_obj/object_dy_obj.h" diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h index cf0fba2ea1..a093b62b31 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h @@ -2,7 +2,7 @@ #define Z_EN_DY_EXTRA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnDyExtra; 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 b4da54551d..87558e258d 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -14,8 +14,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.h b/src/overlays/actors/ovl_En_Eg/z_en_eg.h index c42994f61c..4636ad9149 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.h +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.h @@ -2,7 +2,7 @@ #define Z_EN_EG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnEg; diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 35239e2dcb..f0a5b4466e 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -7,9 +7,9 @@ #include "sfx.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ei/object_ei.h" diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h index 7626924496..b9e19f884f 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h @@ -2,7 +2,7 @@ #define Z_EN_EIYER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnEiyer; diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 58cd30f3ff..b40e670140 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -19,13 +19,13 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64quest_hint.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "quest_hint.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h index 60e9940d75..2c796cfbbc 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -2,8 +2,8 @@ #define Z_EN_ELF_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnElf; 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 92374ad12a..d43571b7d6 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -8,10 +8,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "debug_display.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h index b9c8c1d882..73486e493b 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -2,7 +2,7 @@ #define Z_EN_ENCOUNT1_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define SPAWNER_PARAMS(type, number, total) ((type << 0xB) | (number << 0x6) | total) 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 c3604dd321..9234904d05 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -12,9 +12,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h index c91c7a7512..20095e4cd3 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h @@ -2,7 +2,7 @@ #define Z_EN_ENCOUNT2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnEncount2; 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 e9c0d12dda..6c232529e7 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 @@ -17,10 +17,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64draw.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "draw.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h index eba20bc116..1783672579 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h @@ -2,7 +2,7 @@ #define Z_EN_EX_ITEM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnExItem; 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 0777494e6a..c9dd249402 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 @@ -13,9 +13,9 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h index 7ba20450e8..1e3b6ece87 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h @@ -2,7 +2,7 @@ #define Z_EN_EX_RUPPY_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnExRuppy; diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 475c476bb5..8050aef560 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -16,9 +16,9 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fw/object_fw.h" diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.h b/src/overlays/actors/ovl_En_Fd/z_en_fd.h index 3fc40a54cf..81774fac66 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.h +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.h @@ -2,7 +2,7 @@ #define Z_EN_FD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnFd; diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index b124094a2c..a26b54a64a 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -6,8 +6,8 @@ #include "rand.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h index d027a07972..3100b31e72 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h @@ -2,7 +2,7 @@ #define Z_EN_FD_FIRE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnFdFire; diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 3eeb70ecb2..793f6a5e82 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -22,9 +22,9 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fhg/object_fhg.h" diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h index 59136f7dfd..fbdb9d8c62 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h @@ -2,8 +2,8 @@ #define Z_EN_FHG_FIRE_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnFhgFire; 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 10b2e7fb54..f07d0ac868 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 @@ -12,10 +12,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "debug_display.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h index 9b88eaa2c0..0bd9ab2e65 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h @@ -2,7 +2,7 @@ #define Z_EN_FIRE_ROCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 5604e83b74..e3df3a19f1 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -17,9 +17,9 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_firefly/object_firefly.h" diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h index 7638036a82..d49e8b1943 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -2,7 +2,7 @@ #define Z_EN_FIREFLY_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnFirefly; 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 f5964ebaea..ce2cb23937 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -15,9 +15,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64item.h" -#include "z64play.h" -#include "z64player.h" +#include "item.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h index d75de5b0a5..8019ff06cb 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h @@ -2,7 +2,7 @@ #define Z_EN_FISH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnFish; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 4f31952f72..2c102649c3 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -13,10 +13,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_wallmaster/object_wallmaster.h" diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h index 4aefd1ad97..7c96d195b6 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -2,7 +2,7 @@ #define Z_EN_FLOORMAS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef struct EnFloormas EnFloormas; 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 00d29dcc6f..17889ad568 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -15,14 +15,14 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "debug_display.h" +#include "effect.h" +#include "light.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_fr/object_fr.h" diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h index 2bed02b4a0..541fa5ae12 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -2,8 +2,8 @@ #define Z_EN_FR_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnFr; 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..e8cfb6342f 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -12,11 +12,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_fu/object_fu.h" #include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h" diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h index af90b2cf05..d2138f7613 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h @@ -2,7 +2,7 @@ #define Z_EN_FU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnFu; diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index ba002aefbe..9d8b9e5aa3 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fw/object_fw.h" diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.h b/src/overlays/actors/ovl_En_Fw/z_en_fw.h index b19f967111..6bc847f3c1 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.h +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.h @@ -2,7 +2,7 @@ #define Z_EN_FW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnFw; diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 73ee412ee5..fc0c1363bb 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -9,8 +9,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_fz/object_fz.h" diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h index 277e039e2d..891ae41d94 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h @@ -2,7 +2,7 @@ #define Z_EN_FZ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnFz; 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 5a6ad4a323..bc8c75c255 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 @@ -22,12 +22,12 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "debug_display.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h index c680fb1440..85f77284d5 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h @@ -2,7 +2,7 @@ #define Z_EN_G_SWITCH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGSwitch; diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 6f3156037f..c7f32b7bd7 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "tex_len.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h index 61bf1826bc..84d6ecce90 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h @@ -2,7 +2,7 @@ #define Z_EN_GANON_MANT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGanonMant; diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index a002ce5e1b..6237f84e06 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h index 8d20bee4d3..5e5f4a577c 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h @@ -2,7 +2,7 @@ #define Z_EN_GANON_ORGAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGanonOrgan; diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 9565ceba98..ccf8740470 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -16,10 +16,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ps/object_ps.h" diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.h b/src/overlays/actors/ovl_En_Gb/z_en_gb.h index 24b7d30560..5f12f4b360 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.h +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.h @@ -2,8 +2,8 @@ #define Z_EN_GB_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnGb; 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 8b6d821346..6d08efd921 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -16,11 +16,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64horse.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "horse.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ge1/object_ge1.h" diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h index 6aaaf2ab37..077f0f9cc0 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h @@ -2,7 +2,7 @@ #define Z_EN_GE1_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGe1; 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 704ca69543..c40402d602 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -15,11 +15,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64horse.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "horse.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_gla/object_gla.h" diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h index b453531040..27094a5833 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h @@ -2,7 +2,7 @@ #define Z_EN_GE2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGe2; diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 5e0783bc30..ad77c01118 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -13,9 +13,9 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64item.h" -#include "z64play.h" -#include "z64player.h" +#include "item.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_geldb/object_geldb.h" diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h index d767ba6d9a..62b9882055 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h @@ -2,7 +2,7 @@ #define Z_EN_GE3_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_GeldB/z_en_geldb.h" struct EnGe3; diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index e24904798e..11850ccdf5 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -17,11 +17,11 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_geldb/object_geldb.h" diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h index a2c9563ac6..a5ce4286b5 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h @@ -2,7 +2,7 @@ #define Z_EN_GELDB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGeldB; 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 da20b5db11..4bfe862466 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -12,9 +12,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64draw.h" -#include "z64play.h" -#include "z64save.h" +#include "draw.h" +#include "play_state.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index 504837044e..21439399b5 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -2,7 +2,7 @@ #define Z_EN_GIRLA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGirlA; 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 0c904a8808..3c0b766413 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -16,9 +16,9 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" #include "assets/objects/object_gm/object_gm.h" diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h index d5234bde14..653bd72a59 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h @@ -2,7 +2,7 @@ #define Z_EN_GM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGm; diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 4f7f47630f..aa911c2f19 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -11,9 +11,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h index 691472aef6..d18cb6e99c 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.h +++ b/src/overlays/actors/ovl_En_Go/z_en_go.h @@ -2,7 +2,7 @@ #define Z_EN_GO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGo; 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 61c3d5f6e1..d437df1c08 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -14,11 +14,11 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h index 0c49a30363..2bec2f55d9 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h @@ -2,7 +2,7 @@ #define Z_EN_GO2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_Go/z_en_go.h" struct EnGo2; diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 82175795bd..d13c4a85f8 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -18,9 +18,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_gol/object_gol.h" diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.h b/src/overlays/actors/ovl_En_Goma/z_en_goma.h index 6b2f7cf309..04a14e9a7e 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.h +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.h @@ -2,7 +2,7 @@ #define Z_EN_GOMA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum GomaType { /* 0 */ ENGOMA_NORMAL, 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 dfd8130d8d..06e1dae817 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -19,9 +19,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h index 26a5810a2d..805e13ef00 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h @@ -2,7 +2,7 @@ #define Z_EN_GOROIWA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGoroiwa; diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 8beef25775..77db13b027 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -15,10 +15,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_gs/object_gs.h" diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h index d7abdc676f..45503245f8 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h @@ -2,7 +2,7 @@ #define Z_EN_GS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGs; 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 91a896632d..9dd16fe237 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -16,9 +16,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_os_anime/object_os_anime.h" #include "assets/objects/object_boj/object_boj.h" diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.h b/src/overlays/actors/ovl_En_Guest/z_en_guest.h index 92dbc72d5c..e7e2395437 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.h +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.h @@ -2,7 +2,7 @@ #define Z_EN_GUEST_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnGuest; diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 27cd1341ce..2b4133c39f 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -12,7 +12,7 @@ #include "rand.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hata/object_hata.h" diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h index 82f6ba1a8b..53d31bab58 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h @@ -2,7 +2,7 @@ #define Z_EN_HATA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum EnHataLimb { 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 3a0347e555..94b2d43368 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -19,11 +19,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "debug_display.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h index bc1837241e..739aeab546 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h @@ -2,7 +2,7 @@ #define Z_EN_HEISHI1_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHeishi1; 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 abb33f3fe3..3d6a7cb7dc 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -18,10 +18,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.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_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h index 3753012bee..30305aeb8b 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h @@ -2,7 +2,7 @@ #define Z_EN_HEISHI2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHeishi2; 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 8e03fe3e62..075c5f8cb0 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -14,9 +14,9 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h index 57eb11c61c..4ed1e47f89 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h @@ -2,7 +2,7 @@ #define Z_EN_HEISHI3_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHeishi3; 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 6a7866f17d..ced83c19c4 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -5,10 +5,10 @@ #include "printf.h" #include "terminal.h" #include "translation.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h index 9ab928fe3e..57a2b436dc 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h @@ -2,7 +2,7 @@ #define Z_EN_HEISHI4_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum Heishi4Type { /* 0x00 */ HEISHI4_AT_KAKARIKO_ENTRANCE, diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 454f83c2d0..72a6fb9d63 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -10,7 +10,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hintnuts/object_hintnuts.h" diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h index a24b387fe1..222c08bd29 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h @@ -2,7 +2,7 @@ #define Z_EN_HINTNUTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHintnuts; diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 98df8ae242..6f9a589458 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -5,9 +5,9 @@ #include "ichain.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h index 4a9409373a..f1c8f49ac7 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h @@ -2,7 +2,7 @@ #define Z_EN_HOLL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define ENHOLL_GET_TYPE(thisx) PARAMS_GET_U((thisx)->params, 6, 3) #define ENHOLL_GET_SWITCH_FLAG(thisx) PARAMS_GET_U((thisx)->params, 0, 6) diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 5f884f8997..2fa5d13382 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -17,9 +17,9 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h index debd2bfb7c..1b78e692fb 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -2,7 +2,7 @@ #define Z_EN_HONOTRAP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHonotrap; diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index dded516560..e3359b4181 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -23,13 +23,13 @@ #include "sys_math3d.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64horse.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "audio.h" +#include "effect.h" +#include "horse.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/objects/object_horse/object_horse.h" #include "assets/objects/object_hni/object_hni.h" diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index 0eed5c001c..db953948fe 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -2,8 +2,8 @@ #define Z_EN_HORSE_H #include "ultra64.h" -#include "z64actor.h" -#include "z64skin.h" +#include "actor.h" +#include "skin.h" typedef enum EnHorseAction { /* 0 */ ENHORSE_ACT_FROZEN, diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index dc23954d50..56f09ec2d8 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -17,9 +17,9 @@ #include "sys_math3d.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h index 84ab117216..f3e8cd7d4a 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h @@ -2,7 +2,7 @@ #define Z_EN_HORSE_GAME_CHECK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHorseGameCheckBase; diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index e1991688a1..b5f402ba1d 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -13,9 +13,9 @@ #include "sfx.h" #include "sys_math3d.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64skin.h" +#include "play_state.h" +#include "player.h" +#include "skin.h" #include "assets/objects/object_horse_ganon/object_horse_ganon.h" diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h index 473f6cecb4..41a659079b 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h @@ -2,8 +2,8 @@ #define Z_EN_HORSE_GANON_H #include "ultra64.h" -#include "z64actor.h" -#include "z64skin.h" +#include "actor.h" +#include "skin.h" struct EnHorseGanon; diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 1610147130..7e1282d880 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -16,12 +16,12 @@ #include "sfx.h" #include "sys_math3d.h" #include "z_lib.h" -#include "z64actor.h" -#include "z64horse.h" -#include "z64player.h" -#include "z64play.h" -#include "z64save.h" -#include "z64skin.h" +#include "actor.h" +#include "horse.h" +#include "player.h" +#include "play_state.h" +#include "save.h" +#include "skin.h" #include "assets/objects/object_horse_link_child/object_horse_link_child.h" diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h index a4e9b512d7..54656fb547 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h @@ -2,8 +2,8 @@ #define Z_EN_HORSE_LINK_CHILD_H #include "ultra64.h" -#include "z64actor.h" -#include "z64skin.h" +#include "actor.h" +#include "skin.h" struct EnHorseLinkChild; diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 300711ff37..c3713febb6 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -17,10 +17,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" -#include "z64skin.h" -#include "z64skin_matrix.h" +#include "play_state.h" +#include "save.h" +#include "skin.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_horse_normal/object_horse_normal.h" diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h index 01ddd44608..06f7237322 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h @@ -2,8 +2,8 @@ #define Z_EN_HORSE_NORMAL_H #include "ultra64.h" -#include "z64actor.h" -#include "z64skin.h" +#include "actor.h" +#include "skin.h" struct EnHorseNormal; diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index fb59c5b84a..2906e541cd 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_math3d.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_horse_zelda/object_horse_zelda.h" diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h index 86b851c77b..353e09d6ec 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h @@ -2,8 +2,8 @@ #define Z_EN_HORSE_ZELDA_H #include "ultra64.h" -#include "z64actor.h" -#include "z64skin.h" +#include "actor.h" +#include "skin.h" struct EnHorseZelda; 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 76281c549f..757eab0a77 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -14,9 +14,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_hs/object_hs.h" diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h index f938b51518..cf2097c11a 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h @@ -2,7 +2,7 @@ #define Z_EN_HS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHs; 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 d63bc0c0ba..453ab7f659 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -13,8 +13,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" +#include "face_reaction.h" +#include "play_state.h" #include "assets/objects/object_hs/object_hs.h" diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h index dec1533f89..7732d7b7c2 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h @@ -2,7 +2,7 @@ #define Z_EN_HS2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnHs2; 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 8680d13aa6..bcc58becb1 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -15,11 +15,11 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_aob/object_aob.h" #include "assets/objects/object_ahg/object_ahg.h" diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.h b/src/overlays/actors/ovl_En_Hy/z_en_hy.h index 50bdc90933..7a49efb396 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.h +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.h @@ -2,7 +2,7 @@ #define Z_EN_HY_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define ENHY_GET_TYPE(thisx) PARAMS_GET_S((thisx)->params, 0, 7) #define ENHY_GET_PATH_INDEX(thisx) PARAMS_GET_S((thisx)->params, 7, 4) diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index b165f34647..86e86a8065 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64item.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" +#include "item.h" +#include "light.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h index ea975199aa..8cdef19fbd 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h @@ -2,8 +2,8 @@ #define Z_EN_ICE_HONO_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnIceHono; 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 690d2d29d9..2dfee076b2 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -21,12 +21,12 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h" #include "assets/objects/object_ik/object_ik.h" diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h index e9fb906d52..9ae2a9cee4 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -2,7 +2,7 @@ #define Z_EN_IK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnIk; 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 521b8dcbfa..3fb2a8f5e9 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -14,11 +14,11 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_in/object_in.h" diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h index 00774d0ddb..78d8f89170 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.h +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -2,7 +2,7 @@ #define Z_EN_IN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnIn; 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 8695ba0a58..dd215680c9 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -17,10 +17,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h index 7bf443a2ea..e5e938176a 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h @@ -2,7 +2,7 @@ #define Z_EN_INSECT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnInsect; 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 de24197b7d..aedb18900b 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -23,9 +23,9 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64item.h" -#include "z64play.h" +#include "effect.h" +#include "item.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h index 731929a384..5139e851b7 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h @@ -2,7 +2,7 @@ #define Z_EN_ISHI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" // The switch flag value for this actor is constructed in a unique way. // There are two separate param values which get OR'd together to create one final switch flag index. diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index 975fe8411f..2faea7fb6e 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -6,7 +6,7 @@ #include "z_en_it.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_It/z_en_it.h b/src/overlays/actors/ovl_En_It/z_en_it.h index 9f1f794e4f..6d1992ecd6 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.h +++ b/src/overlays/actors/ovl_En_It/z_en_it.h @@ -2,7 +2,7 @@ #define Z_EN_IT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnIt; diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 3f6b3c587c..917c765c7e 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -14,9 +14,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_jj/object_jj.h" diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.h b/src/overlays/actors/ovl_En_Jj/z_en_jj.h index 9ac2df8bb4..7b37ee0058 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.h +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.h @@ -2,7 +2,7 @@ #define Z_EN_JJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnJj; diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c index 0cf56d63e6..35a67d6972 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_jj.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gJabuInhalingCs[] = { diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index f5aee34c6a..7e570bdd56 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -11,8 +11,8 @@ #include "regs.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_js/object_js.h" diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h index e1e22f547d..8add36574b 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.h +++ b/src/overlays/actors/ovl_En_Js/z_en_js.h @@ -2,7 +2,7 @@ #define Z_EN_JS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnJs; diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 25e98efe6a..fc3ff48de1 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -15,9 +15,9 @@ #include "sys_matrix.h" #include "tex_len.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h index b6c4b07591..18c3afc26c 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h @@ -2,7 +2,7 @@ #define Z_EN_JSJUTAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnJsjutan; 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 b94806e585..71a3eae57f 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -17,10 +17,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ka/object_ka.h" diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h index c2eff368ca..4e7df38313 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h @@ -2,7 +2,7 @@ #define Z_EN_KAKASI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKakasi; 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 216365d4c6..e4b3dbf9e6 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -14,11 +14,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "debug_display.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ka/object_ka.h" diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h index c3398d7e7f..ae93150f04 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h @@ -2,7 +2,7 @@ #define Z_EN_KAKASI2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKakasi2; 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 254d4d8f4b..15859de70f 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -17,10 +17,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ka/object_ka.h" diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h index e09b98a9fb..d301d4c077 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h @@ -2,7 +2,7 @@ #define Z_EN_KAKASI3_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKakasi3; 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 67778ccfbd..a7cc77a262 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -19,11 +19,11 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_kanban/object_kanban.h" diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h index 36efa211df..c8839c89bf 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h @@ -2,7 +2,7 @@ #define Z_EN_KANBAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKanban; diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index be3b0eacb5..3a128a5b12 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -13,10 +13,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_dekubaba/object_dekubaba.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h index 97b04f1a7f..347cafa189 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h @@ -2,7 +2,7 @@ #define Z_EN_KAREBABA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKarebaba; 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 348c3a0acc..1ad021f692 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -16,10 +16,10 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_fa/object_fa.h" #include "assets/objects/object_os_anime/object_os_anime.h" diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.h b/src/overlays/actors/ovl_En_Ko/z_en_ko.h index d9531e57e6..1de4967f28 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.h +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.h @@ -2,7 +2,7 @@ #define Z_EN_KO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKo; 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 771d9377d8..9a5a41119f 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -18,8 +18,8 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h index a375581cf9..85ed0d5407 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h @@ -2,7 +2,7 @@ #define Z_EN_KUSA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKusa; 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..81aacf1335 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_kz/object_kz.h" diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.h b/src/overlays/actors/ovl_En_Kz/z_en_kz.h index 933fbe2617..f05b123712 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.h +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.h @@ -2,7 +2,7 @@ #define Z_EN_KZ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnKz; diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index f0cc5dddc6..8d9640a2ad 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -12,9 +12,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64light.h" -#include "z64play.h" -#include "z64save.h" +#include "light.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h index 035471f47d..94f7004036 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.h +++ b/src/overlays/actors/ovl_En_Light/z_en_light.h @@ -2,8 +2,8 @@ #define Z_EN_LIGHT_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnLight; diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index b4bd3af91b..097564b021 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -9,7 +9,7 @@ #include "regs.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_lightbox/object_lightbox.h" diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h index c09c77f850..232daedc8f 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h @@ -2,7 +2,7 @@ #define Z_EN_LIGHTBOX_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnLightbox; diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 2097bb9d26..eef5e1c0b9 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -7,7 +7,7 @@ #include "z_en_m_fire1.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h index 59ebb44318..091c6e268a 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h @@ -2,7 +2,7 @@ #define Z_EN_M_FIRE1_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMFire1; diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index ba34f9adcc..1a64d485d3 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -6,11 +6,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h index 8c7cdd7a1f..7332cdcf21 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h @@ -2,8 +2,8 @@ #define Z_EN_M_THUNDER_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnMThunder; 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 9c1689a524..1709fb037c 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -12,12 +12,12 @@ #include "sequence.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ma1/object_ma1.h" diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h index 3664fc98a8..10cc508afd 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h @@ -2,7 +2,7 @@ #define Z_EN_MA1_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMa1; 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 aed88bb92c..88098c93bf 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -7,12 +7,12 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ma2/object_ma2.h" diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h index 81fddf7672..c312591b94 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h @@ -2,7 +2,7 @@ #define Z_EN_MA2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMa2; diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index cdac009221..a685945a2a 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -14,10 +14,10 @@ #include "sys_matrix.h" #include "z_lib.h" #include "versions.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ma2/object_ma2.h" diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h index ecf637561e..a6bb2096f3 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h @@ -2,7 +2,7 @@ #define Z_EN_MA3_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMa3; diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 5c1e68f77d..849eee33d8 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -20,11 +20,11 @@ #include "sfx.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64cutscene_flags.h" -#include "z64play.h" -#include "z64save.h" -#include "z64ss_sram.h" +#include "audio.h" +#include "cutscene_flags.h" +#include "play_state.h" +#include "save.h" +#include "ss_sram.h" #include "assets/objects/object_mag/object_mag.h" diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h index ace8427278..07733d40ce 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h @@ -2,8 +2,8 @@ #define Z_EN_MAG_H #include "ultra64.h" -#include "z64actor.h" -#include "z64message.h" +#include "actor.h" +#include "message.h" struct EnMag; diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index a2700bd6b5..8c1413bc0f 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -18,9 +18,9 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mb/object_mb.h" diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.h b/src/overlays/actors/ovl_En_Mb/z_en_mb.h index 31b621b1bb..c8413b8173 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.h +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.h @@ -2,7 +2,7 @@ #define Z_EN_MB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMb; 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..3059baa7bb 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -14,11 +14,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_md/object_md.h" diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.h b/src/overlays/actors/ovl_En_Md/z_en_md.h index bfd9b0450a..3b5cc079bb 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.h +++ b/src/overlays/actors/ovl_En_Md/z_en_md.h @@ -2,7 +2,7 @@ #define Z_EN_MD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMd; 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..59257e93d3 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -11,10 +11,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_mk/object_mk.h" diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h index 53df56b76a..d9c85a90d8 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h @@ -2,7 +2,7 @@ #define Z_EN_MK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMk; 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..9881334a0a 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -14,10 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_mm/object_mm.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.h b/src/overlays/actors/ovl_En_Mm/z_en_mm.h index 555073753f..b7def02740 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.h +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.h @@ -2,7 +2,7 @@ #define Z_EN_MM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMm; 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 2144294ab3..187b576594 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -16,8 +16,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_mm/object_mm.h" diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h index 8e48261d7c..e855b99c88 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h @@ -2,7 +2,7 @@ #define Z_EN_MM2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMm2; 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..e9012fb1e4 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -10,9 +10,9 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "printf.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_ms/object_ms.h" diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h index 9ace7bc2d0..77a19a5004 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h @@ -2,7 +2,7 @@ #define Z_EN_MS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMs; 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..78229fc754 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -10,9 +10,9 @@ #include "gfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_mu/object_mu.h" diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.h b/src/overlays/actors/ovl_En_Mu/z_en_mu.h index 417ce242b1..0fce157890 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.h +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.h @@ -2,7 +2,7 @@ #define Z_EN_MU_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnMu; 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 1c937e8721..c2120b1fc9 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -21,10 +21,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_nb/object_nb.h" diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h index 3ed08cbf8e..397c6b63a2 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h @@ -2,7 +2,7 @@ #define Z_EN_NB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnNb; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c index 3c3a68311c..15d6ff298f 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_nb.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gSpiritMedallionCs[] = { 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 e7a908bff2..7c1445813f 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -24,10 +24,10 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h index a0f58d0a35..b64180af22 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h @@ -2,7 +2,7 @@ #define Z_EN_NIW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnNiw; 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 fbbe63dca8..8949be2892 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 @@ -17,9 +17,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_gr/object_gr.h" diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h index 422cf33e48..2651d95d8f 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h @@ -2,7 +2,7 @@ #define Z_EN_NIW_GIRL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnNiwGirl; 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 1ea6397096..2ea1ace664 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 @@ -13,10 +13,10 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ane/object_ane.h" #include "assets/objects/object_os_anime/object_os_anime.h" diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h index a6167454da..124efa5947 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h @@ -2,7 +2,7 @@ #define Z_EN_NIW_LADY_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnNiwLady; diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 3511a3c45d..9417316e4c 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -11,10 +11,10 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_dekunuts/object_dekunuts.h" #include "assets/objects/object_hintnuts/object_hintnuts.h" diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h index bcd4e0a936..9af4b042d7 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h @@ -2,7 +2,7 @@ #define Z_EN_NUTSBALL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define NUTSBALL_GET_TYPE(thisx) ((thisx)->params) diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index a5f322def6..4d5ec7f3ca 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -11,7 +11,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_nwc/object_nwc.h" diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h index fbb64d1ca2..5e33e2fd36 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h @@ -2,7 +2,7 @@ #define Z_EN_NWC_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnNwc; struct EnNwcChick; diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 172d8b912b..38167bef26 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -12,8 +12,8 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_ny/object_ny.h" diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.h b/src/overlays/actors/ovl_En_Ny/z_en_ny.h index 03cace42fb..714858408f 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.h +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.h @@ -2,7 +2,7 @@ #define Z_EN_NY_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnNy; diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c index f568d1812b..1d6b8dec43 100644 --- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c +++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c @@ -6,7 +6,7 @@ #include "z_en_oe2.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h index 062e103819..35cd7f65f8 100644 --- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h +++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h @@ -2,7 +2,7 @@ #define Z_EN_OE2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnOE2; 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 5b361c6f1f..d58918ea82 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 @@ -12,12 +12,12 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64cutscene_flags.h" -#include "z64debug_display.h" -#include "z64frame_advance.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "cutscene_flags.h" +#include "debug_display.h" +#include "frame_advance.h" +#include "play_state.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h index bca8c99234..2596766d3a 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h @@ -2,7 +2,7 @@ #define Z_EN_OKARINA_EFFECT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnOkarinaEffect; 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 eb2b9e5ec2..601299706c 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 @@ -15,12 +15,12 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64debug_display.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "debug_display.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" #include "assets/scenes/overworld/spot02/spot02_scene.h" diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h index 76ac1581a5..4e0fff553c 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h @@ -2,7 +2,7 @@ #define Z_EN_OKARINA_TAG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnOkarinaTag; diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c index 2ff69c780e..fde49023cd 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c @@ -1,6 +1,6 @@ #include "sequence.h" -#include "z64cutscene_commands.h" -#include "z64player.h" +#include "cutscene_commands.h" +#include "player.h" // clang-format off CutsceneData gWindmillSpinningFasterCs[] = { diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index f52ba1d54c..1503bb265c 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -8,10 +8,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_okuta/object_okuta.h" diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h index 5409481022..0e0a7a74eb 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h @@ -2,7 +2,7 @@ #define Z_EN_OKUTA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnOkuta; 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 c96cdb270b..ab3c142984 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -15,9 +15,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_ossan/object_ossan.h" diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index 7df4be57b8..e1b9e4691d 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -2,7 +2,7 @@ #define Z_EN_OSSAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnOssan; 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 3ec065c696..cd5da7dd2f 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -22,10 +22,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_owl/object_owl.h" #include "assets/scenes/overworld/spot06/spot06_scene.h" diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h index 2f9e0939f8..5ba352a4c4 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h @@ -2,7 +2,7 @@ #define Z_EN_OWL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnOwl; diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index c10a8edcb4..27956fd3d4 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -15,9 +15,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_tite/object_tite.h" #include "assets/objects/object_ik/object_ik.h" diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h index 405e795e75..e6b618fcb9 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.h +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -2,7 +2,7 @@ #define Z_EN_PART_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnPart; diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index ec59725c25..a4225d0ff4 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -12,10 +12,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_peehat/object_peehat.h" diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h index deb24089f6..2f554ef29e 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -2,7 +2,7 @@ #define Z_EN_PEEHAT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum PeahatType { /* -1 */ PEAHAT_TYPE_GROUNDED = -1, diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 8110c00f3e..caf492b8be 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64light.h" -#include "z64play.h" +#include "light.h" +#include "play_state.h" #include "assets/objects/object_po_field/object_po_field.h" diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h index 3f93eeb01d..729388ca19 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h @@ -2,8 +2,8 @@ #define Z_EN_PO_DESERT_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnPoDesert; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 83bd58ec90..2989292f7f 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -14,11 +14,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_field/object_po_field.h" diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h index 17e08ee999..06f36af808 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h @@ -2,8 +2,8 @@ #define Z_EN_PO_FIELD_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnPoField; diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 983dbf0d71..b2effdffed 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -17,11 +17,11 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_tk/object_tk.h" diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h index e4a440d940..483208f9f0 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h @@ -2,8 +2,8 @@ #define Z_EN_PO_RELAY_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnPoRelay; diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 155a5625a3..fcd5a3ce27 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -17,11 +17,11 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h index bc25e9d035..fdfd734360 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h @@ -2,8 +2,8 @@ #define Z_EN_PO_SISTERS_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnPoSisters; diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 930708bc24..b6e7232852 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -14,11 +14,11 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "light.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_poh/object_poh.h" #include "assets/objects/object_po_composer/object_po_composer.h" diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h index 7e7db7d997..6973719638 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -2,8 +2,8 @@ #define Z_EN_POH_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct EnPoh; diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index e984f316f7..5f72ceeb4d 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -8,7 +8,7 @@ #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_pu_box/object_pu_box.h" diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h index cd15c66c18..c128c86dfb 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h @@ -2,7 +2,7 @@ #define Z_EN_PU_BOX_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnPubox; diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 701ce5a5f3..3091697443 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -16,10 +16,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_rd/object_rd.h" diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index b2e9f3a271..1e85e119f8 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -2,7 +2,7 @@ #define Z_EN_RD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnRd; 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 f672e9c4c9..1cb43e2481 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -20,10 +20,10 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "debug_display.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_reeba/object_reeba.h" diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h index a357af86ef..9f4ba8c07d 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h @@ -2,7 +2,7 @@ #define Z_EN_REEBA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnReeba; diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 871cf6668f..1b1d066b00 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -10,10 +10,10 @@ #include "sequence.h" #include "sfx.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h index 4332af6021..1b9622ae53 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h @@ -2,7 +2,7 @@ #define Z_EN_RIVER_SOUND_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnRiverSound; 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 ff57761161..83b51453e5 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -14,9 +14,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_rl/object_rl.h" diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.h b/src/overlays/actors/ovl_En_Rl/z_en_rl.h index 9ce9949aa6..b06f3fff09 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.h +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.h @@ -2,7 +2,7 @@ #define Z_EN_RL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnRl; 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 346a3168ba..5ed4a1ea37 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -20,10 +20,10 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_rr/object_rr.h" diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h index f0ed5b5c30..e39d79d160 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h @@ -2,7 +2,7 @@ #define Z_EN_RR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnRr; 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 2eb4c00dfd..b1b46d6e62 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -22,11 +22,11 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ru1/object_ru1.h" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 6b495ccf7f..941765edad 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -2,7 +2,7 @@ #define Z_EN_RU1_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c index bce6bf6cac..32717457ef 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_ru1.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gRutoFirstMeetingCs[] = { 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 063a7f53b9..6e35bd842f 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -19,10 +19,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ru2/object_ru2.h" diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index ca051d1800..7b2b0ff2b1 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -2,7 +2,7 @@ #define Z_EN_RU2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #define ENRU2_GET_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->actor.params, 8, 8) #define ENRU2_GET_TYPE(thisx) PARAMS_GET_U(thisx->actor.params, 0, 8) diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c index 4efe6fb390..92b2634543 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_ru2.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gWaterMedallionCs[] = { 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..2f39fefa34 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -7,10 +7,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_sa/object_sa.h" #include "assets/scenes/overworld/spot04/spot04_scene.h" diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.h b/src/overlays/actors/ovl_En_Sa/z_en_sa.h index 0132877731..1161b67ca4 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.h +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.h @@ -2,7 +2,7 @@ #define Z_EN_SA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSa; 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 2a909207e9..6ece8b50b5 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -15,8 +15,8 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_sb/object_sb.h" diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h index f2f0e42adb..e57381420d 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h @@ -2,7 +2,7 @@ #define Z_EN_SB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSb; diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 425b30b8f4..3ba16d656c 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -8,7 +8,7 @@ #include "gfx.h" #include "gfx_setupdl.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h index d1fcb16d90..b1925c1e80 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h @@ -2,7 +2,7 @@ #define Z_ITEM_SCENE_CHANGE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSceneChange; diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 7cec1579b8..1276b7f5ee 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -11,8 +11,8 @@ #include "printf.h" #include "regs.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h index 27cba99665..bd9f623f7c 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.h +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h @@ -2,7 +2,7 @@ #define Z_EN_SDA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSda; diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 4e082fcd47..03ef38b658 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h index 8bea3a0a68..32657cce02 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h @@ -2,7 +2,7 @@ #define Z_EN_SHOPNUTS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" struct EnShopnuts; diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index b5bf27be16..f3894ac83b 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -8,11 +8,11 @@ #include "sequence.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64draw.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "draw.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h index a4ec863028..6aa91c0f30 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.h +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -2,7 +2,7 @@ #define Z_EN_SI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSi; diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index ecdab8d5b2..b56bca6f67 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -14,10 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_siofuki/object_siofuki.h" diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h index 56a08bff6f..4804f961aa 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h @@ -2,7 +2,7 @@ #define Z_EN_SIOFUKI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum EnSiofukiType { /* 0x00 */ EN_SIOFUKI_RAISING, diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 723f6f4836..5d21c25fb4 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -16,10 +16,10 @@ #include "sys_math.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_skb/object_skb.h" diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index eac534f2ff..e40c049cfa 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -2,7 +2,7 @@ #define Z_EN_SKB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSkb; 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 68ac8d2c41..492b973735 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -12,14 +12,14 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64debug_display.h" -#include "z64face_reaction.h" -#include "z64ocarina.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "debug_display.h" +#include "face_reaction.h" +#include "ocarina.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_skj/object_skj.h" diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.h b/src/overlays/actors/ovl_En_Skj/z_en_skj.h index 1d49c81c42..1a9ccda020 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.h +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.h @@ -2,7 +2,7 @@ #define Z_EN_SKJ_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSkj; diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 91e9273054..11c33d8469 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_skj/object_skj.h" diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h index 08ec8f4639..a58a37b933 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h @@ -2,7 +2,7 @@ #define Z_EN_SKJNEEDLE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSkjneedle; 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 95abf52374..f3649fa697 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -6,11 +6,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ssh/object_ssh.h" diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h index 741770cec5..fd056a0cc4 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h @@ -2,7 +2,7 @@ #define Z_EN_SSH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSsh; diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 41ee2f3c73..f32ce0ba67 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -14,9 +14,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_st/object_st.h" diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h index 08e9e8bd8d..36ecd714d2 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.h +++ b/src/overlays/actors/ovl_En_St/z_en_st.h @@ -2,7 +2,7 @@ #define Z_EN_ST_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSt; 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 58ee87f235..5cd96b9c63 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -14,8 +14,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.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_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h index a135fea2aa..d63682a474 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h @@ -2,7 +2,7 @@ #define Z_EN_STH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSth; diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 118328e793..c8c301cb2d 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_stream/object_stream.h" diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h index 0a21d54d84..e188cb1dca 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h @@ -2,7 +2,7 @@ #define Z_EN_STREAM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnStream; diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 8e10154c10..44a589c993 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -10,10 +10,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_st/object_st.h" diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h index fe68092667..6a22eb7ba1 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -2,7 +2,7 @@ #define Z_EN_SW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSw; 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 623fc8ad62..045c8afbc0 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 @@ -10,10 +10,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "debug_display.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h index 46f54b7c79..fba3f9fac6 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_ITM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSyatekiItm; 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 5829aa68f1..3c983d700f 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 @@ -11,9 +11,9 @@ #include "sequence.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ossan/object_ossan.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h index 306c33104f..b17187573c 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_MAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSyatekiMan; 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 5eca8ac947..c01b1a22d2 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 @@ -17,10 +17,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h index 37db3e65fd..97ea786921 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_NIW_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnSyatekiNiw; 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 3dea1af351..353cb507b4 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -22,11 +22,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_ta/object_ta.h" diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.h b/src/overlays/actors/ovl_En_Ta/z_en_ta.h index d230c2b757..d8888d79b3 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.h +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.h @@ -2,7 +2,7 @@ #define Z_EN_TA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTa; 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 0a918999c4..f087395369 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 @@ -14,8 +14,8 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_ts/object_ts.h" diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h index e7d51c4b07..dbc0f80f45 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h @@ -2,7 +2,7 @@ #define Z_EN_TAKARA_MAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTakaraMan; diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 1bb9841482..31df49fbc1 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -12,7 +12,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_shop_dungen/object_shop_dungen.h" diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.h b/src/overlays/actors/ovl_En_Tana/z_en_tana.h index 1804bcd798..28f9c50f7c 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.h +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.h @@ -2,7 +2,7 @@ #define Z_EN_TANA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTana; diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index aba5f6d564..f81eba1e5d 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_sk2/object_sk2.h" diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h index 28192142c5..8a0e41abf6 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.h +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -2,7 +2,7 @@ #define Z_EN_TEST_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTest; 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..e0e7ef04b2 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -8,8 +8,8 @@ #include "gfx.h" #include "sys_matrix.h" -#include "z64face_reaction.h" -#include "z64play.h" +#include "face_reaction.h" +#include "play_state.h" #include "assets/objects/object_mu/object_mu.h" diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h index b4d9bfe063..f32b2b698f 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h @@ -2,7 +2,7 @@ #define Z_EN_TG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTg; 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 fbdaf61bf4..22c4a16cee 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -20,9 +20,9 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_tite/object_tite.h" diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h index 78de6938e7..4fedb782d1 100755 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -2,7 +2,7 @@ #define Z_EN_TITE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTite; 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..a802541986 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -17,9 +17,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tk/object_tk.h" diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 2ce0b9ef87..26f9774d41 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -2,7 +2,7 @@ #define Z_EN_TK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" /* Dirt particle effect */ struct EnTkEff; diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 6e406c6bab..1219bab670 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -7,8 +7,8 @@ #include "z_en_torch.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h index fc3e2dabac..88b339c7ef 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.h +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h @@ -2,7 +2,7 @@ #define Z_EN_TORCH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTorch; diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 21ab44a0ff..3f10462ead 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -17,11 +17,11 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_torch2/object_torch2.h" diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h index bb132bc91e..a45afbba4a 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -2,8 +2,8 @@ #define Z_EN_TORCH2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" -// Uses the Player struct (from z64player.h) +// Uses the Player struct (from player.h) #endif 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..361ef77182 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -11,10 +11,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_toryo/object_toryo.h" diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h index f8d04e74ac..479b97e8bb 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h @@ -2,7 +2,7 @@ #define Z_EN_TORYO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnToryo; diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 3b29e01601..f197510c55 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -18,9 +18,9 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_tp/object_tp.h" diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h index 3c8fd5f15e..7e596aadbd 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h @@ -2,7 +2,7 @@ #define Z_EN_TP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTp; diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 3f2672cde4..84b2dd4cf6 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -13,9 +13,9 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_tr/object_tr.h" diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.h b/src/overlays/actors/ovl_En_Tr/z_en_tr.h index 091aa5c52f..d649090229 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.h +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.h @@ -2,7 +2,7 @@ #define Z_EN_TR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTr; diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 848e6701b0..22b44abdfc 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -8,8 +8,8 @@ #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_trap/object_trap.h" diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.h b/src/overlays/actors/ovl_En_Trap/z_en_trap.h index fcd62dd170..86b0c1d043 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.h +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.h @@ -2,7 +2,7 @@ #define Z_EN_TRAP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" // Different movement modes (set in params): #define SPIKETRAP_MODE_LINEAR 0x10 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 7ff6013e48..b7afe53f41 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 @@ -15,10 +15,10 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h index 3abe8b625a..04d54d3847 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h @@ -2,7 +2,7 @@ #define Z_EN_TUBO_TRAP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnTuboTrap; diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 9a188bca56..643cae1b35 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_vali/object_vali.h" diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.h b/src/overlays/actors/ovl_En_Vali/z_en_vali.h index 1a031d964b..66ac96d3d1 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.h +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.h @@ -2,7 +2,7 @@ #define Z_EN_VALI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnVali; diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index 30f8b32b18..4e8cec5ff4 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -6,7 +6,7 @@ #include "z_en_vase.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_vase/object_vase.h" diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.h b/src/overlays/actors/ovl_En_Vase/z_en_vase.h index 04a8381e29..50cc1d08e3 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.h +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.h @@ -2,7 +2,7 @@ #define Z_EN_VASE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnVase; diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 8791409d01..826d7f0ebe 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_fd/object_fd.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h index e81bc1ac25..e7954751de 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h @@ -2,7 +2,7 @@ #define Z_EN_VB_BALL_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnVbBall; diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 165065d714..09368f5b09 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -20,10 +20,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64save.h" -#include "z64skin.h" +#include "audio.h" +#include "play_state.h" +#include "save.h" +#include "skin.h" #include "assets/objects/object_zl4/object_zl4.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h index a06435d553..1bb5780203 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h @@ -2,8 +2,8 @@ #define Z_EN_VIEWER_H #include "ultra64.h" -#include "z64actor.h" -#include "z64skin.h" +#include "actor.h" +#include "skin.h" struct EnViewer; diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 2ee230d9bd..128a0af5f4 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -17,9 +17,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_vm/object_vm.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h index 7705d87032..33d52e2fb8 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h @@ -2,7 +2,7 @@ #define Z_EN_VM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnVm; 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 f60e224f40..cda2c07dc0 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 @@ -17,9 +17,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64play.h" +#include "debug_display.h" +#include "effect.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h index b2e9005372..5cbbb878e7 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h @@ -2,7 +2,7 @@ #define Z_EN_WALL_TUBO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" struct EnWallTubo; diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 9c6a27e026..7373f441a6 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -14,10 +14,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_wallmaster/object_wallmaster.h" diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h index 76ee52d9e0..664bc80778 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -2,7 +2,7 @@ #define Z_EN_WALLMAS_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum WallmasType { /* 0x00 */ WMT_TIMER, 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 520e7edc61..3fe70749c9 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 @@ -12,10 +12,10 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "debug_display.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h index 52b617a0e7..e3db54c571 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h @@ -2,7 +2,7 @@ #define Z_EN_WEATHER_TAG_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnWeatherTag; diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 4fa8370d0a..35e232c69b 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -13,9 +13,9 @@ #include "sfx.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ei/object_ei.h" diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h index ab1b81c34f..d35e43544f 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h @@ -2,7 +2,7 @@ #define Z_EN_WEIYER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnWeiyer; 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 6e86771d7a..2f33d07a2c 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -22,10 +22,10 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_wf/object_wf.h" diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h index 38827154aa..cc69df8ad4 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -2,7 +2,7 @@ #define Z_EN_WF_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnWf; 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 a1cf8f5be6..7cfe974b8a 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 @@ -13,9 +13,9 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64debug_display.h" -#include "z64play.h" -#include "z64player.h" +#include "debug_display.h" +#include "play_state.h" +#include "player.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h index 5b99e235c3..2910fcae17 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h @@ -2,7 +2,7 @@ #define Z_EN_WONDER_ITEM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnWonderItem; 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 4b43e59cb2..7313c8100d 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 @@ -10,9 +10,9 @@ #include "regs.h" #include "terminal.h" #include "translation.h" -#include "z64debug_display.h" -#include "z64play.h" -#include "z64save.h" +#include "debug_display.h" +#include "play_state.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED) diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h index a42c3febfc..7850cf6fff 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h @@ -2,7 +2,7 @@ #define Z_EN_WONDER_TALK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnWonderTalk; 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 78e8d152d7..137cbf619e 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 @@ -10,10 +10,10 @@ #include "regs.h" #include "terminal.h" #include "translation.h" -#include "z64debug_display.h" -#include "z64item.h" -#include "z64play.h" -#include "z64player.h" +#include "debug_display.h" +#include "item.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED) diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h index 0dad49d375..d48ad99777 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h @@ -2,7 +2,7 @@ #define Z_EN_WONDER_TALK2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnWonderTalk2; diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index bf32807226..2d351c9184 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -16,9 +16,9 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64skin_matrix.h" +#include "play_state.h" +#include "player.h" +#include "skin_matrix.h" #include "assets/objects/object_wood02/object_wood02.h" diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h index 89242188ae..d9ebab697a 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h @@ -2,7 +2,7 @@ #define Z_EN_WOOD02_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnWood02; 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 c657a761f0..2ff73c8f4a 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -21,11 +21,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/objects/object_xc/object_xc.h" #include "assets/scenes/overworld/spot05/spot05_scene.h" diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.h b/src/overlays/actors/ovl_En_Xc/z_en_xc.h index 1cc56f68e6..419f67d55d 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.h +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.h @@ -2,7 +2,7 @@ #define Z_EN_XC_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnXc; 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 e84716c110..ee1d8b8161 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 @@ -13,11 +13,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64debug_display.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "audio.h" +#include "debug_display.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h index 12cfb46cbb..f7587d8152 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h @@ -2,7 +2,7 @@ #define Z_EN_YABUSAME_MARK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnYabusameMark; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 22d454fb61..772eceb114 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_yukabyun/object_yukabyun.h" diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h index a695fb4c1f..36e7b13512 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h @@ -2,7 +2,7 @@ #define Z_EN_YUKABYUN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnYukabyun; diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 48f02b074e..7fa645e64a 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -18,10 +18,10 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "audio.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_zf/object_zf.h" diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.h b/src/overlays/actors/ovl_En_Zf/z_en_zf.h index 1995b48943..1ecd0b646b 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.h +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.h @@ -2,7 +2,7 @@ #define Z_EN_ZF_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnZf; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 5c60653b4e..8de9163341 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -14,10 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_zl1/object_zl1.h" diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h index ada1335819..f1a07e1930 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h @@ -2,7 +2,7 @@ #define Z_EN_ZL1_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnZl1; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c index f6fac8940a..4c763e5583 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c @@ -1,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" static CutsceneCameraDirection D_80B4D5C0[] = { { { -440.0f, 117.0f, 0.0f }, { -490.0f, 120.0f, 0.0f }, 0, 45 }, diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c index 4a8622cbba..77709ec0fb 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c @@ -1,6 +1,6 @@ #include "sequence.h" -#include "z64cutscene_commands.h" -#include "z64player.h" +#include "cutscene_commands.h" +#include "player.h" // clang-format off CutsceneData gTriforceCreationStartCs[] = { 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 8d937cba88..817ac9c3dd 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -18,10 +18,10 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64frame_advance.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "frame_advance.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_zl2/object_zl2.h" #include "assets/objects/object_zl2_anime1/object_zl2_anime1.h" diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h index 4bd0730de7..42ea682f68 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h @@ -2,7 +2,7 @@ #define Z_EN_ZL2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnZl2; 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 a73e7f3203..b9c396dfcc 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -24,11 +24,11 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64frame_advance.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "frame_advance.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h index 695588fd52..ab656ead8c 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h @@ -2,8 +2,8 @@ #define Z_EN_ZL3_H #include "ultra64.h" -#include "z64actor.h" -#include "z64scene.h" +#include "actor.h" +#include "scene.h" #include "overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.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 a18efd4ba9..be729698f4 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -16,11 +16,11 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_zl4/object_zl4.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h index b371092e08..c7020df315 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h @@ -2,7 +2,7 @@ #define Z_EN_ZL4_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnZl4; diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c index 933f7e0aaa..3819247d5c 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c @@ -1,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" static CutsceneCameraDirection sCamDirections[] = { { { -490.0f, 120.0f, 0.0f }, { -440.0f, 117.0f, 0.0f }, 0, 45 }, 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..85f0f300e9 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -14,10 +14,10 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64face_reaction.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "face_reaction.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_zo/object_zo.h" diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h index 5f26a20230..a0ada224a1 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h @@ -2,7 +2,7 @@ #define Z_EN_ZO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EnZo; diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 02e24ff540..5b37333bc9 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -20,10 +20,10 @@ #include "sequence.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin.h" #include "assets/objects/object_fhg/object_fhg.h" diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h index dca6eeb82a..f8f514dfdb 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h @@ -2,8 +2,8 @@ #define Z_EN_FHG_H #include "ultra64.h" -#include "z64actor.h" -#include "z64skin.h" +#include "actor.h" +#include "skin.h" struct EnfHG; diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 289b82d1e9..20c26abb89 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -11,8 +11,8 @@ #include "sys_matrix.h" #include "tex_len.h" #include "versions.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.h b/src/overlays/actors/ovl_End_Title/z_end_title.h index cd29ff507c..41cbb8664b 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.h +++ b/src/overlays/actors/ovl_End_Title/z_end_title.h @@ -2,7 +2,7 @@ #define Z_END_TITLE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct EndTitle; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 7f3c3eb85b..9f94310a35 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -28,11 +28,11 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" +#include "skin_matrix.h" #if PLATFORM_N64 #include "cic6105.h" #endif diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.h b/src/overlays/actors/ovl_Fishing/z_fishing.h index 6836ce79f8..7cb72e88dd 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.h +++ b/src/overlays/actors/ovl_Fishing/z_fishing.h @@ -2,8 +2,8 @@ #define Z_FISHING_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct Fishing; diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index a690bfa73f..3c636bc128 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -11,8 +11,8 @@ #include "ichain.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64item.h" -#include "z64play.h" +#include "item.h" +#include "play_state.h" #include "assets/objects/object_gi_hearts/object_gi_hearts.h" diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h index ef92f86b86..d8bc6bfe72 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h @@ -2,7 +2,7 @@ #define Z_ITEM_B_HEART_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ItemBHeart; diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 3909fb72f9..99db32656c 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -10,10 +10,10 @@ #include "libu64/debug.h" #include "printf.h" #include "rand.h" -#include "z64draw.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "draw.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h index e938c81267..dcae852df4 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h @@ -2,7 +2,7 @@ #define Z_ITEM_ETC_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ItemEtcetera; diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index 40594c86f6..4459188135 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -5,8 +5,8 @@ */ #include "z_item_inbox.h" -#include "z64draw.h" -#include "z64play.h" +#include "draw.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h index d13bad0053..c22eda0a95 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h @@ -2,7 +2,7 @@ #define Z_ITEM_INBOX_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ItemInbox; diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index fa4f500c87..7e6630f4f8 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -9,10 +9,10 @@ #include "libu64/debug.h" #include "segmented_address.h" #include "sfx.h" -#include "z64draw.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "draw.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/scenes/overworld/spot00/spot00_scene.h" diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h index 3ae598e7d1..5dd7dd74de 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h @@ -2,7 +2,7 @@ #define Z_ITEM_OCARINA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ItemOcarina; 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 2f281a17d2..9dda7af3f0 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64item.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "item.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h index 564170e465..6fcfcbd209 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h @@ -2,7 +2,7 @@ #define Z_ITEM_SHIELD_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ItemShield; diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index d2912c7ea5..21827f32c0 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -12,9 +12,9 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h index 59344baff1..d475bab70f 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h @@ -2,7 +2,7 @@ #define Z_MAGIC_DARK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct MagicDark; diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index e60e524b84..103a7ee1b8 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h index ae953c0d3c..d561d291e6 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h @@ -2,7 +2,7 @@ #define Z_MAGIC_FIRE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct MagicFire; diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index ec09e1c89b..aff6fcd55a 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -12,9 +12,9 @@ #include "printf.h" #include "sfx.h" #include "translation.h" -#include "z64curve.h" -#include "z64play.h" -#include "z64player.h" +#include "curve.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h index b7ba93c264..6a186dcb56 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h @@ -2,8 +2,8 @@ #define Z_MAGIC_WIND_H #include "ultra64.h" -#include "z64actor.h" -#include "z64curve.h" +#include "actor.h" +#include "curve.h" struct MagicWind; diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 3f9d04843c..3a164db8ea 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -16,9 +16,9 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64light.h" -#include "z64play.h" -#include "z64player.h" +#include "light.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mir_ray/object_mir_ray.h" diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h index 245cf1007b..ddc4a4708d 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h @@ -2,8 +2,8 @@ #define Z_MIR_RAY_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct MirRay; 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 88638e1ed8..2229560f1f 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -19,10 +19,10 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64cutscene_flags.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64save.h" +#include "cutscene_flags.h" +#include "effect.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_mamenoki/object_mamenoki.h" diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h index 42ba39261c..172fa66101 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -2,7 +2,7 @@ #define Z_OBJ_BEAN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjBean; diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 8f24b7e647..5f76c6e02a 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -9,7 +9,7 @@ #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h index e0159e0f97..a8e75a42cd 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h @@ -2,7 +2,7 @@ #define Z_OBJ_BLOCKSTOP_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjBlockstop; diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index c6d7b1da3f..1ebc95cff8 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -13,8 +13,8 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_bombiwa/object_bombiwa.h" diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h index 9c5c38d127..f12a0d246e 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h @@ -2,7 +2,7 @@ #define Z_OBJ_BOMBIWA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjBombiwa; diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index d3affc90a9..9430414f3e 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h index acda97f16d..5395353efb 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -2,7 +2,7 @@ #define Z_OBJ_COMB_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjComb; diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 2c77570a41..3484ffcefa 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/object_dekujr/object_dekujr.h" diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h index 68b483f8dc..4c7b50b9f9 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h @@ -2,7 +2,7 @@ #define Z_OBJ_DEKUJR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjDekujr; diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 2163114cd2..f849298e10 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_d_elevator/object_d_elevator.h" diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h index e6b8d4b6d8..a6d665d55a 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h @@ -2,7 +2,7 @@ #define Z_OBJ_ELEVATOR_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjElevator; diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 39d6de7d65..97c898f466 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h index 8a2256bf04..457a413f85 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h @@ -2,7 +2,7 @@ #define Z_OBJ_HAMISHI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjHamishi; diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index f1f8000063..8cfaa9599e 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -7,8 +7,8 @@ #include "z_obj_hana.h" #include "ichain.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h index 69c08b4cb6..1296e275c7 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h @@ -2,7 +2,7 @@ #define Z_OBJ_HANA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjHana; diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index c057c6b875..187bb4d184 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_d_hsblock/object_d_hsblock.h" diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h index 299ba7d3d6..4f4696eb6c 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h @@ -2,7 +2,7 @@ #define Z_OBJ_HSBLOCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjHsblock; diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 71ff43d277..3dac2d7fe4 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h index c6a56d16f1..bb2c860a7d 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h @@ -2,7 +2,7 @@ #define Z_OBJ_ICE_POLY_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjIcePoly; diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 8501c29f5b..b4dd823735 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -14,9 +14,9 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h index 7538b53705..8a299bfe07 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h @@ -2,7 +2,7 @@ #define Z_OBJ_KIBAKO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjKibako; diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 9233f00c7a..c8c0a1211f 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -14,8 +14,8 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_kibako2/object_kibako2.h" diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h index 177ef0b04c..201e5cde88 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h @@ -2,7 +2,7 @@ #define Z_OBJ_KIBAKO2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjKibako2; diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 0a5866d1d1..a8da522c09 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_d_lift/object_d_lift.h" diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h index e3f217b930..58bebccf1e 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h @@ -2,7 +2,7 @@ #define Z_OBJ_LIFT_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjLift; 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 05fe7a206f..a8387c0d75 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -19,8 +19,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_lightswitch/object_lightswitch.h" diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h index 7f0834a240..0b11c6ae72 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h @@ -2,7 +2,7 @@ #define Z_OBJ_LIGHTSWITCH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjLightswitch; 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 cc7651b6b4..ca902bce1b 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -9,8 +9,8 @@ #include "printf.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h index 0ac9b7ab84..c6134808c5 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h @@ -2,7 +2,7 @@ #define Z_OBJ_MAKEKINSUTA_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjMakekinsuta; 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 ee2e8801c5..7865da9830 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h index 84938f578a..8ff31186c5 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h @@ -2,7 +2,7 @@ #define Z_OBJ_MAKEOSHIHIKI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjMakeoshihiki; diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 126e2c42ec..c27662dd0c 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "printf.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h index 20cf667daa..bc6fc66e9a 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h @@ -2,7 +2,7 @@ #define Z_OBJ_MURE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjMure; diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index eca8b0d933..e2e50736e0 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -11,7 +11,7 @@ #include "sys_math3d.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h index 8643d477e1..b15386e945 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h @@ -2,7 +2,7 @@ #define Z_OBJ_MURE2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjMure2; diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index 51035c0678..ff37f4b8e1 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -10,7 +10,7 @@ #include "sys_math3d.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h index fc9a3e83aa..e9b237361b 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -2,7 +2,7 @@ #define Z_OBJ_MURE3_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjMure3; diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index efa0fe3f46..8c4c20cc48 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -18,8 +18,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h index 265ba4691c..45e72bec96 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h @@ -2,7 +2,7 @@ #define Z_OBJ_OSHIHIKI_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjOshihiki; diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 6eca379686..0ff67cc85c 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -8,8 +8,8 @@ #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h index ee8e74eaa2..c23785a32a 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h @@ -2,7 +2,7 @@ #define Z_OBJ_ROOMTIMER_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjRoomtimer; 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 2ad4bbf09a..e71673413c 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -19,8 +19,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h index b4d3ae8b20..328f6389c0 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h @@ -2,7 +2,7 @@ #define Z_OBJ_SWITCH_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjSwitch; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index a189fe4345..9409ee0a52 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h index 4dee2ba671..e651bc29de 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h @@ -2,8 +2,8 @@ #define Z_OBJ_SYOKUDAI_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct ObjSyokudai; diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index b3dc890ca8..2e3f6e0186 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -15,10 +15,10 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_timeblock/object_timeblock.h" diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h index 966f474496..1cd2a07644 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h @@ -2,7 +2,7 @@ #define Z_OBJ_TIMEBLOCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjTimeblock; diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 9afd53ae53..4a2ba2d3d9 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -14,10 +14,10 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64item.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "item.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h index 8e27cc8310..b42de51f48 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -2,7 +2,7 @@ #define Z_OBJ_TSUBO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjTsubo; 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 55023cccc1..0d5e46873a 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -17,9 +17,9 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_timeblock/object_timeblock.h" diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h index 8f22398db7..199dca053a 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h @@ -2,7 +2,7 @@ #define Z_OBJ_WARP2BLOCK_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjWarp2block; diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index c170279758..5f8f580e4e 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -16,10 +16,10 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h index 40307f5e91..a225f53bc9 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h @@ -2,7 +2,7 @@ #define Z_OBJECT_KANKYO_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ObjectKankyo; 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 ab09e7420b..61772fa0c1 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -15,11 +15,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64light.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "light.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h index 222c977fc2..be5389c74c 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h @@ -2,8 +2,8 @@ #define Z_OCEFF_SPOT_H #include "ultra64.h" -#include "z64actor.h" -#include "z64light.h" +#include "actor.h" +#include "light.h" struct OceffSpot; diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 5e236c86f4..036349d0e9 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -9,9 +9,9 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h index aebc002780..269d57d8b5 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h @@ -2,7 +2,7 @@ #define Z_OCEFF_STORM_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct OceffStorm; 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 36177c0729..8346407c9a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -12,9 +12,9 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h index 65a18468a3..5e6e4add96 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h @@ -2,7 +2,7 @@ #define Z_OCEFF_WIPE_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum OceffWipeType { /* 0x00 */ OCEFF_WIPE_ZL, 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 db8171b362..71498caa13 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -12,9 +12,9 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h index 6276bb33c4..c83616da8c 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h @@ -2,7 +2,7 @@ #define Z_OCEFF_WIPE2_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct OceffWipe2; 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 7aec9136f2..6ec42324a2 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -12,9 +12,9 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h index 5e6abb0456..b7fddd9f60 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h @@ -2,7 +2,7 @@ #define Z_OCEFF_WIPE3_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct OceffWipe3; 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 0828ba289f..8b860cc0c1 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h index bd82ddc7c4..f7eac4cf04 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h @@ -2,7 +2,7 @@ #define Z_OCEFF_WIPE4_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" typedef enum OceffWipe4Type { /* 0x00 */ OCEFF_WIPE4_SCARECROWS, 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 e069f1730a..71d8b881f2 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -17,11 +17,11 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64environment.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "environment.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/scenes/overworld/spot06/spot06_scene.h" diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h index 4415e6e98f..3404d52013 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -2,7 +2,7 @@ #define Z_SHOT_SUN_H #include "ultra64.h" -#include "z64actor.h" +#include "actor.h" struct ShotSun; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index f6b765fee0..e6e017490a 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -42,14 +42,14 @@ #include "z_en_item00.h" #include "z_lib.h" #include "zelda_arena.h" -#include "z64audio.h" -#include "z64debug.h" -#include "z64effect.h" -#include "z64lifemeter.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64save.h" -#include "z64skin_matrix.h" +#include "audio.h" +#include "debug.h" +#include "effect.h" +#include "lifemeter.h" +#include "ocarina.h" +#include "play_state.h" +#include "save.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index 9ff1bd5a96..aa9ae498eb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -11,8 +11,8 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h index bfceec5856..22be855946 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsBlastParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 2ab88a16b1..f78c1e2f56 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -13,9 +13,9 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h index 923739819b..6939246900 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BOMB_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsBombInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index 4ec61bc8ea..176f68acc1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -11,9 +11,9 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h index 8aea4d3cc5..91dbf726f3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BOMB2_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsBomb2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index f23d0a9aab..49f3ace0c1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -12,8 +12,8 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h index 7701365bdc..52d7c40e26 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BUBBLE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsBubbleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index c32349e1fa..f89b0840b8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -9,9 +9,9 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "segmented_address.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/object_dodongo/object_dodongo.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h index fbaa8aa28c..686d02b183 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_D_FIRE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsDFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index e8b904a4b6..b75a7077c8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -10,9 +10,9 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sfx.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h index fb7fc84af1..f4297d8fe4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsDeadDbInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index cb6d76eeb3..7bc0936907 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -11,9 +11,9 @@ #include "gfx_setupdl.h" #include "printf.h" #include "translation.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h index c9c91ec609..0adb102caa 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsDeadDdInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 4d649d4be4..5f6da1295f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -9,8 +9,8 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h index 7a7d57363a..a248e76229 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_DEAD_DS_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsDeadDsInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c index 58daefa387..4a577652b9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c @@ -8,8 +8,8 @@ #include "printf.h" #include "sfx.h" #include "translation.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #define rSfxId regs[10] #define rRepeatMode regs[11] // sound is replayed every update. unused in the original game diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h index 1f8ca9304c..7c9a67b3d2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_DEAD_SOUND_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsDeadSoundInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 2f5901ca2e..1e7e3ca2ed 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -12,8 +12,8 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h index 6138c86046..2d51f1ed11 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsDtBubbleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 899e9f2a2d..f06b5f3031 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -12,9 +12,9 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h index 958bde91f8..4a4d9ec4bd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsDustInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index 56dc375337..d632dfaa52 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -11,8 +11,8 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h index 14acb95e40..e4ec69ea9a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_EN_FIRE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsEnFireInitParams { /* 0x00 */ struct Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index e1ed9e924f..d4b07ef730 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -15,8 +15,8 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h index 238b005bcc..a9b60960d0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsEnIceInitParams { /* 0x00 */ struct Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index c5cee8db21..f2eaceaee8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_yabusame_point/object_yabusame_point.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h index 1bf5a5d30c..b4d77a21c1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_EXTRA_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsExtraInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 9f00f52e30..c9bfbe981a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h index fc2a4ec2de..0a16be9333 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_FCIRCLE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsFcircleInitParams { /* 0x00 */ struct Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index fb074909a3..b44cc99533 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -15,10 +15,10 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "translation.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64skin.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "skin.h" #include "assets/objects/object_fhg/object_fhg.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h index f3c1ea6168..8c57bad37d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_FHGFLASH_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct Actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index de4ae887bb..8a5e416a6a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -10,9 +10,9 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h index ebe8a7203d..01e80d30d0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsFireTailInitParams { /* 0x00 */ struct Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c index 05e4a3d8bf..9fc9d920dd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c @@ -7,8 +7,8 @@ #include "z_eff_ss_g_fire.h" #include "segmented_address.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h index 52312527d9..d1673ab4f7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_FIRE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsGFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index 9610917043..b37136a18c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -8,8 +8,8 @@ #include "libc64/qrand.h" #include "segmented_address.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h index 55215239d2..e2361a3ed2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_MAGMA_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsGMagmaInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 316f65258a..19f535ef71 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h index 2ddc9f4ce7..9ab63141a0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsGMagma2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 2c83108d35..ef0565c8f8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -10,9 +10,9 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h index 86a7d8378e..196e688c88 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_RIPPLE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsGRippleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index a5472c29fa..783224c9e0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -11,9 +11,9 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h index 0d94bd7e0a..d88cdfcf86 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsGSpkInitParams { /* 0x00 */ struct Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c index 3baab32db9..5995c1b563 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c @@ -7,8 +7,8 @@ #include "z_eff_ss_g_splash.h" #include "segmented_address.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h index fa1907f667..507117656e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsGSplashInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index e084b5f1f6..550c4a08d3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -11,9 +11,9 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h index d598cebf5d..a6a5d7acf3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_HAHEN_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsHahenInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 9be42db8d9..e1fa2a982e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -10,9 +10,9 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h index 591ba5a7d0..cbe297176d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_HITMARK_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsHitMarkInitParams { /* 0x00 */ s32 type; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 9ce9885de3..4bad83b5f0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -11,8 +11,8 @@ #include "rand.h" #include "sys_math.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h index afb96c213c..6ed2557174 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_ICE_PIECE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsIcePieceInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 9e2757049d..bfa4d40db8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -13,8 +13,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/object_fz/object_fz.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h index 24c27f1cf6..649aff9adb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_ICE_SMOKE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsIceSmokeInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 12d9c5a5eb..ce06859168 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "rand.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h index eb8e8764d7..2afeb50935 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_K_FIRE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsKFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index b0ba95adae..cf5f3a2b88 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -15,9 +15,9 @@ #include "sys_matrix.h" #include "translation.h" #include "versions.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #define rReg0 regs[0] #define rGravity regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h index 90f3a8cdab..09d38ed7e9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_KAKERA_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsKakeraInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index f7c22aaa19..a4093ead1b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -13,9 +13,9 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h index 0c128ff7ab..64612fcbb4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsKiraKiraInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index f44ac38496..5e2ff3aaf0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -12,9 +12,9 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h index 39f5d51841..75af1b7e0c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "color.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsLightningInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index 1dadd7f069..aecdd6c936 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -13,9 +13,9 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h index e45c2c6f2a..11eb6c9e8b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SIBUKI_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsSibukiInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index 8566be1623..24e484c1ee 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" +#include "effect.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h index 37a9425dc7..a01146d3e0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SIBUKI2_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsSibuki2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index 2277a71d85..beac5fd414 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -6,10 +6,10 @@ #include "z_eff_ss_solder_srch_ball.h" -#include "z64bgcheck.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" +#include "bgcheck.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" #define rUnused regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h index b105f063d5..c68ae12bfa 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SOLDERSRCHBALL_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsSolderSrchBallInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index 520f8af02a..d7758d3b97 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -10,10 +10,10 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "effect.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/objects/object_link_boy/object_link_boy.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h index 4b5ccda965..1748ca5249 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_STICK_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsStickInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index 5ecd83add1..bdd99e1e31 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -12,9 +12,9 @@ #include "regs.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" -#include "z64play.h" -#include "z64skin_matrix.h" +#include "effect.h" +#include "play_state.h" +#include "skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h index efb8df225d..c84ab06f9c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_STONE1_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" typedef struct EffectSsStone1InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h index 9c8527a1d6..016c04dce5 100644 --- a/src/overlays/gamestates/ovl_file_choose/file_select.h +++ b/src/overlays/gamestates/ovl_file_choose/file_select.h @@ -5,7 +5,7 @@ #include "ultra64.h" #include "gfx.h" #include "versions.h" -#include "z64game.h" +#include "game.h" #define GET_NEWF(sramCtx, slotNum, index) (sramCtx->readBuff[gSramSlotOffsets[slotNum] + offsetof(SaveContext, save.info.playerData.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 2ad81b90f3..fdb36d94bd 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -25,14 +25,14 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64audio.h" -#include "z64environment.h" -#include "z64play.h" -#include "z64save.h" -#include "z64skybox.h" -#include "z64sram.h" -#include "z64ss_sram.h" -#include "z64view.h" +#include "audio.h" +#include "environment.h" +#include "play_state.h" +#include "save.h" +#include "skybox.h" +#include "sram.h" +#include "ss_sram.h" +#include "view.h" #if OOT_PAL_N64 #include "assets/objects/object_mag/object_mag.h" diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index 03fb5d0f12..fb14504bd7 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -6,8 +6,8 @@ #include "regs.h" #include "rumble.h" #include "sfx.h" -#include "z64save.h" -#include "z64sram.h" +#include "save.h" +#include "sram.h" // In iQue versions, this file contains many workarounds for EGCS internal // compiler errors (see docs/compilers.md) diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index 8e300baf02..faf219fd93 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -14,8 +14,8 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64save.h" +#include "audio.h" +#include "save.h" #include "assets/textures/title_static/title_static.h" diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index ad36b6e205..f300c1ea7b 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -8,11 +8,11 @@ #include "regs.h" #include "sys_matrix.h" #include "title_setup_state.h" -#include "z64game.h" -#include "z64play.h" -#include "z64save.h" -#include "z64sram.h" -#include "z64view.h" +#include "game.h" +#include "play_state.h" +#include "save.h" +#include "sram.h" +#include "view.h" void TitleSetup_SetupTitleScreen(TitleSetupState* this) { gSaveContext.gameMode = GAMEMODE_TITLE_SCREEN; diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 84b1cb69ae..329af45f22 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -25,9 +25,9 @@ #include "terminal.h" #include "translation.h" #include "ultra64.h" -#include "z64play.h" -#include "z64save.h" -#include "z64sram.h" +#include "play_state.h" +#include "save.h" +#include "sram.h" void MapSelect_LoadTitle(MapSelectState* this) { this->state.running = false; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 588588b243..907fdb886c 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -25,9 +25,9 @@ #include "sys_freeze.h" #include "title_setup_state.h" #include "versions.h" -#include "z64actor.h" -#include "z64environment.h" -#include "z64save.h" +#include "actor.h" +#include "environment.h" +#include "save.h" #include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index eede783f5c..87a30a53b5 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -6,9 +6,9 @@ #include "printf.h" #include "regs.h" #include "sfx.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64save.h" +#include "ocarina.h" +#include "play_state.h" +#include "save.h" #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index b849ca74b4..2ba3fd1139 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -7,8 +7,8 @@ #include "gfxalloc.h" #include "printf.h" #include "translation.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 9843e4efa3..1f573ca3e3 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -7,9 +7,9 @@ #include "regs.h" #include "sfx.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/textures/icon_item_static/icon_item_static.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 96524d29ba..eb4d7e3c7a 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -8,8 +8,8 @@ #include "regs.h" #include "sfx.h" #include "translation.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c index c090b77fb9..00c57579b0 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c @@ -9,8 +9,8 @@ #include "sfx.h" #include "sys_ucode.h" #include "versions.h" -#include "z64play.h" -#include "z64save.h" +#include "play_state.h" +#include "save.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" #if OOT_NTSC diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c index 6264c4147c..265a122116 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c @@ -3,7 +3,7 @@ #include "libu64/pad.h" #include "regs.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" static s16 sKaleidoPromptCursorAlphaVals[] = { 100, 255 }; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index f2f1966c9e..2a76a40fa2 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -22,11 +22,11 @@ #include "title_setup_state.h" #include "translation.h" #include "versions.h" -#include "z64audio.h" -#include "z64ocarina.h" -#include "z64play.h" -#include "z64player.h" -#include "z64save.h" +#include "audio.h" +#include "ocarina.h" +#include "play_state.h" +#include "player.h" +#include "save.h" #include "assets/textures/icon_item_static/icon_item_static.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index 8c5d583887..8f42eb244d 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -3,8 +3,8 @@ #include "ultra64.h" #include "gfx.h" -#include "z64inventory.h" -#include "z64pause.h" +#include "inventory.h" +#include "pause.h" struct PlayState; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index ec2c566ece..05371b7149 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -5,7 +5,7 @@ #include "sys_matrix.h" #include "z_kaleido_scope.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c index 48a18fff9d..bb78417dde 100644 --- a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c +++ b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c @@ -1,4 +1,4 @@ -#include "z64map_mark.h" +#include "map_mark.h" static MapMarkData sMapMarkDekuTree[] = { // Deku Tree minimap 0 diff --git a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c index ba7517034c..1587228a44 100644 --- a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c +++ b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c @@ -1,4 +1,4 @@ -#include "z64map_mark.h" +#include "map_mark.h" static MapMarkData sMapMarkDekuTree[] = { // Deku Tree minimap 0 diff --git a/tools/assets/extract/extase/cdata_resources.py b/tools/assets/extract/extase/cdata_resources.py index 8358694a9f..d959a0c1f5 100644 --- a/tools/assets/extract/extase/cdata_resources.py +++ b/tools/assets/extract/extase/cdata_resources.py @@ -443,7 +443,7 @@ class Vec3sArrayResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64math.h",) + return ("z_math.h",) class S16ArrayResource(CDataResource): diff --git a/tools/assets/extract/extase_oot64/animation_resources.py b/tools/assets/extract/extase_oot64/animation_resources.py index 164c093ac0..7a54f00c85 100644 --- a/tools/assets/extract/extase_oot64/animation_resources.py +++ b/tools/assets/extract/extase_oot64/animation_resources.py @@ -84,7 +84,7 @@ class AnimationJointIndicesResource(CDataResource, can_size_be_unknown=True): raise ValueError() def get_h_includes(self): - return ("z64animation.h",) + return ("animation.h",) class AnimationResource(CDataResource): @@ -210,4 +210,4 @@ class AnimationResource(CDataResource): return f"AnimationHeader {self.symbol_name}" def get_h_includes(self): - return ("z64animation.h",) + return ("animation.h",) diff --git a/tools/assets/extract/extase_oot64/collision_resources.py b/tools/assets/extract/extase_oot64/collision_resources.py index c96b0ad5be..d8005ba446 100644 --- a/tools/assets/extract/extase_oot64/collision_resources.py +++ b/tools/assets/extract/extase_oot64/collision_resources.py @@ -58,7 +58,7 @@ class CollisionVtxListResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64math.h",) + return ("z_math.h",) class CollisionPolyListResource(CDataResource): @@ -177,7 +177,7 @@ class CollisionPolyListResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64bgcheck.h",) + return ("bgcheck.h",) class CollisionSurfaceTypeListResource(CDataResource): @@ -305,7 +305,7 @@ class CollisionSurfaceTypeListResource(CDataResource): return ("stdbool.h",) def get_h_includes(self): - return ("z64bgcheck.h",) + return ("bgcheck.h",) class BgCamFuncDataResource(CDataResource): @@ -332,7 +332,7 @@ class BgCamFuncDataResource(CDataResource): return f"&{self.symbol_name}[{index}]" def get_h_includes(self): - return ("z64math.h",) + return ("z_math.h",) class CollisionBgCamListResource(CDataResource): @@ -429,10 +429,10 @@ class CollisionBgCamListResource(CDataResource): raise ValueError() def get_c_includes(self): - return ("z64camera.h",) + return ("camera.h",) def get_h_includes(self): - return ("z64bgcheck.h",) + return ("bgcheck.h",) class CollisionWaterBoxesResource(CDataResource): @@ -479,7 +479,7 @@ class CollisionWaterBoxesResource(CDataResource): return ("stdbool.h",) def get_h_includes(self): - return ("z64bgcheck.h",) + return ("bgcheck.h",) def transfer_HACK_IS_STATIC_ON(source, dest): @@ -829,4 +829,4 @@ class CollisionResource(CDataResource): return ("array_count.h",) def get_h_includes(self): - return ("z64bgcheck.h",) + return ("bgcheck.h",) diff --git a/tools/assets/extract/extase_oot64/misc_resources.py b/tools/assets/extract/extase_oot64/misc_resources.py index 6f5f3a8265..b4c02c82c5 100644 --- a/tools/assets/extract/extase_oot64/misc_resources.py +++ b/tools/assets/extract/extase_oot64/misc_resources.py @@ -53,11 +53,11 @@ class CutsceneResource(Resource, can_size_be_unknown=True): def get_c_includes(self): return ( - "z64cutscene_commands.h", + "cutscene_commands.h", # TODO these are not always needed: - "z64ocarina.h", # for OCARINA_ACTION_* - "z64player.h", # for PLAYER_CUEID_* + "ocarina.h", # for OCARINA_ACTION_* + "player.h", # for PLAYER_CUEID_* ) def get_h_includes(self): - return ("z64cutscene.h",) + return ("cutscene.h",) diff --git a/tools/assets/extract/extase_oot64/playeranim_resources.py b/tools/assets/extract/extase_oot64/playeranim_resources.py index b002f91ff9..9dd9dd960e 100644 --- a/tools/assets/extract/extase_oot64/playeranim_resources.py +++ b/tools/assets/extract/extase_oot64/playeranim_resources.py @@ -35,7 +35,7 @@ class PlayerAnimationDataResource(CDataArrayResource): return f"s16 {self.symbol_name}[{self.frame_count_name} * (PLAYER_LIMB_MAX * 3 + 1)]" def get_h_includes(self): - return ("ultra64.h", "z64player.h") + return ("ultra64.h", "player.h") class PlayerAnimationResource(CDataResource): @@ -99,4 +99,4 @@ class PlayerAnimationResource(CDataResource): return f"LinkAnimationHeader {self.symbol_name}" def get_h_includes(self): - return ("z64animation.h",) + return ("animation.h",) diff --git a/tools/assets/extract/extase_oot64/room_shape_resources.py b/tools/assets/extract/extase_oot64/room_shape_resources.py index e6e43b30bf..935c5045b0 100644 --- a/tools/assets/extract/extase_oot64/room_shape_resources.py +++ b/tools/assets/extract/extase_oot64/room_shape_resources.py @@ -113,7 +113,7 @@ class RoomShapeNormalEntryArrayResource(CDataArrayNamedLengthResource): return f"RoomShapeDListsEntry {self.symbol_name}[{self.length_name}]" def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) class RoomShapeNormalResource(CDataResource): @@ -191,7 +191,7 @@ class RoomShapeNormalResource(CDataResource): return ("array_count.h",) def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) class RoomShapeDListsEntryResource(CDataResource): @@ -207,7 +207,7 @@ class RoomShapeDListsEntryResource(CDataResource): raise ValueError def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) def report_RoomShapeImageBase_entry(resource, memory_context: "MemoryContext", v): @@ -343,7 +343,7 @@ class RoomShapeImageSingleResource(CDataResource): raise ValueError def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) class RoomShapeImageMultiBgEntryArrayResource(CDataArrayNamedLengthResource): @@ -395,7 +395,7 @@ class RoomShapeImageMultiBgEntryArrayResource(CDataArrayNamedLengthResource): return f"RoomShapeImageMultiBgEntry {self.name}[{self.length_name}]" def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) class RoomShapeImageMultiResource(CDataResource): @@ -462,7 +462,7 @@ class RoomShapeImageMultiResource(CDataResource): raise ValueError def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) class RoomShapeCullableEntryArrayResource(CDataArrayNamedLengthResource): @@ -479,7 +479,7 @@ class RoomShapeCullableEntryArrayResource(CDataArrayNamedLengthResource): return f"RoomShapeCullableEntry {self.symbol_name}[{self.length_name}]" def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) class RoomShapeCullableResource(CDataResource): @@ -554,4 +554,4 @@ class RoomShapeCullableResource(CDataResource): raise ValueError def get_h_includes(self): - return ("z64room.h",) + return ("room.h",) diff --git a/tools/assets/extract/extase_oot64/scene_commands_resource.py b/tools/assets/extract/extase_oot64/scene_commands_resource.py index 1579fe1a48..57f2cbf440 100644 --- a/tools/assets/extract/extase_oot64/scene_commands_resource.py +++ b/tools/assets/extract/extase_oot64/scene_commands_resource.py @@ -635,14 +635,14 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True): def get_c_includes(self): return ( "array_count.h", - "z64object.h", # for OBJECT_* + "object.h", # for OBJECT_* # TODO these are not always needed: "sequence.h", # for NATURE_ID_* and NA_BGM_* - "z64skybox.h", # for SKYBOX_* + "skybox.h", # for SKYBOX_* ) def get_h_includes(self): - return ("z64scene.h",) + return ("scene.h",) class AltHeadersResource(CDataArrayResource): @@ -714,4 +714,4 @@ class AltHeadersResource(CDataArrayResource): return f"SceneCmd* {self.symbol_name}[]" def get_h_includes(self): - return ("z64scene.h",) + return ("scene.h",) diff --git a/tools/assets/extract/extase_oot64/scene_rooms_resources.py b/tools/assets/extract/extase_oot64/scene_rooms_resources.py index 86baae7ae0..d3b8903f2a 100644 --- a/tools/assets/extract/extase_oot64/scene_rooms_resources.py +++ b/tools/assets/extract/extase_oot64/scene_rooms_resources.py @@ -76,10 +76,10 @@ class ActorEntryListResource(CDataArrayNamedLengthResource): return f"ActorEntry {self.symbol_name}[{self.length_name}]" def get_c_includes(self): - return ("z64actor.h",) + return ("actor.h",) def get_h_includes(self): - return ("z64scene.h",) + return ("scene.h",) class ObjectListResource(CDataArrayNamedLengthResource): @@ -91,7 +91,7 @@ class ObjectListResource(CDataArrayNamedLengthResource): return f"s16 {self.symbol_name}[{self.length_name}]" def get_c_includes(self): - return ("z64object.h",) + return ("object.h",) def get_h_includes(self): return ("ultra64.h",) @@ -256,7 +256,7 @@ class SpawnListResource(CDataArrayResource): return f"Spawn {self.symbol_name}[]" def get_h_includes(self): - return ("z64scene.h",) + return ("scene.h",) class ExitListResource(CDataArrayResource): @@ -316,7 +316,7 @@ class EnvLightSettingsListResource(CDataArrayNamedLengthResource): return f"EnvLightSettings {self.symbol_name}[{self.length_name}]" def get_h_includes(self): - return ("z64environment.h",) + return ("environment.h",) class TransitionActorEntryListResource(CDataArrayNamedLengthResource): @@ -392,10 +392,10 @@ class TransitionActorEntryListResource(CDataArrayNamedLengthResource): return f"TransitionActorEntry {self.symbol_name}[{self.length_name}]" def get_c_includes(self): - return ("z64actor.h",) + return ("actor.h",) def get_h_includes(self): - return ("z64scene.h",) + return ("scene.h",) class PathListResource(CDataArrayResource): @@ -454,4 +454,4 @@ class PathListResource(CDataArrayResource): return f"Path {self.symbol_name}[]" def get_h_includes(self): - return ("z64path.h",) + return ("path.h",) diff --git a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py index 056e49762b..df21aa8d28 100644 --- a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py +++ b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py @@ -79,7 +79,7 @@ class LegacyLimbResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64animation_legacy.h",) + return ("animation_legacy.h",) class LegacyJointKeyArrayResource(CDataArrayResource): @@ -104,7 +104,7 @@ class LegacyJointKeyArrayResource(CDataArrayResource): raise ValueError() def get_h_includes(self): - return ("z64animation_legacy.h",) + return ("animation_legacy.h",) class LegacyAnimationResource(CDataResource): @@ -207,7 +207,7 @@ class LegacyAnimationResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64animation_legacy.h",) + return ("animation_legacy.h",) class LegacyLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC): @@ -215,4 +215,4 @@ class LegacyLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC): c_limb_type = "LegacyLimb" def get_h_includes(self): - return ("z64animation_legacy.h",) + return ("animation_legacy.h",) diff --git a/tools/assets/extract/extase_oot64/skelcurve_resources.py b/tools/assets/extract/extase_oot64/skelcurve_resources.py index 4b140c2568..ea872b8bc1 100644 --- a/tools/assets/extract/extase_oot64/skelcurve_resources.py +++ b/tools/assets/extract/extase_oot64/skelcurve_resources.py @@ -83,7 +83,7 @@ class CurveInterpKnotArrayResource(CDataResource, can_size_be_unknown=True): raise ValueError() def get_h_includes(self): - return ("z64curve.h",) + return ("curve.h",) class ConstantDataArrayResource(CDataResource, can_size_be_unknown=True): @@ -254,7 +254,7 @@ class CurveAnimationHeaderResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64curve.h",) + return ("curve.h",) class SkelCurveLimbResource(CDataResource): @@ -283,7 +283,7 @@ class SkelCurveLimbResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64curve.h",) + return ("curve.h",) class SkelCurveLimbArrayResource(CDataResource): @@ -328,7 +328,7 @@ class SkelCurveLimbArrayResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64curve.h",) + return ("curve.h",) class CurveSkeletonHeaderResource(CDataResource): @@ -375,4 +375,4 @@ class CurveSkeletonHeaderResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64curve.h",) + return ("curve.h",) diff --git a/tools/assets/extract/extase_oot64/skeleton_resources.py b/tools/assets/extract/extase_oot64/skeleton_resources.py index a3459d1172..3cff22c59b 100644 --- a/tools/assets/extract/extase_oot64/skeleton_resources.py +++ b/tools/assets/extract/extase_oot64/skeleton_resources.py @@ -75,7 +75,7 @@ class StandardLimbResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64animation.h",) + return ("animation.h",) class LODLimbResource(CDataResource): @@ -111,7 +111,7 @@ class LODLimbResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64animation.h",) + return ("animation.h",) class LimbsArrayResourceABC(CDataArrayResource): @@ -299,7 +299,7 @@ class SkeletonResourceABC(SkeletonResourceBaseABC): return ("array_count.h",) def get_h_includes(self): - return ("z64animation.h",) + return ("animation.h",) class SkeletonNormalResource(SkeletonResourceABC): @@ -345,7 +345,7 @@ class SkeletonFlexResourceABC(SkeletonResourceBaseABC): return ("array_count.h",) def get_h_includes(self): - return ("z64animation.h",) + return ("animation.h",) class SkeletonFlexResource(SkeletonFlexResourceABC): diff --git a/tools/assets/extract/extase_oot64/skeleton_skin_resources.py b/tools/assets/extract/extase_oot64/skeleton_skin_resources.py index b1ad1e5b3a..e4b06e7001 100644 --- a/tools/assets/extract/extase_oot64/skeleton_skin_resources.py +++ b/tools/assets/extract/extase_oot64/skeleton_skin_resources.py @@ -38,7 +38,7 @@ class SkinVertexArrayResource(CDataArrayResource): return f"SkinVertex {self.symbol_name}[]" def get_h_includes(self): - return ("z64skin.h",) + return ("skin.h",) class SkinTransformationArrayResource(CDataArrayResource): @@ -58,7 +58,7 @@ class SkinTransformationArrayResource(CDataArrayResource): return f"SkinTransformation {self.symbol_name}[]" def get_h_includes(self): - return ("z64skin.h",) + return ("skin.h",) class SkinLimbModifArrayResource(CDataArrayResource): @@ -132,7 +132,7 @@ class SkinLimbModifArrayResource(CDataArrayResource): return f"SkinLimbModif {self.symbol_name}[]" def get_h_includes(self): - return ("z64skin.h",) + return ("skin.h",) class SkinAnimatedLimbDataResource(CDataResource): @@ -186,7 +186,7 @@ class SkinAnimatedLimbDataResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64skin.h",) + return ("skin.h",) class SkinLimbResource(CDataResource): @@ -267,7 +267,7 @@ class SkinLimbResource(CDataResource): raise ValueError() def get_h_includes(self): - return ("z64skin.h",) + return ("skin.h",) class SkinLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC): From d0bc691ec8a1356599ad3ddbf2a19de807e1461b Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Wed, 4 Jun 2025 15:11:37 -0400 Subject: [PATCH 26/42] Child Ruto Part 9: Camera setting (#2577) * Child Ruto Part 9: Camera setting * Add comment * Rename "Jabu-Jabu context" to "Big Octo platform" * Rename getter and setter --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 38 +++++++++++------------ src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) 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 b1b46d6e62..1c3b17994b 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -313,7 +313,7 @@ s32 func_80AEB020(EnRu1* this, PlayState* play) { return false; } -BgBdanObjects* EnRu1_FindSwitch(PlayState* play) { +BgBdanObjects* EnRu1_FindBigOctoPlatform(PlayState* play) { Actor* actorIt = play->actorCtx.actorLists[ACTORCAT_BG].head; while (actorIt != NULL) { @@ -327,15 +327,15 @@ BgBdanObjects* EnRu1_FindSwitch(PlayState* play) { return NULL; } -void func_80AEB0EC(EnRu1* this, s32 cameraSetting) { - if (this->unk_28C != NULL) { - this->unk_28C->cameraSetting = cameraSetting; +void EnRu1_SetPlatformCamSetting(EnRu1* this, s32 cameraSetting) { + if (this->bigOctoPlatform != NULL) { + this->bigOctoPlatform->cameraSetting = cameraSetting; } } -s32 func_80AEB104(EnRu1* this) { - if (this->unk_28C != NULL) { - return this->unk_28C->cameraSetting; +s32 EnRu1_GetPlatformCamSetting(EnRu1* this) { + if (this->bigOctoPlatform != NULL) { + return this->bigOctoPlatform->cameraSetting; } else { return 0; } @@ -371,7 +371,7 @@ void func_80AEB1D8(EnRu1* this) { this->actor.speed = 0.0f; this->actor.gravity = 0.0f; this->actor.minVelocityY = 0.0f; - func_80AEB0EC(this, 0); + EnRu1_SetPlatformCamSetting(this, 0); } void func_80AEB220(EnRu1* this, PlayState* play) { @@ -1576,7 +1576,7 @@ s32 func_80AEE394(EnRu1* this, PlayState* play) { gSaveContext.cutsceneTrigger = 1; this->action = 36; this->drawConfig = 0; - this->unk_28C = (BgBdanObjects*)dynaPolyActor; + this->bigOctoPlatform = (BgBdanObjects*)dynaPolyActor; this->actor.shape.shadowAlpha = 0; return true; } @@ -1958,7 +1958,7 @@ void func_80AEF51C(EnRu1* this) { } void func_80AEF540(EnRu1* this) { - if (func_80AEB104(this) == 2) { + if (EnRu1_GetPlatformCamSetting(this) == 2) { EnRu1_SetEyeIndex(this, 3); EnRu1_SetMouthIndex(this, 2); if (this->skelAnime.mode != 2) { @@ -2047,14 +2047,14 @@ void func_80AEF890(EnRu1* this, PlayState* play) { curRoomNum = play->roomCtx.curRoom.num; SET_INFTABLE(INFTABLE_145); Flags_SetSwitch(play, func_80AEADE0(this)); - func_80AEB0EC(this, 1); + EnRu1_SetPlatformCamSetting(this, 1); this->action = 42; this->actor.room = curRoomNum; } } void func_80AEF930(EnRu1* this, PlayState* play) { - if (func_80AEB104(this) == 3) { + if (EnRu1_GetPlatformCamSetting(this) == 3) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; this->actor.textId = 0x4048; #if !OOT_PAL_N64 @@ -2070,7 +2070,7 @@ void func_80AEF930(EnRu1* this, PlayState* play) { void func_80AEF99C(EnRu1* this, PlayState* play) { if (func_80AEB1B4(play) != 0) { - func_80AEB0EC(this, 4); + EnRu1_SetPlatformCamSetting(this, 4); Actor_Kill(&this->actor); } } @@ -2155,8 +2155,8 @@ void EnRu1_InitInSapphireRoom(EnRu1* this, PlayState* play) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); this->action = 41; - this->unk_28C = EnRu1_FindSwitch(play); - func_80AEB0EC(this, 1); + this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play); + EnRu1_SetPlatformCamSetting(this, 1); this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY); } else { Actor_Kill(&this->actor); @@ -2164,11 +2164,11 @@ void EnRu1_InitInSapphireRoom(EnRu1* this, PlayState* play) { } void func_80AEFCE8(EnRu1* this, PlayState* play) { - this->unk_28C = EnRu1_FindSwitch(play); - if (this->unk_28C != NULL) { + this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play); + if (this->bigOctoPlatform != NULL) { this->action = 42; this->drawConfig = 1; - func_80AEB0EC(this, 1); + EnRu1_SetPlatformCamSetting(this, 1); } } @@ -2261,7 +2261,7 @@ void func_80AF0050(EnRu1* this, PlayState* play) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); this->action = 36; this->roomNum1 = this->actor.room; - this->unk_28C = EnRu1_FindSwitch(play); + this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play); this->actor.room = -1; } #endif diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 941765edad..b3fea7c432 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -33,7 +33,7 @@ typedef struct EnRu1 { /* 0x0285 */ s8 roomNum2; /* 0x0286 */ s8 roomNum3; /* 0x0288 */ f32 unk_288; - /* 0x028C */ BgBdanObjects* unk_28C; + /* 0x028C */ BgBdanObjects* bigOctoPlatform; /* 0x0290 */ s32 unk_290; /* 0x0294 */ char unk_294[0x4]; /* 0x0298 */ s32 unk_298; From 892bddbccef94eeee66030415b929396a0c18efd Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Wed, 4 Jun 2025 16:29:13 -0400 Subject: [PATCH 27/42] Child Ruto Part 13: Animation change function (#2581) * Child Ruto Part 13: Animation change function * Update function signature * Revert playReversed parameter type Co-authored-by: Dragorn421 * Missed call Co-authored-by: Dragorn421 * Revert the other parameter type Co-authored-by: Dragorn421 --------- Co-authored-by: Dragorn421 --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) 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 1c3b17994b..e254ca1a57 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -381,25 +381,25 @@ void func_80AEB220(EnRu1* this, PlayState* play) { } #endif -void func_80AEB264(EnRu1* this, AnimationHeader* animation, u8 arg2, f32 morphFrames, s32 arg4) { +void EnRu1_AnimationChange(EnRu1* this, AnimationHeader* animation, u8 mode, f32 morphFrames, s32 playReversed) { s32 pad[2]; AnimationHeader* animHeader = SEGMENTED_TO_VIRTUAL(animation); f32 frameCount = Animation_GetLastFrame(animHeader); f32 playbackSpeed; - f32 unk0; - f32 fc; + f32 startFrame; + f32 endFrame; - if (arg4 == 0) { - unk0 = 0.0f; - fc = frameCount; + if (!playReversed) { + startFrame = 0.0f; + endFrame = frameCount; playbackSpeed = 1.0f; } else { - unk0 = frameCount; - fc = 0.0f; + startFrame = frameCount; + endFrame = 0.0f; playbackSpeed = -1.0f; } - Animation_Change(&this->skelAnime, animHeader, playbackSpeed, unk0, fc, arg2, morphFrames); + Animation_Change(&this->skelAnime, animHeader, playbackSpeed, startFrame, endFrame, mode, morphFrames); } s32 EnRu1_UpdateSkelAnime(EnRu1* this) { @@ -426,7 +426,7 @@ void func_80AEB3CC(EnRu1* this) { } void EnRu1_InitOutsideJabuJabu(EnRu1* this, PlayState* play) { - func_80AEB264(this, &gRutoChildWaitHandsBehindBackAnim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWaitHandsBehindBackAnim, ANIMMODE_LOOP, 0, false); this->action = 0; this->drawConfig = 1; EnRu1_SetEyeIndex(this, 4); @@ -784,14 +784,14 @@ void func_80AEC2C0(EnRu1* this, PlayState* play) { void EnRu1_InitInJabuJabuHolesRoom(EnRu1* this, PlayState* play) { if (!GET_INFTABLE(INFTABLE_141)) { - func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); this->action = 7; EnRu1_SetMouthIndex(this, 1); } else if (GET_INFTABLE(INFTABLE_147) && !GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145)) { if (!func_80AEB020(this, play)) { s8 actorRoom; - func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); actorRoom = this->actor.room; this->action = 22; this->actor.room = -1; @@ -1028,7 +1028,7 @@ void func_80AECCB0(EnRu1* this, PlayState* play) { } void EnRu1_InitInBossRoom(EnRu1* this, PlayState* play) { - func_80AEB264(this, &gRutoChildWaitHandsOnHipsAnim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWaitHandsOnHipsAnim, ANIMMODE_LOOP, 0, false); this->action = 15; this->actor.shape.yOffset = -10000.0f; EnRu1_SetEyeIndex(this, 5); @@ -1199,7 +1199,7 @@ void EnRu1_InitInJabuJabuBasement(EnRu1* this, PlayState* play) { if (!func_80AEB020(this, play)) { s8 actorRoom; - func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); actorRoom = this->actor.room; this->action = 22; this->actor.room = -1; @@ -1962,7 +1962,7 @@ void func_80AEF540(EnRu1* this) { EnRu1_SetEyeIndex(this, 3); EnRu1_SetMouthIndex(this, 2); if (this->skelAnime.mode != 2) { - func_80AEB264(this, &gRutoChildShutterAnim, 2, -8.0f, 0); + EnRu1_AnimationChange(this, &gRutoChildShutterAnim, ANIMMODE_ONCE, -8.0f, false); func_80AEF51C(this); } } @@ -2153,7 +2153,7 @@ void EnRu1_InitInSapphireRoom(EnRu1* this, PlayState* play) { if (GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_146)) { s32 pad; - func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); this->action = 41; this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play); EnRu1_SetPlatformCamSetting(this, 1); @@ -2174,7 +2174,7 @@ void func_80AEFCE8(EnRu1* this, PlayState* play) { void EnRu1_InitBesideKingZora(EnRu1* this, PlayState* play) { if (GET_EVENTCHKINF(EVENTCHKINF_37) && LINK_IS_CHILD) { - func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->action = 44; this->drawConfig = 1; @@ -2241,7 +2241,7 @@ void EnRu1_InitBesideDoorSwitch(EnRu1* this, PlayState* play) { if (GET_INFTABLE(INFTABLE_141) && GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145) && (!(func_80AEB020(this, play)))) { - func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); actorRoom = this->actor.room; this->action = 22; this->actor.room = -1; @@ -2258,7 +2258,7 @@ void EnRu1_InitBesideDoorSwitch(EnRu1* this, PlayState* play) { #if DEBUG_FEATURES void func_80AF0050(EnRu1* this, PlayState* play) { - func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); + EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); this->action = 36; this->roomNum1 = this->actor.room; this->bigOctoPlatform = EnRu1_FindBigOctoPlatform(play); From 61284297bf4aa5994c59694874830597046f880b Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Thu, 5 Jun 2025 13:24:11 -0400 Subject: [PATCH 28/42] Child Ruto Part 6: Switch flag and type functions (#2574) * Child Ruto Part 6: Switch flag and type functions * Add type enum and getter macros * Fix macros * Fix macros better * Revert improper usage * Move macros to header * Refactor enum * Move type enum to header --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 34 ++++++++++----------- src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 36 ++++++++++++++++------- 2 files changed, 43 insertions(+), 27 deletions(-) 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 e254ca1a57..7267ac4e9e 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -209,16 +209,16 @@ void func_80AEADD8(EnRu1* this) { this->unk_34C = 0; } -u8 func_80AEADE0(EnRu1* this) { - u8 params = PARAMS_GET_U(this->actor.params, 8, 8); +u8 EnRu1_GetSwitchFlag(EnRu1* this) { + u8 switchFlag = ENRU1_SWITCH_FLAG(&this->actor); - return params; + return switchFlag; } -u8 func_80AEADF0(EnRu1* this) { - u8 params = PARAMS_GET_U(this->actor.params, 0, 8); +u8 EnRu1_GetType(EnRu1* this) { + u8 type = ENRU1_TYPE(&this->actor); - return params; + return type; } void EnRu1_Destroy(Actor* thisx, PlayState* play) { @@ -2046,7 +2046,7 @@ void func_80AEF890(EnRu1* this, PlayState* play) { if (!(DEBUG_FEATURES && IS_CUTSCENE_LAYER) && EnRu1_IsCsStateIdle(play)) { curRoomNum = play->roomCtx.curRoom.num; SET_INFTABLE(INFTABLE_145); - Flags_SetSwitch(play, func_80AEADE0(this)); + Flags_SetSwitch(play, EnRu1_GetSwitchFlag(this)); EnRu1_SetPlatformCamSetting(this, 1); this->action = 42; this->actor.room = curRoomNum; @@ -2285,36 +2285,36 @@ void EnRu1_Init(Actor* thisx, PlayState* play) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gRutoChildSkel, NULL, this->jointTable, this->morphTable, 17); func_80AEAD20(&this->actor, play); - switch (func_80AEADF0(this)) { - case 0: + switch (EnRu1_GetType(this)) { + case ENRU1_TYPE_BOSS_ROOM: EnRu1_InitInBossRoom(this, play); break; - case 1: + case ENRU1_TYPE_FOUNTAIN: EnRu1_InitOutsideJabuJabu(this, play); break; - case 2: + case ENRU1_TYPE_HOLES_ROOM: EnRu1_InitInJabuJabuHolesRoom(this, play); break; - case 3: + case ENRU1_TYPE_BASEMENT: EnRu1_InitInJabuJabuBasement(this, play); break; - case 4: + case ENRU1_TYPE_SAPPHIRE_ROOM: EnRu1_InitInSapphireRoom(this, play); break; - case 5: + case ENRU1_TYPE_BESIDE_KZ: EnRu1_InitBesideKingZora(this, play); break; - case 6: + case ENRU1_TYPE_BESIDE_DOOR_SWITCH: EnRu1_InitBesideDoorSwitch(this, play); break; #if DEBUG_FEATURES - case 10: + case ENRU1_TYPE_DEBUG: func_80AF0050(this, play); break; #endif default: Actor_Kill(&this->actor); - PRINTF(T("該当 arge_data = %d 無し\n", "Relevant arge_data = %d unacceptable\n"), func_80AEADF0(this)); + PRINTF(T("該当 arge_data = %d 無し\n", "Relevant arge_data = %d unacceptable\n"), EnRu1_GetType(this)); break; } } diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index b3fea7c432..53f9b9a7fb 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -7,6 +7,9 @@ #include "overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" +#define ENRU1_SWITCH_FLAG(thisx) PARAMS_GET_U((thisx)->params, 8, 8) +#define ENRU1_TYPE(thisx) PARAMS_GET_U((thisx)->params, 0, 8) + struct EnRu1; typedef void (*EnRu1ActionFunc)(struct EnRu1*, struct PlayState*); @@ -57,17 +60,30 @@ typedef struct EnRu1 { /* 0x0374 */ NpcInteractInfo interactInfo; } EnRu1; // size = 0x039C +typedef enum EnRu1Type { + /* 0 */ ENRU1_TYPE_BOSS_ROOM, + /* 1 */ ENRU1_TYPE_FOUNTAIN, + /* 2 */ ENRU1_TYPE_HOLES_ROOM, + /* 3 */ ENRU1_TYPE_BASEMENT, + /* 4 */ ENRU1_TYPE_SAPPHIRE_ROOM, + /* 5 */ ENRU1_TYPE_BESIDE_KZ, + /* 6 */ ENRU1_TYPE_BESIDE_DOOR_SWITCH, +#if DEBUG_FEATURES + /* 10 */ ENRU1_TYPE_DEBUG = 10, +#endif +} EnRu1Type; + typedef enum RutoLimb { - /* 0 */ RUTO_CHILD_NONE, - /* 1 */ RUTO_CHILD_ROOT, - /* 2 */ RUTO_CHILD_LEFT_THIGH, - /* 3 */ RUTO_CHILD_LEFT_SHIN, - /* 4 */ RUTO_CHILD_LEFT_FOOT, - /* 5 */ RUTO_CHILD_RIGHT_THIGH, - /* 6 */ RUTO_CHILD_RIGHT_SHIN, - /* 7 */ RUTO_CHILD_RIGHT_FOOT, - /* 8 */ RUTO_CHILD_CHEST, - /* 9 */ RUTO_CHILD_LEFT_UPPER_ARM, + /* 0 */ RUTO_CHILD_NONE, + /* 1 */ RUTO_CHILD_ROOT, + /* 2 */ RUTO_CHILD_LEFT_THIGH, + /* 3 */ RUTO_CHILD_LEFT_SHIN, + /* 4 */ RUTO_CHILD_LEFT_FOOT, + /* 5 */ RUTO_CHILD_RIGHT_THIGH, + /* 6 */ RUTO_CHILD_RIGHT_SHIN, + /* 7 */ RUTO_CHILD_RIGHT_FOOT, + /* 8 */ RUTO_CHILD_CHEST, + /* 9 */ RUTO_CHILD_LEFT_UPPER_ARM, /* 10 */ RUTO_CHILD_LEFT_FIN, /* 11 */ RUTO_CHILD_LEFT_HAND, /* 12 */ RUTO_CHILD_RIGHT_UPPER_ARM, From 57097bf36e09ae022b57dce67ebb71430509f695 Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Thu, 5 Jun 2025 16:31:21 -0400 Subject: [PATCH 29/42] Child Ruto Part 3: Water states (#2570) * Child Ruto Part 3: Water states * Update function names too * Rename more water-related variables * Revise/remove comments * Enum updates --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 67 +++++++++++++---------- src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 10 ++-- 2 files changed, 43 insertions(+), 34 deletions(-) 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 7267ac4e9e..1033a31e73 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -90,6 +90,13 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play); void EnRu1_DrawOpa(EnRu1* this, PlayState* play); void EnRu1_DrawXlu(EnRu1* this, PlayState* play); +typedef enum EnRu1WaterState { + /* 0 */ ENRU1_WATER_OUTSIDE, + /* 1 */ ENRU1_WATER_IMMERSED, + /* 2 */ ENRU1_WATER_BOBBING, + /* 3 */ ENRU1_WATER_SINKING, +} EnRu1WaterState; + static ColliderCylinderInitType1 sCylinderInit1 = { { COL_MATERIAL_HIT0, @@ -1470,20 +1477,22 @@ void func_80AEE02C(EnRu1* this) { this->actor.minVelocityY = 0.0f; } -void func_80AEE050(EnRu1* this) { +void EnRu1_UpdateWaterState(EnRu1* this) { s32 pad; - f32 sp28; - f32 sp24; + f32 bobMagnitude; + f32 startY; EnRu1* thisx = this; // necessary to match - if (this->unk_350 == 0) { + if (this->waterState == ENRU1_WATER_OUTSIDE) { if ((this->actor.minVelocityY == 0.0f) && (this->actor.speed == 0.0f)) { - this->unk_350 = 1; + // When Ruto's velocity has been slowed enough by the water, stop her motion + this->waterState = ENRU1_WATER_IMMERSED; func_80AEE02C(this); - this->unk_35C = 0; - this->unk_358 = (this->actor.depthInWater - 10.0f) * 0.5f; - this->unk_354 = this->actor.world.pos.y + thisx->unk_358; // thisx only used here + this->bobPhase = 0; + this->bobDepth = (this->actor.depthInWater - 10.0f) * 0.5f; + this->sinkingStartPosY = this->actor.world.pos.y + thisx->bobDepth; } else { + // Ruto is touching the water but still in motion, e.g. from being thrown this->actor.gravity = 0.0f; this->actor.minVelocityY *= 0.2f; this->actor.velocity.y *= 0.2f; @@ -1500,25 +1509,25 @@ void func_80AEE050(EnRu1* this) { Actor_UpdatePos(&this->actor); } } else { - if (this->unk_350 == 1) { - if (this->unk_358 <= 1.0f) { + if (this->waterState == ENRU1_WATER_IMMERSED) { + if (this->bobDepth <= 1.0f) { func_80AEE02C(this); - this->unk_350 = 2; - this->unk_360 = 0.0f; + this->waterState = ENRU1_WATER_BOBBING; + this->isSinking = 0.0f; } else { - f32 temp_f10; + f32 deltaY; - sp28 = this->unk_358; - sp24 = this->unk_354; - temp_f10 = Math_CosS(this->unk_35C) * -sp28; - this->actor.world.pos.y = temp_f10 + sp24; - this->unk_35C += 0x3E8; - this->unk_358 *= 0.95f; + bobMagnitude = this->bobDepth; + startY = this->sinkingStartPosY; + deltaY = Math_CosS(this->bobPhase) * -bobMagnitude; + this->actor.world.pos.y = deltaY + startY; + this->bobPhase += 0x3E8; + this->bobDepth *= 0.95f; } } else { - this->unk_360 += 1.0f; - if (this->unk_360 > 0.0f) { - this->unk_350 = 3; + this->isSinking += 1.0f; + if (this->isSinking > 0.0f) { + this->waterState = ENRU1_WATER_SINKING; } } } @@ -1616,7 +1625,7 @@ void func_80AEE568(EnRu1* this, PlayState* play) { if (this->actor.depthInWater > 0.0f) { this->action = 29; - this->unk_350 = 0; + this->waterState = ENRU1_WATER_OUTSIDE; } } } @@ -1711,7 +1720,7 @@ void EnRu1_UpdateCarriedBehavior(EnRu1* this, PlayState* play) { } } -s32 func_80AEEAC8(EnRu1* this, PlayState* play) { +s32 EnRu1_CheckHitBottomUnderwater(EnRu1* this, PlayState* play) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { s32 pad; @@ -1724,8 +1733,8 @@ s32 func_80AEEAC8(EnRu1* this, PlayState* play) { return false; } -void func_80AEEB24(EnRu1* this, PlayState* play) { - if ((func_80AEEAC8(this, play) == 0) && (this->unk_350 == 3)) { +void EnRu1_CheckSinkingState(EnRu1* this, PlayState* play) { + if ((EnRu1_CheckHitBottomUnderwater(this, play) == 0) && (this->waterState == ENRU1_WATER_SINKING)) { this->action = 30; func_80AEE02C(this); this->actor.gravity = -0.1f; @@ -1765,10 +1774,10 @@ void func_80AEEC5C(EnRu1* this, PlayState* play) { void func_80AEECF0(EnRu1* this, PlayState* play) { func_80AED83C(this); func_80AEAECC(this, play); - func_80AEE050(this); + EnRu1_UpdateWaterState(this); EnRu1_UpdateSkelAnime(this); EnRu1_UpdateEyes(this); - func_80AEEB24(this, play); + EnRu1_CheckSinkingState(this, play); func_80AED624(this, play); } @@ -1778,7 +1787,7 @@ void func_80AEED58(EnRu1* this, PlayState* play) { Actor_MoveXZGravity(&this->actor); EnRu1_UpdateSkelAnime(this); EnRu1_UpdateEyes(this); - func_80AEEAC8(this, play); + EnRu1_CheckHitBottomUnderwater(this, play); func_80AED624(this, play); func_80AEDAE0(this, play); } diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 53f9b9a7fb..3b44d40319 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -50,11 +50,11 @@ typedef struct EnRu1 { /* 0x02B4 */ ColliderCylinder collider; /* 0x0300 */ ColliderCylinder collider2; /* 0x034C */ s32 unk_34C; - /* 0x0350 */ s32 unk_350; - /* 0x0354 */ f32 unk_354; - /* 0x0358 */ f32 unk_358; - /* 0x035C */ s16 unk_35C; - /* 0x0360 */ f32 unk_360; + /* 0x0350 */ s32 waterState; + /* 0x0354 */ f32 sinkingStartPosY; + /* 0x0358 */ f32 bobDepth; + /* 0x035C */ s16 bobPhase; + /* 0x0360 */ f32 isSinking; /* 0x0364 */ Vec3f unk_364; /* 0x0370 */ f32 carryIdleTimer; /* 0x0374 */ NpcInteractInfo interactInfo; From d1ac2561b5c5f184eb4eed1894398dc4e4e7728c Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 5 Jun 2025 23:49:09 +0200 Subject: [PATCH 30/42] T() macro loose ends 3 (#2592) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remaining weird T() * cleanup "発生" as ~"spawn" * single strings T() * more single strings T() * more single strings T() (InitDynaPoly helpers) --- src/boot/z_std_dma.c | 2 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 11 +++++----- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 3 ++- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 6 +++--- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 17 +++++++++------- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 2 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 8 ++++---- .../z_bg_hidan_kowarerukabe.c | 12 +++++------ .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 4 ++-- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 7 ++++--- .../z_bg_jya_amishutter.c | 4 ++-- .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 10 +++++----- .../z_bg_jya_bombchuiwa.c | 3 ++- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 11 +++++----- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 11 +++++----- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 6 +++--- .../z_bg_jya_zurerukabe.c | 9 +++++---- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 20 +++++++++---------- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 2 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 14 ++++++------- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 14 +++++++------ .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 11 +++++----- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 7 ++++--- .../z_bg_mori_rakkatenjo.c | 2 +- .../z_bg_spot08_iceblock.c | 12 +++++------ .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 7 ++++--- .../z_bg_spot11_bakudankabe.c | 2 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 4 ++-- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 4 ++-- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 10 ++++++---- .../z_bg_spot16_bombstone.c | 15 ++++++++------ .../z_bg_spot16_doughnut.c | 3 ++- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 3 ++- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 2 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 10 ++++++---- .../actors/ovl_En_Anubice/z_en_anubice.c | 2 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.c | 2 +- .../actors/ovl_En_Changer/z_en_changer.c | 6 +++--- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 9 +++++---- .../actors/ovl_En_Encount2/z_en_encount2.c | 10 +++++----- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 3 ++- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 3 +-- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 3 +-- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 2 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 4 ++-- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 4 ++-- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 4 ++-- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 4 ++-- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 4 ++-- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 2 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 2 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 6 +++--- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 4 ++-- .../actors/ovl_Obj_Switch/z_obj_switch.c | 6 +++--- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 2 +- 58 files changed, 190 insertions(+), 166 deletions(-) diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 6ab0c87f3c..226465a3f6 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -519,7 +519,7 @@ void DmaMgr_ThreadEntry(void* arg) { } if (0) { - PRINTF(T("ＤＭＡ登録受付", "DMA registration acceptance") " dmap=%08x\n", req); + PRINTF(T("ＤＭＡ登録受付 dmap=%08x\n", "DMA registration acceptance dmap=%08x\n"), req); } // Process the DMA request diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index a27bb69c1f..280730bcda 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -113,8 +113,8 @@ void BgBdanSwitch_InitDynaPoly(BgBdanSwitch* this, PlayState* play, CollisionHea if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_bdan_switch.c", 325, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -209,12 +209,13 @@ void BgBdanSwitch_Init(Actor* thisx, PlayState* play) { } break; default: - PRINTF(T("不正な", "Invalid") " ARG_DATA(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, - "../z_bg_bdan_switch.c", 454); + PRINTF(T("不正な ARG_DATA(arg_data 0x%04x)(%s %d)\n", "Invalid ARG_DATA(arg_data 0x%04x)(%s %d)\n"), + this->dyna.actor.params, "../z_bg_bdan_switch.c", 454); Actor_Kill(&this->dyna.actor); return; } - PRINTF(T("(巨大魚ダンジョン 専用スイッチ)", "(Giant Fish Dungeon Special Switch)") "(arg_data 0x%04x)\n", + PRINTF(T("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n", + "(Giant Fish Dungeon Special Switch)(arg_data 0x%04x)\n"), this->dyna.actor.params); } 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 a7ae0f3cc6..e773a20c4c 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 @@ -49,7 +49,7 @@ void BgBomGuard_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader); PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("透明ガード出現", "Transparent guard appears") " ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 透明ガード出現 ☆☆☆☆☆ \n", " ☆☆☆☆☆ Transparent guard appears ☆☆☆☆☆ \n") VT_RST); thisx->scale.x = 1.0f; thisx->scale.y = 1.0f; diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index a40a29242a..15a2ffb841 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -156,7 +156,8 @@ void BgBombwall_Init(Actor* thisx, PlayState* play) { func_8086ED50(this, play); } - PRINTF("(field keep " T("汎用爆弾壁", "general purpose bomb wall") ")(arg_data 0x%04x)(angY %d)\n", + PRINTF(T("(field keep 汎用爆弾壁)(arg_data 0x%04x)(angY %d)\n", + "(field keep general purpose bomb wall)(arg_data 0x%04x)(angY %d)\n"), this->dyna.actor.params, this->dyna.actor.shape.rot.y); } 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 7900504f7f..57a5b0b9e6 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 @@ -74,9 +74,9 @@ void BgBowlWall_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); this->initPos = this->dyna.actor.world.pos; PRINTF("\n\n"); - PRINTF( - VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("ボーリングおじゃま壁発生", "Bowling obstacle wall appears") " ☆☆☆☆☆ %d\n" VT_RST, - this->dyna.actor.params); + PRINTF(VT_FGCOL(GREEN) + T(" ☆☆☆☆☆ ボーリングおじゃま壁発生 ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Bowling obstacle wall spawns ☆☆☆☆☆ %d\n") VT_RST, + this->dyna.actor.params); this->actionFunc = BgBowlWall_SpawnBullseyes; this->dyna.actor.scale.x = this->dyna.actor.scale.y = this->dyna.actor.scale.z = 1.0f; } 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 233368d438..44dc02ca0d 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 @@ -104,7 +104,8 @@ void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) { this->actor.focus.pos = this->actor.world.pos; if (play->sceneId == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) { - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ " T("大妖精の泉", "Great Fairy Fountain") " ☆☆☆☆☆ %d\n" VT_RST, play->spawn); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Great Fairy Fountain ☆☆☆☆☆ %d\n") VT_RST, + play->spawn); SkelAnime_InitFlex(play, &this->skelAnime, &gGreatFairySkel, &gGreatFairySittingTransitionAnim, this->jointTable, this->morphTable, 28); #if OOT_VERSION < NTSC_1_1 @@ -114,7 +115,8 @@ void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) { } #endif } else { - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ " T("石妖精の泉", "Stone Fairy Fountain") " ☆☆☆☆☆ %d\n" VT_RST, play->spawn); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Stone Fairy Fountain ☆☆☆☆☆ %d\n") VT_RST, + play->spawn); SkelAnime_InitFlex(play, &this->skelAnime, &gGreatFairySkel, &gGreatFairyLayingDownTransitionAnim, this->jointTable, this->morphTable, 28); #if OOT_VERSION < NTSC_1_1 @@ -251,7 +253,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) { #endif Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ " T("もうど", "Mode") " ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Mode ☆☆☆☆☆ %d\n") VT_RST, play->msgCtx.ocarinaMode); givingReward = false; if (play->sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) { @@ -276,22 +278,23 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) { switch (this->fountainType) { case FAIRY_UPGRADE_MAGIC: if (!gSaveContext.save.info.playerData.isMagicAcquired || BREG(2)) { - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("回転切り速度ＵＰ", "Turning speed UP") " ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n", " ☆☆☆☆☆ Turning speed UP ☆☆☆☆☆ \n") + VT_RST); this->givingSpell = true; givingReward = true; } break; case FAIRY_UPGRADE_DOUBLE_MAGIC: if (!gSaveContext.save.info.playerData.isDoubleMagicAcquired) { - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ " T("魔法ゲージメーター倍増", - "Magic Gauge Meter Doubled") " ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n", + " ☆☆☆☆☆ Magic Gauge Meter Doubled ☆☆☆☆☆ \n") VT_RST); this->givingSpell = true; givingReward = true; } break; case FAIRY_UPGRADE_DOUBLE_DEFENSE: if (!gSaveContext.save.info.playerData.isDoubleDefenseAcquired) { - PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ " T("ダメージ半減", "Damage halved") " ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n", " ☆☆☆☆☆ Damage halved ☆☆☆☆☆ \n") VT_RST); this->givingSpell = true; givingReward = true; } 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 6e9821d64f..8e7ad4c3d6 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 @@ -62,7 +62,7 @@ void BgGateShutter_Init(Actor* thisx, PlayState* play) { thisx->scale.y = 1.0f; thisx->scale.z = 1.0f; PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ " T("柵でたなぁ", "There's a fence") " ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 柵でたなぁ ☆☆☆☆☆ \n", " ☆☆☆☆☆ There's a fence ☆☆☆☆☆ \n") VT_RST); this->actionFunc = func_8087828C; } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index fbb2b4be30..7abcc1f912 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -87,8 +87,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { Actor_SetFocus(&this->actor, 20.0f); this->type = PARAMS_GET_U(thisx->params, 12, 4); if (this->type > 6) { - PRINTF(T("Error : object のタイプが設定されていない", - "Error : object type is not set") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", + "Error : object type is not set (%s %d)(arg_data 0x%04x)\n"), "../z_bg_hidan_curtain.c", 352, this->actor.params); Actor_Kill(&this->actor); return; @@ -100,8 +100,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { thisx->params &= 0x3F; if (DEBUG_FEATURES && ((this->actor.params < 0) || (this->actor.params > 0x3F))) { - PRINTF(T("Warning : object のセーブビットが設定されていない", - "Warning : object save bit is not set") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n", + "Warning : object save bit is not set (%s %d)(arg_data 0x%04x)\n"), "../z_bg_hidan_curtain.c", 373, this->actor.params); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index ff71d16fc0..4f1be80a62 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -131,10 +131,9 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) { if (PARAMS_GET_U(this->dyna.actor.params, 0, 8) < CRACKED_STONE_FLOOR || PARAMS_GET_U(this->dyna.actor.params, 0, 8) > LARGE_BOMBABLE_WALL) { - PRINTF( - T("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない", - "Error : arg_data for the Fire Temple breakable wall cannot be determined") "(%s %d)(arg_data 0x%04x)\n", - "../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params); + PRINTF(T("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", + "Error : arg_data for the Fire Temple breakable wall cannot be determined (%s %d)(arg_data 0x%04x)\n"), + "../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); return; } @@ -148,8 +147,9 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->dyna.actor, 0.1f); BgHidanKowarerukabe_InitColliderSphere(this, play); BgHidanKowarerukabe_OffsetActorYPos(this); - PRINTF(T("(hidan 爆弾で壊れる 壁 床)", "(hidan bomb destroys walls and floors)") "(arg_data 0x%04x)\n", - this->dyna.actor.params); + PRINTF( + T("(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n", "(hidan bomb destroys walls and floors)(arg_data 0x%04x)\n"), + this->dyna.actor.params); } void BgHidanKowarerukabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index cc8f46a982..0c6578ec26 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -137,8 +137,8 @@ void BgIceShelter_InitDynaPoly(BgIceShelter* this, PlayState* play, CollisionHea if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_ice_shelter.c", 362, this->dyna.actor.id, this->dyna.actor.params); } #endif diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 1fa0559484..6ff102aa41 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -87,8 +87,8 @@ void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeade if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_jya_1flift.c", 179, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -104,7 +104,8 @@ void BgJya1flift_InitCollision(Actor* thisx, PlayState* play) { void BgJya1flift_Init(Actor* thisx, PlayState* play) { BgJya1flift* this = (BgJya1flift*)thisx; - PRINTF(T("(１Ｆリフト)", "1F lift") "(flag %d)(room %d)\n", sIsSpawned, play->roomCtx.curRoom.num); + PRINTF(T("(１Ｆリフト)(flag %d)(room %d)\n", "(1F lift)(flag %d)(room %d)\n"), sIsSpawned, + play->roomCtx.curRoom.num); this->hasInitialized = false; if (sIsSpawned) { Actor_Kill(thisx); diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 1147ed7e6f..046da7d10f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -62,8 +62,8 @@ void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, Collis if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_jya_amishutter.c", 129, this->dyna.actor.id, this->dyna.actor.params); } #endif diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index 66cc92b98c..feb7cba7b7 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -85,8 +85,8 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, PlayState* play) { #if DEBUG_FEATURES if (curCobraInfo->cobra->dyna.actor.update == NULL) { - PRINTF("Error : " T("コブラ削除された", "Cobra deleted") " (%s %d)\n", "../z_bg_jya_bigmirror.c", - 203); + PRINTF(T("Error : コブラ削除された (%s %d)\n", "Error : Cobra deleted (%s %d)\n"), + "../z_bg_jya_bigmirror.c", 203); } #endif } else { @@ -96,7 +96,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, PlayState* play) { this->actor.child = NULL; if (curCobraInfo->cobra == NULL) { - PRINTF("Error : " T("コブラ発生失敗", "Cobra generation failed") " (%s %d)\n", + PRINTF(T("Error : コブラ発生失敗 (%s %d)\n", "Error : Cobra failed to spawn (%s %d)\n"), "../z_bg_jya_bigmirror.c", 221); } } @@ -164,7 +164,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, PlayState* play) { #if DEBUG_FEATURES if (this->lightBeams[i] == NULL) { - PRINTF("Error : " T("Mir Ray 発生失敗", "Mir Ray generation failed") " (%s %d)\n", + PRINTF(T("Error : Mir Ray 発生失敗 (%s %d)\n", "Error : Mir Ray failed to spawn (%s %d)\n"), "../z_bg_jya_bigmirror.c", 310); } #endif @@ -196,7 +196,7 @@ void BgJyaBigmirror_Init(Actor* thisx, PlayState* play) { this->spawned = true; this->mirRayObjectSlot = -1; - PRINTF("(jya " T("大鏡", "Big mirror") ")(arg_data 0x%04x)\n", this->actor.params); + PRINTF(T("(jya 大鏡)(arg_data 0x%04x)\n", "(jya Big mirror)(arg_data 0x%04x)\n"), this->actor.params); } void BgJyaBigmirror_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 6d524848e4..e19f90863a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -195,7 +195,8 @@ void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, PlayState* play) { BgJyaBombchuiwa_SetDrawFlags(this, 4); if (Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0) == NULL) { - PRINTF(T("Ｅｒｒｏｒ : Mir_Ray 発生失敗", "Error : Mir_Ray failed to occur") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Mir_Ray failed to spawn (%s %d)(arg_data 0x%04x)\n"), "../z_bg_jya_bombchuiwa.c", 410, this->actor.params); } } 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 5e231d5414..87a1aa3a78 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 @@ -83,8 +83,8 @@ void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHe if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_jya_bombiwa.c", 174, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -102,8 +102,8 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) { if (PARAMS_GET_U(this->dyna.actor.params, 0, 6) != 0x29) { PRINTF_COLOR_WARNING(); - PRINTF(T("Ｗａｒｎｉｎｇ : Switch Number が変更された", - "Warning : Switch Number has been changed") "(%s %d)(SW %d)\n", + PRINTF(T("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n", + "Warning : Switch Number has been changed (%s %d)(SW %d)\n"), "../z_bg_jya_bombiwa.c", 218, PARAMS_GET_U(this->dyna.actor.params, 0, 6)); PRINTF_RST(); } @@ -114,7 +114,8 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) { } else { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); - PRINTF(T("(jya 爆弾で破壊岩)", "(jya bomb destroys rocks)") "(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(jya 爆弾で破壊岩)(arg_data 0x%04x)\n", "(jya bomb destroys rocks)(arg_data 0x%04x)\n"), + this->dyna.actor.params); } } 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 26402414d9..81fe1e598f 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 @@ -145,8 +145,8 @@ void BgJyaCobra_InitDynapoly(BgJyaCobra* this, PlayState* play, CollisionHeader* if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_jya_cobra.c", 247, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -159,7 +159,7 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, PlayState* play) { #if DEBUG_FEATURES if (this->dyna.actor.child == NULL) { PRINTF_COLOR_RED(); - PRINTF(T("Ｅｒｒｏｒ : Mir Ray 発生失敗", "Error : Mir Ray failed to occur") " (%s %d)\n", + PRINTF(T("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "Error : Mir Ray failed to occur (%s %d)\n"), "../z_bg_jya_cobra.c", 270); PRINTF_RST(); } @@ -445,8 +445,9 @@ void BgJyaCobra_Init(Actor* thisx, PlayState* play) { BgJyaCobra_UpdateShadowFromTop(this); } - PRINTF("(jya " T("コブラ", "cobra") ")(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n", this->dyna.actor.params, this, - &this->shadowTextureBuffer, COBRA_SHADOW_TEX_PTR(this)); + PRINTF(T("(jya コブラ)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n", + "(jya cobra)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n"), + this->dyna.actor.params, this, &this->shadowTextureBuffer, COBRA_SHADOW_TEX_PTR(this)); } void BgJyaCobra_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 6c5bc7cc66..652ec8e8e6 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -61,8 +61,8 @@ void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHea if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_jya_kanaami.c", 145, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -78,7 +78,7 @@ void BgJyaKanaami_Init(Actor* thisx, PlayState* play) { } else { func_80899880(this); } - PRINTF("(jya " T("金網", "wire mesh") ")(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(jya 金網)(arg_data 0x%04x)\n", "(jya wire mesh)(arg_data 0x%04x)\n"), this->dyna.actor.params); } void BgJyaKanaami_Destroy(Actor* thisx, PlayState* play) { 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 810b3ff9e1..148d6c0098 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 @@ -81,8 +81,8 @@ void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, Collis if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_jya_zurerukabe.c", 194, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -137,14 +137,15 @@ void BgJyaZurerukabe_Init(Actor* thisx, PlayState* play) { if (i == ARRAY_COUNT(D_8089B9F0)) { PRINTF_COLOR_ERROR(); - PRINTF(T("home pos が変更されたみたい", "It seems that the home pos has changed") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n", + "It seems that the home pos has changed (%s %d)(arg_data 0x%04x)\n"), "../z_bg_jya_zurerukabe.c", 299, this->dyna.actor.params); PRINTF_RST(); } this->unk_16E = D_8089B9F8[this->unk_168]; func_8089B7B4(this); - PRINTF("(jya " T("ずれる壁", "sliding wall") ")(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(jya ずれる壁)(arg_data 0x%04x)\n", "(jya sliding wall)(arg_data 0x%04x)\n"), this->dyna.actor.params); } void BgJyaZurerukabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 22ccbff60d..bb21a6cb6f 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -211,8 +211,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitFloor, this->colliderElements)) { - PRINTF(T("Error : コリジョンデータセット失敗", - "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"), "../z_bg_mizu_bwall.c", 484, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { @@ -252,8 +252,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitRutoWall, this->colliderElements)) { - PRINTF(T("Error : コリジョンデータセット失敗", - "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"), "../z_bg_mizu_bwall.c", 558, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { @@ -293,8 +293,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitUnusedWall, this->colliderElements)) { - PRINTF(T("Error : コリジョンデータセット失敗", - "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"), "../z_bg_mizu_bwall.c", 638, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { @@ -336,8 +336,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall, this->colliderElements)) { - PRINTF(T("Error : コリジョンデータセット失敗", - "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"), "../z_bg_mizu_bwall.c", 724, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { @@ -379,8 +379,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall, this->colliderElements)) { - PRINTF(T("Error : コリジョンデータセット失敗", - "Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"), "../z_bg_mizu_bwall.c", 798, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 8bad01b034..4b08d9479f 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -122,7 +122,7 @@ void BgMizuWater_Init(Actor* thisx, PlayState* play) { switch (this->type) { case 0: if (bREG(15) == 0) { - PRINTF(T("<コンストラクト>", "") "%x %x %x\n", + PRINTF(T("<コンストラクト>%x %x %x\n", "%x %x %x\n"), Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG), Flags_GetSwitch(play, WATER_TEMPLE_WATER_F2_FLAG), Flags_GetSwitch(play, WATER_TEMPLE_WATER_F3_FLAG)); diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 697b1f72c9..baf9156bb7 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -74,8 +74,8 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeade if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_mori_bigst.c", 190, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -85,8 +85,8 @@ void BgMoriBigst_Init(Actor* thisx, PlayState* play) { s32 pad; BgMoriBigst* this = (BgMoriBigst*)thisx; - PRINTF(T("mori (bigST.鍵型天井)", - "mori (bigST. key-shaped ceiling)") "(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n", + PRINTF(T("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n", + "mori (bigST. key-shaped ceiling)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n"), this->dyna.actor.params, Flags_GetSwitch(play, PARAMS_GET_U(this->dyna.actor.params, 8, 6)), Flags_GetTempClear(play, this->dyna.actor.room), Flags_GetClear(play, this->dyna.actor.room), GET_PLAYER(play)->actor.world.pos.y); @@ -151,7 +151,7 @@ void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, PlayState* play) { this->dyna.actor.child = NULL; this->dyna.actor.home.rot.z++; } else { - PRINTF(T("Warning : 第２スタルフォス発生失敗\n", "Warning : Second Stalfos failed to generate\n")); + PRINTF(T("Warning : 第２スタルフォス発生失敗\n", "Warning : Second Stalfos failed to spawn\n")); } Flags_SetClear(play, this->dyna.actor.room); } @@ -212,7 +212,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) { this->dyna.actor.child = NULL; this->dyna.actor.home.rot.z++; } else { - PRINTF(T("Warning : 第３-1スタルフォス発生失敗\n", "Warning : 3-1 Stalfos generation failure\n")); + PRINTF(T("Warning : 第３-1スタルフォス発生失敗\n", "Warning : 3-1 Stalfos failed to spawn\n")); } stalfos2 = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 170.0f, 827.0f, -3260.0f, 0, 0, 0, 5); @@ -220,7 +220,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) { this->dyna.actor.child = NULL; this->dyna.actor.home.rot.z++; } else { - PRINTF(T("Warning : 第３-2スタルフォス発生失敗\n", "Warning : 3-2 Stalfos generation failure\n")); + PRINTF(T("Warning : 第３-2スタルフォス発生失敗\n", "Warning : 3-2 Stalfos failed to spawn\n")); } Flags_SetClear(play, this->dyna.actor.room); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index a2b1193c30..ad41dfc212 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -102,8 +102,8 @@ void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionH if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_mori_hashigo.c", 164, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -140,7 +140,8 @@ s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, PlayState* play) { if (ladder != NULL) { return true; } else { - PRINTF("Error : " T("梯子の発生失敗", "Ladder spawn failure") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Ladder failed to spawn (%s %d)(arg_data 0x%04x)\n"), "../z_bg_mori_hashigo.c", 220, this->dyna.actor.params); return false; } @@ -181,12 +182,13 @@ void BgMoriHashigo_Init(Actor* thisx, PlayState* play) { } this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX); if (this->moriTexObjectSlot < 0) { - PRINTF("Error : " T("バンク危険！", "Bank danger!") "(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, - "../z_bg_mori_hashigo.c", 312); + PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"), + this->dyna.actor.params, "../z_bg_mori_hashigo.c", 312); Actor_Kill(&this->dyna.actor); } else { BgMoriHashigo_SetupWaitForMoriTex(this); - PRINTF(T("(森の神殿 梯子とその留め金)", "(Forest Temple Ladder and its clasp)") "(arg_data 0x%04x)\n", + PRINTF(T("(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n", + "(Forest Temple Ladder and its clasp)(arg_data 0x%04x)\n"), this->dyna.actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index f1ae962844..fa25e2df8d 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -72,8 +72,8 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, Collisio if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_mori_hashira4.c", 155, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -95,8 +95,8 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX); if (this->moriTexObjectSlot < 0) { Actor_Kill(&this->dyna.actor); - PRINTF("Error : " T("バンク危険！", "Bank danger!") "(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, - "../z_bg_mori_hashira4.c", 196); + PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"), + this->dyna.actor.params, "../z_bg_mori_hashira4.c", 196); return; } if ((this->dyna.actor.params != 0) && Flags_GetSwitch(play, this->switchFlag)) { @@ -105,7 +105,8 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { } Actor_SetFocus(&this->dyna.actor, 50.0f); BgMoriHashira4_SetupWaitForMoriTex(this); - PRINTF(T("(森の神殿 ４本柱)", "Forest Temple 4 Pillars") "(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(森の神殿 ４本柱)(arg_data 0x%04x)\n", "(Forest Temple 4 Pillars)(arg_data 0x%04x)\n"), + this->dyna.actor.params); sUnkTimer = 0; } diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 7c68aa1b69..2cd35ab1ee 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -80,15 +80,16 @@ void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) { this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX); if (this->moriTexObjectSlot < 0) { Actor_Kill(&this->actor); - PRINTF("Error : " T("バンク危険！", "Bank danger!") "(arg_data 0x%04x)(%s %d)\n", this->actor.params, - "../z_bg_mori_idomizu.c", 202); + PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"), + this->actor.params, "../z_bg_mori_idomizu.c", 202); return; } BgMoriIdomizu_SetupWaitForMoriTex(this); sIsSpawned = true; this->isLoaded = true; this->actor.room = -1; - PRINTF(T("(森の神殿 井戸水)", "(Forest Temple well water)") "(arg_data 0x%04x)\n", this->actor.params); + PRINTF(T("(森の神殿 井戸水)(arg_data 0x%04x)\n", "(Forest Temple well water)(arg_data 0x%04x)\n"), + this->actor.params); } void BgMoriIdomizu_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 4c11347b9e..8693802846 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -68,7 +68,7 @@ void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); #if DEBUG_FEATURES - PRINTF(T("森の神殿 obj. 落下天井", "Forest Temple obj. Falling Ceiling") " (home posY %f)\n", + PRINTF(T("森の神殿 obj. 落下天井 (home posY %f)\n", "Forest Temple obj. Falling Ceiling (home posY %f)\n"), this->dyna.actor.home.pos.y); if ((fabsf(1991.0f - this->dyna.actor.home.pos.x) > 0.001f) || (fabsf(683.0f - this->dyna.actor.home.pos.y) > 0.001f) || diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 12ab1abe17..ee7036a491 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -63,8 +63,8 @@ void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, Coll if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_spot08_iceblock.c", 0xD9, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -77,9 +77,9 @@ void BgSpot08Iceblock_CheckParams(BgSpot08Iceblock* this) { this->dyna.actor.params = 0x10; break; default: - PRINTF( - T("Error : arg_data 設定ミスです。", "Error : arg_data setting error. ") "(%s %d)(arg_data 0x%04x)\n", - "../z_bg_spot08_iceblock.c", 0xF6, this->dyna.actor.params); + PRINTF(T("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", + "Error : arg_data setting error. (%s %d)(arg_data 0x%04x)\n"), + "../z_bg_spot08_iceblock.c", 0xF6, this->dyna.actor.params); this->dyna.actor.params = 0x10; break; case 1: @@ -300,7 +300,7 @@ void BgSpot08Iceblock_Init(Actor* thisx, PlayState* play) { BgSpot08Iceblock* this = (BgSpot08Iceblock*)thisx; CollisionHeader* colHeader; - PRINTF("(spot08 " T("流氷", "ice floe") ")(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(spot08 流氷)(arg_data 0x%04x)\n", "(spot08 ice floe)(arg_data 0x%04x)\n"), this->dyna.actor.params); BgSpot08Iceblock_CheckParams(this); switch (PARAMS_GET_NOSHIFT(this->dyna.actor.params, 9, 1)) { diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index e7e55f52ba..8fa33c1d22 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -148,12 +148,13 @@ s32 func_808B1D44(BgSpot09Obj* this, PlayState* play) { void BgSpot09Obj_Init(Actor* thisx, PlayState* play) { BgSpot09Obj* this = (BgSpot09Obj*)thisx; - PRINTF("Spot09 Object [arg_data : 0x%04x](" T("大工救出フラグ", "Carpenter Rescue Flag") " 0x%x)\n", + PRINTF(T("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n", + "Spot09 Object [arg_data : 0x%04x](Carpenter Rescue Flag 0x%x)\n"), this->dyna.actor.params, GET_EVENTCHKINF_CARPENTERS_RESCUED_FLAGS()); this->dyna.actor.params &= 0xFF; if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) { - PRINTF(T("Error : Spot 09 object の arg_data が判別出来ない", - "Error : Spot 09 object arg_data cannot be determined") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", + "Error : Spot 09 object arg_data cannot be determined (%s %d)(arg_data 0x%04x)\n"), "../z_bg_spot09_obj.c", 322, this->dyna.actor.params); } diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 42dcc0ee73..427d9d4a6c 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -130,7 +130,7 @@ void BgSpot11Bakudankabe_Init(Actor* thisx, PlayState* play) { CollisionHeader_GetVirtual(&gDesertColossusBombableWallCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); Actor_SetScale(&this->dyna.actor, 1.0f); - PRINTF("(spot11 " T("爆弾壁", "Bomb Wall") ")(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(spot11 爆弾壁)(arg_data 0x%04x)\n", "(spot11 Bomb Wall)(arg_data 0x%04x)\n"), this->dyna.actor.params); } void BgSpot11Bakudankabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 190f964943..f6eae41733 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -64,8 +64,8 @@ void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHea if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_spot12_gate.c", 145, this->dyna.actor.id, this->dyna.actor.params); } #endif diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 48752674a0..71674bc12b 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -61,8 +61,8 @@ void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collisi if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_spot12_saku.c", 140, this->dyna.actor.id, this->dyna.actor.params); } #endif diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index fb07391ebe..650cc50723 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -79,8 +79,8 @@ void func_808B3960(BgSpot15Rrbox* this, PlayState* play, CollisionHeader* collis if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_bg_spot15_rrbox.c", 171, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -146,7 +146,8 @@ void BgSpot15Rrbox_Init(Actor* thisx, PlayState* play) { } else { func_808B4084(this, play); } - PRINTF("(spot15 " T("ロンロン木箱", "Lon Lon Wooden Box") ")(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(spot15 ロンロン木箱)(arg_data 0x%04x)\n", "(spot15 Lon Lon Wooden Box)(arg_data 0x%04x)\n"), + this->dyna.actor.params); } void BgSpot15Rrbox_Destroy(Actor* thisx, PlayState* play) { @@ -333,7 +334,8 @@ void func_808B43D0(BgSpot15Rrbox* this, PlayState* play) { Actor_MoveXZGravity(actor); if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) { - PRINTF("Warning : " T("ロンロン木箱落ちすぎた", "Lon Lon Wooden Box fell too far") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", + "Warning : Lon Lon Wooden Box fell too far (%s %d)(arg_data 0x%04x)\n"), "../z_bg_spot15_rrbox.c", 599, actor->params); Actor_Kill(actor); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 446177325f..d3b44d8aeb 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -240,8 +240,8 @@ s32 func_808B4E58(BgSpot16Bombstone* this, PlayState* play) { this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_BOMBIWA); if (this->requiredObjectSlot < 0) { - PRINTF("Error : " T("バンク危険！", "Bank danger! ") "(arg_data 0x%04x)(%s %d)\n", actor->params, - "../z_bg_spot16_bombstone.c", 589); + PRINTF(T("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"), + actor->params, "../z_bg_spot16_bombstone.c", 589); return false; } @@ -273,7 +273,8 @@ void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play) { #if DEBUG_FEATURES default: - PRINTF(T("Error : arg_data おかしいな", "Error : arg_data is strange") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", + "Error : arg_data is strange (%s %d)(arg_data 0x%04x)\n"), "../z_bg_spot16_bombstone.c", 668, this->actor.params); shouldLive = false; break; @@ -284,8 +285,9 @@ void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); return; } - PRINTF("Spot16 obj " T("爆弾石", "Bomb Stone") " (scaleX %f)(arg_data 0x%04x)\n", this->actor.scale.x, - this->actor.params); + PRINTF( + T("Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n", "Spot16 obj Bomb Stone (scaleX %f)(arg_data 0x%04x)\n"), + this->actor.scale.x, this->actor.params); } void BgSpot16Bombstone_Destroy(Actor* thisx, PlayState* play) { @@ -408,7 +410,8 @@ void func_808B56BC(BgSpot16Bombstone* this, PlayState* play) { player->actor.world.pos.x += sinValue * this->sinRotation; player->actor.world.pos.z += sinValue * this->cosRotation; } else { - PRINTF(T("Error 補正出来ない", "Error Can't correct") "(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", + PRINTF(T("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", + "Error Can't correct (%s %d)(arg_data 0x%04x)(hosei_angY %x)\n"), "../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff); } } 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 7acb1fc100..dbeb445596 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 @@ -85,7 +85,8 @@ void BgSpot16Doughnut_Init(Actor* thisx, PlayState* play) { } else { this->fireFlag |= 1; } - PRINTF(T("(ｓｐｏｔ１６ ドーナツ雲)", "(spot16 Donut Cloud)") "(arg_data 0x%04x)\n", this->actor.params); + PRINTF(T("(ｓｐｏｔ１６ ドーナツ雲)(arg_data 0x%04x)\n", "(spot16 Donut Cloud)(arg_data 0x%04x)\n"), + this->actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 2d32d0199b..7d580c9b46 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -44,7 +44,8 @@ void BgSpot17Funen_Init(Actor* thisx, PlayState* play) { BgSpot17Funen* this = (BgSpot17Funen*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); - PRINTF("spot17 obj. " T("噴煙", "volcanic smoke") " (arg_data 0x%04x)\n", this->actor.params); + PRINTF(T("spot17 obj. 噴煙 (arg_data 0x%04x)\n", "spot17 obj. volcanic smoke (arg_data 0x%04x)\n"), + this->actor.params); } void BgSpot17Funen_Destroy(Actor* thisx, PlayState* play) { 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 4f79fc5f39..5e4c7896f7 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 @@ -171,7 +171,7 @@ void BgSpot18Basket_Init(Actor* thisx, PlayState* play) { if (this->dyna.actor.child == NULL) { PRINTF_COLOR_RED(); - PRINTF(T("Ｅｒｒｏｒ : 変化壷蓋発生失敗", "Error : Failed to generate the change pot cover") "(%s %d)\n", + PRINTF(T("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "Error : Failed to spawn the change pot cover (%s %d)\n"), "../z_bg_spot18_basket.c", 351); PRINTF_RST(); Actor_Kill(&this->dyna.actor); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index c1ebb465a0..e5ebde92cf 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -108,7 +108,8 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) { } else if (LINK_AGE_IN_YEARS == YEARS_CHILD) { age = 0; } else { - PRINTF(T("Error : リンク年齢不詳", "Error : Link age unknown") " (%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", + "Error : Link age unknown (%s %d)(arg_data 0x%04x)\n"), "../z_bg_spot18_obj.c", 182, this->dyna.actor.params); return 0; } @@ -121,12 +122,13 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) { } return D_808B90F0[PARAMS_GET_U(this->dyna.actor.params, 0, 4)][age]; case 2: - PRINTF(T("Error : Obj出現判定が設定されていない", - "Error : Obj appearance detection is not set") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n", + "Error : Obj appearance detection is not set (%s %d)(arg_data 0x%04x)\n"), "../z_bg_spot18_obj.c", 202, this->dyna.actor.params); return 0; default: - PRINTF(T("Error : Obj出現判定失敗", "Error : Obj appearance check failed") "(%s %d)(arg_data 0x%04x)\n", + PRINTF(T("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n", + "Error : Obj appearance check failed (%s %d)(arg_data 0x%04x)\n"), "../z_bg_spot18_obj.c", 210, this->dyna.actor.params); } return 0; 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 e6a697b21c..dd527d95bd 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -148,7 +148,7 @@ void EnAnubice_Init(Actor* thisx, PlayState* play) { ANUBICE_LIMB_MAX); PRINTF("\n\n"); - PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n", "☆☆☆☆☆ Anubis occurrence ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n", "☆☆☆☆☆ Anubis spawn ☆☆☆☆☆ \n") VT_RST); this->actor.naviEnemyId = NAVI_ENEMY_ANUBIS; 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 6fe71f26ff..9d49a27234 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 @@ -41,7 +41,7 @@ void EnAnubiceTag_Init(Actor* thisx, PlayState* play) { EnAnubiceTag* this = (EnAnubiceTag*)thisx; PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Anubis control tag generated ☆☆☆☆☆ %d\n") + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Anubis control tag spawn ☆☆☆☆☆ %d\n") VT_RST, this->actor.params); 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 ea951a0726..c400d0e08d 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -122,7 +122,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) { Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, 20.0f, 20.0f, -2500.0f, 0, 0, 0, ((sTreasureFlags[5] & 0x1F) << 8) + rewardParams); PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 中央宝発生(ＧＲＥＡＴ) ☆☆☆☆☆ %x\n", - "☆☆☆☆☆ Central treasure occurrence (GREAT) ☆☆☆☆☆ %x\n") VT_RST, + "☆☆☆☆☆ Central treasure spawn (GREAT) ☆☆☆☆☆ %x\n") VT_RST, rewardChestParams); this->actionFunc = EnChanger_SetHeartPieceFlag; return; @@ -160,7 +160,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) { if (this->leftChest != NULL) { PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 左宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n", - "☆☆☆☆☆ Left treasure generation (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST, + "☆☆☆☆☆ Left treasure spawn (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST, leftChestParams); PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 部屋番号は？ %x\n", "☆☆☆☆☆ What is the room number? %x\n") VT_RST, play->roomCtx.curRoom.num); @@ -185,7 +185,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) { if (this->rightChest != NULL) { PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 右宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n", - "☆☆☆☆☆ Right treasure generation (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST, + "☆☆☆☆☆ Right treasure spawn (what does it contain?) ☆☆☆☆☆ %x\n") VT_RST, rightChestParams); PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 部屋番号は？ %d\n", "☆☆☆☆☆ What is the room number? %d\n") VT_RST, play->roomCtx.curRoom.num); 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 53dc831f86..24e881840f 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 @@ -98,8 +98,9 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) { this->scrubPos[i].x, this->scrubPos[i].y, this->scrubPos[i].z, 0, 0, 0, i + ENDNTNOMAL_STAGE); if (this->scrubs[i] != NULL) { - // "zako zako" [small fries] - PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" VT_RST, this->scrubs[i]); + // [small fry] + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n", "☆☆☆☆☆ zako zako ☆☆☆☆☆ %x\n") VT_RST, + this->scrubs[i]); } } @@ -161,8 +162,8 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { } } if (this->judgeTimer > 40) { - // "gera gera" [onomatopoeia for loud giggling] - PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" VT_RST); + // [onomatopoeia for loud giggling] + PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ げらげら ☆☆☆☆☆ \n", "☆☆☆☆☆ gera gera ☆☆☆☆☆ \n") VT_RST); func_800F436C(&this->actor.projectedPos, NA_SE_EV_CROWD - SFX_FLAG, 2.0f); } if (this->judgeTimer < 120) { 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 9234904d05..b1f714e5df 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -249,11 +249,11 @@ void EnEncount2_SpawnRocks(EnEncount2* this, PlayState* play) { this->numSpawnedRocks++; return; } - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n") VT_RST); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n", "☆☆☆☆☆ Can't occur! ☆☆☆☆☆\n\n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n", "☆☆☆☆☆ Can't spawn! ☆☆☆☆☆\n\n") VT_RST); } } } 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 94b2d43368..e377c17ae5 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -100,7 +100,8 @@ void EnHeishi1_Init(Actor* thisx, PlayState* play2) { PRINTF(VT_FGCOL(GREEN) T(" 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n", " type ☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n") VT_RST, this->type); - PRINTF(VT_FGCOL(YELLOW) " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->path); + PRINTF(VT_FGCOL(YELLOW) T(" れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n", " rail data ☆☆☆☆☆☆☆☆ %d\n") VT_RST, + this->path); PRINTF(VT_FGCOL(MAGENTA) " anime_frame_speed ☆☆☆☆☆☆ %f\n" VT_RST, this->animSpeed); PRINTF(VT_FGCOL(MAGENTA) T(" 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n", " interpolation frame ☆☆☆☆☆☆☆☆☆ %f\n") VT_RST, this->animMorphFrames); 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 15859de70f..6752e92d1c 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -85,8 +85,7 @@ void EnKakasi3_Init(Actor* thisx, PlayState* play) { EnKakasi3* this = (EnKakasi3*)thisx; PRINTF("\n\n"); - // "Obonur" -- Related to the name of the scarecrow (Bonooru) - PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n", "☆☆☆☆☆ Bonooru ☆☆☆☆☆ \n") VT_RST); this->actor.attentionRangeType = ATTENTION_RANGE_6; Collider_InitCylinder(play, &this->collider); 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 7c1445813f..5acaf3f9ed 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -390,7 +390,7 @@ void EnNiw_SpawnAttackCucco(EnNiw* this, PlayState* play) { this->timer5 = 10; } else { PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n", " ☆☆☆☆☆ Cannot occur ☆☆☆☆☆ \n") VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n", " ☆☆☆☆☆ Cannot spawn ☆☆☆☆☆ \n") VT_RST); } } } 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 601299706c..13bba29d07 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 @@ -60,7 +60,7 @@ void EnOkarinaTag_Init(Actor* thisx, PlayState* play) { EnOkarinaTag* this = (EnOkarinaTag*)thisx; PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Ocarina tag occurrence ☆☆☆☆☆ %x\n") VT_RST, + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Ocarina tag spawn ☆☆☆☆☆ %x\n") VT_RST, this->actor.params); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->type = PARAMS_GET_U(this->actor.params, 10, 6); 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 22c4a16cee..1f45f2541b 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -227,8 +227,7 @@ void EnTite_Destroy(Actor* thisx, PlayState* play) { spawner->curNumSpawn--; } PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n") - VT_RST, + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous spawns ☆☆☆☆☆%d\n") VT_RST, spawner->curNumSpawn); PRINTF("\n\n"); } 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 2f33d07a2c..c651e4ff4a 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -293,7 +293,7 @@ void EnWf_Destroy(Actor* thisx, PlayState* play) { } PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n") + PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous spawns ☆☆☆☆☆%d\n") VT_RST, parent->curNumSpawn); PRINTF("\n\n"); diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 3a164db8ea..06254d6ca6 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -182,11 +182,11 @@ void MirRay_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f); PRINTF(T("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", - "Generation of reflectable light!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")); + "Spawn of reflectable light!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")); LOG_NUM("this->actor.arg_data", this->actor.params, "../z_mir_ray.c", 518); if (this->actor.params >= 0xA) { - LOG_STRING_T("反射光 発生失敗", "Reflected light generation failure", "../z_mir_ray.c", 521); + LOG_STRING_T("反射光 発生失敗", "Reflected light failed to spawn", "../z_mir_ray.c", 521); Actor_Kill(&this->actor); } 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 2229560f1f..7ccb70299d 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -163,8 +163,8 @@ void ObjBean_InitDynaPoly(ObjBean* this, PlayState* play, CollisionHeader* colli if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_obj_bean.c", 374, this->dyna.actor.id, this->dyna.actor.params); } #endif diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index f849298e10..ad572f17be 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -63,8 +63,8 @@ void func_80B92B08(ObjElevator* this, PlayState* play, CollisionHeader* collisio if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_obj_elevator.c", 136, this->dyna.actor.id, this->dyna.actor.params); } #endif diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 187bb4d184..3d8af090e5 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -75,8 +75,8 @@ void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_obj_hsblock.c", 163, this->dyna.actor.id, this->dyna.actor.params); } #endif diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index a8da522c09..a6c35ed922 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -84,8 +84,8 @@ void ObjLift_InitDynaPoly(ObjLift* this, PlayState* play, CollisionHeader* colli if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_obj_lift.c", 188, this->dyna.actor.id, this->dyna.actor.params); } #endif 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 a8387c0d75..3a99282723 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -205,7 +205,7 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) { (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) { PRINTF_COLOR_ERROR(); PRINTF(T("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", - "Push/pull block failure(%s %d)(arg_data 0x%04x)\n"), + "Push/pull block failed to spawn (%s %d)(arg_data 0x%04x)\n"), "../z_obj_lightswitch.c", 452, this->actor.params); PRINTF_RST(); removeSelf = true; 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 7865da9830..ad06491a54 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -80,7 +80,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) { if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0, block->rotY, 0, ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) { PRINTF_COLOR_ERROR(); - PRINTF(T("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "Error : Push/pull block failure (%s %d)\n"), + PRINTF(T("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "Error : Push/pull block failed to spawn (%s %d)\n"), "../z_obj_makeoshihiki.c", 194); PRINTF_RST(); Actor_Kill(thisx); diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index c27662dd0c..238bf69cf6 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -176,7 +176,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { this->children[i]->flags |= ACTOR_FLAG_GRASS_DESTROYED; this->children[i]->room = actor->room; } else { - PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c", + PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to spawn (%s %d)\n"), "../z_obj_mure.c", 359); } break; @@ -188,7 +188,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { if (this->children[i] != NULL) { this->children[i]->room = actor->room; } else { - PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c", + PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to spawn (%s %d)\n"), "../z_obj_mure.c", 382); } break; @@ -221,7 +221,7 @@ void ObjMure_SpawnActors1(ObjMure* this, PlayState* play2) { this->children[i]->room = actor->room; } else { this->childrenStates[i] = OBJMURE_CHILD_STATE_1; - PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c", 438); + PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to spawn (%s %d)\n"), "../z_obj_mure.c", 438); } } } diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 8c4c20cc48..b328e2b6c1 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -111,8 +111,8 @@ void ObjOshihiki_InitDynapoly(ObjOshihiki* this, PlayState* play, CollisionHeade if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_obj_oshihiki.c", 280, this->dyna.actor.id, this->dyna.actor.params); } #endif 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 e71673413c..f8cc6397f8 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -218,8 +218,8 @@ void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* c if (this->dyna.bgId == BG_ACTOR_MAX) { s32 pad2; - PRINTF(T("Warning : move BG 登録失敗", - "Warning : move BG registration failed") "(%s %d)(name %d)(arg_data 0x%04x)\n", + PRINTF(T("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", + "Warning : move BG registration failed (%s %d)(name %d)(arg_data 0x%04x)\n"), "../z_obj_switch.c", 531, this->dyna.actor.id, this->dyna.actor.params); } #endif @@ -339,7 +339,7 @@ void ObjSwitch_Init(Actor* thisx, PlayState* play) { if (OBJSWITCH_FROZEN(&this->dyna.actor) && (ObjSwitch_SpawnIce(this, play) == NULL)) { PRINTF_COLOR_RED(); - PRINTF(T("Error : 氷発生失敗 (%s %d)\n", "Error : Ice generation failure (%s %d)\n"), "../z_obj_switch.c", 732); + PRINTF(T("Error : 氷発生失敗 (%s %d)\n", "Error : Ice failed to spawn (%s %d)\n"), "../z_obj_switch.c", 732); PRINTF_RST(); this->dyna.actor.params &= ~OBJSWITCH_FROZEN_FLAG; } 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 71d8b881f2..1ba86361ed 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -78,7 +78,7 @@ void ShotSun_Init(Actor* thisx, PlayState* play) { ShotSun* this = (ShotSun*)thisx; s32 params; - PRINTF(T("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", "%d ---- Ocarina secret occurrence!!!!!!!!!!!!!\n"), + PRINTF(T("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", "%d ---- Ocarina secret spawn!!!!!!!!!!!!!\n"), this->actor.params); params = PARAMS_GET_U(this->actor.params, 0, 8); if (params == 0x40 || params == 0x41) { From 6e804b165e0b042694b3ade3c70401405802cf06 Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Thu, 5 Jun 2025 19:51:35 -0400 Subject: [PATCH 31/42] Child Ruto Part 5: Colliders (#2572) * Child Ruto Part 5: Colliders * Suggested refactoring * Missed function rename --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 60 +++++++++++------------ src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 6 +-- 2 files changed, 33 insertions(+), 33 deletions(-) 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 1033a31e73..aea5f9ba2e 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -97,7 +97,7 @@ typedef enum EnRu1WaterState { /* 3 */ ENRU1_WATER_SINKING, } EnRu1WaterState; -static ColliderCylinderInitType1 sCylinderInit1 = { +static ColliderCylinderInitType1 sStandingCylinderInit = { { COL_MATERIAL_HIT0, AT_NONE, @@ -109,7 +109,7 @@ static ColliderCylinderInitType1 sCylinderInit1 = { { 25, 80, 0, { 0 } }, }; -static ColliderCylinderInitType1 sCylinderInit2 = { +static ColliderCylinderInitType1 sSittingCylinderInit = { { COL_MATERIAL_HIT0, AT_ON | AT_TYPE_PLAYER, @@ -172,48 +172,48 @@ ActorProfile En_Ru1_Profile = { /**/ EnRu1_Draw, }; -void func_80AEAC10(EnRu1* this, PlayState* play) { +void EnRu1_UpdateStandingOC(EnRu1* this, PlayState* play) { s32 pad[5]; - Collider_UpdateCylinder(&this->actor, &this->collider); - CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); + Collider_UpdateCylinder(&this->actor, &this->standingCollider); + CollisionCheck_SetOC(play, &play->colChkCtx, &this->standingCollider.base); } -void func_80AEAC54(EnRu1* this, PlayState* play) { +void EnRu1_UpdateSittingOC(EnRu1* this, PlayState* play) { s32 pad[5]; - Collider_UpdateCylinder(&this->actor, &this->collider2); - if (this->unk_34C != 0) { - CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider2.base); + Collider_UpdateCylinder(&this->actor, &this->sittingCollider); + if (this->isSittingOCActive) { + CollisionCheck_SetOC(play, &play->colChkCtx, &this->sittingCollider.base); } else if (this->actor.xzDistToPlayer > 32.0f) { - this->unk_34C = 1; + this->isSittingOCActive = true; } } -void func_80AEACDC(EnRu1* this, PlayState* play) { +void EnRu1_UpdateSittingAT(EnRu1* this, PlayState* play) { s32 pad[5]; - Collider_UpdateCylinder(&this->actor, &this->collider2); - CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider2.base); + Collider_UpdateCylinder(&this->actor, &this->sittingCollider); + CollisionCheck_SetAT(play, &play->colChkCtx, &this->sittingCollider.base); } -void func_80AEAD20(Actor* thisx, PlayState* play) { +void EnRu1_InitColliders(Actor* thisx, PlayState* play) { EnRu1* this = (EnRu1*)thisx; - Collider_InitCylinder(play, &this->collider); - Collider_SetCylinderType1(play, &this->collider, &this->actor, &sCylinderInit1); + Collider_InitCylinder(play, &this->standingCollider); + Collider_SetCylinderType1(play, &this->standingCollider, &this->actor, &sStandingCylinderInit); - Collider_InitCylinder(play, &this->collider2); - Collider_SetCylinderType1(play, &this->collider2, &this->actor, &sCylinderInit2); + Collider_InitCylinder(play, &this->sittingCollider); + Collider_SetCylinderType1(play, &this->sittingCollider, &this->actor, &sSittingCylinderInit); } void EnRu1_DestroyColliders(EnRu1* this, PlayState* play) { - Collider_DestroyCylinder(play, &this->collider); - Collider_DestroyCylinder(play, &this->collider2); + Collider_DestroyCylinder(play, &this->standingCollider); + Collider_DestroyCylinder(play, &this->sittingCollider); } -void func_80AEADD8(EnRu1* this) { - this->unk_34C = 0; +void EnRu1_DisableSittingOC(EnRu1* this) { + this->isSittingOCActive = false; } u8 EnRu1_GetSwitchFlag(EnRu1* this) { @@ -1619,7 +1619,7 @@ void func_80AEE568(EnRu1* this, PlayState* play) { func_80AEE02C(this); Actor_OfferCarry(&this->actor, play); this->action = 27; - func_80AEADD8(this); + EnRu1_DisableSittingOC(this); return; } @@ -1727,7 +1727,7 @@ s32 EnRu1_CheckHitBottomUnderwater(EnRu1* this, PlayState* play) { func_80AEE02C(this); Actor_OfferCarry(&this->actor, play); this->action = 27; - func_80AEADD8(this); + EnRu1_DisableSittingOC(this); return true; } return false; @@ -1748,7 +1748,7 @@ void func_80AEEBB4(EnRu1* this, PlayState* play) { void func_80AEEBD4(EnRu1* this, PlayState* play) { func_80AED83C(this); - func_80AEAC54(this, play); + EnRu1_UpdateSittingOC(this, play); func_80AEAECC(this, play); EnRu1_UpdateSkelAnime(this); EnRu1_UpdateEyes(this); @@ -1760,7 +1760,7 @@ void func_80AEEBD4(EnRu1* this, PlayState* play) { void func_80AEEC5C(EnRu1* this, PlayState* play) { func_80AED83C(this); - func_80AEACDC(this, play); + EnRu1_UpdateSittingAT(this, play); func_80AEAECC(this, play); func_80AEE2F8(this, play); func_80AEDFF4(this, play); @@ -1896,7 +1896,7 @@ void func_80AEF1F0(EnRu1* this, PlayState* play, UNK_TYPE arg2) { func_80AED6DC(this, play); Actor_OfferCarry(&this->actor, play); this->action = 27; - func_80AEADD8(this); + EnRu1_DisableSittingOC(this); } } @@ -1916,7 +1916,7 @@ void func_80AEF2D0(EnRu1* this, PlayState* play) { func_80AEEF68(this, play); EnRu1_UpdateSkelAnime(this); EnRu1_UpdateEyes(this); - func_80AEAC10(this, play); + EnRu1_UpdateStandingOC(this, play); func_80AEAECC(this, play); cond = func_80AEE264(this, play); func_80AED624(this, play); @@ -2229,7 +2229,7 @@ void func_80AEFECC(EnRu1* this, PlayState* play) { func_80AEEF68(this, play); EnRu1_UpdateSkelAnime(this); EnRu1_UpdateEyes(this); - func_80AEAC10(this, play); + EnRu1_UpdateStandingOC(this, play); func_80AEAECC(this, play); func_80AEFE84(this, play, func_80AEFDC0(this, play)); } @@ -2293,7 +2293,7 @@ void EnRu1_Init(Actor* thisx, PlayState* play) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gRutoChildSkel, NULL, this->jointTable, this->morphTable, 17); - func_80AEAD20(&this->actor, play); + EnRu1_InitColliders(&this->actor, play); switch (EnRu1_GetType(this)) { case ENRU1_TYPE_BOSS_ROOM: EnRu1_InitInBossRoom(this, play); diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 3b44d40319..80f1bccb13 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -47,9 +47,9 @@ typedef struct EnRu1 { /* 0x02A8 */ s32 alpha; /* 0x02AC */ s16 headRotTimer; /* 0x02B0 */ s32 headRotDirection; - /* 0x02B4 */ ColliderCylinder collider; - /* 0x0300 */ ColliderCylinder collider2; - /* 0x034C */ s32 unk_34C; + /* 0x02B4 */ ColliderCylinder standingCollider; + /* 0x0300 */ ColliderCylinder sittingCollider; + /* 0x034C */ s32 isSittingOCActive; /* 0x0350 */ s32 waterState; /* 0x0354 */ f32 sinkingStartPosY; /* 0x0358 */ f32 bobDepth; From a750282d2d48d8dff589cdfca17ccdd0389419c6 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 02:24:29 +0200 Subject: [PATCH 32/42] Add various undocumented resources in xmls 1 (#2589) * Add various undocumented resources in xmls 1 * bss --- assets/xml/objects/gameplay_dangeon_keep.xml | 23 ++++++ assets/xml/objects/gameplay_keep.xml | 54 +++++++++++++ assets/xml/objects/gameplay_keep_pal.xml | 54 +++++++++++++ assets/xml/objects/object_door_killer.xml | 8 ++ assets/xml/objects/object_gi_boots_2.xml | 1 + assets/xml/objects/object_gi_butterfly.xml | 1 + assets/xml/objects/object_gi_clothes.xml | 1 + assets/xml/objects/object_gi_dekupouch.xml | 2 + assets/xml/objects/object_gi_fire.xml | 2 + assets/xml/objects/object_gi_frog.xml | 1 + assets/xml/objects/object_gi_gerudo.xml | 1 + assets/xml/objects/object_gi_gerudomask.xml | 6 ++ assets/xml/objects/object_gi_ghost.xml | 2 + assets/xml/objects/object_gi_gloves.xml | 1 + assets/xml/objects/object_gi_golonmask.xml | 6 ++ assets/xml/objects/object_gi_hoverboots.xml | 2 + assets/xml/objects/object_gi_ki_tan_mask.xml | 1 + assets/xml/objects/object_gi_letter.xml | 2 + assets/xml/objects/object_gi_liquid.xml | 3 + assets/xml/objects/object_gi_milk.xml | 1 + assets/xml/objects/object_gi_niwatori.xml | 2 + assets/xml/objects/object_gi_nuts.xml | 1 + assets/xml/objects/object_gi_ocarina.xml | 1 + assets/xml/objects/object_gi_ocarina_0.xml | 1 + assets/xml/objects/object_gi_prescription.xml | 1 + assets/xml/objects/object_gi_purse.xml | 1 + assets/xml/objects/object_gi_rabit_mask.xml | 1 + assets/xml/objects/object_gi_shield_1.xml | 1 + assets/xml/objects/object_gi_shield_3.xml | 2 + assets/xml/objects/object_gi_soldout.xml | 1 + assets/xml/objects/object_gi_soul.xml | 1 + assets/xml/objects/object_gi_ticketstone.xml | 2 + assets/xml/objects/object_gi_truth_mask.xml | 2 + assets/xml/objects/object_gi_zoramask.xml | 6 ++ assets/xml/objects/object_kingdodongo.xml | 75 +++++++++++++++++++ assets/xml/objects/object_oE4s.xml | 2 + assets/xml/objects/object_ossan.xml | 26 +++++++ assets/xml/objects/object_po_field.xml | 28 +++++++ assets/xml/objects/object_po_sisters.xml | 31 ++++++++ assets/xml/objects/object_poh.xml | 39 ++++++++++ assets/xml/objects/object_ps.xml | 45 +++++++++++ assets/xml/objects/object_reeba.xml | 17 +++++ assets/xml/objects/object_rl.xml | 2 + assets/xml/objects/object_tk.xml | 51 +++++++++++++ .../actors/ovl_En_Viewer/z_en_viewer.c | 2 + src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- 46 files changed, 514 insertions(+), 1 deletion(-) diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml index 4dcfa922b1..4b1360a558 100644 --- a/assets/xml/objects/gameplay_dangeon_keep.xml +++ b/assets/xml/objects/gameplay_dangeon_keep.xml @@ -1,5 +1,7 @@ + + @@ -8,6 +10,7 @@ + @@ -17,6 +20,7 @@ + @@ -104,6 +108,10 @@ + + + + @@ -113,11 +121,26 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 0c90a35d5c..d41a28b8d9 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -640,6 +640,10 @@ + + + + @@ -733,6 +737,10 @@ + + + + @@ -803,6 +811,20 @@ + + + + + + + + + + + + + + @@ -823,8 +845,17 @@ + + + + + + + + + @@ -1035,6 +1066,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml index f290314d5c..2c5f147386 100644 --- a/assets/xml/objects/gameplay_keep_pal.xml +++ b/assets/xml/objects/gameplay_keep_pal.xml @@ -640,6 +640,10 @@ + + + + @@ -724,6 +728,10 @@ + + + + @@ -794,6 +802,20 @@ + + + + + + + + + + + + + + @@ -814,8 +836,17 @@ + + + + + + + + + @@ -1026,6 +1057,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml index 7f8d8f186c..8ef83cd9fa 100644 --- a/assets/xml/objects/object_door_killer.xml +++ b/assets/xml/objects/object_door_killer.xml @@ -48,6 +48,14 @@ + + + + + + + + diff --git a/assets/xml/objects/object_gi_boots_2.xml b/assets/xml/objects/object_gi_boots_2.xml index 026e9a482a..ae5d148421 100644 --- a/assets/xml/objects/object_gi_boots_2.xml +++ b/assets/xml/objects/object_gi_boots_2.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_butterfly.xml b/assets/xml/objects/object_gi_butterfly.xml index 23487544e4..65eed5b0e8 100644 --- a/assets/xml/objects/object_gi_butterfly.xml +++ b/assets/xml/objects/object_gi_butterfly.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_clothes.xml b/assets/xml/objects/object_gi_clothes.xml index 32550cfc8d..be9853eb8f 100644 --- a/assets/xml/objects/object_gi_clothes.xml +++ b/assets/xml/objects/object_gi_clothes.xml @@ -1,5 +1,6 @@ + diff --git a/assets/xml/objects/object_gi_dekupouch.xml b/assets/xml/objects/object_gi_dekupouch.xml index f51d885c01..d717edb8ba 100644 --- a/assets/xml/objects/object_gi_dekupouch.xml +++ b/assets/xml/objects/object_gi_dekupouch.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_fire.xml b/assets/xml/objects/object_gi_fire.xml index ddeafaaf48..0211f60187 100644 --- a/assets/xml/objects/object_gi_fire.xml +++ b/assets/xml/objects/object_gi_fire.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_frog.xml b/assets/xml/objects/object_gi_frog.xml index 503f08c416..53384429b4 100644 --- a/assets/xml/objects/object_gi_frog.xml +++ b/assets/xml/objects/object_gi_frog.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_gerudo.xml b/assets/xml/objects/object_gi_gerudo.xml index ac80cdd2f7..34986a295e 100644 --- a/assets/xml/objects/object_gi_gerudo.xml +++ b/assets/xml/objects/object_gi_gerudo.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_gerudomask.xml b/assets/xml/objects/object_gi_gerudomask.xml index 3b42e2ee29..94576b0406 100644 --- a/assets/xml/objects/object_gi_gerudomask.xml +++ b/assets/xml/objects/object_gi_gerudomask.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_ghost.xml b/assets/xml/objects/object_gi_ghost.xml index 30a0edf1eb..5dbf39480f 100644 --- a/assets/xml/objects/object_gi_ghost.xml +++ b/assets/xml/objects/object_gi_ghost.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_gloves.xml b/assets/xml/objects/object_gi_gloves.xml index 09976d11ef..85ad6ddeff 100644 --- a/assets/xml/objects/object_gi_gloves.xml +++ b/assets/xml/objects/object_gi_gloves.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_golonmask.xml b/assets/xml/objects/object_gi_golonmask.xml index ac8d86669c..68dbddb365 100644 --- a/assets/xml/objects/object_gi_golonmask.xml +++ b/assets/xml/objects/object_gi_golonmask.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/assets/xml/objects/object_gi_hoverboots.xml b/assets/xml/objects/object_gi_hoverboots.xml index 5b3bf0c80f..fed584e742 100644 --- a/assets/xml/objects/object_gi_hoverboots.xml +++ b/assets/xml/objects/object_gi_hoverboots.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_ki_tan_mask.xml b/assets/xml/objects/object_gi_ki_tan_mask.xml index ad6763bb9c..b888acfe73 100644 --- a/assets/xml/objects/object_gi_ki_tan_mask.xml +++ b/assets/xml/objects/object_gi_ki_tan_mask.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_letter.xml b/assets/xml/objects/object_gi_letter.xml index d6acdf820d..098b8cca79 100644 --- a/assets/xml/objects/object_gi_letter.xml +++ b/assets/xml/objects/object_gi_letter.xml @@ -1,5 +1,7 @@ + + diff --git a/assets/xml/objects/object_gi_liquid.xml b/assets/xml/objects/object_gi_liquid.xml index 27ef25b0b0..133d8ce902 100644 --- a/assets/xml/objects/object_gi_liquid.xml +++ b/assets/xml/objects/object_gi_liquid.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gi_milk.xml b/assets/xml/objects/object_gi_milk.xml index a1904f7f1d..cc72cec9d1 100644 --- a/assets/xml/objects/object_gi_milk.xml +++ b/assets/xml/objects/object_gi_milk.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_niwatori.xml b/assets/xml/objects/object_gi_niwatori.xml index 9bea0dbbaf..edf67f88d8 100644 --- a/assets/xml/objects/object_gi_niwatori.xml +++ b/assets/xml/objects/object_gi_niwatori.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_nuts.xml b/assets/xml/objects/object_gi_nuts.xml index 590c78d7dd..d4a2f0e9cd 100644 --- a/assets/xml/objects/object_gi_nuts.xml +++ b/assets/xml/objects/object_gi_nuts.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_ocarina.xml b/assets/xml/objects/object_gi_ocarina.xml index 4e85cc04e1..dafcb92424 100644 --- a/assets/xml/objects/object_gi_ocarina.xml +++ b/assets/xml/objects/object_gi_ocarina.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_ocarina_0.xml b/assets/xml/objects/object_gi_ocarina_0.xml index 7ec13c466e..e43bb3a87c 100644 --- a/assets/xml/objects/object_gi_ocarina_0.xml +++ b/assets/xml/objects/object_gi_ocarina_0.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_prescription.xml b/assets/xml/objects/object_gi_prescription.xml index 619252fafb..1b4e54ec5d 100644 --- a/assets/xml/objects/object_gi_prescription.xml +++ b/assets/xml/objects/object_gi_prescription.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_purse.xml b/assets/xml/objects/object_gi_purse.xml index c896b47de0..70ec500508 100644 --- a/assets/xml/objects/object_gi_purse.xml +++ b/assets/xml/objects/object_gi_purse.xml @@ -1,5 +1,6 @@ + diff --git a/assets/xml/objects/object_gi_rabit_mask.xml b/assets/xml/objects/object_gi_rabit_mask.xml index 64e82b888c..65b6cdd4bc 100644 --- a/assets/xml/objects/object_gi_rabit_mask.xml +++ b/assets/xml/objects/object_gi_rabit_mask.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_shield_1.xml b/assets/xml/objects/object_gi_shield_1.xml index 5fa12c7cc2..c7a5c7cb42 100644 --- a/assets/xml/objects/object_gi_shield_1.xml +++ b/assets/xml/objects/object_gi_shield_1.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_shield_3.xml b/assets/xml/objects/object_gi_shield_3.xml index 2ff34c2f23..3550bd0d89 100644 --- a/assets/xml/objects/object_gi_shield_3.xml +++ b/assets/xml/objects/object_gi_shield_3.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_soldout.xml b/assets/xml/objects/object_gi_soldout.xml index 517750ee9a..ba45784761 100644 --- a/assets/xml/objects/object_gi_soldout.xml +++ b/assets/xml/objects/object_gi_soldout.xml @@ -1,5 +1,6 @@ + diff --git a/assets/xml/objects/object_gi_soul.xml b/assets/xml/objects/object_gi_soul.xml index 1487b57042..519226270d 100644 --- a/assets/xml/objects/object_gi_soul.xml +++ b/assets/xml/objects/object_gi_soul.xml @@ -1,6 +1,7 @@ + diff --git a/assets/xml/objects/object_gi_ticketstone.xml b/assets/xml/objects/object_gi_ticketstone.xml index cebc99a759..ce756e3abc 100644 --- a/assets/xml/objects/object_gi_ticketstone.xml +++ b/assets/xml/objects/object_gi_ticketstone.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_truth_mask.xml b/assets/xml/objects/object_gi_truth_mask.xml index fbeab76d3e..32c550560c 100644 --- a/assets/xml/objects/object_gi_truth_mask.xml +++ b/assets/xml/objects/object_gi_truth_mask.xml @@ -1,6 +1,8 @@ + + diff --git a/assets/xml/objects/object_gi_zoramask.xml b/assets/xml/objects/object_gi_zoramask.xml index 06bca27371..0788f67f0d 100644 --- a/assets/xml/objects/object_gi_zoramask.xml +++ b/assets/xml/objects/object_gi_zoramask.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index 3ada2822c9..ff8b2014dd 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -10,6 +10,9 @@ + + + @@ -17,25 +20,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102,6 +165,9 @@ + + + @@ -111,8 +177,17 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_oE4s.xml b/assets/xml/objects/object_oE4s.xml index 1f1b33dcfa..8aefb0bb2c 100644 --- a/assets/xml/objects/object_oE4s.xml +++ b/assets/xml/objects/object_oE4s.xml @@ -19,6 +19,8 @@ + + diff --git a/assets/xml/objects/object_ossan.xml b/assets/xml/objects/object_ossan.xml index c0d80ad0b0..4eb3e74131 100644 --- a/assets/xml/objects/object_ossan.xml +++ b/assets/xml/objects/object_ossan.xml @@ -25,19 +25,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml index 7900b787ac..2caf708162 100644 --- a/assets/xml/objects/object_po_field.xml +++ b/assets/xml/objects/object_po_field.xml @@ -13,6 +13,15 @@ + + + + + + + + + @@ -54,13 +63,32 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml index 2ba750a2a2..f82b24286a 100644 --- a/assets/xml/objects/object_po_sisters.xml +++ b/assets/xml/objects/object_po_sisters.xml @@ -36,7 +36,13 @@ + + + + + + @@ -65,6 +71,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_poh.xml b/assets/xml/objects/object_poh.xml index b2dd07568d..30cd1c4a62 100644 --- a/assets/xml/objects/object_poh.xml +++ b/assets/xml/objects/object_poh.xml @@ -10,21 +10,27 @@ + + + + + + @@ -32,6 +38,7 @@ + @@ -39,10 +46,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml index e3a04685c6..4b49513afa 100644 --- a/assets/xml/objects/object_ps.xml +++ b/assets/xml/objects/object_ps.xml @@ -2,9 +2,27 @@ + + + + + + + + + + + + + + + + + + @@ -12,6 +30,13 @@ + + + + + + + @@ -39,6 +64,15 @@ + + + + + + + + + @@ -46,6 +80,17 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml index 474e4edc59..4fc31fb594 100644 --- a/assets/xml/objects/object_reeba.xml +++ b/assets/xml/objects/object_reeba.xml @@ -40,6 +40,23 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml index e9a26ef2fb..5be8b03fe4 100644 --- a/assets/xml/objects/object_rl.xml +++ b/assets/xml/objects/object_rl.xml @@ -36,6 +36,8 @@ + + diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml index 6ea256b875..d257294d8c 100644 --- a/assets/xml/objects/object_tk.xml +++ b/assets/xml/objects/object_tk.xml @@ -5,11 +5,19 @@ + + + + + + + + @@ -55,6 +63,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -64,7 +93,12 @@ + + + + + @@ -78,6 +112,23 @@ + + + + + + + + + + + + + + + + + diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 09368f5b09..ce7ea7e2c9 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -34,6 +34,8 @@ #include "assets/objects/object_ganon/object_ganon.h" #include "assets/objects/object_opening_demo1/object_opening_demo1.h" +#pragma increment_block_number "ntsc-1.0:128" + #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnViewer_Init(Actor* thisx, PlayState* play); 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 2ff73c8f4a..2820225931 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -1416,7 +1416,7 @@ void func_80B3F3D8(void) { } #pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \ - "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" + "ntsc-1.0:64 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) { static Vec3f D_80B42DA0; From 3435ebe2165e77d65ad2fd093ca2f1c96ef75f5d Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 03:27:18 +0200 Subject: [PATCH 33/42] Add Vtx[] resources in xmls for (partially) documented assets 6 (#2588) --- assets/xml/objects/object_peehat.xml | 26 +++++++ assets/xml/objects/object_relay_objects.xml | 8 ++- assets/xml/objects/object_ru1.xml | 46 ++++++++++++ assets/xml/objects/object_ru2.xml | 65 +++++++++++++++++ assets/xml/objects/object_sa.xml | 49 +++++++++++++ assets/xml/objects/object_sd.xml | 49 +++++++++++++ assets/xml/objects/object_shopnuts.xml | 56 +++++++++++++++ assets/xml/objects/object_sk2.xml | 74 ++++++++++++++++++++ assets/xml/objects/object_skb.xml | 53 ++++++++++++++ assets/xml/objects/object_skj.xml | 59 ++++++++++++++++ assets/xml/objects/object_spot00_break.xml | 6 ++ assets/xml/objects/object_spot00_objects.xml | 6 ++ assets/xml/objects/object_spot01_matoya.xml | 15 ++++ assets/xml/objects/object_spot04_objects.xml | 3 + assets/xml/objects/object_ta.xml | 47 +++++++++++++ assets/xml/objects/object_vm.xml | 19 ++++- assets/xml/objects/object_zl1.xml | 59 +++++++++++++++- assets/xml/objects/object_zo.xml | 63 +++++++++++++++++ 18 files changed, 700 insertions(+), 3 deletions(-) diff --git a/assets/xml/objects/object_peehat.xml b/assets/xml/objects/object_peehat.xml index 42ee66cdef..8abf77add3 100644 --- a/assets/xml/objects/object_peehat.xml +++ b/assets/xml/objects/object_peehat.xml @@ -28,6 +28,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_relay_objects.xml b/assets/xml/objects/object_relay_objects.xml index 47b92fcd2d..16f47413e8 100644 --- a/assets/xml/objects/object_relay_objects.xml +++ b/assets/xml/objects/object_relay_objects.xml @@ -1,7 +1,13 @@ - + + + + + + + diff --git a/assets/xml/objects/object_ru1.xml b/assets/xml/objects/object_ru1.xml index 7ac2fbc256..0a2842a266 100644 --- a/assets/xml/objects/object_ru1.xml +++ b/assets/xml/objects/object_ru1.xml @@ -23,6 +23,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml index d6cea22915..cd47562236 100644 --- a/assets/xml/objects/object_ru2.xml +++ b/assets/xml/objects/object_ru2.xml @@ -27,6 +27,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_sa.xml b/assets/xml/objects/object_sa.xml index e87cd793dd..1d666c9b26 100644 --- a/assets/xml/objects/object_sa.xml +++ b/assets/xml/objects/object_sa.xml @@ -49,6 +49,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_sd.xml b/assets/xml/objects/object_sd.xml index 0228b48690..068ace8e0d 100644 --- a/assets/xml/objects/object_sd.xml +++ b/assets/xml/objects/object_sd.xml @@ -25,6 +25,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_shopnuts.xml b/assets/xml/objects/object_shopnuts.xml index 105ce88247..3cbe6b698f 100644 --- a/assets/xml/objects/object_shopnuts.xml +++ b/assets/xml/objects/object_shopnuts.xml @@ -22,6 +22,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml index f2e7ef6d89..a08353c520 100644 --- a/assets/xml/objects/object_sk2.xml +++ b/assets/xml/objects/object_sk2.xml @@ -1,5 +1,79 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml index 1220ddf6d9..219e14b3c7 100644 --- a/assets/xml/objects/object_skb.xml +++ b/assets/xml/objects/object_skb.xml @@ -24,6 +24,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_skj.xml b/assets/xml/objects/object_skj.xml index 958301d2e8..866a38c73b 100644 --- a/assets/xml/objects/object_skj.xml +++ b/assets/xml/objects/object_skj.xml @@ -23,6 +23,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot00_break.xml b/assets/xml/objects/object_spot00_break.xml index bee1361fab..c23e47f4fa 100644 --- a/assets/xml/objects/object_spot00_break.xml +++ b/assets/xml/objects/object_spot00_break.xml @@ -1,11 +1,17 @@ + + + + + + diff --git a/assets/xml/objects/object_spot00_objects.xml b/assets/xml/objects/object_spot00_objects.xml index 10fb13aeac..0bd365a839 100644 --- a/assets/xml/objects/object_spot00_objects.xml +++ b/assets/xml/objects/object_spot00_objects.xml @@ -1,12 +1,18 @@ + + + + + + diff --git a/assets/xml/objects/object_spot01_matoya.xml b/assets/xml/objects/object_spot01_matoya.xml index d44b944e0e..a06d296a11 100644 --- a/assets/xml/objects/object_spot01_matoya.xml +++ b/assets/xml/objects/object_spot01_matoya.xml @@ -1,7 +1,13 @@ + + + + + + @@ -11,14 +17,23 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_spot04_objects.xml b/assets/xml/objects/object_spot04_objects.xml index 66293d7523..ec0a712152 100644 --- a/assets/xml/objects/object_spot04_objects.xml +++ b/assets/xml/objects/object_spot04_objects.xml @@ -4,6 +4,9 @@ + + + diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml index 4f339fc951..bac3ed4370 100644 --- a/assets/xml/objects/object_ta.xml +++ b/assets/xml/objects/object_ta.xml @@ -25,6 +25,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_vm.xml b/assets/xml/objects/object_vm.xml index c5b949b36e..f9a3163d72 100644 --- a/assets/xml/objects/object_vm.xml +++ b/assets/xml/objects/object_vm.xml @@ -15,6 +15,20 @@ + + + + + + + + + + + + + + @@ -35,7 +49,10 @@ - + + + + diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml index 1b83550605..c409c6033d 100644 --- a/assets/xml/objects/object_zl1.xml +++ b/assets/xml/objects/object_zl1.xml @@ -22,6 +22,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,8 +123,14 @@ - + + + + + + + diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml index 8872cc4c9f..849b01bb45 100644 --- a/assets/xml/objects/object_zo.xml +++ b/assets/xml/objects/object_zo.xml @@ -4,53 +4,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -77,10 +134,16 @@ + + + + + + From 747006fdd489002111c4895c4724051e7896a7e8 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 03:38:01 +0200 Subject: [PATCH 34/42] Add Vtx[] resources in xmls for (partially) documented assets 5 (#2587) --- assets/xml/objects/object_demo_kekkai.xml | 45 +++++++ assets/xml/objects/object_gj.xml | 24 ++++ assets/xml/objects/object_goroiwa.xml | 3 + assets/xml/objects/object_gt.xml | 23 +++- assets/xml/objects/object_haka.xml | 6 + assets/xml/objects/object_hakach_objects.xml | 27 ++++ assets/xml/objects/object_hata.xml | 29 +++++ assets/xml/objects/object_heavy_object.xml | 9 ++ assets/xml/objects/object_hidan_objects.xml | 90 ++++++++++++++ assets/xml/objects/object_im.xml | 55 +++++++++ assets/xml/objects/object_in.xml | 116 ++++++++++++++++++ assets/xml/objects/object_jj.xml | 35 ++++++ assets/xml/objects/object_js.xml | 35 ++++++ assets/xml/objects/object_kibako2.xml | 8 ++ assets/xml/objects/object_ma1.xml | 52 ++++++++ assets/xml/objects/object_ma2.xml | 52 ++++++++ assets/xml/objects/object_mamenoki.xml | 12 ++ .../xml/objects/object_masterkokirihead.xml | 3 + assets/xml/objects/object_md.xml | 47 +++++++ assets/xml/objects/object_menkuri_objects.xml | 15 +++ assets/xml/objects/object_mir_ray.xml | 8 ++ assets/xml/objects/object_mori_objects.xml | 27 ++++ assets/xml/objects/object_ms.xml | 23 ++++ assets/xml/objects/object_nb.xml | 53 ++++++++ assets/xml/objects/object_niw.xml | 28 ++++- assets/xml/objects/object_nwc.xml | 12 ++ 26 files changed, 835 insertions(+), 2 deletions(-) diff --git a/assets/xml/objects/object_demo_kekkai.xml b/assets/xml/objects/object_demo_kekkai.xml index 8b7b739c64..256a9fdebc 100644 --- a/assets/xml/objects/object_demo_kekkai.xml +++ b/assets/xml/objects/object_demo_kekkai.xml @@ -2,41 +2,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gj.xml b/assets/xml/objects/object_gj.xml index 50d6337b4a..bb67f1262d 100644 --- a/assets/xml/objects/object_gj.xml +++ b/assets/xml/objects/object_gj.xml @@ -1,29 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_goroiwa.xml b/assets/xml/objects/object_goroiwa.xml index 5d406e9578..c454e78b53 100644 --- a/assets/xml/objects/object_goroiwa.xml +++ b/assets/xml/objects/object_goroiwa.xml @@ -1,6 +1,9 @@ + + + diff --git a/assets/xml/objects/object_gt.xml b/assets/xml/objects/object_gt.xml index dd48318d1d..83ab9d9f75 100644 --- a/assets/xml/objects/object_gt.xml +++ b/assets/xml/objects/object_gt.xml @@ -21,13 +21,34 @@ - + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_haka.xml b/assets/xml/objects/object_haka.xml index f6b263c375..ca6557cc8c 100644 --- a/assets/xml/objects/object_haka.xml +++ b/assets/xml/objects/object_haka.xml @@ -3,7 +3,13 @@ + + + + + + diff --git a/assets/xml/objects/object_hakach_objects.xml b/assets/xml/objects/object_hakach_objects.xml index b978e77a31..a3eb7795ba 100644 --- a/assets/xml/objects/object_hakach_objects.xml +++ b/assets/xml/objects/object_hakach_objects.xml @@ -1,13 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_hata.xml b/assets/xml/objects/object_hata.xml index b0324c3be3..1679dce18a 100644 --- a/assets/xml/objects/object_hata.xml +++ b/assets/xml/objects/object_hata.xml @@ -31,6 +31,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_heavy_object.xml b/assets/xml/objects/object_heavy_object.xml index ecc7953211..ad09fcffce 100644 --- a/assets/xml/objects/object_heavy_object.xml +++ b/assets/xml/objects/object_heavy_object.xml @@ -1,8 +1,17 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_hidan_objects.xml b/assets/xml/objects/object_hidan_objects.xml index fe0405d9dd..857cd80ed6 100644 --- a/assets/xml/objects/object_hidan_objects.xml +++ b/assets/xml/objects/object_hidan_objects.xml @@ -1,38 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,7 +89,13 @@ + + + + + + @@ -56,32 +107,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_im.xml b/assets/xml/objects/object_im.xml index a628a113a4..ee8848cab4 100644 --- a/assets/xml/objects/object_im.xml +++ b/assets/xml/objects/object_im.xml @@ -19,6 +19,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36,6 +68,9 @@ + + + @@ -46,6 +81,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml index 155b9c9ad1..102fc82c0d 100644 --- a/assets/xml/objects/object_in.xml +++ b/assets/xml/objects/object_in.xml @@ -37,6 +37,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -81,6 +142,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_jj.xml b/assets/xml/objects/object_jj.xml index 96ff7dc02a..dcbdd4ff8f 100644 --- a/assets/xml/objects/object_jj.xml +++ b/assets/xml/objects/object_jj.xml @@ -12,6 +12,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml index ff7bd3efa1..bc89bf42fc 100644 --- a/assets/xml/objects/object_js.xml +++ b/assets/xml/objects/object_js.xml @@ -17,6 +17,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kibako2.xml b/assets/xml/objects/object_kibako2.xml index a701b294de..10d3149c69 100644 --- a/assets/xml/objects/object_kibako2.xml +++ b/assets/xml/objects/object_kibako2.xml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml index 11509ad6aa..257958a2ea 100644 --- a/assets/xml/objects/object_ma1.xml +++ b/assets/xml/objects/object_ma1.xml @@ -46,6 +46,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml index 0b6eabff70..9b450aa94a 100644 --- a/assets/xml/objects/object_ma2.xml +++ b/assets/xml/objects/object_ma2.xml @@ -29,6 +29,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mamenoki.xml b/assets/xml/objects/object_mamenoki.xml index 819d890225..f17ff1fc8a 100644 --- a/assets/xml/objects/object_mamenoki.xml +++ b/assets/xml/objects/object_mamenoki.xml @@ -1,8 +1,20 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_masterkokirihead.xml b/assets/xml/objects/object_masterkokirihead.xml index 1e489323c2..1a35b675cf 100644 --- a/assets/xml/objects/object_masterkokirihead.xml +++ b/assets/xml/objects/object_masterkokirihead.xml @@ -1,5 +1,8 @@ + + + diff --git a/assets/xml/objects/object_md.xml b/assets/xml/objects/object_md.xml index 45527ca1b9..ac10cb64eb 100644 --- a/assets/xml/objects/object_md.xml +++ b/assets/xml/objects/object_md.xml @@ -21,6 +21,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_menkuri_objects.xml b/assets/xml/objects/object_menkuri_objects.xml index 4c2b51df5b..864ef25b85 100644 --- a/assets/xml/objects/object_menkuri_objects.xml +++ b/assets/xml/objects/object_menkuri_objects.xml @@ -8,10 +8,25 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mir_ray.xml b/assets/xml/objects/object_mir_ray.xml index 2acc9391ab..0d1972c3c6 100644 --- a/assets/xml/objects/object_mir_ray.xml +++ b/assets/xml/objects/object_mir_ray.xml @@ -1,6 +1,14 @@ + + + + + + + + diff --git a/assets/xml/objects/object_mori_objects.xml b/assets/xml/objects/object_mori_objects.xml index 1844cf6f69..85ffe02181 100644 --- a/assets/xml/objects/object_mori_objects.xml +++ b/assets/xml/objects/object_mori_objects.xml @@ -6,20 +6,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ms.xml b/assets/xml/objects/object_ms.xml index 66923df8ae..3fbab475e4 100644 --- a/assets/xml/objects/object_ms.xml +++ b/assets/xml/objects/object_ms.xml @@ -13,6 +13,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_nb.xml b/assets/xml/objects/object_nb.xml index 74de9e2859..b720a53020 100644 --- a/assets/xml/objects/object_nb.xml +++ b/assets/xml/objects/object_nb.xml @@ -24,6 +24,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_niw.xml b/assets/xml/objects/object_niw.xml index 4eafec9566..c68f90b88c 100644 --- a/assets/xml/objects/object_niw.xml +++ b/assets/xml/objects/object_niw.xml @@ -20,6 +20,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -29,8 +52,11 @@ - + + + + diff --git a/assets/xml/objects/object_nwc.xml b/assets/xml/objects/object_nwc.xml index abe2be092b..b6cad1801a 100644 --- a/assets/xml/objects/object_nwc.xml +++ b/assets/xml/objects/object_nwc.xml @@ -5,12 +5,24 @@ + + + + + + + + + + + + From b84d1afc67eb0452f715232f832dcef19635c743 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 03:55:30 +0200 Subject: [PATCH 35/42] Better automatic names for Limbs and JointKeys, and implement more get_as_xml (#2590) --- tools/assets/extract/extase/__init__.py | 4 ++++ .../assets/extract/extase_oot64/dlist_resources.py | 13 +++++++++++++ .../extase_oot64/skelanime_legacy_resources.py | 6 +++++- .../extract/extase_oot64/skeleton_resources.py | 14 +++++++++++++- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/tools/assets/extract/extase/__init__.py b/tools/assets/extract/extase/__init__.py index 527a187a72..029b20d214 100644 --- a/tools/assets/extract/extase/__init__.py +++ b/tools/assets/extract/extase/__init__.py @@ -1110,6 +1110,10 @@ class BinaryBlobResource(Resource): # Nothing specific to do return RESOURCE_PARSE_SUCCESS + def get_as_xml(self): + return f"""\ + """ + def get_c_reference(self, resource_offset): return f"&{self.symbol_name}[{resource_offset}]" diff --git a/tools/assets/extract/extase_oot64/dlist_resources.py b/tools/assets/extract/extase_oot64/dlist_resources.py index ad470c33aa..fb69fc2b90 100644 --- a/tools/assets/extract/extase_oot64/dlist_resources.py +++ b/tools/assets/extract/extase_oot64/dlist_resources.py @@ -275,6 +275,15 @@ class TextureResource(Resource): self.width_name = f"{self.symbol_name}_WIDTH" self.height_name = f"{self.symbol_name}_HEIGHT" + def get_as_xml(self): + tlut_offset_attr = ( + f' TlutOffset="0x{self.resource_tlut.range_start:X}"' + if self.resource_tlut + else "" + ) + return f"""\ + """ + def check_declare_length(self): return ( hasattr(self, "HACK_IS_STATIC_ON") or EXPLICIT_DL_AND_TEX_SIZES @@ -1347,6 +1356,10 @@ class DListResource(Resource, can_size_be_unknown=True): return RESOURCE_PARSE_SUCCESS + def get_as_xml(self): + return f"""\ + """ + def get_c_declaration_base(self): if hasattr(self, "HACK_IS_STATIC_ON") or EXPLICIT_DL_AND_TEX_SIZES: length = (self.range_end - self.range_start) // 8 diff --git a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py index df21aa8d28..42cf8c4c3f 100644 --- a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py +++ b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py @@ -164,7 +164,11 @@ class LegacyAnimationResource(CDataResource): lambda file, offset: LegacyJointKeyArrayResource( file, offset, - f"{self.name}_{address_jointKey:08X}_JointKeys", + ( + f"{self.symbol_name.removesuffix('Anim')}JointKeys" + if self.symbol_name.endswith("Anim") + else f"{self.symbol_name}_{address_jointKey:08X}_JointKeys" + ), ), ) resource_jointKey.set_length(self.cdata_unpacked["limbCount"] + 1) diff --git a/tools/assets/extract/extase_oot64/skeleton_resources.py b/tools/assets/extract/extase_oot64/skeleton_resources.py index 3cff22c59b..12fe050a61 100644 --- a/tools/assets/extract/extase_oot64/skeleton_resources.py +++ b/tools/assets/extract/extase_oot64/skeleton_resources.py @@ -65,6 +65,10 @@ class StandardLimbResource(CDataResource): def set_enum_member_name(self, enum_member_name: str): self.enum_member_name = enum_member_name + def get_as_xml(self) -> str: + return f"""\ + """ + def get_c_declaration_base(self): return f"StandardLimb {self.symbol_name}" @@ -101,6 +105,10 @@ class LODLimbResource(CDataResource): def set_enum_member_name(self, enum_member_name: str): self.enum_member_name = enum_member_name + def get_as_xml(self): + return f"""\ + """ + def get_c_declaration_base(self): return f"LodLimb {self.symbol_name}" @@ -241,7 +249,11 @@ class SkeletonResourceABC(SkeletonResourceBaseABC): lambda file, offset: resource.limbs_array_type( file, offset, - f"{resource.name}_{address:08X}_Limbs", + ( + f"{resource.name.removesuffix('Skel')}Limbs" + if resource.name.endswith("Skel") + else f"{resource.name}_{address:08X}_Limbs" + ), ), ) resource_limbs.set_length( From c6dbebfcd25ea86ceefcc8957a2d3ec8f8f4d67b Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 05:02:04 +0200 Subject: [PATCH 36/42] Fix too long filenames for windows (#2591) --- tools/assets/extract/extase_oot64/dlist_resources.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/assets/extract/extase_oot64/dlist_resources.py b/tools/assets/extract/extase_oot64/dlist_resources.py index fb69fc2b90..f80a2f9954 100644 --- a/tools/assets/extract/extase_oot64/dlist_resources.py +++ b/tools/assets/extract/extase_oot64/dlist_resources.py @@ -43,6 +43,7 @@ VERBOSE_ColorIndexedTexturesManager = False VERBOSE_BEST_EFFORT_TLUT_NO_REAL_USER = True EXPLICIT_DL_AND_TEX_SIZES = True +TEXS_SHORTER_NAMES = True class MtxResource(CDataResource): @@ -1168,7 +1169,7 @@ class ColorIndexedTexturesManager: lambda file, offset: TextureResource( file, offset, - f"{reporter.name}_{offset:08X}_CITex", + f"{file.name if TEXS_SHORTER_NAMES else reporter.name}_{offset:08X}_CITex", tex.fmt, tex.siz, tex.width, @@ -1190,7 +1191,7 @@ class ColorIndexedTexturesManager: lambda file, offset: TLUTResource( file, offset, - f"{reporter.name}_{offset:08X}_TLUT", + f"{file.name if TEXS_SHORTER_NAMES else reporter.name}_{offset:08X}_TLUT", { G_TT.RGBA16: G_IM_FMT.RGBA, G_TT.IA16: G_IM_FMT.IA, @@ -1258,7 +1259,7 @@ class DListResource(Resource, can_size_be_unknown=True): lambda file, offset: TextureResource( file, offset, - f"{self.name}_{offset:08X}_Tex", + f"{file.name if TEXS_SHORTER_NAMES else self.name}_{offset:08X}_Tex", g_fmt, g_siz, width, From b37f62fc1fabf75358867fc931591278923288aa Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Fri, 6 Jun 2025 12:00:02 -0400 Subject: [PATCH 37/42] Child Ruto Part 4: Eye and mouth index enums (#2571) * Child Ruto Part 4: Eye and mouth index enums * Suggested changes * Rename struct variables --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 65 ++++++++++++++--------- src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 4 +- 2 files changed, 42 insertions(+), 27 deletions(-) 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 aea5f9ba2e..850d1177e3 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -90,6 +90,21 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play); void EnRu1_DrawOpa(EnRu1* this, PlayState* play); void EnRu1_DrawXlu(EnRu1* this, PlayState* play); +typedef enum EnRu1Eyes { + /* 0 */ ENRU1_EYES_OPEN, + /* 1 */ ENRU1_EYES_HALF_BLINK, + /* 2 */ ENRU1_EYES_CLOSED, + /* 3 */ ENRU1_EYES_UP, + /* 4 */ ENRU1_EYES_GAZING, + /* 5 */ ENRU1_EYES_BLUSH, +} EnRu1Eyes; + +typedef enum EnRu1Mouth { + /* 0 */ ENRU1_MOUTH_SMILING, + /* 1 */ ENRU1_MOUTH_FROWNING, + /* 2 */ ENRU1_MOUTH_OPEN, +} EnRu1Mouth; + typedef enum EnRu1WaterState { /* 0 */ ENRU1_WATER_OUTSIDE, /* 1 */ ENRU1_WATER_IMMERSED, @@ -237,24 +252,24 @@ void EnRu1_Destroy(Actor* thisx, PlayState* play) { void EnRu1_UpdateEyes(EnRu1* this) { s32 pad[3]; s16* blinkTimer = &this->blinkTimer; - s16* eyeIndex = &this->eyeIndex; + s16* eyes = &this->eyes; if (DECR(*blinkTimer) == 0) { *blinkTimer = Rand_S16Offset(60, 60); } - *eyeIndex = *blinkTimer; - if (*eyeIndex >= 3) { - *eyeIndex = 0; + *eyes = *blinkTimer; + if (*eyes >= ENRU1_EYES_UP) { + *eyes = ENRU1_EYES_OPEN; } } -void EnRu1_SetEyeIndex(EnRu1* this, s16 eyeIndex) { - this->eyeIndex = eyeIndex; +void EnRu1_SetEyes(EnRu1* this, s16 eyes) { + this->eyes = eyes; } -void EnRu1_SetMouthIndex(EnRu1* this, s16 mouthIndex) { - this->mouthIndex = mouthIndex; +void EnRu1_SetMouth(EnRu1* this, s16 mouth) { + this->mouth = mouth; } void func_80AEAECC(EnRu1* this, PlayState* play) { @@ -436,8 +451,8 @@ void EnRu1_InitOutsideJabuJabu(EnRu1* this, PlayState* play) { EnRu1_AnimationChange(this, &gRutoChildWaitHandsBehindBackAnim, ANIMMODE_LOOP, 0, false); this->action = 0; this->drawConfig = 1; - EnRu1_SetEyeIndex(this, 4); - EnRu1_SetMouthIndex(this, 0); + EnRu1_SetEyes(this, ENRU1_EYES_GAZING); + EnRu1_SetMouth(this, ENRU1_MOUTH_SMILING); } CsCmdActorCue* EnRu1_GetCueChannel3(PlayState* play) { @@ -793,7 +808,7 @@ void EnRu1_InitInJabuJabuHolesRoom(EnRu1* this, PlayState* play) { if (!GET_INFTABLE(INFTABLE_141)) { EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false); this->action = 7; - EnRu1_SetMouthIndex(this, 1); + EnRu1_SetMouth(this, ENRU1_MOUTH_FROWNING); } else if (GET_INFTABLE(INFTABLE_147) && !GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145)) { if (!func_80AEB020(this, play)) { s8 actorRoom; @@ -1038,8 +1053,8 @@ void EnRu1_InitInBossRoom(EnRu1* this, PlayState* play) { EnRu1_AnimationChange(this, &gRutoChildWaitHandsOnHipsAnim, ANIMMODE_LOOP, 0, false); this->action = 15; this->actor.shape.yOffset = -10000.0f; - EnRu1_SetEyeIndex(this, 5); - EnRu1_SetMouthIndex(this, 2); + EnRu1_SetEyes(this, ENRU1_EYES_BLUSH); + EnRu1_SetMouth(this, ENRU1_MOUTH_OPEN); } void func_80AECE04(EnRu1* this, PlayState* play) { @@ -1968,8 +1983,8 @@ void func_80AEF51C(EnRu1* this) { void func_80AEF540(EnRu1* this) { if (EnRu1_GetPlatformCamSetting(this) == 2) { - EnRu1_SetEyeIndex(this, 3); - EnRu1_SetMouthIndex(this, 2); + EnRu1_SetEyes(this, ENRU1_EYES_UP); + EnRu1_SetMouth(this, ENRU1_MOUTH_OPEN); if (this->skelAnime.mode != 2) { EnRu1_AnimationChange(this, &gRutoChildShutterAnim, ANIMMODE_ONCE, -8.0f, false); func_80AEF51C(this); @@ -1983,8 +1998,8 @@ void func_80AEF5B8(EnRu1* this) { if (D_80AF1938 == 0) { curFrame = this->skelAnime.curFrame; if (curFrame >= 60.0f) { - EnRu1_SetEyeIndex(this, 3); - EnRu1_SetMouthIndex(this, 0); + EnRu1_SetEyes(this, ENRU1_EYES_UP); + EnRu1_SetMouth(this, ENRU1_MOUTH_SMILING); func_80AED57C(this); D_80AF1938 = 1; } @@ -2380,11 +2395,11 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play) { void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { s32 pad[2]; - s16 eyeIndex = this->eyeIndex; - void* eyeTex = sEyeTextures[eyeIndex]; - s16 mouthIndex = this->mouthIndex; + s16 eyes = this->eyes; + void* eyeTex = sEyeTextures[eyes]; + s16 mouth = this->mouth; SkelAnime* skelAnime = &this->skelAnime; - void* mouthTex = sMouthTextures[mouthIndex]; + void* mouthTex = sMouthTextures[mouth]; s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1282); @@ -2405,11 +2420,11 @@ void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { void EnRu1_DrawXlu(EnRu1* this, PlayState* play) { s32 pad[2]; - s16 eyeIndex = this->eyeIndex; - void* eyeTex = sEyeTextures[eyeIndex]; - s16 mouthIndex = this->mouthIndex; + s16 eyes = this->eyes; + void* eyeTex = sEyeTextures[eyes]; + s16 mouth = this->mouth; SkelAnime* skelAnime = &this->skelAnime; - void* mouthTex = sMouthTextures[mouthIndex]; + void* mouthTex = sMouthTextures[mouth]; s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1324); diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 80f1bccb13..b4faf8d3f4 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -21,9 +21,9 @@ typedef struct EnRu1 { /* 0x014C */ SkelAnime skelAnime; /* 0x0190 */ Vec3s jointTable[17]; /* 0x01F6 */ Vec3s morphTable[17]; - /* 0x025C */ s16 eyeIndex; + /* 0x025C */ s16 eyes; /* 0x025E */ s16 blinkTimer; - /* 0x0260 */ s16 mouthIndex; + /* 0x0260 */ s16 mouth; /* 0x0264 */ s32 action; /* 0x0268 */ s32 drawConfig; /* 0x026C */ f32 unk_26C; From 597bd27f5b4ea4768c8d7f85dcaaf902383d768c Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Fri, 6 Jun 2025 12:17:11 -0400 Subject: [PATCH 38/42] Child Ruto Part 7: Limb draw functions (#2575) * Child Ruto Part 7: Limb draw functions * Add comment * Rename vectors, remove comment * Rename again --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 25 ++++++++++++----------- src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) 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 850d1177e3..575755d445 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -84,7 +84,7 @@ void func_80AEFC24(EnRu1* this, PlayState* play); void func_80AEFECC(EnRu1* this, PlayState* play); void func_80AEFF40(EnRu1* this, PlayState* play); -void func_80AF0278(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot); +void EnRu1_PreLimbDraw(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot); void EnRu1_DrawNothing(EnRu1* this, PlayState* play); void EnRu1_DrawOpa(EnRu1* this, PlayState* play); @@ -164,7 +164,7 @@ static EnRu1ActionFunc sActionFuncs[] = { }; static EnRu1PreLimbDrawFunc sPreLimbDrawFuncs[] = { - func_80AF0278, + EnRu1_PreLimbDraw, }; static Vec3f sMultVec = { 0.0f, 10.0f, 0.0f }; @@ -2343,7 +2343,7 @@ void EnRu1_Init(Actor* thisx, PlayState* play) { } } -void func_80AF0278(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot) { +void EnRu1_PreLimbDraw(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot) { Vec3s* torsoRot = &this->interactInfo.torsoRot; Vec3s* headRot = &this->interactInfo.headRot; @@ -2363,11 +2363,12 @@ s32 EnRu1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p Gfx** gfx) { EnRu1* this = (EnRu1*)thisx; - if ((this->unk_290 < 0) || (this->unk_290 > 0) || (*sPreLimbDrawFuncs[this->unk_290] == NULL)) { + if ((this->preLimbDrawIndex < 0) || (this->preLimbDrawIndex > 0) || + (*sPreLimbDrawFuncs[this->preLimbDrawIndex] == NULL)) { PRINTF(VT_FGCOL(RED) T("首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n", "Neck rotation mode is improper!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); } else { - sPreLimbDrawFuncs[this->unk_290](this, play, limbIndex, rot); + sPreLimbDrawFuncs[this->preLimbDrawIndex](this, play, limbIndex, rot); } return false; } @@ -2376,14 +2377,14 @@ void EnRu1_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, EnRu1* this = (EnRu1*)thisx; if (limbIndex == RUTO_CHILD_HEAD) { - Vec3f vec1; - Vec3f vec2; + Vec3f multVec; + Vec3f focusPos; - vec1 = sMultVec; - Matrix_MultVec3f(&vec1, &vec2); - this->actor.focus.pos.x = vec2.x; - this->actor.focus.pos.y = vec2.y; - this->actor.focus.pos.z = vec2.z; + multVec = sMultVec; + Matrix_MultVec3f(&multVec, &focusPos); + this->actor.focus.pos.x = focusPos.x; + this->actor.focus.pos.y = focusPos.y; + this->actor.focus.pos.z = focusPos.z; this->actor.focus.rot.x = this->actor.world.rot.x; this->actor.focus.rot.y = this->actor.world.rot.y; this->actor.focus.rot.z = this->actor.world.rot.z; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index b4faf8d3f4..6968b6fb0d 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -37,7 +37,7 @@ typedef struct EnRu1 { /* 0x0286 */ s8 roomNum3; /* 0x0288 */ f32 unk_288; /* 0x028C */ BgBdanObjects* bigOctoPlatform; - /* 0x0290 */ s32 unk_290; + /* 0x0290 */ s32 preLimbDrawIndex; /* 0x0294 */ char unk_294[0x4]; /* 0x0298 */ s32 unk_298; /* 0x029C */ char unk_29C[0x2]; From f73e56481782858b13a7122738ba47322a2b4e1e Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 19:24:44 +0200 Subject: [PATCH 39/42] Add various undocumented resources in xmls 2 (#2594) --- assets/xml/objects/gameplay_field_keep.xml | 17 ++++ assets/xml/objects/object_am.xml | 32 ++++++++ assets/xml/objects/object_ani.xml | 1 + assets/xml/objects/object_anubice.xml | 33 ++++++++ assets/xml/objects/object_bdan_objects.xml | 2 + assets/xml/objects/object_blkobj.xml | 24 ++++++ assets/xml/objects/object_crow.xml | 16 ++++ assets/xml/objects/object_ddan_objects.xml | 2 + assets/xml/objects/object_dekunuts.xml | 34 ++++++++ assets/xml/objects/object_demo_kekkai.xml | 18 +++++ assets/xml/objects/object_dnk.xml | 26 +++++++ assets/xml/objects/object_dns.xml | 30 +++++++ assets/xml/objects/object_dodongo.xml | 43 ++++++++++ assets/xml/objects/object_fd2.xml | 82 ++++++++++++++++++++ assets/xml/objects/object_firefly.xml | 37 +++++++++ assets/xml/objects/object_fw.xml | 1 + assets/xml/objects/object_geldb.xml | 60 ++++++++++++++ assets/xml/objects/object_gj.xml | 12 +++ assets/xml/objects/object_gnd.xml | 43 ++++++++++ assets/xml/objects/object_gr.xml | 44 +++++++++++ assets/xml/objects/object_hakach_objects.xml | 1 + assets/xml/objects/object_hidan_objects.xml | 20 +++++ 22 files changed, 578 insertions(+) diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml index 3c0f18d74e..c0a5b8e30e 100644 --- a/assets/xml/objects/gameplay_field_keep.xml +++ b/assets/xml/objects/gameplay_field_keep.xml @@ -58,5 +58,22 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_am.xml b/assets/xml/objects/object_am.xml index c787a7b391..faf6c5576a 100644 --- a/assets/xml/objects/object_am.xml +++ b/assets/xml/objects/object_am.xml @@ -23,5 +23,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml index f0b09bba59..da67fd71d8 100644 --- a/assets/xml/objects/object_ani.xml +++ b/assets/xml/objects/object_ani.xml @@ -47,6 +47,7 @@ + diff --git a/assets/xml/objects/object_anubice.xml b/assets/xml/objects/object_anubice.xml index 7c3148d742..492a8e4235 100644 --- a/assets/xml/objects/object_anubice.xml +++ b/assets/xml/objects/object_anubice.xml @@ -51,5 +51,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bdan_objects.xml b/assets/xml/objects/object_bdan_objects.xml index 36f6541f03..39c5ec55bc 100644 --- a/assets/xml/objects/object_bdan_objects.xml +++ b/assets/xml/objects/object_bdan_objects.xml @@ -33,7 +33,9 @@ + + diff --git a/assets/xml/objects/object_blkobj.xml b/assets/xml/objects/object_blkobj.xml index c8f3012bf4..a2f22813b9 100644 --- a/assets/xml/objects/object_blkobj.xml +++ b/assets/xml/objects/object_blkobj.xml @@ -21,5 +21,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_crow.xml b/assets/xml/objects/object_crow.xml index ee166346b3..61a77d122d 100644 --- a/assets/xml/objects/object_crow.xml +++ b/assets/xml/objects/object_crow.xml @@ -30,5 +30,21 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ddan_objects.xml b/assets/xml/objects/object_ddan_objects.xml index 6eeb481eb3..6f1f9d8549 100644 --- a/assets/xml/objects/object_ddan_objects.xml +++ b/assets/xml/objects/object_ddan_objects.xml @@ -15,7 +15,9 @@ + + diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml index 8f1303fadb..b5b4065983 100644 --- a/assets/xml/objects/object_dekunuts.xml +++ b/assets/xml/objects/object_dekunuts.xml @@ -63,5 +63,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_demo_kekkai.xml b/assets/xml/objects/object_demo_kekkai.xml index 256a9fdebc..b35f9d0422 100644 --- a/assets/xml/objects/object_demo_kekkai.xml +++ b/assets/xml/objects/object_demo_kekkai.xml @@ -83,5 +83,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml index 00b5da9157..91eee5052c 100644 --- a/assets/xml/objects/object_dnk.xml +++ b/assets/xml/objects/object_dnk.xml @@ -64,5 +64,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml index 5989afbc5f..f934b6b125 100644 --- a/assets/xml/objects/object_dns.xml +++ b/assets/xml/objects/object_dns.xml @@ -74,5 +74,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml index e7b00e7d31..e01b49133e 100644 --- a/assets/xml/objects/object_dodongo.xml +++ b/assets/xml/objects/object_dodongo.xml @@ -78,5 +78,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fd2.xml b/assets/xml/objects/object_fd2.xml index e6c4d6cce8..f37d53fd83 100644 --- a/assets/xml/objects/object_fd2.xml +++ b/assets/xml/objects/object_fd2.xml @@ -151,5 +151,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml index e7de1cfc44..48424e7af0 100644 --- a/assets/xml/objects/object_firefly.xml +++ b/assets/xml/objects/object_firefly.xml @@ -51,5 +51,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml index d18ac114a1..2ecd79e695 100644 --- a/assets/xml/objects/object_fw.xml +++ b/assets/xml/objects/object_fw.xml @@ -91,6 +91,7 @@ + diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml index 4d23d80e8c..c0ac526558 100644 --- a/assets/xml/objects/object_geldb.xml +++ b/assets/xml/objects/object_geldb.xml @@ -83,5 +83,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gj.xml b/assets/xml/objects/object_gj.xml index bb67f1262d..64f1f5e119 100644 --- a/assets/xml/objects/object_gj.xml +++ b/assets/xml/objects/object_gj.xml @@ -55,5 +55,17 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml index e8b6937a8d..1c5533a3d1 100644 --- a/assets/xml/objects/object_gnd.xml +++ b/assets/xml/objects/object_gnd.xml @@ -137,5 +137,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_gr.xml b/assets/xml/objects/object_gr.xml index 103d4412e9..f825a9f0af 100644 --- a/assets/xml/objects/object_gr.xml +++ b/assets/xml/objects/object_gr.xml @@ -12,5 +12,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_hakach_objects.xml b/assets/xml/objects/object_hakach_objects.xml index a3eb7795ba..d7c61f321b 100644 --- a/assets/xml/objects/object_hakach_objects.xml +++ b/assets/xml/objects/object_hakach_objects.xml @@ -51,5 +51,6 @@ + diff --git a/assets/xml/objects/object_hidan_objects.xml b/assets/xml/objects/object_hidan_objects.xml index 857cd80ed6..65f74b9f68 100644 --- a/assets/xml/objects/object_hidan_objects.xml +++ b/assets/xml/objects/object_hidan_objects.xml @@ -175,5 +175,25 @@ + + + + + + + + + + + + + + + + + + + + From e1fb3a974fc49ca9e20a629004dc5a3f09e5728c Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 20:44:13 +0200 Subject: [PATCH 40/42] Add various undocumented resources in xmls 3 (#2595) --- assets/xml/objects/object_hintnuts.xml | 25 +++++++ assets/xml/objects/object_ik.xml | 65 +++++++++++++++++ assets/xml/objects/object_jj.xml | 43 ++++++------ assets/xml/objects/object_jya_obj.xml | 8 +++ .../xml/objects/object_masterkokirihead.xml | 2 + assets/xml/objects/object_mb.xml | 70 +++++++++++++++++++ assets/xml/objects/object_mizu_objects.xml | 15 ++++ assets/xml/objects/object_mm.xml | 40 +++++++++++ assets/xml/objects/object_oF1d_map.xml | 50 +++++++++++++ assets/xml/objects/object_okuta.xml | 54 ++++++++++++++ assets/xml/objects/object_owl.xml | 38 ++++++++++ assets/xml/objects/object_ru2.xml | 2 + assets/xml/objects/object_sa.xml | 1 + assets/xml/objects/object_skj.xml | 11 +++ assets/xml/objects/object_spot01_matoya.xml | 1 + assets/xml/objects/object_spot01_matoyab.xml | 1 + assets/xml/objects/object_spot09_obj.xml | 21 ++++++ assets/xml/objects/object_torch2.xml | 41 +++++++++++ assets/xml/objects/object_wallmaster.xml | 40 +++++++++++ assets/xml/objects/object_ydan_objects.xml | 3 + assets/xml/objects/object_zl1.xml | 1 + assets/xml/objects/object_zl2.xml | 59 ++++++++++++++++ assets/xml/objects/object_zl4.xml | 63 +++++++++++++++++ 23 files changed, 632 insertions(+), 22 deletions(-) diff --git a/assets/xml/objects/object_hintnuts.xml b/assets/xml/objects/object_hintnuts.xml index d3595d85e8..fe02e8adbe 100644 --- a/assets/xml/objects/object_hintnuts.xml +++ b/assets/xml/objects/object_hintnuts.xml @@ -19,5 +19,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml index 50f47e9d7c..0d056681ab 100644 --- a/assets/xml/objects/object_ik.xml +++ b/assets/xml/objects/object_ik.xml @@ -100,5 +100,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_jj.xml b/assets/xml/objects/object_jj.xml index dcbdd4ff8f..76162935c6 100644 --- a/assets/xml/objects/object_jj.xml +++ b/assets/xml/objects/object_jj.xml @@ -61,28 +61,27 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml index 50c2700db1..07dcd31f7b 100644 --- a/assets/xml/objects/object_jya_obj.xml +++ b/assets/xml/objects/object_jya_obj.xml @@ -76,5 +76,13 @@ + + + + + + + + diff --git a/assets/xml/objects/object_masterkokirihead.xml b/assets/xml/objects/object_masterkokirihead.xml index 1a35b675cf..0062871c05 100644 --- a/assets/xml/objects/object_masterkokirihead.xml +++ b/assets/xml/objects/object_masterkokirihead.xml @@ -6,6 +6,8 @@ + + diff --git a/assets/xml/objects/object_mb.xml b/assets/xml/objects/object_mb.xml index a8471429db..115d2c82d9 100644 --- a/assets/xml/objects/object_mb.xml +++ b/assets/xml/objects/object_mb.xml @@ -55,5 +55,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mizu_objects.xml b/assets/xml/objects/object_mizu_objects.xml index 5882b20501..e6bafbc67f 100644 --- a/assets/xml/objects/object_mizu_objects.xml +++ b/assets/xml/objects/object_mizu_objects.xml @@ -37,5 +37,20 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mm.xml b/assets/xml/objects/object_mm.xml index 834afe5ef0..38e98d9553 100644 --- a/assets/xml/objects/object_mm.xml +++ b/assets/xml/objects/object_mm.xml @@ -12,5 +12,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml index 09a35dbd1c..49ab959e26 100644 --- a/assets/xml/objects/object_oF1d_map.xml +++ b/assets/xml/objects/object_oF1d_map.xml @@ -33,5 +33,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_okuta.xml b/assets/xml/objects/object_okuta.xml index b4fccea6f3..d1698ba6ef 100644 --- a/assets/xml/objects/object_okuta.xml +++ b/assets/xml/objects/object_okuta.xml @@ -25,5 +25,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml index 4ea2006678..b9185a55f7 100644 --- a/assets/xml/objects/object_owl.xml +++ b/assets/xml/objects/object_owl.xml @@ -67,5 +67,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml index cd47562236..35e8e6b980 100644 --- a/assets/xml/objects/object_ru2.xml +++ b/assets/xml/objects/object_ru2.xml @@ -142,6 +142,8 @@ + + diff --git a/assets/xml/objects/object_sa.xml b/assets/xml/objects/object_sa.xml index 1d666c9b26..62dcda8697 100644 --- a/assets/xml/objects/object_sa.xml +++ b/assets/xml/objects/object_sa.xml @@ -122,6 +122,7 @@ + diff --git a/assets/xml/objects/object_skj.xml b/assets/xml/objects/object_skj.xml index 866a38c73b..1e4dffa648 100644 --- a/assets/xml/objects/object_skj.xml +++ b/assets/xml/objects/object_skj.xml @@ -120,5 +120,16 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot01_matoya.xml b/assets/xml/objects/object_spot01_matoya.xml index a06d296a11..f8c3ec6d02 100644 --- a/assets/xml/objects/object_spot01_matoya.xml +++ b/assets/xml/objects/object_spot01_matoya.xml @@ -40,6 +40,7 @@ + diff --git a/assets/xml/objects/object_spot01_matoyab.xml b/assets/xml/objects/object_spot01_matoyab.xml index 720f50cd3e..8c1e933246 100644 --- a/assets/xml/objects/object_spot01_matoyab.xml +++ b/assets/xml/objects/object_spot01_matoyab.xml @@ -10,6 +10,7 @@ + diff --git a/assets/xml/objects/object_spot09_obj.xml b/assets/xml/objects/object_spot09_obj.xml index b4d9ae42a1..d86cf59874 100644 --- a/assets/xml/objects/object_spot09_obj.xml +++ b/assets/xml/objects/object_spot09_obj.xml @@ -10,5 +10,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_torch2.xml b/assets/xml/objects/object_torch2.xml index ec55bbe26d..09d9ff8a40 100644 --- a/assets/xml/objects/object_torch2.xml +++ b/assets/xml/objects/object_torch2.xml @@ -7,5 +7,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_wallmaster.xml b/assets/xml/objects/object_wallmaster.xml index fbbc4f4af3..2003606c08 100644 --- a/assets/xml/objects/object_wallmaster.xml +++ b/assets/xml/objects/object_wallmaster.xml @@ -31,5 +31,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ydan_objects.xml b/assets/xml/objects/object_ydan_objects.xml index 70174a1e70..298b892c75 100644 --- a/assets/xml/objects/object_ydan_objects.xml +++ b/assets/xml/objects/object_ydan_objects.xml @@ -7,14 +7,17 @@ + + + diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml index c409c6033d..42918cdbdc 100644 --- a/assets/xml/objects/object_zl1.xml +++ b/assets/xml/objects/object_zl1.xml @@ -122,6 +122,7 @@ + diff --git a/assets/xml/objects/object_zl2.xml b/assets/xml/objects/object_zl2.xml index 2503b811d3..f910906920 100644 --- a/assets/xml/objects/object_zl2.xml +++ b/assets/xml/objects/object_zl2.xml @@ -40,5 +40,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml index 99cc12ea2a..8e057041e0 100644 --- a/assets/xml/objects/object_zl4.xml +++ b/assets/xml/objects/object_zl4.xml @@ -58,5 +58,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7a816391bbb9584a5047a927dfd069414061927f Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 6 Jun 2025 22:07:53 +0200 Subject: [PATCH 41/42] Remove OutName from xmls (both on File and Texture) (#2596) --- assets/xml/code/fbdemo_circle.xml | 10 +- assets/xml/code/fbdemo_triforce.xml | 2 +- assets/xml/code/fbdemo_wipe1.xml | 4 +- assets/xml/n64dd/error_textures.xml | 10 +- assets/xml/objects/gameplay_dangeon_keep.xml | 40 +- assets/xml/objects/gameplay_field_keep.xml | 44 +- assets/xml/objects/gameplay_keep.xml | 458 +- assets/xml/objects/gameplay_keep_pal.xml | 438 +- assets/xml/objects/object_Bb.xml | 16 +- assets/xml/objects/object_ahg.xml | 36 +- assets/xml/objects/object_ane.xml | 26 +- assets/xml/objects/object_ani.xml | 28 +- assets/xml/objects/object_aob.xml | 24 +- assets/xml/objects/object_b_heart.xml | 4 +- assets/xml/objects/object_bba.xml | 20 +- assets/xml/objects/object_bdan_objects.xml | 62 +- assets/xml/objects/object_bdoor.xml | 14 +- assets/xml/objects/object_bg.xml | 16 +- assets/xml/objects/object_bigokuta.xml | 20 +- assets/xml/objects/object_bird.xml | 6 +- assets/xml/objects/object_bji.xml | 28 +- assets/xml/objects/object_bl.xml | 20 +- assets/xml/objects/object_bob.xml | 24 +- assets/xml/objects/object_boj.xml | 40 +- assets/xml/objects/object_bombf.xml | 8 +- assets/xml/objects/object_bombiwa.xml | 4 +- assets/xml/objects/object_bowl.xml | 6 +- assets/xml/objects/object_box.xml | 8 +- assets/xml/objects/object_brob.xml | 2 +- assets/xml/objects/object_bubble.xml | 2 +- assets/xml/objects/object_bv.xml | 2 +- assets/xml/objects/object_bv_pal.xml | 2 +- assets/xml/objects/object_bw.xml | 10 +- assets/xml/objects/object_bwall.xml | 2 +- assets/xml/objects/object_bxa.xml | 12 +- assets/xml/objects/object_cne.xml | 20 +- assets/xml/objects/object_cob.xml | 12 +- assets/xml/objects/object_cow.xml | 16 +- assets/xml/objects/object_crow.xml | 6 +- assets/xml/objects/object_cs.xml | 32 +- assets/xml/objects/object_d_elevator.xml | 2 +- assets/xml/objects/object_d_hsblock.xml | 4 +- assets/xml/objects/object_d_lift.xml | 4 +- assets/xml/objects/object_daiku.xml | 26 +- assets/xml/objects/object_ddan_objects.xml | 26 +- assets/xml/objects/object_dekubaba.xml | 12 +- assets/xml/objects/object_dekujr.xml | 14 +- assets/xml/objects/object_dekunuts.xml | 12 +- assets/xml/objects/object_demo_6k.xml | 6 +- assets/xml/objects/object_dh.xml | 16 +- assets/xml/objects/object_dnk.xml | 6 +- assets/xml/objects/object_dodojr.xml | 8 +- assets/xml/objects/object_dodongo.xml | 20 +- assets/xml/objects/object_dog.xml | 16 +- assets/xml/objects/object_door_gerudo.xml | 2 +- assets/xml/objects/object_ds.xml | 24 +- assets/xml/objects/object_ds2.xml | 24 +- assets/xml/objects/object_du.xml | 52 +- assets/xml/objects/object_du_pal.xml | 52 +- assets/xml/objects/object_dy_obj.xml | 44 +- .../xml/objects/object_efc_crystal_light.xml | 2 +- assets/xml/objects/object_efc_doughnut.xml | 4 +- assets/xml/objects/object_efc_erupc.xml | 8 +- assets/xml/objects/object_efc_fire_ball.xml | 4 +- assets/xml/objects/object_efc_lgt_shower.xml | 2 +- assets/xml/objects/object_efc_star_field.xml | 4 +- assets/xml/objects/object_efc_tw.xml | 2 +- assets/xml/objects/object_ei.xml | 16 +- assets/xml/objects/object_fa.xml | 20 +- assets/xml/objects/object_fd.xml | 10 +- assets/xml/objects/object_fd2.xml | 6 +- assets/xml/objects/object_fd_pal.xml | 10 +- assets/xml/objects/object_fhg.xml | 2 +- assets/xml/objects/object_fhg_pal.xml | 2 +- assets/xml/objects/object_fire.xml | 16 +- assets/xml/objects/object_firefly.xml | 20 +- assets/xml/objects/object_fish.xml | 100 +- assets/xml/objects/object_fr.xml | 22 +- assets/xml/objects/object_fu.xml | 30 +- assets/xml/objects/object_fw.xml | 12 +- assets/xml/objects/object_fz.xml | 2 +- assets/xml/objects/object_ganon.xml | 66 +- assets/xml/objects/object_ganon2.xml | 82 +- assets/xml/objects/object_ganon2_pal.xml | 82 +- assets/xml/objects/object_ganon_objects.xml | 2 +- assets/xml/objects/object_ganon_pal.xml | 66 +- assets/xml/objects/object_ge1.xml | 36 +- assets/xml/objects/object_geff.xml | 4 +- assets/xml/objects/object_geldb.xml | 6 +- assets/xml/objects/object_gi_jewel.xml | 6 +- assets/xml/objects/object_gj.xml | 6 +- assets/xml/objects/object_gjyo_objects.xml | 2 +- assets/xml/objects/object_gla.xml | 38 +- assets/xml/objects/object_gnd.xml | 54 +- assets/xml/objects/object_gnd_magic.xml | 4 +- assets/xml/objects/object_gndd.xml | 62 +- assets/xml/objects/object_god_lgt.xml | 6 +- assets/xml/objects/object_gol.xml | 10 +- assets/xml/objects/object_goma.xml | 16 +- assets/xml/objects/object_goma_pal.xml | 16 +- assets/xml/objects/object_goroiwa.xml | 2 +- assets/xml/objects/object_gr.xml | 18 +- assets/xml/objects/object_gs.xml | 2 +- assets/xml/objects/object_gt.xml | 38 +- assets/xml/objects/object_haka.xml | 6 +- assets/xml/objects/object_haka_door.xml | 6 +- assets/xml/objects/object_haka_objects.xml | 58 +- assets/xml/objects/object_hakach_objects.xml | 6 +- assets/xml/objects/object_hata.xml | 6 +- assets/xml/objects/object_heavy_object.xml | 2 +- assets/xml/objects/object_hidan_objects.xml | 34 +- assets/xml/objects/object_hni.xml | 32 +- assets/xml/objects/object_horse.xml | 38 +- assets/xml/objects/object_horse_ganon.xml | 6 +- .../xml/objects/object_horse_link_child.xml | 8 +- assets/xml/objects/object_horse_normal.xml | 2 +- assets/xml/objects/object_horse_zelda.xml | 8 +- assets/xml/objects/object_hs.xml | 24 +- assets/xml/objects/object_human.xml | 92 +- assets/xml/objects/object_ice_objects.xml | 18 +- assets/xml/objects/object_ik.xml | 54 +- assets/xml/objects/object_im.xml | 58 +- assets/xml/objects/object_in.xml | 102 +- assets/xml/objects/object_ingate.xml | 2 +- assets/xml/objects/object_jj.xml | 38 +- assets/xml/objects/object_js.xml | 22 +- assets/xml/objects/object_jya_door.xml | 4 +- assets/xml/objects/object_jya_iron.xml | 4 +- assets/xml/objects/object_jya_obj.xml | 68 +- assets/xml/objects/object_ka.xml | 14 +- assets/xml/objects/object_kanban.xml | 2 +- assets/xml/objects/object_kibako2.xml | 10 +- assets/xml/objects/object_kingdodongo.xml | 80 +- assets/xml/objects/object_kingdodongo_pal.xml | 80 +- assets/xml/objects/object_km1.xml | 24 +- assets/xml/objects/object_kw1.xml | 34 +- assets/xml/objects/object_kz.xml | 28 +- assets/xml/objects/object_light_ring.xml | 2 +- assets/xml/objects/object_lightbox.xml | 4 +- assets/xml/objects/object_lightswitch.xml | 8 +- assets/xml/objects/object_link_boy.xml | 132 +- assets/xml/objects/object_link_child.xml | 132 +- assets/xml/objects/object_ma1.xml | 36 +- assets/xml/objects/object_ma2.xml | 50 +- assets/xml/objects/object_mag.xml | 32 +- assets/xml/objects/object_mag_ique.xml | 32 +- assets/xml/objects/object_mag_v2.xml | 32 +- assets/xml/objects/object_mag_v2_mq.xml | 34 +- assets/xml/objects/object_mag_v3.xml | 34 +- assets/xml/objects/object_mag_v3_mq.xml | 38 +- assets/xml/objects/object_mamenoki.xml | 12 +- .../xml/objects/object_masterkokirihead.xml | 18 +- assets/xml/objects/object_mb.xml | 2 +- assets/xml/objects/object_md.xml | 52 +- assets/xml/objects/object_medal.xml | 14 +- assets/xml/objects/object_menkuri_objects.xml | 16 +- assets/xml/objects/object_mir_ray.xml | 6 +- assets/xml/objects/object_mizu_objects.xml | 2 +- assets/xml/objects/object_mjin.xml | 4 +- assets/xml/objects/object_mjin_dark.xml | 2 +- assets/xml/objects/object_mjin_flame.xml | 2 +- assets/xml/objects/object_mjin_flash.xml | 2 +- assets/xml/objects/object_mjin_ice.xml | 2 +- assets/xml/objects/object_mjin_oka.xml | 4 +- assets/xml/objects/object_mjin_soul.xml | 2 +- assets/xml/objects/object_mjin_wind.xml | 2 +- assets/xml/objects/object_mk.xml | 22 +- assets/xml/objects/object_mm.xml | 6 +- assets/xml/objects/object_mori_objects.xml | 8 +- assets/xml/objects/object_mori_tex.xml | 36 +- assets/xml/objects/object_ms.xml | 22 +- assets/xml/objects/object_mu.xml | 46 +- assets/xml/objects/object_nb.xml | 72 +- assets/xml/objects/object_niw.xml | 16 +- assets/xml/objects/object_nwc.xml | 6 +- assets/xml/objects/object_ny.xml | 6 +- assets/xml/objects/object_oA1.xml | 22 +- assets/xml/objects/object_oA10.xml | 16 +- assets/xml/objects/object_oA11.xml | 8 +- assets/xml/objects/object_oA3.xml | 10 +- assets/xml/objects/object_oA4.xml | 12 +- assets/xml/objects/object_oA5.xml | 12 +- assets/xml/objects/object_oA6.xml | 12 +- assets/xml/objects/object_oA7.xml | 8 +- assets/xml/objects/object_oA8.xml | 6 +- assets/xml/objects/object_oA9.xml | 4 +- assets/xml/objects/object_oB1.xml | 22 +- assets/xml/objects/object_oB2.xml | 20 +- assets/xml/objects/object_oB3.xml | 24 +- assets/xml/objects/object_oB4.xml | 12 +- assets/xml/objects/object_oE1.xml | 26 +- assets/xml/objects/object_oE10.xml | 20 +- assets/xml/objects/object_oE11.xml | 22 +- assets/xml/objects/object_oE12.xml | 22 +- assets/xml/objects/object_oE1s.xml | 18 +- assets/xml/objects/object_oE2.xml | 28 +- assets/xml/objects/object_oE3.xml | 32 +- assets/xml/objects/object_oE4.xml | 22 +- assets/xml/objects/object_oE4s.xml | 18 +- assets/xml/objects/object_oE5.xml | 28 +- assets/xml/objects/object_oE6.xml | 22 +- assets/xml/objects/object_oE7.xml | 20 +- assets/xml/objects/object_oE8.xml | 22 +- assets/xml/objects/object_oE9.xml | 22 +- assets/xml/objects/object_oF1d_map.xml | 14 +- assets/xml/objects/object_oF1s.xml | 26 +- assets/xml/objects/object_okuta.xml | 20 +- assets/xml/objects/object_os.xml | 28 +- assets/xml/objects/object_ossan.xml | 12 +- assets/xml/objects/object_ouke_haka.xml | 2 +- assets/xml/objects/object_owl.xml | 10 +- assets/xml/objects/object_peehat.xml | 8 +- assets/xml/objects/object_po_field.xml | 4 +- assets/xml/objects/object_ps.xml | 20 +- assets/xml/objects/object_pu_box.xml | 2 +- assets/xml/objects/object_rd.xml | 18 +- assets/xml/objects/object_reeba.xml | 6 +- assets/xml/objects/object_relay_objects.xml | 8 +- assets/xml/objects/object_rl.xml | 40 +- assets/xml/objects/object_rr.xml | 6 +- assets/xml/objects/object_rs.xml | 20 +- assets/xml/objects/object_ru1.xml | 34 +- assets/xml/objects/object_ru2.xml | 44 +- assets/xml/objects/object_sa.xml | 54 +- assets/xml/objects/object_sb.xml | 12 +- assets/xml/objects/object_sd.xml | 34 +- assets/xml/objects/object_shop_dungen.xml | 8 +- assets/xml/objects/object_shopnuts.xml | 14 +- assets/xml/objects/object_siofuki.xml | 2 +- assets/xml/objects/object_sk2.xml | 24 +- assets/xml/objects/object_skb.xml | 18 +- assets/xml/objects/object_skj.xml | 6 +- assets/xml/objects/object_spot00_break.xml | 8 +- assets/xml/objects/object_spot00_objects.xml | 6 +- assets/xml/objects/object_spot01_matoya.xml | 20 +- assets/xml/objects/object_spot01_matoyab.xml | 12 +- assets/xml/objects/object_spot01_objects.xml | 6 +- assets/xml/objects/object_spot02_objects.xml | 58 +- assets/xml/objects/object_spot03_object.xml | 4 +- assets/xml/objects/object_spot04_objects.xml | 8 +- assets/xml/objects/object_spot05_objects.xml | 4 +- assets/xml/objects/object_spot06_objects.xml | 8 +- assets/xml/objects/object_spot07_object.xml | 22 +- assets/xml/objects/object_spot08_obj.xml | 24 +- assets/xml/objects/object_spot11_obj.xml | 4 +- assets/xml/objects/object_spot12_obj.xml | 4 +- assets/xml/objects/object_spot15_obj.xml | 4 +- assets/xml/objects/object_spot16_obj.xml | 4 +- assets/xml/objects/object_spot17_obj.xml | 8 +- assets/xml/objects/object_spot18_obj.xml | 30 +- assets/xml/objects/object_ssh.xml | 22 +- assets/xml/objects/object_sst.xml | 6 +- assets/xml/objects/object_sst_pal.xml | 6 +- assets/xml/objects/object_st.xml | 22 +- assets/xml/objects/object_stream.xml | 2 +- assets/xml/objects/object_syokudai.xml | 10 +- assets/xml/objects/object_ta.xml | 54 +- assets/xml/objects/object_timeblock.xml | 2 +- assets/xml/objects/object_tite.xml | 16 +- assets/xml/objects/object_tk.xml | 10 +- assets/xml/objects/object_toki_objects.xml | 22 +- assets/xml/objects/object_toryo.xml | 30 +- assets/xml/objects/object_tp.xml | 10 +- assets/xml/objects/object_tr.xml | 50 +- assets/xml/objects/object_trap.xml | 8 +- assets/xml/objects/object_triforce_spot.xml | 6 +- assets/xml/objects/object_ts.xml | 20 +- assets/xml/objects/object_tsubo.xml | 6 +- assets/xml/objects/object_tw.xml | 124 +- assets/xml/objects/object_tw_pal.xml | 124 +- assets/xml/objects/object_umajump.xml | 4 +- assets/xml/objects/object_vali.xml | 10 +- assets/xml/objects/object_vase.xml | 4 +- assets/xml/objects/object_vm.xml | 18 +- assets/xml/objects/object_wallmaster.xml | 14 +- assets/xml/objects/object_warp1.xml | 4 +- assets/xml/objects/object_wf.xml | 32 +- assets/xml/objects/object_wood02.xml | 24 +- assets/xml/objects/object_xc.xml | 10 +- assets/xml/objects/object_xc_pal.xml | 10 +- assets/xml/objects/object_yabusame_point.xml | 6 +- assets/xml/objects/object_ydan_objects.xml | 28 +- assets/xml/objects/object_yukabyun.xml | 6 +- assets/xml/objects/object_zf.xml | 44 +- assets/xml/objects/object_zg.xml | 4 +- assets/xml/objects/object_zl1.xml | 90 +- assets/xml/objects/object_zl2.xml | 52 +- assets/xml/objects/object_zl4.xml | 22 +- assets/xml/objects/object_zo.xml | 24 +- assets/xml/overlays/ovl_Arrow_Fire.xml | 4 +- assets/xml/overlays/ovl_Arrow_Ice.xml | 4 +- assets/xml/overlays/ovl_Arrow_Light.xml | 4 +- assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml | 4 +- assets/xml/overlays/ovl_Boss_Dodongo.xml | 4 +- assets/xml/overlays/ovl_Boss_Ganon.xml | 26 +- assets/xml/overlays/ovl_Boss_Ganon2.xml | 20 +- .../xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml | 2 +- assets/xml/overlays/ovl_En_Ganon_Mant.xml | 4 +- assets/xml/overlays/ovl_En_Ganon_Organ.xml | 24 +- assets/xml/overlays/ovl_En_Jsjutan.xml | 2 +- assets/xml/overlays/ovl_En_Mag_ique.xml | 2 +- assets/xml/overlays/ovl_En_Sth.xml | 14 +- assets/xml/overlays/ovl_End_Title.xml | 12 +- assets/xml/overlays/ovl_End_Title_ique.xml | 16 +- assets/xml/overlays/ovl_Magic_Dark.xml | 2 +- assets/xml/overlays/ovl_Magic_Fire.xml | 2 +- assets/xml/overlays/ovl_Magic_Wind.xml | 2 +- assets/xml/overlays/ovl_Oceff_Spot.xml | 2 +- assets/xml/overlays/ovl_Oceff_Storm.xml | 2 +- assets/xml/overlays/ovl_Oceff_Wipe.xml | 2 +- assets/xml/overlays/ovl_Oceff_Wipe2.xml | 4 +- assets/xml/overlays/ovl_Oceff_Wipe3.xml | 2 +- assets/xml/overlays/ovl_Oceff_Wipe4.xml | 2 +- assets/xml/scenes/dungeons/Bmori1.xml | 4 +- assets/xml/scenes/dungeons/Bmori1_mq.xml | 4 +- assets/xml/scenes/dungeons/MIZUsin.xml | 4 +- assets/xml/scenes/dungeons/MIZUsin_mq.xml | 4 +- assets/xml/scenes/dungeons/ddan.xml | 20 +- assets/xml/scenes/dungeons/ddan_boss.xml | 2 +- assets/xml/scenes/dungeons/ddan_boss_v2.xml | 2 +- assets/xml/scenes/dungeons/ddan_mq.xml | 20 +- assets/xml/scenes/dungeons/gerudoway.xml | 4 +- assets/xml/scenes/dungeons/ice_doukutu.xml | 4 +- assets/xml/scenes/dungeons/ice_doukutu_mq.xml | 4 +- .../scenes/dungeons/ice_doukutu_pal_n64.xml | 4 +- assets/xml/scenes/dungeons/ice_doukutu_v2.xml | 4 +- assets/xml/scenes/dungeons/jyasinzou.xml | 4 +- assets/xml/scenes/dungeons/jyasinzou_mq.xml | 4 +- assets/xml/scenes/dungeons/men.xml | 4 +- assets/xml/scenes/dungeons/men_mq.xml | 4 +- assets/xml/scenes/indoors/miharigoya.xml | 8 +- assets/xml/scenes/indoors/souko.xml | 4 +- assets/xml/scenes/overworld/spot01.xml | 4 +- .../xml/scenes/overworld/spot01_pal_n64.xml | 4 +- assets/xml/scenes/overworld/spot07.xml | 4 +- .../xml/scenes/overworld/spot07_pal_n64.xml | 4 +- assets/xml/scenes/overworld/spot18.xml | 4 +- .../xml/scenes/overworld/spot18_pal_n64.xml | 4 +- assets/xml/scenes/overworld/spot20.xml | 4 +- assets/xml/scenes/overworld/spot20_pal.xml | 4 +- assets/xml/textures/backgrounds.xml | 268 +- assets/xml/textures/do_action_static.xml | 116 +- assets/xml/textures/do_action_static_pal.xml | 174 +- assets/xml/textures/icon_item_24_static.xml | 40 +- .../xml/textures/icon_item_dungeon_static.xml | 38 +- .../xml/textures/icon_item_field_static.xml | 56 +- assets/xml/textures/icon_item_fra_static.xml | 66 +- .../textures/icon_item_gameover_static.xml | 12 +- .../icon_item_gameover_static_pal.xml | 14 +- assets/xml/textures/icon_item_ger_static.xml | 64 +- assets/xml/textures/icon_item_jpn_static.xml | 62 +- assets/xml/textures/icon_item_nes_static.xml | 62 +- assets/xml/textures/icon_item_static.xml | 352 +- assets/xml/textures/icon_item_static_pal.xml | 356 +- assets/xml/textures/item_name_static.xml | 492 +- assets/xml/textures/item_name_static_pal.xml | 738 +- assets/xml/textures/kanji.xml | 7948 ++++++++--------- assets/xml/textures/map_48x85_static.xml | 136 +- assets/xml/textures/map_grand_static.xml | 48 +- assets/xml/textures/map_i_static.xml | 478 +- assets/xml/textures/map_name_static.xml | 136 +- assets/xml/textures/map_name_static_pal.xml | 204 +- assets/xml/textures/message_static.xml | 14 +- .../xml/textures/message_texture_static.xml | 4 +- assets/xml/textures/nes_font_static.xml | 278 +- .../xml/textures/nes_font_static_ique_cn.xml | 3818 ++++---- assets/xml/textures/nes_font_static_v2.xml | 280 +- assets/xml/textures/nintendo_rogo_static.xml | 4 +- .../xml/textures/nintendo_rogo_static_v2.xml | 4 +- assets/xml/textures/parameter_static.xml | 112 +- assets/xml/textures/parameter_static_ique.xml | 112 +- assets/xml/textures/place_title_cards.xml | 228 +- assets/xml/textures/place_title_cards_pal.xml | 342 +- assets/xml/textures/skyboxes.xml | 124 +- assets/xml/textures/title_static.xml | 234 +- assets/xml/textures/title_static_pal_gc.xml | 290 +- assets/xml/textures/title_static_pal_n64.xml | 310 +- 377 files changed, 12625 insertions(+), 12625 deletions(-) diff --git a/assets/xml/code/fbdemo_circle.xml b/assets/xml/code/fbdemo_circle.xml index 618c743314..5120f49ccf 100644 --- a/assets/xml/code/fbdemo_circle.xml +++ b/assets/xml/code/fbdemo_circle.xml @@ -1,9 +1,9 @@ - - - - - + + + + + diff --git a/assets/xml/code/fbdemo_triforce.xml b/assets/xml/code/fbdemo_triforce.xml index 613f7995d2..db7e23019a 100644 --- a/assets/xml/code/fbdemo_triforce.xml +++ b/assets/xml/code/fbdemo_triforce.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/code/fbdemo_wipe1.xml b/assets/xml/code/fbdemo_wipe1.xml index 87f7e47b6f..79217fce93 100644 --- a/assets/xml/code/fbdemo_wipe1.xml +++ b/assets/xml/code/fbdemo_wipe1.xml @@ -1,9 +1,9 @@ - + - + diff --git a/assets/xml/n64dd/error_textures.xml b/assets/xml/n64dd/error_textures.xml index 6db2ab37d5..82b997cb26 100644 --- a/assets/xml/n64dd/error_textures.xml +++ b/assets/xml/n64dd/error_textures.xml @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml index 4b1360a558..015e400e41 100644 --- a/assets/xml/objects/gameplay_dangeon_keep.xml +++ b/assets/xml/objects/gameplay_dangeon_keep.xml @@ -11,7 +11,7 @@ - + @@ -21,15 +21,15 @@ - - + + - - - + + + @@ -112,20 +112,20 @@ - - - - - - - - - + + + + + + + + + - - - + + + @@ -135,8 +135,8 @@ - - + + diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml index c0a5b8e30e..432a963c80 100644 --- a/assets/xml/objects/gameplay_field_keep.xml +++ b/assets/xml/objects/gameplay_field_keep.xml @@ -8,56 +8,56 @@ - - + + - + - + - - - + + + - - - + + + - - - + + + - + - + - - - - + + + + - - + + - + diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index d41a28b8d9..ce2c7fb7d4 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -607,10 +607,10 @@ - - - - + + + + @@ -623,15 +623,15 @@ - + - - + + @@ -645,30 +645,30 @@ - - + + - + - + - - - - - - - - + + + + + + + + @@ -679,7 +679,7 @@ - + @@ -700,17 +700,17 @@ - + - + - - - + + + @@ -719,8 +719,8 @@ - - + + @@ -736,7 +736,7 @@ - + @@ -752,9 +752,9 @@ - - - + + + @@ -771,20 +771,20 @@ - - + + - - + + - + @@ -810,7 +810,7 @@ - + @@ -826,11 +826,11 @@ - - - - - + + + + + @@ -848,8 +848,8 @@ - - + + @@ -858,7 +858,7 @@ - + @@ -868,75 +868,75 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + @@ -945,61 +945,61 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + @@ -1064,8 +1064,8 @@ - - + + @@ -1098,10 +1098,10 @@ - - - - + + + + @@ -1111,19 +1111,19 @@ - - - + + + - + - + @@ -1183,7 +1183,7 @@ - + @@ -1218,60 +1218,60 @@ - - - - + + + + - - + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - + - - - + + + - - - - - - - - - - - + + + + + + + + + + + @@ -1280,33 +1280,33 @@ - + - + - + - + - - - - - - - + + + + + + + @@ -1325,8 +1325,8 @@ - - + + @@ -1342,24 +1342,24 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml index 2c5f147386..9e792020bf 100644 --- a/assets/xml/objects/gameplay_keep_pal.xml +++ b/assets/xml/objects/gameplay_keep_pal.xml @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -607,10 +607,10 @@ - - - - + + + + @@ -623,15 +623,15 @@ - + - - + + @@ -645,30 +645,30 @@ - - + + - + - + - - - - - - - - + + + + + + + + @@ -679,7 +679,7 @@ - + @@ -694,14 +694,14 @@ - + - - - + + + @@ -710,8 +710,8 @@ - - + + @@ -727,7 +727,7 @@ - + @@ -743,9 +743,9 @@ - - - + + + @@ -762,20 +762,20 @@ - - + + - - + + - + @@ -801,7 +801,7 @@ - + @@ -817,11 +817,11 @@ - - - - - + + + + + @@ -839,8 +839,8 @@ - - + + @@ -849,7 +849,7 @@ - + @@ -859,75 +859,75 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + @@ -936,61 +936,61 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + @@ -1055,8 +1055,8 @@ - - + + @@ -1089,10 +1089,10 @@ - - - - + + + + @@ -1102,19 +1102,19 @@ - - - + + + - + - + @@ -1156,7 +1156,7 @@ - + @@ -1177,43 +1177,43 @@ - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -1222,33 +1222,33 @@ - + - + - + - + - - - - - - - + + + + + + + @@ -1267,8 +1267,8 @@ - - + + @@ -1284,24 +1284,24 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_Bb.xml b/assets/xml/objects/object_Bb.xml index b65f7f6b60..cc64dc95ce 100644 --- a/assets/xml/objects/object_Bb.xml +++ b/assets/xml/objects/object_Bb.xml @@ -27,14 +27,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml index 19b8876390..44c02a7edc 100644 --- a/assets/xml/objects/object_ahg.xml +++ b/assets/xml/objects/object_ahg.xml @@ -21,19 +21,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -100,11 +100,11 @@ - - - - - + + + + + diff --git a/assets/xml/objects/object_ane.xml b/assets/xml/objects/object_ane.xml index d1c245308c..be1acf5637 100644 --- a/assets/xml/objects/object_ane.xml +++ b/assets/xml/objects/object_ane.xml @@ -38,23 +38,23 @@ - + - - - - - - - - - + + + + + + + + + - - - + + + diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml index da67fd71d8..33dc215ba2 100644 --- a/assets/xml/objects/object_ani.xml +++ b/assets/xml/objects/object_ani.xml @@ -38,27 +38,27 @@ - - + + - - - - - + + + + + - - - + + + - + - - - + + + diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml index b3ef98f914..e7bcfb05ff 100644 --- a/assets/xml/objects/object_aob.xml +++ b/assets/xml/objects/object_aob.xml @@ -38,22 +38,22 @@ - + - - - - - - - - + + + + + + + + - - - + + + diff --git a/assets/xml/objects/object_b_heart.xml b/assets/xml/objects/object_b_heart.xml index dc4e7fa4c3..9b7b81bb75 100644 --- a/assets/xml/objects/object_b_heart.xml +++ b/assets/xml/objects/object_b_heart.xml @@ -8,7 +8,7 @@ - - + + diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml index a0cc6812f7..6ab5be4e34 100644 --- a/assets/xml/objects/object_bba.xml +++ b/assets/xml/objects/object_bba.xml @@ -19,16 +19,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_bdan_objects.xml b/assets/xml/objects/object_bdan_objects.xml index 39c5ec55bc..781f33eafb 100644 --- a/assets/xml/objects/object_bdan_objects.xml +++ b/assets/xml/objects/object_bdan_objects.xml @@ -1,40 +1,40 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml index 6addd6e4f5..632baa6330 100644 --- a/assets/xml/objects/object_bdoor.xml +++ b/assets/xml/objects/object_bdoor.xml @@ -2,7 +2,7 @@ - + @@ -19,13 +19,13 @@ - - - - - + + + + + - + diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml index 50d18c7187..133de136f6 100644 --- a/assets/xml/objects/object_bg.xml +++ b/assets/xml/objects/object_bg.xml @@ -34,16 +34,16 @@ - - - - - + + + + + - - - + + + diff --git a/assets/xml/objects/object_bigokuta.xml b/assets/xml/objects/object_bigokuta.xml index 9c77261caf..ec2b7d8dc6 100644 --- a/assets/xml/objects/object_bigokuta.xml +++ b/assets/xml/objects/object_bigokuta.xml @@ -81,16 +81,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_bird.xml b/assets/xml/objects/object_bird.xml index 2c184e87fc..800a8a6b58 100644 --- a/assets/xml/objects/object_bird.xml +++ b/assets/xml/objects/object_bird.xml @@ -22,9 +22,9 @@ - - - + + + diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml index b658cfe7f8..8e82b0a0d8 100644 --- a/assets/xml/objects/object_bji.xml +++ b/assets/xml/objects/object_bji.xml @@ -21,17 +21,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -98,9 +98,9 @@ - - - + + + diff --git a/assets/xml/objects/object_bl.xml b/assets/xml/objects/object_bl.xml index 6614aad836..a987840a31 100644 --- a/assets/xml/objects/object_bl.xml +++ b/assets/xml/objects/object_bl.xml @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml index f3d0d55944..41f9b10562 100644 --- a/assets/xml/objects/object_bob.xml +++ b/assets/xml/objects/object_bob.xml @@ -19,18 +19,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml index e25054fe23..ff2a57a986 100644 --- a/assets/xml/objects/object_boj.xml +++ b/assets/xml/objects/object_boj.xml @@ -21,18 +21,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -99,14 +99,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_bombf.xml b/assets/xml/objects/object_bombf.xml index 83e60248d1..853e4b3385 100644 --- a/assets/xml/objects/object_bombf.xml +++ b/assets/xml/objects/object_bombf.xml @@ -1,10 +1,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_bombiwa.xml b/assets/xml/objects/object_bombiwa.xml index 0f3f5a7e40..88769bba17 100644 --- a/assets/xml/objects/object_bombiwa.xml +++ b/assets/xml/objects/object_bombiwa.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_bowl.xml b/assets/xml/objects/object_bowl.xml index d84a9598cd..31fd9eb841 100644 --- a/assets/xml/objects/object_bowl.xml +++ b/assets/xml/objects/object_bowl.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml index 8387130c94..515f76c571 100644 --- a/assets/xml/objects/object_box.xml +++ b/assets/xml/objects/object_box.xml @@ -13,25 +13,25 @@ - + - + - + - + diff --git a/assets/xml/objects/object_brob.xml b/assets/xml/objects/object_brob.xml index ad8e61d3b7..35eaec3427 100644 --- a/assets/xml/objects/object_brob.xml +++ b/assets/xml/objects/object_brob.xml @@ -21,7 +21,7 @@ - + diff --git a/assets/xml/objects/object_bubble.xml b/assets/xml/objects/object_bubble.xml index f5de186920..a502b4480e 100644 --- a/assets/xml/objects/object_bubble.xml +++ b/assets/xml/objects/object_bubble.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_bv.xml b/assets/xml/objects/object_bv.xml index 5a8e6c594d..b7d6d01b89 100644 --- a/assets/xml/objects/object_bv.xml +++ b/assets/xml/objects/object_bv.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_bv_pal.xml b/assets/xml/objects/object_bv_pal.xml index 8de7492663..fa6b3a538f 100644 --- a/assets/xml/objects/object_bv_pal.xml +++ b/assets/xml/objects/object_bv_pal.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml index 8ee83090c7..27a84f18f2 100644 --- a/assets/xml/objects/object_bw.xml +++ b/assets/xml/objects/object_bw.xml @@ -26,11 +26,11 @@ - - - - - + + + + + diff --git a/assets/xml/objects/object_bwall.xml b/assets/xml/objects/object_bwall.xml index e0bdea1b40..02320cc65c 100644 --- a/assets/xml/objects/object_bwall.xml +++ b/assets/xml/objects/object_bwall.xml @@ -5,6 +5,6 @@ - + diff --git a/assets/xml/objects/object_bxa.xml b/assets/xml/objects/object_bxa.xml index f1ad934e25..98b43d7a24 100644 --- a/assets/xml/objects/object_bxa.xml +++ b/assets/xml/objects/object_bxa.xml @@ -4,8 +4,8 @@ - - + + @@ -14,9 +14,9 @@ - - - - + + + + diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml index c35805885e..82181568ef 100644 --- a/assets/xml/objects/object_cne.xml +++ b/assets/xml/objects/object_cne.xml @@ -21,14 +21,14 @@ - - - - - - - - + + + + + + + + @@ -95,8 +95,8 @@ - - + + diff --git a/assets/xml/objects/object_cob.xml b/assets/xml/objects/object_cob.xml index 8135707021..7aad9dc661 100644 --- a/assets/xml/objects/object_cob.xml +++ b/assets/xml/objects/object_cob.xml @@ -1,12 +1,12 @@ - - - - - - + + + + + + diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml index d825f089c5..48d1defdd1 100644 --- a/assets/xml/objects/object_cow.xml +++ b/assets/xml/objects/object_cow.xml @@ -41,16 +41,16 @@ - + - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_crow.xml b/assets/xml/objects/object_crow.xml index 61a77d122d..4322992884 100644 --- a/assets/xml/objects/object_crow.xml +++ b/assets/xml/objects/object_crow.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml index 9c2443ce5d..9be0327a92 100644 --- a/assets/xml/objects/object_cs.xml +++ b/assets/xml/objects/object_cs.xml @@ -85,22 +85,22 @@ - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_d_elevator.xml b/assets/xml/objects/object_d_elevator.xml index d2761b4f5c..4dd6ef4ee5 100644 --- a/assets/xml/objects/object_d_elevator.xml +++ b/assets/xml/objects/object_d_elevator.xml @@ -5,6 +5,6 @@ - + diff --git a/assets/xml/objects/object_d_hsblock.xml b/assets/xml/objects/object_d_hsblock.xml index b9a62acdfb..3d78728fe0 100644 --- a/assets/xml/objects/object_d_hsblock.xml +++ b/assets/xml/objects/object_d_hsblock.xml @@ -4,8 +4,8 @@ - - + + diff --git a/assets/xml/objects/object_d_lift.xml b/assets/xml/objects/object_d_lift.xml index 8c226f30fb..00945ba7c4 100644 --- a/assets/xml/objects/object_d_lift.xml +++ b/assets/xml/objects/object_d_lift.xml @@ -5,7 +5,7 @@ - - + + diff --git a/assets/xml/objects/object_daiku.xml b/assets/xml/objects/object_daiku.xml index c2c538e1be..e70af879c6 100644 --- a/assets/xml/objects/object_daiku.xml +++ b/assets/xml/objects/object_daiku.xml @@ -3,19 +3,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ddan_objects.xml b/assets/xml/objects/object_ddan_objects.xml index 6f1f9d8549..1857c31e5f 100644 --- a/assets/xml/objects/object_ddan_objects.xml +++ b/assets/xml/objects/object_ddan_objects.xml @@ -1,22 +1,22 @@ - - - - - - - - - - + + + + + + + + + + - - + + - + diff --git a/assets/xml/objects/object_dekubaba.xml b/assets/xml/objects/object_dekubaba.xml index fa587f3403..e099d4e6c9 100644 --- a/assets/xml/objects/object_dekubaba.xml +++ b/assets/xml/objects/object_dekubaba.xml @@ -31,11 +31,11 @@ - - - - - + + + + + @@ -54,6 +54,6 @@ - + diff --git a/assets/xml/objects/object_dekujr.xml b/assets/xml/objects/object_dekujr.xml index 7f4e70681b..b593dcbbdd 100644 --- a/assets/xml/objects/object_dekujr.xml +++ b/assets/xml/objects/object_dekujr.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml index b5b4065983..6cccc444b1 100644 --- a/assets/xml/objects/object_dekunuts.xml +++ b/assets/xml/objects/object_dekunuts.xml @@ -16,18 +16,18 @@ - - - - - + + + + + - + diff --git a/assets/xml/objects/object_demo_6k.xml b/assets/xml/objects/object_demo_6k.xml index 9cb598a2e1..726fd2384b 100644 --- a/assets/xml/objects/object_demo_6k.xml +++ b/assets/xml/objects/object_demo_6k.xml @@ -1,17 +1,17 @@ - + - + - + diff --git a/assets/xml/objects/object_dh.xml b/assets/xml/objects/object_dh.xml index 0e8d7fc7e1..9790fbb743 100644 --- a/assets/xml/objects/object_dh.xml +++ b/assets/xml/objects/object_dh.xml @@ -16,8 +16,8 @@ - - + + @@ -26,10 +26,10 @@ - - - - + + + + @@ -107,7 +107,7 @@ - - + + diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml index 91eee5052c..f4850e6aa1 100644 --- a/assets/xml/objects/object_dnk.xml +++ b/assets/xml/objects/object_dnk.xml @@ -12,9 +12,9 @@ - - - + + + diff --git a/assets/xml/objects/object_dodojr.xml b/assets/xml/objects/object_dodojr.xml index 1938fc574d..f28c4dd760 100644 --- a/assets/xml/objects/object_dodojr.xml +++ b/assets/xml/objects/object_dodojr.xml @@ -25,10 +25,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml index e01b49133e..9ec37d74a8 100644 --- a/assets/xml/objects/object_dodongo.xml +++ b/assets/xml/objects/object_dodongo.xml @@ -19,21 +19,21 @@ - - - - - - + + + + + + - - - - + + + + diff --git a/assets/xml/objects/object_dog.xml b/assets/xml/objects/object_dog.xml index 7b32982441..431c11c809 100644 --- a/assets/xml/objects/object_dog.xml +++ b/assets/xml/objects/object_dog.xml @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_door_gerudo.xml b/assets/xml/objects/object_door_gerudo.xml index 6f9ec37e45..090582d3b2 100644 --- a/assets/xml/objects/object_door_gerudo.xml +++ b/assets/xml/objects/object_door_gerudo.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_ds.xml b/assets/xml/objects/object_ds.xml index 2dea3f869b..cccf04d937 100644 --- a/assets/xml/objects/object_ds.xml +++ b/assets/xml/objects/object_ds.xml @@ -17,20 +17,20 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml index 9c61ea4d24..d044d8208d 100644 --- a/assets/xml/objects/object_ds2.xml +++ b/assets/xml/objects/object_ds2.xml @@ -33,18 +33,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/xml/objects/object_du.xml b/assets/xml/objects/object_du.xml index 0babd962b9..feeafc83f8 100644 --- a/assets/xml/objects/object_du.xml +++ b/assets/xml/objects/object_du.xml @@ -40,42 +40,42 @@ - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/assets/xml/objects/object_du_pal.xml b/assets/xml/objects/object_du_pal.xml index 44bbd1aa04..4e4ae09eb4 100644 --- a/assets/xml/objects/object_du_pal.xml +++ b/assets/xml/objects/object_du_pal.xml @@ -40,42 +40,42 @@ - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml index 63a200b102..42b2f6340a 100644 --- a/assets/xml/objects/object_dy_obj.xml +++ b/assets/xml/objects/object_dy_obj.xml @@ -70,34 +70,34 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - + + diff --git a/assets/xml/objects/object_efc_crystal_light.xml b/assets/xml/objects/object_efc_crystal_light.xml index 6ff4a830ed..dbd0936191 100644 --- a/assets/xml/objects/object_efc_crystal_light.xml +++ b/assets/xml/objects/object_efc_crystal_light.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_efc_doughnut.xml b/assets/xml/objects/object_efc_doughnut.xml index e141c4ab4d..b948bab151 100644 --- a/assets/xml/objects/object_efc_doughnut.xml +++ b/assets/xml/objects/object_efc_doughnut.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_efc_erupc.xml b/assets/xml/objects/object_efc_erupc.xml index 14d28438b2..6df65546cf 100644 --- a/assets/xml/objects/object_efc_erupc.xml +++ b/assets/xml/objects/object_efc_erupc.xml @@ -1,13 +1,13 @@ - - + + - + @@ -17,6 +17,6 @@ - + diff --git a/assets/xml/objects/object_efc_fire_ball.xml b/assets/xml/objects/object_efc_fire_ball.xml index 645a95f4c2..2c9ec2cab9 100644 --- a/assets/xml/objects/object_efc_fire_ball.xml +++ b/assets/xml/objects/object_efc_fire_ball.xml @@ -4,7 +4,7 @@ - - + + diff --git a/assets/xml/objects/object_efc_lgt_shower.xml b/assets/xml/objects/object_efc_lgt_shower.xml index c4e54e7748..81d3d5e17d 100644 --- a/assets/xml/objects/object_efc_lgt_shower.xml +++ b/assets/xml/objects/object_efc_lgt_shower.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_efc_star_field.xml b/assets/xml/objects/object_efc_star_field.xml index 66782689c1..0fb6763f50 100644 --- a/assets/xml/objects/object_efc_star_field.xml +++ b/assets/xml/objects/object_efc_star_field.xml @@ -4,11 +4,11 @@ - + - + diff --git a/assets/xml/objects/object_efc_tw.xml b/assets/xml/objects/object_efc_tw.xml index de53765696..cfc539111f 100644 --- a/assets/xml/objects/object_efc_tw.xml +++ b/assets/xml/objects/object_efc_tw.xml @@ -8,6 +8,6 @@ - + diff --git a/assets/xml/objects/object_ei.xml b/assets/xml/objects/object_ei.xml index c2f191deaf..bffc17aaf7 100644 --- a/assets/xml/objects/object_ei.xml +++ b/assets/xml/objects/object_ei.xml @@ -37,14 +37,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_fa.xml b/assets/xml/objects/object_fa.xml index 5b802e67aa..c13b195ec4 100644 --- a/assets/xml/objects/object_fa.xml +++ b/assets/xml/objects/object_fa.xml @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_fd.xml b/assets/xml/objects/object_fd.xml index 4a5ce9fafa..b18bfe25ce 100644 --- a/assets/xml/objects/object_fd.xml +++ b/assets/xml/objects/object_fd.xml @@ -1,7 +1,7 @@ - + @@ -20,9 +20,9 @@ - - - + + + @@ -62,7 +62,7 @@ - + diff --git a/assets/xml/objects/object_fd2.xml b/assets/xml/objects/object_fd2.xml index f37d53fd83..51fe70772f 100644 --- a/assets/xml/objects/object_fd2.xml +++ b/assets/xml/objects/object_fd2.xml @@ -22,9 +22,9 @@ - - - + + + diff --git a/assets/xml/objects/object_fd_pal.xml b/assets/xml/objects/object_fd_pal.xml index be375399f6..23fd822c65 100644 --- a/assets/xml/objects/object_fd_pal.xml +++ b/assets/xml/objects/object_fd_pal.xml @@ -1,7 +1,7 @@ - + @@ -20,9 +20,9 @@ - - - + + + @@ -62,7 +62,7 @@ - + diff --git a/assets/xml/objects/object_fhg.xml b/assets/xml/objects/object_fhg.xml index 5f69fcb5a1..2186056a22 100644 --- a/assets/xml/objects/object_fhg.xml +++ b/assets/xml/objects/object_fhg.xml @@ -18,7 +18,7 @@ - + diff --git a/assets/xml/objects/object_fhg_pal.xml b/assets/xml/objects/object_fhg_pal.xml index d12a90cb08..e4b5f3fee2 100644 --- a/assets/xml/objects/object_fhg_pal.xml +++ b/assets/xml/objects/object_fhg_pal.xml @@ -18,7 +18,7 @@ - + diff --git a/assets/xml/objects/object_fire.xml b/assets/xml/objects/object_fire.xml index aef28a61a5..82b438138c 100644 --- a/assets/xml/objects/object_fire.xml +++ b/assets/xml/objects/object_fire.xml @@ -5,13 +5,13 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml index 48424e7af0..34c45196f9 100644 --- a/assets/xml/objects/object_firefly.xml +++ b/assets/xml/objects/object_firefly.xml @@ -6,17 +6,17 @@ - - - - - + + + + + - - - - - + + + + + diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml index c640a6bcd1..8cc28c0229 100644 --- a/assets/xml/objects/object_fish.xml +++ b/assets/xml/objects/object_fish.xml @@ -50,13 +50,13 @@ - - - - - - - + + + + + + + @@ -74,28 +74,28 @@ - - + + - - + + - + - + @@ -113,7 +113,7 @@ - + @@ -174,37 +174,37 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + @@ -215,7 +215,7 @@ - + @@ -262,12 +262,12 @@ - - - - - - + + + + + + @@ -281,17 +281,17 @@ - - - + + + - - + + @@ -301,8 +301,8 @@ - - + + @@ -313,7 +313,7 @@ - + @@ -325,9 +325,9 @@ - - - + + + diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml index 19675d84fd..df113d49cc 100644 --- a/assets/xml/objects/object_fr.xml +++ b/assets/xml/objects/object_fr.xml @@ -3,18 +3,18 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml index 673472c973..1bc18759a5 100644 --- a/assets/xml/objects/object_fu.xml +++ b/assets/xml/objects/object_fu.xml @@ -17,24 +17,24 @@ - - - - - - - - - - + + + + + + + + + + - - + + - - + + - + diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml index 2ecd79e695..ffbc70bd57 100644 --- a/assets/xml/objects/object_fw.xml +++ b/assets/xml/objects/object_fw.xml @@ -85,12 +85,12 @@ - - - - - - + + + + + + diff --git a/assets/xml/objects/object_fz.xml b/assets/xml/objects/object_fz.xml index bd01a38707..00fe154fcc 100644 --- a/assets/xml/objects/object_fz.xml +++ b/assets/xml/objects/object_fz.xml @@ -8,7 +8,7 @@ - + diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml index 4eb7dabcdb..01d0f7ab77 100644 --- a/assets/xml/objects/object_ganon.xml +++ b/assets/xml/objects/object_ganon.xml @@ -90,38 +90,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -149,7 +149,7 @@ - + diff --git a/assets/xml/objects/object_ganon2.xml b/assets/xml/objects/object_ganon2.xml index 7391787e9c..dd84b7efe0 100644 --- a/assets/xml/objects/object_ganon2.xml +++ b/assets/xml/objects/object_ganon2.xml @@ -158,46 +158,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -244,7 +244,7 @@ - + diff --git a/assets/xml/objects/object_ganon2_pal.xml b/assets/xml/objects/object_ganon2_pal.xml index bed3b0aa9b..b6658c7aec 100644 --- a/assets/xml/objects/object_ganon2_pal.xml +++ b/assets/xml/objects/object_ganon2_pal.xml @@ -158,46 +158,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -244,7 +244,7 @@ - + diff --git a/assets/xml/objects/object_ganon_objects.xml b/assets/xml/objects/object_ganon_objects.xml index dc2cfdb40f..fc38ccfd35 100644 --- a/assets/xml/objects/object_ganon_objects.xml +++ b/assets/xml/objects/object_ganon_objects.xml @@ -4,6 +4,6 @@ - + diff --git a/assets/xml/objects/object_ganon_pal.xml b/assets/xml/objects/object_ganon_pal.xml index 17317d878e..83ebb85ea7 100644 --- a/assets/xml/objects/object_ganon_pal.xml +++ b/assets/xml/objects/object_ganon_pal.xml @@ -90,38 +90,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -149,7 +149,7 @@ - + diff --git a/assets/xml/objects/object_ge1.xml b/assets/xml/objects/object_ge1.xml index d116d2098f..bbb5d82a0d 100644 --- a/assets/xml/objects/object_ge1.xml +++ b/assets/xml/objects/object_ge1.xml @@ -39,22 +39,22 @@ - - + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -62,12 +62,12 @@ - + - - - + + + diff --git a/assets/xml/objects/object_geff.xml b/assets/xml/objects/object_geff.xml index 6a42a89a5c..268535892d 100644 --- a/assets/xml/objects/object_geff.xml +++ b/assets/xml/objects/object_geff.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml index c0ac526558..f80ad410a6 100644 --- a/assets/xml/objects/object_geldb.xml +++ b/assets/xml/objects/object_geldb.xml @@ -17,9 +17,9 @@ - - - + + + diff --git a/assets/xml/objects/object_gi_jewel.xml b/assets/xml/objects/object_gi_jewel.xml index 012fc83514..1d919b6ef6 100644 --- a/assets/xml/objects/object_gi_jewel.xml +++ b/assets/xml/objects/object_gi_jewel.xml @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/assets/xml/objects/object_gj.xml b/assets/xml/objects/object_gj.xml index 64f1f5e119..581bf93c7d 100644 --- a/assets/xml/objects/object_gj.xml +++ b/assets/xml/objects/object_gj.xml @@ -52,9 +52,9 @@ - - - + + + diff --git a/assets/xml/objects/object_gjyo_objects.xml b/assets/xml/objects/object_gjyo_objects.xml index 44f3ba791b..3903235948 100644 --- a/assets/xml/objects/object_gjyo_objects.xml +++ b/assets/xml/objects/object_gjyo_objects.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml index 7e7f934f62..cf92179a79 100644 --- a/assets/xml/objects/object_gla.xml +++ b/assets/xml/objects/object_gla.xml @@ -47,29 +47,29 @@ - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml index 1c5533a3d1..d340135433 100644 --- a/assets/xml/objects/object_gnd.xml +++ b/assets/xml/objects/object_gnd.xml @@ -39,38 +39,38 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + diff --git a/assets/xml/objects/object_gnd_magic.xml b/assets/xml/objects/object_gnd_magic.xml index f8bc83dcd9..5ce187a1cf 100644 --- a/assets/xml/objects/object_gnd_magic.xml +++ b/assets/xml/objects/object_gnd_magic.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_gndd.xml b/assets/xml/objects/object_gndd.xml index 103e9412da..d284893579 100644 --- a/assets/xml/objects/object_gndd.xml +++ b/assets/xml/objects/object_gndd.xml @@ -112,37 +112,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_god_lgt.xml b/assets/xml/objects/object_god_lgt.xml index d8f1e92278..e6f38dfdc2 100644 --- a/assets/xml/objects/object_god_lgt.xml +++ b/assets/xml/objects/object_god_lgt.xml @@ -5,9 +5,9 @@ - - - + + + diff --git a/assets/xml/objects/object_gol.xml b/assets/xml/objects/object_gol.xml index 0f096f58e8..257662024b 100644 --- a/assets/xml/objects/object_gol.xml +++ b/assets/xml/objects/object_gol.xml @@ -25,12 +25,12 @@ - - + + - - - + + + diff --git a/assets/xml/objects/object_goma.xml b/assets/xml/objects/object_goma.xml index bfe6df0fca..be843c7ea2 100644 --- a/assets/xml/objects/object_goma.xml +++ b/assets/xml/objects/object_goma.xml @@ -151,19 +151,19 @@ - - - - - - + + + + + + - + - + diff --git a/assets/xml/objects/object_goma_pal.xml b/assets/xml/objects/object_goma_pal.xml index 543d9ce2a1..95c7f6ce0b 100644 --- a/assets/xml/objects/object_goma_pal.xml +++ b/assets/xml/objects/object_goma_pal.xml @@ -151,19 +151,19 @@ - - - - - - + + + + + + - + - + diff --git a/assets/xml/objects/object_goroiwa.xml b/assets/xml/objects/object_goroiwa.xml index c454e78b53..6ca4f064bc 100644 --- a/assets/xml/objects/object_goroiwa.xml +++ b/assets/xml/objects/object_goroiwa.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_gr.xml b/assets/xml/objects/object_gr.xml index f825a9f0af..8f84870967 100644 --- a/assets/xml/objects/object_gr.xml +++ b/assets/xml/objects/object_gr.xml @@ -3,15 +3,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/assets/xml/objects/object_gs.xml b/assets/xml/objects/object_gs.xml index de69d2571e..4895c63c07 100644 --- a/assets/xml/objects/object_gs.xml +++ b/assets/xml/objects/object_gs.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_gt.xml b/assets/xml/objects/object_gt.xml index 83ab9d9f75..97b6c1b666 100644 --- a/assets/xml/objects/object_gt.xml +++ b/assets/xml/objects/object_gt.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_haka.xml b/assets/xml/objects/object_haka.xml index ca6557cc8c..8a6c0b7d14 100644 --- a/assets/xml/objects/object_haka.xml +++ b/assets/xml/objects/object_haka.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/assets/xml/objects/object_haka_door.xml b/assets/xml/objects/object_haka_door.xml index ec8ca6a90a..9d7ba15f58 100644 --- a/assets/xml/objects/object_haka_door.xml +++ b/assets/xml/objects/object_haka_door.xml @@ -1,6 +1,6 @@ - + @@ -13,12 +13,12 @@ - + - + diff --git a/assets/xml/objects/object_haka_objects.xml b/assets/xml/objects/object_haka_objects.xml index e0961ec596..2325e663a8 100644 --- a/assets/xml/objects/object_haka_objects.xml +++ b/assets/xml/objects/object_haka_objects.xml @@ -145,34 +145,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_hakach_objects.xml b/assets/xml/objects/object_hakach_objects.xml index d7c61f321b..92679bc8de 100644 --- a/assets/xml/objects/object_hakach_objects.xml +++ b/assets/xml/objects/object_hakach_objects.xml @@ -42,10 +42,10 @@ - - + + - + diff --git a/assets/xml/objects/object_hata.xml b/assets/xml/objects/object_hata.xml index 1679dce18a..98887b030d 100644 --- a/assets/xml/objects/object_hata.xml +++ b/assets/xml/objects/object_hata.xml @@ -72,8 +72,8 @@ - - - + + + diff --git a/assets/xml/objects/object_heavy_object.xml b/assets/xml/objects/object_heavy_object.xml index ad09fcffce..f1f3e446ac 100644 --- a/assets/xml/objects/object_heavy_object.xml +++ b/assets/xml/objects/object_heavy_object.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_hidan_objects.xml b/assets/xml/objects/object_hidan_objects.xml index 65f74b9f68..2d926e7c0d 100644 --- a/assets/xml/objects/object_hidan_objects.xml +++ b/assets/xml/objects/object_hidan_objects.xml @@ -80,14 +80,14 @@ - - - - - - - - + + + + + + + + @@ -98,14 +98,14 @@ - - - - - - - - + + + + + + + + @@ -174,7 +174,7 @@ - + diff --git a/assets/xml/objects/object_hni.xml b/assets/xml/objects/object_hni.xml index 763f6892c0..5027583aeb 100644 --- a/assets/xml/objects/object_hni.xml +++ b/assets/xml/objects/object_hni.xml @@ -13,28 +13,28 @@ - - - - + + + + - - - - - + + + + + - - + + - - + + @@ -42,10 +42,10 @@ - - + + - + diff --git a/assets/xml/objects/object_horse.xml b/assets/xml/objects/object_horse.xml index 74619e5977..e4b2a067e3 100644 --- a/assets/xml/objects/object_horse.xml +++ b/assets/xml/objects/object_horse.xml @@ -12,28 +12,28 @@ - - + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -43,17 +43,17 @@ - + - - - - + + + + diff --git a/assets/xml/objects/object_horse_ganon.xml b/assets/xml/objects/object_horse_ganon.xml index 98babb0806..e9d04e8cc9 100644 --- a/assets/xml/objects/object_horse_ganon.xml +++ b/assets/xml/objects/object_horse_ganon.xml @@ -15,8 +15,8 @@ - - - + + + diff --git a/assets/xml/objects/object_horse_link_child.xml b/assets/xml/objects/object_horse_link_child.xml index 1491189a13..e15317da66 100644 --- a/assets/xml/objects/object_horse_link_child.xml +++ b/assets/xml/objects/object_horse_link_child.xml @@ -13,9 +13,9 @@ - - - - + + + + diff --git a/assets/xml/objects/object_horse_normal.xml b/assets/xml/objects/object_horse_normal.xml index 2bc2cb0c60..5e6a4fe461 100644 --- a/assets/xml/objects/object_horse_normal.xml +++ b/assets/xml/objects/object_horse_normal.xml @@ -21,6 +21,6 @@ - + diff --git a/assets/xml/objects/object_horse_zelda.xml b/assets/xml/objects/object_horse_zelda.xml index 9595c32453..628e043877 100644 --- a/assets/xml/objects/object_horse_zelda.xml +++ b/assets/xml/objects/object_horse_zelda.xml @@ -5,10 +5,10 @@ - - - + + + - + diff --git a/assets/xml/objects/object_hs.xml b/assets/xml/objects/object_hs.xml index 3a3dfb46f7..bf5cbf047f 100644 --- a/assets/xml/objects/object_hs.xml +++ b/assets/xml/objects/object_hs.xml @@ -48,18 +48,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/xml/objects/object_human.xml b/assets/xml/objects/object_human.xml index fcf015b312..ae5fb63c06 100644 --- a/assets/xml/objects/object_human.xml +++ b/assets/xml/objects/object_human.xml @@ -1,58 +1,58 @@ - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - - - - - - - + + + + + + + + + - + @@ -190,21 +190,21 @@ - + - - + + - - - - + + + + - + - - + + diff --git a/assets/xml/objects/object_ice_objects.xml b/assets/xml/objects/object_ice_objects.xml index 0c4abb6964..97ce9b782c 100644 --- a/assets/xml/objects/object_ice_objects.xml +++ b/assets/xml/objects/object_ice_objects.xml @@ -37,14 +37,14 @@ - - - - - - - - - + + + + + + + + + diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml index 0d056681ab..a3578f27f6 100644 --- a/assets/xml/objects/object_ik.xml +++ b/assets/xml/objects/object_ik.xml @@ -37,22 +37,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -73,13 +73,13 @@ - - - - - - - + + + + + + + @@ -96,10 +96,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_im.xml b/assets/xml/objects/object_im.xml index ee8848cab4..c6ce6b6890 100644 --- a/assets/xml/objects/object_im.xml +++ b/assets/xml/objects/object_im.xml @@ -4,21 +4,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -61,26 +61,26 @@ - - - - - + + + + + - + - + - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml index 102fc82c0d..4530adc370 100644 --- a/assets/xml/objects/object_in.xml +++ b/assets/xml/objects/object_in.xml @@ -4,38 +4,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + @@ -119,28 +119,28 @@ - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_ingate.xml b/assets/xml/objects/object_ingate.xml index e68c2d091a..cccb797511 100644 --- a/assets/xml/objects/object_ingate.xml +++ b/assets/xml/objects/object_ingate.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_jj.xml b/assets/xml/objects/object_jj.xml index 76162935c6..816b7d706c 100644 --- a/assets/xml/objects/object_jj.xml +++ b/assets/xml/objects/object_jj.xml @@ -5,9 +5,9 @@ - - - + + + @@ -84,22 +84,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml index bc89bf42fc..1e309f1cb1 100644 --- a/assets/xml/objects/object_js.xml +++ b/assets/xml/objects/object_js.xml @@ -66,19 +66,19 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_jya_door.xml b/assets/xml/objects/object_jya_door.xml index 25d15dd5d0..b29c8ff771 100644 --- a/assets/xml/objects/object_jya_door.xml +++ b/assets/xml/objects/object_jya_door.xml @@ -8,7 +8,7 @@ - - + + diff --git a/assets/xml/objects/object_jya_iron.xml b/assets/xml/objects/object_jya_iron.xml index 3cd24c715e..6cf7681630 100644 --- a/assets/xml/objects/object_jya_iron.xml +++ b/assets/xml/objects/object_jya_iron.xml @@ -22,7 +22,7 @@ - - + + diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml index 07dcd31f7b..1e203941f5 100644 --- a/assets/xml/objects/object_jya_obj.xml +++ b/assets/xml/objects/object_jya_obj.xml @@ -2,42 +2,42 @@ - - + + - + - - + + - - - - - - + + + + + + - - + + - - - + + + @@ -55,25 +55,25 @@ - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ka.xml b/assets/xml/objects/object_ka.xml index 9c7ae1317b..ee9dfd6dd7 100644 --- a/assets/xml/objects/object_ka.xml +++ b/assets/xml/objects/object_ka.xml @@ -93,13 +93,13 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_kanban.xml b/assets/xml/objects/object_kanban.xml index f859164472..13ce2fbaff 100644 --- a/assets/xml/objects/object_kanban.xml +++ b/assets/xml/objects/object_kanban.xml @@ -50,6 +50,6 @@ - + diff --git a/assets/xml/objects/object_kibako2.xml b/assets/xml/objects/object_kibako2.xml index 10d3149c69..c406b1d8ac 100644 --- a/assets/xml/objects/object_kibako2.xml +++ b/assets/xml/objects/object_kibako2.xml @@ -13,13 +13,13 @@ - - + + - - - + + + diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index ff8b2014dd..1e0b94cf97 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -15,7 +15,7 @@ - + @@ -100,18 +100,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -168,14 +168,14 @@ - - - - - - - - + + + + + + + + @@ -189,25 +189,25 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kingdodongo_pal.xml b/assets/xml/objects/object_kingdodongo_pal.xml index e323584205..b9ec4d4387 100644 --- a/assets/xml/objects/object_kingdodongo_pal.xml +++ b/assets/xml/objects/object_kingdodongo_pal.xml @@ -15,7 +15,7 @@ - + @@ -100,18 +100,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -168,14 +168,14 @@ - - - - - - - - + + + + + + + + @@ -189,25 +189,25 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_km1.xml b/assets/xml/objects/object_km1.xml index 2db9a8d119..086666bf2d 100644 --- a/assets/xml/objects/object_km1.xml +++ b/assets/xml/objects/object_km1.xml @@ -21,19 +21,19 @@ - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/assets/xml/objects/object_kw1.xml b/assets/xml/objects/object_kw1.xml index 534c223b29..39120b108e 100644 --- a/assets/xml/objects/object_kw1.xml +++ b/assets/xml/objects/object_kw1.xml @@ -21,28 +21,28 @@ - - + + - - + + - - + + - - + + - - - - - - - - - + + + + + + + + + diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml index 8c744985b8..0e75d9094c 100644 --- a/assets/xml/objects/object_kz.xml +++ b/assets/xml/objects/object_kz.xml @@ -2,22 +2,22 @@ - - - - - - - + + + + + + + - - - - + + + + - - - + + + diff --git a/assets/xml/objects/object_light_ring.xml b/assets/xml/objects/object_light_ring.xml index 877aa3408d..b2183f32fc 100644 --- a/assets/xml/objects/object_light_ring.xml +++ b/assets/xml/objects/object_light_ring.xml @@ -4,6 +4,6 @@ - + diff --git a/assets/xml/objects/object_lightbox.xml b/assets/xml/objects/object_lightbox.xml index 47fd57dfbf..fcada5c40d 100644 --- a/assets/xml/objects/object_lightbox.xml +++ b/assets/xml/objects/object_lightbox.xml @@ -19,8 +19,8 @@ - - + + diff --git a/assets/xml/objects/object_lightswitch.xml b/assets/xml/objects/object_lightswitch.xml index 9caeb59b19..267897eb3b 100644 --- a/assets/xml/objects/object_lightswitch.xml +++ b/assets/xml/objects/object_lightswitch.xml @@ -15,9 +15,9 @@ - - - - + + + + diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml index b51e779cc8..a0052722f3 100644 --- a/assets/xml/objects/object_link_boy.xml +++ b/assets/xml/objects/object_link_boy.xml @@ -347,33 +347,33 @@ - - - + + + - - + + - - + + - - - + + + - + - + - - - + + + - - + + - + @@ -443,22 +443,22 @@ - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + @@ -487,8 +487,8 @@ - - + + @@ -504,7 +504,7 @@ - + @@ -514,47 +514,47 @@ - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - + + - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml index 9e1c1e5733..476c5f568d 100644 --- a/assets/xml/objects/object_link_child.xml +++ b/assets/xml/objects/object_link_child.xml @@ -369,85 +369,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - + - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml index 257958a2ea..4b2b7869a1 100644 --- a/assets/xml/objects/object_ma1.xml +++ b/assets/xml/objects/object_ma1.xml @@ -25,26 +25,26 @@ - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - + + + + diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml index 9b450aa94a..960e9485bf 100644 --- a/assets/xml/objects/object_ma2.xml +++ b/assets/xml/objects/object_ma2.xml @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - + + + diff --git a/assets/xml/objects/object_mag.xml b/assets/xml/objects/object_mag.xml index 1a59b4092b..59a0613548 100644 --- a/assets/xml/objects/object_mag.xml +++ b/assets/xml/objects/object_mag.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mag_ique.xml b/assets/xml/objects/object_mag_ique.xml index 005fc2462d..3a2bed9682 100644 --- a/assets/xml/objects/object_mag_ique.xml +++ b/assets/xml/objects/object_mag_ique.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mag_v2.xml b/assets/xml/objects/object_mag_v2.xml index 69ce890a7a..9897422cbd 100644 --- a/assets/xml/objects/object_mag_v2.xml +++ b/assets/xml/objects/object_mag_v2.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mag_v2_mq.xml b/assets/xml/objects/object_mag_v2_mq.xml index 9f0543ea8a..0b14571ca7 100644 --- a/assets/xml/objects/object_mag_v2_mq.xml +++ b/assets/xml/objects/object_mag_v2_mq.xml @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mag_v3.xml b/assets/xml/objects/object_mag_v3.xml index 66874b0c07..eb95e103be 100644 --- a/assets/xml/objects/object_mag_v3.xml +++ b/assets/xml/objects/object_mag_v3.xml @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mag_v3_mq.xml b/assets/xml/objects/object_mag_v3_mq.xml index 541dc6c389..b0b54fe739 100644 --- a/assets/xml/objects/object_mag_v3_mq.xml +++ b/assets/xml/objects/object_mag_v3_mq.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mamenoki.xml b/assets/xml/objects/object_mamenoki.xml index f17ff1fc8a..78683e565c 100644 --- a/assets/xml/objects/object_mamenoki.xml +++ b/assets/xml/objects/object_mamenoki.xml @@ -16,12 +16,12 @@ - - - - - - + + + + + + diff --git a/assets/xml/objects/object_masterkokirihead.xml b/assets/xml/objects/object_masterkokirihead.xml index 0062871c05..9187df7014 100644 --- a/assets/xml/objects/object_masterkokirihead.xml +++ b/assets/xml/objects/object_masterkokirihead.xml @@ -4,16 +4,16 @@ - - + + - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_mb.xml b/assets/xml/objects/object_mb.xml index 115d2c82d9..c3ec222706 100644 --- a/assets/xml/objects/object_mb.xml +++ b/assets/xml/objects/object_mb.xml @@ -39,7 +39,7 @@ - + diff --git a/assets/xml/objects/object_md.xml b/assets/xml/objects/object_md.xml index ac10cb64eb..ea1fca3cda 100644 --- a/assets/xml/objects/object_md.xml +++ b/assets/xml/objects/object_md.xml @@ -86,36 +86,36 @@ - - - + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_medal.xml b/assets/xml/objects/object_medal.xml index 2ab2e87faa..35beef0487 100644 --- a/assets/xml/objects/object_medal.xml +++ b/assets/xml/objects/object_medal.xml @@ -25,12 +25,12 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_menkuri_objects.xml b/assets/xml/objects/object_menkuri_objects.xml index 864ef25b85..8776de699e 100644 --- a/assets/xml/objects/object_menkuri_objects.xml +++ b/assets/xml/objects/object_menkuri_objects.xml @@ -1,13 +1,13 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_mir_ray.xml b/assets/xml/objects/object_mir_ray.xml index 0d1972c3c6..90d93a999c 100644 --- a/assets/xml/objects/object_mir_ray.xml +++ b/assets/xml/objects/object_mir_ray.xml @@ -14,8 +14,8 @@ - - - + + + diff --git a/assets/xml/objects/object_mizu_objects.xml b/assets/xml/objects/object_mizu_objects.xml index e6bafbc67f..b0abf34ec5 100644 --- a/assets/xml/objects/object_mizu_objects.xml +++ b/assets/xml/objects/object_mizu_objects.xml @@ -20,7 +20,7 @@ - + diff --git a/assets/xml/objects/object_mjin.xml b/assets/xml/objects/object_mjin.xml index 2784956770..45a2f1cd99 100644 --- a/assets/xml/objects/object_mjin.xml +++ b/assets/xml/objects/object_mjin.xml @@ -5,7 +5,7 @@ - - + + diff --git a/assets/xml/objects/object_mjin_dark.xml b/assets/xml/objects/object_mjin_dark.xml index 2fa0bdbe4c..8f98d2c495 100644 --- a/assets/xml/objects/object_mjin_dark.xml +++ b/assets/xml/objects/object_mjin_dark.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_mjin_flame.xml b/assets/xml/objects/object_mjin_flame.xml index 6274feaee1..87fb3a2435 100644 --- a/assets/xml/objects/object_mjin_flame.xml +++ b/assets/xml/objects/object_mjin_flame.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_mjin_flash.xml b/assets/xml/objects/object_mjin_flash.xml index c1040ea118..f8cf72756a 100644 --- a/assets/xml/objects/object_mjin_flash.xml +++ b/assets/xml/objects/object_mjin_flash.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_mjin_ice.xml b/assets/xml/objects/object_mjin_ice.xml index 1aaeea193d..6686296f73 100644 --- a/assets/xml/objects/object_mjin_ice.xml +++ b/assets/xml/objects/object_mjin_ice.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_mjin_oka.xml b/assets/xml/objects/object_mjin_oka.xml index 8da3481c73..322b6808dc 100644 --- a/assets/xml/objects/object_mjin_oka.xml +++ b/assets/xml/objects/object_mjin_oka.xml @@ -5,7 +5,7 @@ - - + + diff --git a/assets/xml/objects/object_mjin_soul.xml b/assets/xml/objects/object_mjin_soul.xml index 6386f7f9ea..5ce15c1f2e 100644 --- a/assets/xml/objects/object_mjin_soul.xml +++ b/assets/xml/objects/object_mjin_soul.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_mjin_wind.xml b/assets/xml/objects/object_mjin_wind.xml index 8bba7eb91b..6eadf588b9 100644 --- a/assets/xml/objects/object_mjin_wind.xml +++ b/assets/xml/objects/object_mjin_wind.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_mk.xml b/assets/xml/objects/object_mk.xml index 8ae1bd3959..7371743d0b 100644 --- a/assets/xml/objects/object_mk.xml +++ b/assets/xml/objects/object_mk.xml @@ -52,17 +52,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_mm.xml b/assets/xml/objects/object_mm.xml index 38e98d9553..04963a6c6b 100644 --- a/assets/xml/objects/object_mm.xml +++ b/assets/xml/objects/object_mm.xml @@ -9,9 +9,9 @@ - - - + + + diff --git a/assets/xml/objects/object_mori_objects.xml b/assets/xml/objects/object_mori_objects.xml index 85ffe02181..1ee708091e 100644 --- a/assets/xml/objects/object_mori_objects.xml +++ b/assets/xml/objects/object_mori_objects.xml @@ -1,10 +1,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_mori_tex.xml b/assets/xml/objects/object_mori_tex.xml index 756347bcc6..b3b6611346 100644 --- a/assets/xml/objects/object_mori_tex.xml +++ b/assets/xml/objects/object_mori_tex.xml @@ -1,28 +1,28 @@ - - - + + + - - - + + + - - + + - - + + - + - - - - - - + + + + + + - + diff --git a/assets/xml/objects/object_ms.xml b/assets/xml/objects/object_ms.xml index 3fbab475e4..847b674d54 100644 --- a/assets/xml/objects/object_ms.xml +++ b/assets/xml/objects/object_ms.xml @@ -46,19 +46,19 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_mu.xml b/assets/xml/objects/object_mu.xml index ac4aeb084d..e1037a370b 100644 --- a/assets/xml/objects/object_mu.xml +++ b/assets/xml/objects/object_mu.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -81,18 +81,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/xml/objects/object_nb.xml b/assets/xml/objects/object_nb.xml index b720a53020..cf2dba8da4 100644 --- a/assets/xml/objects/object_nb.xml +++ b/assets/xml/objects/object_nb.xml @@ -98,46 +98,46 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + diff --git a/assets/xml/objects/object_niw.xml b/assets/xml/objects/object_niw.xml index c68f90b88c..0b672f940b 100644 --- a/assets/xml/objects/object_niw.xml +++ b/assets/xml/objects/object_niw.xml @@ -60,14 +60,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_nwc.xml b/assets/xml/objects/object_nwc.xml index b6cad1801a..2f3f8705b4 100644 --- a/assets/xml/objects/object_nwc.xml +++ b/assets/xml/objects/object_nwc.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/assets/xml/objects/object_ny.xml b/assets/xml/objects/object_ny.xml index 0b94903b19..f92549311c 100644 --- a/assets/xml/objects/object_ny.xml +++ b/assets/xml/objects/object_ny.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/assets/xml/objects/object_oA1.xml b/assets/xml/objects/object_oA1.xml index 192a19b5a7..fe7eced252 100644 --- a/assets/xml/objects/object_oA1.xml +++ b/assets/xml/objects/object_oA1.xml @@ -99,16 +99,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oA10.xml b/assets/xml/objects/object_oA10.xml index ae234bf692..0e17150e2c 100644 --- a/assets/xml/objects/object_oA10.xml +++ b/assets/xml/objects/object_oA10.xml @@ -99,13 +99,13 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_oA11.xml b/assets/xml/objects/object_oA11.xml index c1e0efe191..b1b4b9a4fe 100644 --- a/assets/xml/objects/object_oA11.xml +++ b/assets/xml/objects/object_oA11.xml @@ -79,9 +79,9 @@ - - - - + + + + diff --git a/assets/xml/objects/object_oA3.xml b/assets/xml/objects/object_oA3.xml index 7abe8dd474..38becb819c 100644 --- a/assets/xml/objects/object_oA3.xml +++ b/assets/xml/objects/object_oA3.xml @@ -4,10 +4,10 @@ - - - - - + + + + + diff --git a/assets/xml/objects/object_oA4.xml b/assets/xml/objects/object_oA4.xml index e883f3bcf3..83fa41f434 100644 --- a/assets/xml/objects/object_oA4.xml +++ b/assets/xml/objects/object_oA4.xml @@ -99,11 +99,11 @@ - - - - - - + + + + + + diff --git a/assets/xml/objects/object_oA5.xml b/assets/xml/objects/object_oA5.xml index 14a6b19e22..1ec4b6f876 100644 --- a/assets/xml/objects/object_oA5.xml +++ b/assets/xml/objects/object_oA5.xml @@ -99,11 +99,11 @@ - - - - - - + + + + + + diff --git a/assets/xml/objects/object_oA6.xml b/assets/xml/objects/object_oA6.xml index 72db514fcb..1d80b31f3d 100644 --- a/assets/xml/objects/object_oA6.xml +++ b/assets/xml/objects/object_oA6.xml @@ -99,11 +99,11 @@ - - - - - - + + + + + + diff --git a/assets/xml/objects/object_oA7.xml b/assets/xml/objects/object_oA7.xml index 083f5f3ce5..3f63c3cc06 100644 --- a/assets/xml/objects/object_oA7.xml +++ b/assets/xml/objects/object_oA7.xml @@ -99,9 +99,9 @@ - - - - + + + + diff --git a/assets/xml/objects/object_oA8.xml b/assets/xml/objects/object_oA8.xml index 884797e6d9..5d2fd06f9e 100644 --- a/assets/xml/objects/object_oA8.xml +++ b/assets/xml/objects/object_oA8.xml @@ -99,8 +99,8 @@ - - - + + + diff --git a/assets/xml/objects/object_oA9.xml b/assets/xml/objects/object_oA9.xml index 464e8c91ba..07eb20ce7b 100644 --- a/assets/xml/objects/object_oA9.xml +++ b/assets/xml/objects/object_oA9.xml @@ -4,7 +4,7 @@ - - + + diff --git a/assets/xml/objects/object_oB1.xml b/assets/xml/objects/object_oB1.xml index 9115a2b953..1012ce3a40 100644 --- a/assets/xml/objects/object_oB1.xml +++ b/assets/xml/objects/object_oB1.xml @@ -99,16 +99,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB2.xml b/assets/xml/objects/object_oB2.xml index eb56eae40f..1e018af222 100644 --- a/assets/xml/objects/object_oB2.xml +++ b/assets/xml/objects/object_oB2.xml @@ -86,15 +86,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_oB3.xml b/assets/xml/objects/object_oB3.xml index 396c341702..b5f569cb92 100644 --- a/assets/xml/objects/object_oB3.xml +++ b/assets/xml/objects/object_oB3.xml @@ -99,17 +99,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oB4.xml b/assets/xml/objects/object_oB4.xml index 6cdff038ed..c0bdb1e30b 100644 --- a/assets/xml/objects/object_oB4.xml +++ b/assets/xml/objects/object_oB4.xml @@ -99,11 +99,11 @@ - - - - - - + + + + + + diff --git a/assets/xml/objects/object_oE1.xml b/assets/xml/objects/object_oE1.xml index e3e8374dd9..166efb7002 100644 --- a/assets/xml/objects/object_oE1.xml +++ b/assets/xml/objects/object_oE1.xml @@ -99,18 +99,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE10.xml b/assets/xml/objects/object_oE10.xml index 7e2717e541..a501165fb7 100644 --- a/assets/xml/objects/object_oE10.xml +++ b/assets/xml/objects/object_oE10.xml @@ -4,15 +4,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_oE11.xml b/assets/xml/objects/object_oE11.xml index 64b9ad265a..2e165702f9 100644 --- a/assets/xml/objects/object_oE11.xml +++ b/assets/xml/objects/object_oE11.xml @@ -4,16 +4,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE12.xml b/assets/xml/objects/object_oE12.xml index e500448084..2576a4ad49 100644 --- a/assets/xml/objects/object_oE12.xml +++ b/assets/xml/objects/object_oE12.xml @@ -4,16 +4,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE1s.xml b/assets/xml/objects/object_oE1s.xml index d9a419e5fa..51daef5317 100644 --- a/assets/xml/objects/object_oE1s.xml +++ b/assets/xml/objects/object_oE1s.xml @@ -19,17 +19,17 @@ - + - - - - - + + + + + - - - + + + diff --git a/assets/xml/objects/object_oE2.xml b/assets/xml/objects/object_oE2.xml index 714060fd6c..fae1a87d1d 100644 --- a/assets/xml/objects/object_oE2.xml +++ b/assets/xml/objects/object_oE2.xml @@ -99,19 +99,19 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE3.xml b/assets/xml/objects/object_oE3.xml index b61b850fba..07d27cd715 100644 --- a/assets/xml/objects/object_oE3.xml +++ b/assets/xml/objects/object_oE3.xml @@ -99,21 +99,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE4.xml b/assets/xml/objects/object_oE4.xml index e353bfb9ce..3f25c5e58e 100644 --- a/assets/xml/objects/object_oE4.xml +++ b/assets/xml/objects/object_oE4.xml @@ -99,16 +99,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE4s.xml b/assets/xml/objects/object_oE4s.xml index 8aefb0bb2c..aa59751331 100644 --- a/assets/xml/objects/object_oE4s.xml +++ b/assets/xml/objects/object_oE4s.xml @@ -18,17 +18,17 @@ - + - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_oE5.xml b/assets/xml/objects/object_oE5.xml index 89e9947adc..fd5ebb1b55 100644 --- a/assets/xml/objects/object_oE5.xml +++ b/assets/xml/objects/object_oE5.xml @@ -71,19 +71,19 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE6.xml b/assets/xml/objects/object_oE6.xml index 019797be82..e6902a1121 100644 --- a/assets/xml/objects/object_oE6.xml +++ b/assets/xml/objects/object_oE6.xml @@ -4,16 +4,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE7.xml b/assets/xml/objects/object_oE7.xml index bdf32d3b6c..58c9c2a77a 100644 --- a/assets/xml/objects/object_oE7.xml +++ b/assets/xml/objects/object_oE7.xml @@ -4,15 +4,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_oE8.xml b/assets/xml/objects/object_oE8.xml index d14c141bfd..28f9005c5e 100644 --- a/assets/xml/objects/object_oE8.xml +++ b/assets/xml/objects/object_oE8.xml @@ -4,16 +4,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oE9.xml b/assets/xml/objects/object_oE9.xml index f8c4fa1e78..ea818dbf2b 100644 --- a/assets/xml/objects/object_oE9.xml +++ b/assets/xml/objects/object_oE9.xml @@ -4,16 +4,16 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml index 49ab959e26..f84dc1e077 100644 --- a/assets/xml/objects/object_oF1d_map.xml +++ b/assets/xml/objects/object_oF1d_map.xml @@ -21,17 +21,17 @@ - + - - - - + + + + - - + + diff --git a/assets/xml/objects/object_oF1s.xml b/assets/xml/objects/object_oF1s.xml index 26491d565c..dcc1d1060a 100644 --- a/assets/xml/objects/object_oF1s.xml +++ b/assets/xml/objects/object_oF1s.xml @@ -22,21 +22,21 @@ - - - - - - - - - - + + + + + + + + + + - - + + - + diff --git a/assets/xml/objects/object_okuta.xml b/assets/xml/objects/object_okuta.xml index d1698ba6ef..65d7dfd75c 100644 --- a/assets/xml/objects/object_okuta.xml +++ b/assets/xml/objects/object_okuta.xml @@ -9,21 +9,21 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/assets/xml/objects/object_os.xml b/assets/xml/objects/object_os.xml index 48c69ae276..1b05a523af 100644 --- a/assets/xml/objects/object_os.xml +++ b/assets/xml/objects/object_os.xml @@ -40,20 +40,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ossan.xml b/assets/xml/objects/object_ossan.xml index 4eb3e74131..909c7798fe 100644 --- a/assets/xml/objects/object_ossan.xml +++ b/assets/xml/objects/object_ossan.xml @@ -32,15 +32,15 @@ - - - - + + + + - - + + diff --git a/assets/xml/objects/object_ouke_haka.xml b/assets/xml/objects/object_ouke_haka.xml index 49dc2a4af1..26b9788cc2 100644 --- a/assets/xml/objects/object_ouke_haka.xml +++ b/assets/xml/objects/object_ouke_haka.xml @@ -4,6 +4,6 @@ - + diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml index b9185a55f7..36011ecd29 100644 --- a/assets/xml/objects/object_owl.xml +++ b/assets/xml/objects/object_owl.xml @@ -59,14 +59,14 @@ - + - + - - - + + + diff --git a/assets/xml/objects/object_peehat.xml b/assets/xml/objects/object_peehat.xml index 8abf77add3..98737cff33 100644 --- a/assets/xml/objects/object_peehat.xml +++ b/assets/xml/objects/object_peehat.xml @@ -65,10 +65,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml index 2caf708162..aa9b96b9d5 100644 --- a/assets/xml/objects/object_po_field.xml +++ b/assets/xml/objects/object_po_field.xml @@ -7,8 +7,8 @@ - - + + diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml index 4b49513afa..cf875572e2 100644 --- a/assets/xml/objects/object_ps.xml +++ b/assets/xml/objects/object_ps.xml @@ -23,13 +23,13 @@ - - - - - - - + + + + + + + @@ -73,9 +73,9 @@ - - - + + + diff --git a/assets/xml/objects/object_pu_box.xml b/assets/xml/objects/object_pu_box.xml index e1d686e979..0535781401 100644 --- a/assets/xml/objects/object_pu_box.xml +++ b/assets/xml/objects/object_pu_box.xml @@ -8,6 +8,6 @@ - + diff --git a/assets/xml/objects/object_rd.xml b/assets/xml/objects/object_rd.xml index a0243a7359..c7e8de8a32 100644 --- a/assets/xml/objects/object_rd.xml +++ b/assets/xml/objects/object_rd.xml @@ -2,8 +2,8 @@ - - + + @@ -111,13 +111,13 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml index 4fc31fb594..e8ac5c66e8 100644 --- a/assets/xml/objects/object_reeba.xml +++ b/assets/xml/objects/object_reeba.xml @@ -37,9 +37,9 @@ - - - + + + diff --git a/assets/xml/objects/object_relay_objects.xml b/assets/xml/objects/object_relay_objects.xml index 16f47413e8..fafa93da7c 100644 --- a/assets/xml/objects/object_relay_objects.xml +++ b/assets/xml/objects/object_relay_objects.xml @@ -11,12 +11,12 @@ - + - - - + + + diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml index 5be8b03fe4..9f30bbd899 100644 --- a/assets/xml/objects/object_rl.xml +++ b/assets/xml/objects/object_rl.xml @@ -35,32 +35,32 @@ - + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_rr.xml b/assets/xml/objects/object_rr.xml index 4d95b2da3e..43e7330ea8 100644 --- a/assets/xml/objects/object_rr.xml +++ b/assets/xml/objects/object_rr.xml @@ -4,8 +4,8 @@ - - - + + + diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rs.xml index 64832b127a..503033cf32 100644 --- a/assets/xml/objects/object_rs.xml +++ b/assets/xml/objects/object_rs.xml @@ -35,16 +35,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_ru1.xml b/assets/xml/objects/object_ru1.xml index 0a2842a266..df982f447e 100644 --- a/assets/xml/objects/object_ru1.xml +++ b/assets/xml/objects/object_ru1.xml @@ -85,27 +85,27 @@ - - + + - - - - - - + + + + + + - + - - - + + + - - - - - + + + + + diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml index 35e8e6b980..01d85915d2 100644 --- a/assets/xml/objects/object_ru2.xml +++ b/assets/xml/objects/object_ru2.xml @@ -116,32 +116,32 @@ - - + + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_sa.xml b/assets/xml/objects/object_sa.xml index 62dcda8697..fbc29d6f72 100644 --- a/assets/xml/objects/object_sa.xml +++ b/assets/xml/objects/object_sa.xml @@ -115,35 +115,35 @@ - - - - + + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_sb.xml b/assets/xml/objects/object_sb.xml index 7ba041f183..e79cef0065 100644 --- a/assets/xml/objects/object_sb.xml +++ b/assets/xml/objects/object_sb.xml @@ -10,11 +10,11 @@ - - - - - + + + + + @@ -23,7 +23,7 @@ - + diff --git a/assets/xml/objects/object_sd.xml b/assets/xml/objects/object_sd.xml index 068ace8e0d..d95d5d513f 100644 --- a/assets/xml/objects/object_sd.xml +++ b/assets/xml/objects/object_sd.xml @@ -92,28 +92,28 @@ - + - - - + + + - - + + - - - - - - - - - - + + + + + + + + + + - + diff --git a/assets/xml/objects/object_shop_dungen.xml b/assets/xml/objects/object_shop_dungen.xml index baf9b9b44b..3c52d0a039 100644 --- a/assets/xml/objects/object_shop_dungen.xml +++ b/assets/xml/objects/object_shop_dungen.xml @@ -4,13 +4,13 @@ - - - + + + - + diff --git a/assets/xml/objects/object_shopnuts.xml b/assets/xml/objects/object_shopnuts.xml index 3cbe6b698f..5ee09fee80 100644 --- a/assets/xml/objects/object_shopnuts.xml +++ b/assets/xml/objects/object_shopnuts.xml @@ -98,13 +98,13 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_siofuki.xml b/assets/xml/objects/object_siofuki.xml index 0a758500c9..2932879233 100644 --- a/assets/xml/objects/object_siofuki.xml +++ b/assets/xml/objects/object_siofuki.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml index a08353c520..87e7a37831 100644 --- a/assets/xml/objects/object_sk2.xml +++ b/assets/xml/objects/object_sk2.xml @@ -101,19 +101,19 @@ - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml index 219e14b3c7..a7d5798c61 100644 --- a/assets/xml/objects/object_skb.xml +++ b/assets/xml/objects/object_skb.xml @@ -97,15 +97,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/assets/xml/objects/object_skj.xml b/assets/xml/objects/object_skj.xml index 1e4dffa648..ec07397ac7 100644 --- a/assets/xml/objects/object_skj.xml +++ b/assets/xml/objects/object_skj.xml @@ -117,9 +117,9 @@ - - - + + + diff --git a/assets/xml/objects/object_spot00_break.xml b/assets/xml/objects/object_spot00_break.xml index c23e47f4fa..67ec2ff956 100644 --- a/assets/xml/objects/object_spot00_break.xml +++ b/assets/xml/objects/object_spot00_break.xml @@ -4,16 +4,16 @@ - - - + + + - + diff --git a/assets/xml/objects/object_spot00_objects.xml b/assets/xml/objects/object_spot00_objects.xml index 0bd365a839..2126eddce3 100644 --- a/assets/xml/objects/object_spot00_objects.xml +++ b/assets/xml/objects/object_spot00_objects.xml @@ -5,8 +5,8 @@ - - + + @@ -14,7 +14,7 @@ - + diff --git a/assets/xml/objects/object_spot01_matoya.xml b/assets/xml/objects/object_spot01_matoya.xml index f8c3ec6d02..825eb31bdd 100644 --- a/assets/xml/objects/object_spot01_matoya.xml +++ b/assets/xml/objects/object_spot01_matoya.xml @@ -9,11 +9,11 @@ - - - - - + + + + + @@ -21,26 +21,26 @@ - + - + - + - + - + diff --git a/assets/xml/objects/object_spot01_matoyab.xml b/assets/xml/objects/object_spot01_matoyab.xml index 8c1e933246..3a4179dfa2 100644 --- a/assets/xml/objects/object_spot01_matoyab.xml +++ b/assets/xml/objects/object_spot01_matoyab.xml @@ -4,16 +4,16 @@ - + - + - - - - + + + + diff --git a/assets/xml/objects/object_spot01_objects.xml b/assets/xml/objects/object_spot01_objects.xml index 413e032a9c..c976129d24 100644 --- a/assets/xml/objects/object_spot01_objects.xml +++ b/assets/xml/objects/object_spot01_objects.xml @@ -2,15 +2,15 @@ - + - + - + diff --git a/assets/xml/objects/object_spot02_objects.xml b/assets/xml/objects/object_spot02_objects.xml index 3dfaf227d3..04ac2476c5 100644 --- a/assets/xml/objects/object_spot02_objects.xml +++ b/assets/xml/objects/object_spot02_objects.xml @@ -1,7 +1,7 @@ - - + + @@ -12,32 +12,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot03_object.xml b/assets/xml/objects/object_spot03_object.xml index c844a45103..cf3b709b2b 100644 --- a/assets/xml/objects/object_spot03_object.xml +++ b/assets/xml/objects/object_spot03_object.xml @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/assets/xml/objects/object_spot04_objects.xml b/assets/xml/objects/object_spot04_objects.xml index ec0a712152..8c2e62b066 100644 --- a/assets/xml/objects/object_spot04_objects.xml +++ b/assets/xml/objects/object_spot04_objects.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/assets/xml/objects/object_spot05_objects.xml b/assets/xml/objects/object_spot05_objects.xml index dcca34043a..cd7a4995e0 100644 --- a/assets/xml/objects/object_spot05_objects.xml +++ b/assets/xml/objects/object_spot05_objects.xml @@ -1,12 +1,12 @@ - + - + diff --git a/assets/xml/objects/object_spot06_objects.xml b/assets/xml/objects/object_spot06_objects.xml index 5084fd244e..102772cd6c 100644 --- a/assets/xml/objects/object_spot06_objects.xml +++ b/assets/xml/objects/object_spot06_objects.xml @@ -5,20 +5,20 @@ - + - + - + - + diff --git a/assets/xml/objects/object_spot07_object.xml b/assets/xml/objects/object_spot07_object.xml index 6f0263173e..5477e187ea 100644 --- a/assets/xml/objects/object_spot07_object.xml +++ b/assets/xml/objects/object_spot07_object.xml @@ -8,8 +8,8 @@ - - + + @@ -19,8 +19,8 @@ - - + + @@ -30,12 +30,12 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_spot08_obj.xml b/assets/xml/objects/object_spot08_obj.xml index 8d2aa760ce..f0d76701e7 100644 --- a/assets/xml/objects/object_spot08_obj.xml +++ b/assets/xml/objects/object_spot08_obj.xml @@ -2,26 +2,26 @@ - - - - - + + + + + - - - - - + + + + + - - + + diff --git a/assets/xml/objects/object_spot11_obj.xml b/assets/xml/objects/object_spot11_obj.xml index ba1c4784fd..4ce3bdcb2e 100644 --- a/assets/xml/objects/object_spot11_obj.xml +++ b/assets/xml/objects/object_spot11_obj.xml @@ -1,11 +1,11 @@ - + - + diff --git a/assets/xml/objects/object_spot12_obj.xml b/assets/xml/objects/object_spot12_obj.xml index d619c781e4..4bdf8dce11 100644 --- a/assets/xml/objects/object_spot12_obj.xml +++ b/assets/xml/objects/object_spot12_obj.xml @@ -2,12 +2,12 @@ - + - + diff --git a/assets/xml/objects/object_spot15_obj.xml b/assets/xml/objects/object_spot15_obj.xml index bd59b8cd18..e1544bebd9 100644 --- a/assets/xml/objects/object_spot15_obj.xml +++ b/assets/xml/objects/object_spot15_obj.xml @@ -2,12 +2,12 @@ - + - + diff --git a/assets/xml/objects/object_spot16_obj.xml b/assets/xml/objects/object_spot16_obj.xml index b7a6ff4d54..88af8eeb7b 100644 --- a/assets/xml/objects/object_spot16_obj.xml +++ b/assets/xml/objects/object_spot16_obj.xml @@ -4,8 +4,8 @@ - - + + diff --git a/assets/xml/objects/object_spot17_obj.xml b/assets/xml/objects/object_spot17_obj.xml index 364ee9b9e8..54151b4cd8 100644 --- a/assets/xml/objects/object_spot17_obj.xml +++ b/assets/xml/objects/object_spot17_obj.xml @@ -1,7 +1,7 @@ - - + + @@ -15,7 +15,7 @@ - - + + diff --git a/assets/xml/objects/object_spot18_obj.xml b/assets/xml/objects/object_spot18_obj.xml index cc12b78946..ca9d6ea485 100644 --- a/assets/xml/objects/object_spot18_obj.xml +++ b/assets/xml/objects/object_spot18_obj.xml @@ -8,23 +8,23 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml index 3f50161d96..2aebe9f949 100644 --- a/assets/xml/objects/object_ssh.xml +++ b/assets/xml/objects/object_ssh.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_sst.xml b/assets/xml/objects/object_sst.xml index 66cf6c8e02..12f27e4321 100644 --- a/assets/xml/objects/object_sst.xml +++ b/assets/xml/objects/object_sst.xml @@ -2,7 +2,7 @@ - + @@ -50,7 +50,7 @@ - - + + diff --git a/assets/xml/objects/object_sst_pal.xml b/assets/xml/objects/object_sst_pal.xml index 138a320324..fdbe2e799c 100644 --- a/assets/xml/objects/object_sst_pal.xml +++ b/assets/xml/objects/object_sst_pal.xml @@ -2,7 +2,7 @@ - + @@ -50,7 +50,7 @@ - - + + diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml index d561363649..42a586987d 100644 --- a/assets/xml/objects/object_st.xml +++ b/assets/xml/objects/object_st.xml @@ -2,13 +2,13 @@ - - - - - - - + + + + + + + @@ -49,10 +49,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_stream.xml b/assets/xml/objects/object_stream.xml index e8710781c8..fb2cef4da6 100644 --- a/assets/xml/objects/object_stream.xml +++ b/assets/xml/objects/object_stream.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_syokudai.xml b/assets/xml/objects/object_syokudai.xml index a34d4adc67..6c919ad46f 100644 --- a/assets/xml/objects/object_syokudai.xml +++ b/assets/xml/objects/object_syokudai.xml @@ -13,10 +13,10 @@ - - - - - + + + + + diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml index bac3ed4370..d73e28972a 100644 --- a/assets/xml/objects/object_ta.xml +++ b/assets/xml/objects/object_ta.xml @@ -87,32 +87,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_timeblock.xml b/assets/xml/objects/object_timeblock.xml index 1d6b9e698c..cfc47d3fe1 100644 --- a/assets/xml/objects/object_timeblock.xml +++ b/assets/xml/objects/object_timeblock.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_tite.xml b/assets/xml/objects/object_tite.xml index 4474dab205..c01d117df4 100644 --- a/assets/xml/objects/object_tite.xml +++ b/assets/xml/objects/object_tite.xml @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml index d257294d8c..85b97e0b3e 100644 --- a/assets/xml/objects/object_tk.xml +++ b/assets/xml/objects/object_tk.xml @@ -10,13 +10,13 @@ - - - + + + - - + + diff --git a/assets/xml/objects/object_toki_objects.xml b/assets/xml/objects/object_toki_objects.xml index 7534d44d1e..f539558f9b 100644 --- a/assets/xml/objects/object_toki_objects.xml +++ b/assets/xml/objects/object_toki_objects.xml @@ -1,7 +1,7 @@  - + @@ -10,8 +10,8 @@ - - + + @@ -20,14 +20,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_toryo.xml b/assets/xml/objects/object_toryo.xml index 9bd5b09711..f04c57f358 100644 --- a/assets/xml/objects/object_toryo.xml +++ b/assets/xml/objects/object_toryo.xml @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tp.xml b/assets/xml/objects/object_tp.xml index 5809bac6d1..62abff312c 100644 --- a/assets/xml/objects/object_tp.xml +++ b/assets/xml/objects/object_tp.xml @@ -17,10 +17,10 @@ - - - - - + + + + + diff --git a/assets/xml/objects/object_tr.xml b/assets/xml/objects/object_tr.xml index f365b97266..30978596d5 100644 --- a/assets/xml/objects/object_tr.xml +++ b/assets/xml/objects/object_tr.xml @@ -31,25 +31,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -88,11 +88,11 @@ - + - + @@ -148,9 +148,9 @@ - - - + + + @@ -189,7 +189,7 @@ - + diff --git a/assets/xml/objects/object_trap.xml b/assets/xml/objects/object_trap.xml index 1f8f4b5310..d250939feb 100644 --- a/assets/xml/objects/object_trap.xml +++ b/assets/xml/objects/object_trap.xml @@ -1,10 +1,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_triforce_spot.xml b/assets/xml/objects/object_triforce_spot.xml index 40f936d3c3..f645f2859f 100644 --- a/assets/xml/objects/object_triforce_spot.xml +++ b/assets/xml/objects/object_triforce_spot.xml @@ -9,8 +9,8 @@ - - - + + + diff --git a/assets/xml/objects/object_ts.xml b/assets/xml/objects/object_ts.xml index ce99c27e0b..9fd3327fa5 100644 --- a/assets/xml/objects/object_ts.xml +++ b/assets/xml/objects/object_ts.xml @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_tsubo.xml b/assets/xml/objects/object_tsubo.xml index bdfd9070af..ccfe70c7e3 100644 --- a/assets/xml/objects/object_tsubo.xml +++ b/assets/xml/objects/object_tsubo.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml index c528fb4518..e99bd2c2aa 100644 --- a/assets/xml/objects/object_tw.xml +++ b/assets/xml/objects/object_tw.xml @@ -51,30 +51,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -129,8 +129,8 @@ - - + + @@ -155,32 +155,32 @@ - + - + - - + + - + - - + + - + @@ -192,7 +192,7 @@ - + @@ -203,16 +203,16 @@ - - + + - - + + - - + + @@ -225,19 +225,19 @@ - + - + - + @@ -276,7 +276,7 @@ - + @@ -286,11 +286,11 @@ - - - - - + + + + + @@ -323,16 +323,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -354,7 +354,7 @@ - + @@ -416,6 +416,6 @@ - + diff --git a/assets/xml/objects/object_tw_pal.xml b/assets/xml/objects/object_tw_pal.xml index 126926356f..e77e3c247e 100644 --- a/assets/xml/objects/object_tw_pal.xml +++ b/assets/xml/objects/object_tw_pal.xml @@ -51,30 +51,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -127,8 +127,8 @@ - - + + @@ -151,32 +151,32 @@ - + - + - - + + - + - - + + - + @@ -188,7 +188,7 @@ - + @@ -199,16 +199,16 @@ - - + + - - + + - - + + @@ -221,19 +221,19 @@ - + - + - + @@ -272,7 +272,7 @@ - + @@ -282,11 +282,11 @@ - - - - - + + + + + @@ -319,16 +319,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -350,7 +350,7 @@ - + @@ -412,6 +412,6 @@ - + diff --git a/assets/xml/objects/object_umajump.xml b/assets/xml/objects/object_umajump.xml index 1d205b7a42..5a371dc82d 100644 --- a/assets/xml/objects/object_umajump.xml +++ b/assets/xml/objects/object_umajump.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_vali.xml b/assets/xml/objects/object_vali.xml index e2c8f88159..5e511a1494 100644 --- a/assets/xml/objects/object_vali.xml +++ b/assets/xml/objects/object_vali.xml @@ -64,11 +64,11 @@ - - - - - + + + + + diff --git a/assets/xml/objects/object_vase.xml b/assets/xml/objects/object_vase.xml index 091d4c51e3..ddb61620c5 100644 --- a/assets/xml/objects/object_vase.xml +++ b/assets/xml/objects/object_vase.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_vm.xml b/assets/xml/objects/object_vm.xml index f9a3163d72..88f23bbeb8 100644 --- a/assets/xml/objects/object_vm.xml +++ b/assets/xml/objects/object_vm.xml @@ -36,15 +36,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/assets/xml/objects/object_wallmaster.xml b/assets/xml/objects/object_wallmaster.xml index 2003606c08..f6729fbe28 100644 --- a/assets/xml/objects/object_wallmaster.xml +++ b/assets/xml/objects/object_wallmaster.xml @@ -12,13 +12,13 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_warp1.xml b/assets/xml/objects/object_warp1.xml index cc684029b3..f640333691 100644 --- a/assets/xml/objects/object_warp1.xml +++ b/assets/xml/objects/object_warp1.xml @@ -5,7 +5,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/assets/xml/objects/object_wf.xml b/assets/xml/objects/object_wf.xml index c97207cf0b..cd9a297c9e 100644 --- a/assets/xml/objects/object_wf.xml +++ b/assets/xml/objects/object_wf.xml @@ -1,11 +1,11 @@ - - - - - - + + + + + + @@ -64,8 +64,8 @@ - - + + @@ -178,16 +178,16 @@ - + - - - - - + + + + + - - + + diff --git a/assets/xml/objects/object_wood02.xml b/assets/xml/objects/object_wood02.xml index a79fe654dc..acb18fb57e 100644 --- a/assets/xml/objects/object_wood02.xml +++ b/assets/xml/objects/object_wood02.xml @@ -17,22 +17,22 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/xml/objects/object_xc.xml b/assets/xml/objects/object_xc.xml index 7a69f52f38..fbc458058f 100644 --- a/assets/xml/objects/object_xc.xml +++ b/assets/xml/objects/object_xc.xml @@ -8,7 +8,7 @@ - + @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_xc_pal.xml b/assets/xml/objects/object_xc_pal.xml index 7fae3a0875..5576e4740d 100644 --- a/assets/xml/objects/object_xc_pal.xml +++ b/assets/xml/objects/object_xc_pal.xml @@ -8,7 +8,7 @@ - + @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/assets/xml/objects/object_yabusame_point.xml b/assets/xml/objects/object_yabusame_point.xml index 5a06a44e68..33e4237897 100644 --- a/assets/xml/objects/object_yabusame_point.xml +++ b/assets/xml/objects/object_yabusame_point.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/assets/xml/objects/object_ydan_objects.xml b/assets/xml/objects/object_ydan_objects.xml index 298b892c75..b779e46661 100644 --- a/assets/xml/objects/object_ydan_objects.xml +++ b/assets/xml/objects/object_ydan_objects.xml @@ -1,22 +1,22 @@ - - - - - - + + + + + + - - + + - - - - - - + + + + + + diff --git a/assets/xml/objects/object_yukabyun.xml b/assets/xml/objects/object_yukabyun.xml index d594ebbb89..d03c960175 100644 --- a/assets/xml/objects/object_yukabyun.xml +++ b/assets/xml/objects/object_yukabyun.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/assets/xml/objects/object_zf.xml b/assets/xml/objects/object_zf.xml index a537b9ff8d..3a64ee7266 100644 --- a/assets/xml/objects/object_zf.xml +++ b/assets/xml/objects/object_zf.xml @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -147,18 +147,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/xml/objects/object_zg.xml b/assets/xml/objects/object_zg.xml index d0f301390b..3aa2c142ab 100644 --- a/assets/xml/objects/object_zg.xml +++ b/assets/xml/objects/object_zg.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml index 42918cdbdc..0ba5fdde0f 100644 --- a/assets/xml/objects/object_zl1.xml +++ b/assets/xml/objects/object_zl1.xml @@ -92,36 +92,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -135,25 +135,25 @@ - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + diff --git a/assets/xml/objects/object_zl2.xml b/assets/xml/objects/object_zl2.xml index f910906920..51e18228ea 100644 --- a/assets/xml/objects/object_zl2.xml +++ b/assets/xml/objects/object_zl2.xml @@ -4,42 +4,42 @@ - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + - + - - - - - - - - + + + + + + + + - + - + diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml index 8e057041e0..211c8339e2 100644 --- a/assets/xml/objects/object_zl4.xml +++ b/assets/xml/objects/object_zl4.xml @@ -40,20 +40,20 @@ - - - - + + + + - - - - - - - + + + + + + + diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml index 849b01bb45..45c9601284 100644 --- a/assets/xml/objects/object_zo.xml +++ b/assets/xml/objects/object_zo.xml @@ -117,29 +117,29 @@ - - - + + + - - - - - - + + + + + + - + - + - + diff --git a/assets/xml/overlays/ovl_Arrow_Fire.xml b/assets/xml/overlays/ovl_Arrow_Fire.xml index 061e11f84b..58e8853f7f 100644 --- a/assets/xml/overlays/ovl_Arrow_Fire.xml +++ b/assets/xml/overlays/ovl_Arrow_Fire.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/overlays/ovl_Arrow_Ice.xml b/assets/xml/overlays/ovl_Arrow_Ice.xml index d2a0df3be8..d7657506b1 100644 --- a/assets/xml/overlays/ovl_Arrow_Ice.xml +++ b/assets/xml/overlays/ovl_Arrow_Ice.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/overlays/ovl_Arrow_Light.xml b/assets/xml/overlays/ovl_Arrow_Light.xml index 1f449dd7b9..101e37f227 100644 --- a/assets/xml/overlays/ovl_Arrow_Light.xml +++ b/assets/xml/overlays/ovl_Arrow_Light.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml index 7b294e65b2..dd87558e16 100644 --- a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml +++ b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml @@ -1,6 +1,6 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/assets/xml/overlays/ovl_Boss_Dodongo.xml b/assets/xml/overlays/ovl_Boss_Dodongo.xml index 78d2f8e5b3..9b65f1f181 100644 --- a/assets/xml/overlays/ovl_Boss_Dodongo.xml +++ b/assets/xml/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - - + + diff --git a/assets/xml/overlays/ovl_Boss_Ganon.xml b/assets/xml/overlays/ovl_Boss_Ganon.xml index d09648d8d7..229ab58e1b 100644 --- a/assets/xml/overlays/ovl_Boss_Ganon.xml +++ b/assets/xml/overlays/ovl_Boss_Ganon.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + diff --git a/assets/xml/overlays/ovl_Boss_Ganon2.xml b/assets/xml/overlays/ovl_Boss_Ganon2.xml index b922003dfa..6b92b19a09 100644 --- a/assets/xml/overlays/ovl_Boss_Ganon2.xml +++ b/assets/xml/overlays/ovl_Boss_Ganon2.xml @@ -1,29 +1,29 @@ - + - - + + - + - + - + - + - + - - + + diff --git a/assets/xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml b/assets/xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml index b8c0613ee4..f35bd62a15 100644 --- a/assets/xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml +++ b/assets/xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml @@ -4,6 +4,6 @@ - + diff --git a/assets/xml/overlays/ovl_En_Ganon_Mant.xml b/assets/xml/overlays/ovl_En_Ganon_Mant.xml index a9242f1781..219729809c 100644 --- a/assets/xml/overlays/ovl_En_Ganon_Mant.xml +++ b/assets/xml/overlays/ovl_En_Ganon_Mant.xml @@ -1,8 +1,8 @@ - + - + diff --git a/assets/xml/overlays/ovl_En_Ganon_Organ.xml b/assets/xml/overlays/ovl_En_Ganon_Organ.xml index 05257fb6f6..639d68ad38 100644 --- a/assets/xml/overlays/ovl_En_Ganon_Organ.xml +++ b/assets/xml/overlays/ovl_En_Ganon_Organ.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Jsjutan.xml b/assets/xml/overlays/ovl_En_Jsjutan.xml index 13bbd82199..f535ce9292 100644 --- a/assets/xml/overlays/ovl_En_Jsjutan.xml +++ b/assets/xml/overlays/ovl_En_Jsjutan.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/overlays/ovl_En_Mag_ique.xml b/assets/xml/overlays/ovl_En_Mag_ique.xml index bd239b7f0c..da89ca042e 100644 --- a/assets/xml/overlays/ovl_En_Mag_ique.xml +++ b/assets/xml/overlays/ovl_En_Mag_ique.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/overlays/ovl_En_Sth.xml b/assets/xml/overlays/ovl_En_Sth.xml index 46a30a7185..93d211cb99 100644 --- a/assets/xml/overlays/ovl_En_Sth.xml +++ b/assets/xml/overlays/ovl_En_Sth.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/overlays/ovl_End_Title.xml b/assets/xml/overlays/ovl_End_Title.xml index 53d085681d..0f0bf74048 100644 --- a/assets/xml/overlays/ovl_End_Title.xml +++ b/assets/xml/overlays/ovl_End_Title.xml @@ -1,11 +1,11 @@ - - - - - - + + + + + + diff --git a/assets/xml/overlays/ovl_End_Title_ique.xml b/assets/xml/overlays/ovl_End_Title_ique.xml index 300448cabf..89f6f77847 100644 --- a/assets/xml/overlays/ovl_End_Title_ique.xml +++ b/assets/xml/overlays/ovl_End_Title_ique.xml @@ -1,20 +1,20 @@ - - + + - + - + - + - + - + - + diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml index 37165cebc2..640642adb6 100644 --- a/assets/xml/overlays/ovl_Magic_Dark.xml +++ b/assets/xml/overlays/ovl_Magic_Dark.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/overlays/ovl_Magic_Fire.xml b/assets/xml/overlays/ovl_Magic_Fire.xml index 81de7a989f..fb9282a816 100644 --- a/assets/xml/overlays/ovl_Magic_Fire.xml +++ b/assets/xml/overlays/ovl_Magic_Fire.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/overlays/ovl_Magic_Wind.xml b/assets/xml/overlays/ovl_Magic_Wind.xml index 7da59209b8..8a43d0a2fd 100644 --- a/assets/xml/overlays/ovl_Magic_Wind.xml +++ b/assets/xml/overlays/ovl_Magic_Wind.xml @@ -8,7 +8,7 @@ - + diff --git a/assets/xml/overlays/ovl_Oceff_Spot.xml b/assets/xml/overlays/ovl_Oceff_Spot.xml index 6c81549060..8d5b359938 100644 --- a/assets/xml/overlays/ovl_Oceff_Spot.xml +++ b/assets/xml/overlays/ovl_Oceff_Spot.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/overlays/ovl_Oceff_Storm.xml b/assets/xml/overlays/ovl_Oceff_Storm.xml index d9e1f7e65a..7cdb735909 100644 --- a/assets/xml/overlays/ovl_Oceff_Storm.xml +++ b/assets/xml/overlays/ovl_Oceff_Storm.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe.xml b/assets/xml/overlays/ovl_Oceff_Wipe.xml index 64b3f1332e..0ed7257bf8 100644 --- a/assets/xml/overlays/ovl_Oceff_Wipe.xml +++ b/assets/xml/overlays/ovl_Oceff_Wipe.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe2.xml b/assets/xml/overlays/ovl_Oceff_Wipe2.xml index 0166d1909f..c2db2a6b11 100644 --- a/assets/xml/overlays/ovl_Oceff_Wipe2.xml +++ b/assets/xml/overlays/ovl_Oceff_Wipe2.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe3.xml b/assets/xml/overlays/ovl_Oceff_Wipe3.xml index d797d1675f..6d8a1fea84 100644 --- a/assets/xml/overlays/ovl_Oceff_Wipe3.xml +++ b/assets/xml/overlays/ovl_Oceff_Wipe3.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe4.xml b/assets/xml/overlays/ovl_Oceff_Wipe4.xml index a4ec2c5def..0aa0c729f6 100644 --- a/assets/xml/overlays/ovl_Oceff_Wipe4.xml +++ b/assets/xml/overlays/ovl_Oceff_Wipe4.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/scenes/dungeons/Bmori1.xml b/assets/xml/scenes/dungeons/Bmori1.xml index 70aac34646..8b35f856d2 100644 --- a/assets/xml/scenes/dungeons/Bmori1.xml +++ b/assets/xml/scenes/dungeons/Bmori1.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/scenes/dungeons/Bmori1_mq.xml b/assets/xml/scenes/dungeons/Bmori1_mq.xml index 70aac34646..8b35f856d2 100644 --- a/assets/xml/scenes/dungeons/Bmori1_mq.xml +++ b/assets/xml/scenes/dungeons/Bmori1_mq.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/scenes/dungeons/MIZUsin.xml b/assets/xml/scenes/dungeons/MIZUsin.xml index 12a124cf09..8ebcd35476 100644 --- a/assets/xml/scenes/dungeons/MIZUsin.xml +++ b/assets/xml/scenes/dungeons/MIZUsin.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/MIZUsin_mq.xml b/assets/xml/scenes/dungeons/MIZUsin_mq.xml index cbbe48287e..6ff9ea461c 100644 --- a/assets/xml/scenes/dungeons/MIZUsin_mq.xml +++ b/assets/xml/scenes/dungeons/MIZUsin_mq.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/ddan.xml b/assets/xml/scenes/dungeons/ddan.xml index 295f651739..9a7a29995f 100644 --- a/assets/xml/scenes/dungeons/ddan.xml +++ b/assets/xml/scenes/dungeons/ddan.xml @@ -1,18 +1,18 @@ - - + + - - - - - - - - + + + + + + + + diff --git a/assets/xml/scenes/dungeons/ddan_boss.xml b/assets/xml/scenes/dungeons/ddan_boss.xml index 86a34e6d9a..5e8d324d9a 100644 --- a/assets/xml/scenes/dungeons/ddan_boss.xml +++ b/assets/xml/scenes/dungeons/ddan_boss.xml @@ -6,7 +6,7 @@ - + diff --git a/assets/xml/scenes/dungeons/ddan_boss_v2.xml b/assets/xml/scenes/dungeons/ddan_boss_v2.xml index 2b61024906..0e93072588 100644 --- a/assets/xml/scenes/dungeons/ddan_boss_v2.xml +++ b/assets/xml/scenes/dungeons/ddan_boss_v2.xml @@ -6,7 +6,7 @@ - + diff --git a/assets/xml/scenes/dungeons/ddan_mq.xml b/assets/xml/scenes/dungeons/ddan_mq.xml index 295f651739..9a7a29995f 100644 --- a/assets/xml/scenes/dungeons/ddan_mq.xml +++ b/assets/xml/scenes/dungeons/ddan_mq.xml @@ -1,18 +1,18 @@ - - + + - - - - - - - - + + + + + + + + diff --git a/assets/xml/scenes/dungeons/gerudoway.xml b/assets/xml/scenes/dungeons/gerudoway.xml index d6abe7ed05..c42df3370b 100644 --- a/assets/xml/scenes/dungeons/gerudoway.xml +++ b/assets/xml/scenes/dungeons/gerudoway.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/scenes/dungeons/ice_doukutu.xml b/assets/xml/scenes/dungeons/ice_doukutu.xml index f816d7ca24..3a1f53b168 100644 --- a/assets/xml/scenes/dungeons/ice_doukutu.xml +++ b/assets/xml/scenes/dungeons/ice_doukutu.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/ice_doukutu_mq.xml b/assets/xml/scenes/dungeons/ice_doukutu_mq.xml index a6e6b415df..ed80898b83 100644 --- a/assets/xml/scenes/dungeons/ice_doukutu_mq.xml +++ b/assets/xml/scenes/dungeons/ice_doukutu_mq.xml @@ -2,8 +2,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/ice_doukutu_pal_n64.xml b/assets/xml/scenes/dungeons/ice_doukutu_pal_n64.xml index 9f08f559ed..e811e8b709 100644 --- a/assets/xml/scenes/dungeons/ice_doukutu_pal_n64.xml +++ b/assets/xml/scenes/dungeons/ice_doukutu_pal_n64.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/ice_doukutu_v2.xml b/assets/xml/scenes/dungeons/ice_doukutu_v2.xml index 4d25aa74f4..1ad4512abc 100644 --- a/assets/xml/scenes/dungeons/ice_doukutu_v2.xml +++ b/assets/xml/scenes/dungeons/ice_doukutu_v2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/jyasinzou.xml b/assets/xml/scenes/dungeons/jyasinzou.xml index 1a44e14d72..c51b943e88 100644 --- a/assets/xml/scenes/dungeons/jyasinzou.xml +++ b/assets/xml/scenes/dungeons/jyasinzou.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/jyasinzou_mq.xml b/assets/xml/scenes/dungeons/jyasinzou_mq.xml index 6a99888abb..b95dce6bbd 100644 --- a/assets/xml/scenes/dungeons/jyasinzou_mq.xml +++ b/assets/xml/scenes/dungeons/jyasinzou_mq.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/scenes/dungeons/men.xml b/assets/xml/scenes/dungeons/men.xml index dc495b0c97..a99eb0ad84 100644 --- a/assets/xml/scenes/dungeons/men.xml +++ b/assets/xml/scenes/dungeons/men.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/scenes/dungeons/men_mq.xml b/assets/xml/scenes/dungeons/men_mq.xml index e87b44d8ea..a7426775f9 100644 --- a/assets/xml/scenes/dungeons/men_mq.xml +++ b/assets/xml/scenes/dungeons/men_mq.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/scenes/indoors/miharigoya.xml b/assets/xml/scenes/indoors/miharigoya.xml index 41ff2db9f9..5586c44953 100644 --- a/assets/xml/scenes/indoors/miharigoya.xml +++ b/assets/xml/scenes/indoors/miharigoya.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/assets/xml/scenes/indoors/souko.xml b/assets/xml/scenes/indoors/souko.xml index bc6336b360..0eca29e8e2 100644 --- a/assets/xml/scenes/indoors/souko.xml +++ b/assets/xml/scenes/indoors/souko.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot01.xml b/assets/xml/scenes/overworld/spot01.xml index 0074733cc4..2634dd5927 100644 --- a/assets/xml/scenes/overworld/spot01.xml +++ b/assets/xml/scenes/overworld/spot01.xml @@ -7,8 +7,8 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot01_pal_n64.xml b/assets/xml/scenes/overworld/spot01_pal_n64.xml index 8b2651c1ff..3b92309aea 100644 --- a/assets/xml/scenes/overworld/spot01_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot01_pal_n64.xml @@ -7,8 +7,8 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot07.xml b/assets/xml/scenes/overworld/spot07.xml index 857cab9f01..770b598e03 100644 --- a/assets/xml/scenes/overworld/spot07.xml +++ b/assets/xml/scenes/overworld/spot07.xml @@ -3,8 +3,8 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot07_pal_n64.xml b/assets/xml/scenes/overworld/spot07_pal_n64.xml index f856e54438..fcb4c8c7b9 100644 --- a/assets/xml/scenes/overworld/spot07_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot07_pal_n64.xml @@ -3,8 +3,8 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot18.xml b/assets/xml/scenes/overworld/spot18.xml index affece84b7..ab3a88ccef 100644 --- a/assets/xml/scenes/overworld/spot18.xml +++ b/assets/xml/scenes/overworld/spot18.xml @@ -9,8 +9,8 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot18_pal_n64.xml b/assets/xml/scenes/overworld/spot18_pal_n64.xml index 809e099cfc..afa4915ffb 100644 --- a/assets/xml/scenes/overworld/spot18_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot18_pal_n64.xml @@ -9,8 +9,8 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot20.xml b/assets/xml/scenes/overworld/spot20.xml index d3dd77a41e..af77f5b898 100644 --- a/assets/xml/scenes/overworld/spot20.xml +++ b/assets/xml/scenes/overworld/spot20.xml @@ -12,8 +12,8 @@ - - + + diff --git a/assets/xml/scenes/overworld/spot20_pal.xml b/assets/xml/scenes/overworld/spot20_pal.xml index 297b1c316e..d698fba77e 100644 --- a/assets/xml/scenes/overworld/spot20_pal.xml +++ b/assets/xml/scenes/overworld/spot20_pal.xml @@ -12,8 +12,8 @@ - - + + diff --git a/assets/xml/textures/backgrounds.xml b/assets/xml/textures/backgrounds.xml index c60ff57a8a..1fb4f8828f 100644 --- a/assets/xml/textures/backgrounds.xml +++ b/assets/xml/textures/backgrounds.xml @@ -1,246 +1,246 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - + + + + - - - - + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + diff --git a/assets/xml/textures/do_action_static.xml b/assets/xml/textures/do_action_static.xml index f628496c12..c448dbfdf1 100644 --- a/assets/xml/textures/do_action_static.xml +++ b/assets/xml/textures/do_action_static.xml @@ -1,65 +1,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/do_action_static_pal.xml b/assets/xml/textures/do_action_static_pal.xml index a821e7b2a7..7de3b55b53 100644 --- a/assets/xml/textures/do_action_static_pal.xml +++ b/assets/xml/textures/do_action_static_pal.xml @@ -1,96 +1,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_24_static.xml b/assets/xml/textures/icon_item_24_static.xml index 395da30bb7..d4b33dbe59 100644 --- a/assets/xml/textures/icon_item_24_static.xml +++ b/assets/xml/textures/icon_item_24_static.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_dungeon_static.xml b/assets/xml/textures/icon_item_dungeon_static.xml index 873c490fc5..e832d35298 100644 --- a/assets/xml/textures/icon_item_dungeon_static.xml +++ b/assets/xml/textures/icon_item_dungeon_static.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_field_static.xml b/assets/xml/textures/icon_item_field_static.xml index 1ee2483501..252721f31e 100644 --- a/assets/xml/textures/icon_item_field_static.xml +++ b/assets/xml/textures/icon_item_field_static.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_fra_static.xml b/assets/xml/textures/icon_item_fra_static.xml index 2c8ccad5bf..3630ea9703 100644 --- a/assets/xml/textures/icon_item_fra_static.xml +++ b/assets/xml/textures/icon_item_fra_static.xml @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_gameover_static.xml b/assets/xml/textures/icon_item_gameover_static.xml index ffd3928680..d5d893e6b6 100644 --- a/assets/xml/textures/icon_item_gameover_static.xml +++ b/assets/xml/textures/icon_item_gameover_static.xml @@ -1,10 +1,10 @@ - - - - - - + + + + + + diff --git a/assets/xml/textures/icon_item_gameover_static_pal.xml b/assets/xml/textures/icon_item_gameover_static_pal.xml index fc2a506422..cb80b1ac25 100644 --- a/assets/xml/textures/icon_item_gameover_static_pal.xml +++ b/assets/xml/textures/icon_item_gameover_static_pal.xml @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/textures/icon_item_ger_static.xml b/assets/xml/textures/icon_item_ger_static.xml index ea71dda35e..6aa1b34143 100644 --- a/assets/xml/textures/icon_item_ger_static.xml +++ b/assets/xml/textures/icon_item_ger_static.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_jpn_static.xml b/assets/xml/textures/icon_item_jpn_static.xml index f2fe854b8e..1358212ce8 100644 --- a/assets/xml/textures/icon_item_jpn_static.xml +++ b/assets/xml/textures/icon_item_jpn_static.xml @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_nes_static.xml b/assets/xml/textures/icon_item_nes_static.xml index 6cd92acfca..fb95c69045 100644 --- a/assets/xml/textures/icon_item_nes_static.xml +++ b/assets/xml/textures/icon_item_nes_static.xml @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_static.xml b/assets/xml/textures/icon_item_static.xml index ca772fddda..2d67bfa108 100644 --- a/assets/xml/textures/icon_item_static.xml +++ b/assets/xml/textures/icon_item_static.xml @@ -1,181 +1,181 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_static_pal.xml b/assets/xml/textures/icon_item_static_pal.xml index 474a13f249..161d4039a0 100644 --- a/assets/xml/textures/icon_item_static_pal.xml +++ b/assets/xml/textures/icon_item_static_pal.xml @@ -1,183 +1,183 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/item_name_static.xml b/assets/xml/textures/item_name_static.xml index 0e2d769474..eff98015ec 100644 --- a/assets/xml/textures/item_name_static.xml +++ b/assets/xml/textures/item_name_static.xml @@ -1,251 +1,251 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/item_name_static_pal.xml b/assets/xml/textures/item_name_static_pal.xml index 321c890a94..a990c2620d 100644 --- a/assets/xml/textures/item_name_static_pal.xml +++ b/assets/xml/textures/item_name_static_pal.xml @@ -1,375 +1,375 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/kanji.xml b/assets/xml/textures/kanji.xml index 25987b86de..87dc2bf96c 100644 --- a/assets/xml/textures/kanji.xml +++ b/assets/xml/textures/kanji.xml @@ -1,3984 +1,3984 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_48x85_static.xml b/assets/xml/textures/map_48x85_static.xml index b8795bd07d..d70f247356 100644 --- a/assets/xml/textures/map_48x85_static.xml +++ b/assets/xml/textures/map_48x85_static.xml @@ -2,73 +2,73 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_grand_static.xml b/assets/xml/textures/map_grand_static.xml index 201955bfc3..306fc76d83 100644 --- a/assets/xml/textures/map_grand_static.xml +++ b/assets/xml/textures/map_grand_static.xml @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_i_static.xml b/assets/xml/textures/map_i_static.xml index 1721f6d848..64eed0b2a9 100644 --- a/assets/xml/textures/map_i_static.xml +++ b/assets/xml/textures/map_i_static.xml @@ -1,243 +1,243 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_name_static.xml b/assets/xml/textures/map_name_static.xml index dd705eab60..c35abf0b1d 100644 --- a/assets/xml/textures/map_name_static.xml +++ b/assets/xml/textures/map_name_static.xml @@ -3,78 +3,78 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_name_static_pal.xml b/assets/xml/textures/map_name_static_pal.xml index 780609b18c..f62a4d7981 100644 --- a/assets/xml/textures/map_name_static_pal.xml +++ b/assets/xml/textures/map_name_static_pal.xml @@ -3,114 +3,114 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/message_static.xml b/assets/xml/textures/message_static.xml index afdde60def..e63d65a2a6 100644 --- a/assets/xml/textures/message_static.xml +++ b/assets/xml/textures/message_static.xml @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + diff --git a/assets/xml/textures/message_texture_static.xml b/assets/xml/textures/message_texture_static.xml index bbf7e1259e..34cfb07ed3 100644 --- a/assets/xml/textures/message_texture_static.xml +++ b/assets/xml/textures/message_texture_static.xml @@ -1,6 +1,6 @@ - - + + diff --git a/assets/xml/textures/nes_font_static.xml b/assets/xml/textures/nes_font_static.xml index f1b80ee045..9561fb1036 100644 --- a/assets/xml/textures/nes_font_static.xml +++ b/assets/xml/textures/nes_font_static.xml @@ -1,144 +1,144 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/nes_font_static_ique_cn.xml b/assets/xml/textures/nes_font_static_ique_cn.xml index 484707b05d..1e2dc97184 100644 --- a/assets/xml/textures/nes_font_static_ique_cn.xml +++ b/assets/xml/textures/nes_font_static_ique_cn.xml @@ -2,1918 +2,1918 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/nes_font_static_v2.xml b/assets/xml/textures/nes_font_static_v2.xml index b01646cb54..9e037d45bc 100644 --- a/assets/xml/textures/nes_font_static_v2.xml +++ b/assets/xml/textures/nes_font_static_v2.xml @@ -1,145 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/nintendo_rogo_static.xml b/assets/xml/textures/nintendo_rogo_static.xml index 295bbfcfa2..c5e555fb18 100644 --- a/assets/xml/textures/nintendo_rogo_static.xml +++ b/assets/xml/textures/nintendo_rogo_static.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/textures/nintendo_rogo_static_v2.xml b/assets/xml/textures/nintendo_rogo_static_v2.xml index 7a60524b20..56792cf47f 100644 --- a/assets/xml/textures/nintendo_rogo_static_v2.xml +++ b/assets/xml/textures/nintendo_rogo_static_v2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/assets/xml/textures/parameter_static.xml b/assets/xml/textures/parameter_static.xml index 41f110180a..7d25201cfb 100644 --- a/assets/xml/textures/parameter_static.xml +++ b/assets/xml/textures/parameter_static.xml @@ -1,60 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/parameter_static_ique.xml b/assets/xml/textures/parameter_static_ique.xml index 98449e6746..0eb9409da0 100644 --- a/assets/xml/textures/parameter_static_ique.xml +++ b/assets/xml/textures/parameter_static_ique.xml @@ -1,60 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/place_title_cards.xml b/assets/xml/textures/place_title_cards.xml index b9392f7bca..30851a3694 100644 --- a/assets/xml/textures/place_title_cards.xml +++ b/assets/xml/textures/place_title_cards.xml @@ -1,230 +1,230 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/assets/xml/textures/place_title_cards_pal.xml b/assets/xml/textures/place_title_cards_pal.xml index 44bd6c8fb4..2d2a6170da 100644 --- a/assets/xml/textures/place_title_cards_pal.xml +++ b/assets/xml/textures/place_title_cards_pal.xml @@ -1,287 +1,287 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/assets/xml/textures/skyboxes.xml b/assets/xml/textures/skyboxes.xml index 104ffb2a3f..69b5e5dad3 100644 --- a/assets/xml/textures/skyboxes.xml +++ b/assets/xml/textures/skyboxes.xml @@ -1,113 +1,113 @@ - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + diff --git a/assets/xml/textures/title_static.xml b/assets/xml/textures/title_static.xml index c0f3f2908d..e7d320d448 100644 --- a/assets/xml/textures/title_static.xml +++ b/assets/xml/textures/title_static.xml @@ -1,166 +1,166 @@ - - - - - + + + + + - + - - - - - - + + + + + + - - - - + + + + - - + + - - - + + + - - + + - - - + + + - + - + - - - + + + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - + - - - + + + - + - + - + - - - - - + + + + + - - + + - - - + + + - + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - - - + + + - + - + - - - - + + + + - - - + + + - + - + - + - - - + + + - + - + - + - + - + diff --git a/assets/xml/textures/title_static_pal_gc.xml b/assets/xml/textures/title_static_pal_gc.xml index 5f26d7f8de..9460bcacb5 100644 --- a/assets/xml/textures/title_static_pal_gc.xml +++ b/assets/xml/textures/title_static_pal_gc.xml @@ -1,191 +1,191 @@ - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - + + + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - + diff --git a/assets/xml/textures/title_static_pal_n64.xml b/assets/xml/textures/title_static_pal_n64.xml index ad3bf9dbbe..48276ba5db 100644 --- a/assets/xml/textures/title_static_pal_n64.xml +++ b/assets/xml/textures/title_static_pal_n64.xml @@ -1,201 +1,201 @@ - + - - - - - - + + + + + + - + - - - + + + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - 0x1d480 + + 0x1d480 - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - - + + - + - - - - - + + + + + - - - - + + + + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - - - - + + + + - - + + - - - + + + - - - - - - - - + + + + + + + + - + - - - + + + - + - + From ed02a9db654a802057f1c071a3b60c6824b2feb8 Mon Sep 17 00:00:00 2001 From: mracsys Date: Fri, 6 Jun 2025 19:23:01 -0400 Subject: [PATCH 42/42] Add additional Bazaar display list definitions (#2494) * add unreferenced display lists to shop1 room 0 xml * match naming scheme * add missed display lists for shop1 room 0 --- assets/xml/scenes/shops/shop1.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/assets/xml/scenes/shops/shop1.xml b/assets/xml/scenes/shops/shop1.xml index 525a06d633..f14ed9a76b 100644 --- a/assets/xml/scenes/shops/shop1.xml +++ b/assets/xml/scenes/shops/shop1.xml @@ -4,5 +4,13 @@ + + + + + + + +