diff options
22 files changed, 35 insertions, 46 deletions
@@ -499,7 +499,6 @@ O_FILES := $(filter-out %_reloc.o,$(SPEC_O_FILES)) OVL_RELOC_FILES := $(filter %_reloc.o,$(SPEC_O_FILES)) # Automatic dependency files -# (Only asm_processor dependencies and reloc dependencies are handled for now) DEP_FILES := $(O_FILES:.o=.d) $(O_FILES:.o=.asmproc.d) $(OVL_RELOC_FILES:.o=.d) $(BUILD_DIR)/spec.d TEXTURE_FILES_PNG_EXTRACTED := $(foreach dir,$(ASSET_BIN_DIRS_EXTRACTED),$(wildcard $(dir)/*.png)) @@ -732,7 +731,7 @@ $(BUILD_DIR)/src/makerom/%.o: CCASFLAGS := $(EGCS_CCASFLAGS) $(BUILD_DIR)/src/makerom/%.o: ASOPTFLAGS := $(EGCS_ASOPTFLAGS) endif -ifeq ($(PERMUTER),) # permuter + preprocess.py misbehaves, permuter doesn't care about rodata diffs or bss ordering so just don't use it in that case +ifeq ($(PERMUTER),) # permuter + preprocess.sh misbehaves, permuter doesn't care about rodata diffs or bss ordering so just don't use it in that case # Handle encoding (UTF-8 -> EUC-JP) and custom pragmas $(BUILD_DIR)/src/%.o: PREPROCESS := ./tools/preprocess.sh -v $(VERSION) -i $(ICONV) -- endif diff --git a/assets/objects/gameplay_keep/link_textures.c b/assets/objects/gameplay_keep/link_textures.c index 356400631..2ce9e6968 100644 --- a/assets/objects/gameplay_keep/link_textures.c +++ b/assets/objects/gameplay_keep/link_textures.c @@ -4,8 +4,8 @@ u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShi #include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c" }; -u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = { -#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c" +u64 gOcarinaOfTimeDesignTex[TEX_LEN(u64, gOcarinaOfTimeDesignTex_WIDTH, gOcarinaOfTimeDesignTex_HEIGHT, 16)] = { +#include "assets/objects/gameplay_keep/gOcarinaOfTimeDesignTex.rgba16.inc.c" }; u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = { diff --git a/assets/objects/gameplay_keep/link_textures.h b/assets/objects/gameplay_keep/link_textures.h index 1b69ed135..eea7c7fee 100644 --- a/assets/objects/gameplay_keep/link_textures.h +++ b/assets/objects/gameplay_keep/link_textures.h @@ -7,9 +7,9 @@ #define gHylianShieldDesignTex_WIDTH 32 #define gHylianShieldDesignTex_HEIGHT 64 extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)]; -#define gOcarinaofTimeDesignTex_WIDTH 32 -#define gOcarinaofTimeDesignTex_HEIGHT 16 -extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)]; +#define gOcarinaOfTimeDesignTex_WIDTH 32 +#define gOcarinaOfTimeDesignTex_HEIGHT 16 +extern u64 gOcarinaOfTimeDesignTex[TEX_LEN(u64, gOcarinaOfTimeDesignTex_WIDTH, gOcarinaOfTimeDesignTex_HEIGHT, 16)]; #define gBottleGlassTex_WIDTH 16 #define gBottleGlassTex_HEIGHT 16 extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)]; diff --git a/assets/objects/object_link_boy/object_link_boy.c b/assets/objects/object_link_boy/object_link_boy.c index ea6fe8c9f..5f5065aad 100644 --- a/assets/objects/object_link_boy/object_link_boy.c +++ b/assets/objects/object_link_boy/object_link_boy.c @@ -15,8 +15,8 @@ u64 gLinkAdultEyesHalfTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYE #include "assets/objects/object_link_boy/gLinkAdultEyesHalfTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" }; -u64 gLinkAdultEyesClosedfTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)] = { -#include "assets/objects/object_link_boy/gLinkAdultEyesClosedfTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" +u64 gLinkAdultEyesClosedTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)] = { +#include "assets/objects/object_link_boy/gLinkAdultEyesClosedTex.ci8.tlut_gLinkAdultHeadTLUT.inc.c" }; u64 gLinkAdultEyesRightTex[TEX_LEN(u64, LINK_ADULT_EYES_TEX_WIDTH, LINK_ADULT_EYES_TEX_HEIGHT, 8)] = { diff --git a/assets/objects/object_link_boy/object_link_boy.h b/assets/objects/object_link_boy/object_link_boy.h index 349c36ade..334e62b63 100644 --- a/assets/objects/object_link_boy/object_link_boy.h +++ b/assets/objects/object_link_boy/object_link_boy.h @@ -9,7 +9,7 @@ #define LINK_ADULT_EYES_TEX_HEIGHT 32 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 gLinkAdultEyesClosedTex[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)]; diff --git a/assets/objects/object_link_child/object_link_child.c b/assets/objects/object_link_child/object_link_child.c index 30411ab0b..a7062de65 100644 --- a/assets/objects/object_link_child/object_link_child.c +++ b/assets/objects/object_link_child/object_link_child.c @@ -15,8 +15,8 @@ u64 gLinkChildEyesHalfTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYE #include "assets/objects/object_link_child/gLinkChildEyesHalfTex.ci8.tlut_gLinkChildSkinTLUT.inc.c" }; -u64 gLinkChildEyesClosedfTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)] = { -#include "assets/objects/object_link_child/gLinkChildEyesClosedfTex.ci8.tlut_gLinkChildSkinTLUT.inc.c" +u64 gLinkChildEyesClosedTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)] = { +#include "assets/objects/object_link_child/gLinkChildEyesClosedTex.ci8.tlut_gLinkChildSkinTLUT.inc.c" }; u64 gLinkChildEyesLeftTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)] = { diff --git a/assets/objects/object_link_child/object_link_child.h b/assets/objects/object_link_child/object_link_child.h index 064171408..8da3bfc6b 100644 --- a/assets/objects/object_link_child/object_link_child.h +++ b/assets/objects/object_link_child/object_link_child.h @@ -9,7 +9,7 @@ #define LINK_CHILD_EYES_TEX_HEIGHT 32 extern u64 gLinkChildEyesOpenTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkChildEyesHalfTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)]; -extern u64 gLinkChildEyesClosedfTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)]; +extern u64 gLinkChildEyesClosedTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkChildEyesLeftTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkChildEyesRightTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)]; extern u64 gLinkChildEyesWideTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)]; diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml index 015e400e4..debafa33e 100644 --- a/assets/xml/objects/gameplay_dangeon_keep.xml +++ b/assets/xml/objects/gameplay_dangeon_keep.xml @@ -135,8 +135,8 @@ <Texture Name="gameplay_dangeon_keep_0134A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x134A0"/> <Texture Name="gameplay_dangeon_keep_013CA0_Tex" Format="ia8" Width="4" Height="4" Offset="0x13CA0"/> <Texture Name="gameplay_dangeon_keep_013CB0_Tex" Format="i4" Width="64" Height="64" Offset="0x13CB0"/> - <Texture Name="gCrstalSwitchRedTex" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/> - <Texture Name="gCrstalSwitchBlueTex" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/> + <Texture Name="gCrystalSwitchRedTex" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/> + <Texture Name="gCrystalSwitchBlueTex" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/> <Texture Name="gameplay_dangeon_keep_0154B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x154B0"/> <Texture Name="gameplay_dangeon_keep_015CB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x15CB0"/> <Texture Name="gameplay_dangeon_keep_0164B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x164B0"/> diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index b8e20ab42..973d4c3ce 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -4,7 +4,7 @@ <Texture Name="gHilite1Tex" Format="rgba16" Width="16" Height="16" Offset="0x0"/> <Texture Name="gHilite2Tex" Format="rgba16" Width="16" Height="16" Offset="0x200"/> <Texture Name="gHylianShieldDesignTex" Format="rgba16" Width="32" Height="64" Offset="0x400"/> - <Texture Name="gOcarinaofTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> + <Texture Name="gOcarinaOfTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> <Texture Name="gBottleGlassTex" Format="rgba16" Width="16" Height="16" Offset="0x1800"/> <Texture Name="gDekuStickTex" Format="i8" Width="8" Height="8" Offset="0x1A00"/> <Texture Name="gLinkHairTex" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/> diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml index 04387392f..d09be36fd 100644 --- a/assets/xml/objects/gameplay_keep_pal.xml +++ b/assets/xml/objects/gameplay_keep_pal.xml @@ -4,7 +4,7 @@ <Texture Name="gHilite1Tex" Format="rgba16" Width="16" Height="16" Offset="0x0"/> <Texture Name="gHilite2Tex" Format="rgba16" Width="16" Height="16" Offset="0x200"/> <Texture Name="gHylianShieldDesignTex" Format="rgba16" Width="32" Height="64" Offset="0x400"/> - <Texture Name="gOcarinaofTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> + <Texture Name="gOcarinaOfTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> <Texture Name="gBottleGlassTex" Format="rgba16" Width="16" Height="16" Offset="0x1800"/> <Texture Name="gDekuStickTex" Format="i8" Width="8" Height="8" Offset="0x1A00"/> <Texture Name="gLinkHairTex" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/> diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml index 21a1d407c..eab6ae3ab 100644 --- a/assets/xml/objects/object_link_boy.xml +++ b/assets/xml/objects/object_link_boy.xml @@ -526,7 +526,7 @@ <!-- Eyes --> <Texture Name="gLinkAdultEyesOpenTex" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesHalfTex" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/> - <Texture Name="gLinkAdultEyesClosedfTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/> + <Texture Name="gLinkAdultEyesClosedTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesRightTex" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesLeftTex" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesWideTex" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/> diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml index 25ad178c3..99492de10 100644 --- a/assets/xml/objects/object_link_child.xml +++ b/assets/xml/objects/object_link_child.xml @@ -436,7 +436,7 @@ <!--Eyes--> <Texture Name="gLinkChildEyesOpenTex" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesHalfTex" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/> - <Texture Name="gLinkChildEyesClosedfTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/> + <Texture Name="gLinkChildEyesClosedTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesLeftTex" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesRightTex" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesWideTex" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/> diff --git a/include/fault.h b/include/fault.h index af895927d..015da7d1c 100644 --- a/include/fault.h +++ b/include/fault.h @@ -81,10 +81,6 @@ void Fault_DrawText(s32 x, s32 y, const char* fmt, ...); void func_800AE1F8(void); -// Not implemented. Silently noop-ing is fine, these are not essential for functionality. -#define Fault_SetFontColor(color) (void)0 -#define Fault_SetCharPad(padW, padH) (void)0 - #else void Fault_InitDrawer(void); diff --git a/include/sfx.h b/include/sfx.h index 2a9b543c3..6d61c3cf1 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -184,10 +184,6 @@ void func_800F8F88(void); u8 Audio_IsSfxPlaying(u32 sfxId); void Audio_ResetSfx(void); -extern Vec3f gSfxDefaultPos; -extern f32 gSfxDefaultFreqAndVolScale; -extern s8 gSfxDefaultReverb; - extern SfxParams* gSfxParams[7]; extern char D_80133390[]; extern char D_80133398[]; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 4a86cf25c..ddb8a9e0b 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4511,9 +4511,7 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) { displayList = displayListHead = GRAPH_ALLOC(gfxCtx, 2 * sizeof(Gfx)); - gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, - AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, Z_UPD | G_RM_AA_ZB_XLU_SURF2); gSPEndDisplayList(displayListHead++); @@ -4565,10 +4563,10 @@ s16 Actor_UpdateAlphaByDistance(Actor* actor, PlayState* play, s16 alpha, f32 ra if (radius < distance) { actor->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - Math_SmoothStepToS(&alpha, 0, 6, 0x14, 1); + Math_SmoothStepToS(&alpha, 0, 6, 20, 1); } else { actor->flags |= ACTOR_FLAG_ATTENTION_ENABLED; - Math_SmoothStepToS(&alpha, 0xFF, 6, 0x14, 1); + Math_SmoothStepToS(&alpha, 255, 6, 20, 1); } return alpha; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 803a89400..3baaf6579 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -6333,8 +6333,8 @@ s32 Camera_Demo5(Camera* camera) { camera->timer += D_8011D79C[2].timerInit + D_8011D79C[3].timerInit; } } else if (eyeTargetDist < 300.0f && eyePlayerGeo.r < 30.0f) { - // distance from the camera's current positon and the target is less than 300 units - // and the distance fromthe camera's current position to the player is less than 30 units + // distance from the camera's current position and the target is less than 300 units + // and the distance from the camera's current position to the player is less than 30 units static OnePointCsFull D_8011D83C[] = { { ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), @@ -7237,7 +7237,7 @@ s32 Camera_Special6(Camera* camera) { sCameraInterfaceField = roData->interfaceField; if (eyeNext->x != bgCamPos.x || eyeNext->y != bgCamPos.y || eyeNext->z != bgCamPos.z || camera->animState == 0) { - // A change in the current scene's camera positon has been detected, + // A change in the current scene's camera position has been detected, // Change "screens" camera->player->actor.freezeTimer = 12; // Overwrite hud visibility to CAM_HUD_VISIBILITY_HEARTS_FORCE diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 69d7b76d9..49948f856 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1007,7 +1007,7 @@ PlayerFaceIndices sPlayerFaces[PLAYER_FACE_MAX] = { void* sEyeTextures[PLAYER_EYES_MAX] = { gLinkAdultEyesOpenTex, // PLAYER_EYES_OPEN gLinkAdultEyesHalfTex, // PLAYER_EYES_HALF - gLinkAdultEyesClosedfTex, // PLAYER_EYES_CLOSED + gLinkAdultEyesClosedTex, // PLAYER_EYES_CLOSED gLinkAdultEyesRightTex, // PLAYER_EYES_RIGHT gLinkAdultEyesLeftTex, // PLAYER_EYES_LEFT gLinkAdultEyesWideTex, // PLAYER_EYES_WIDE @@ -1027,7 +1027,7 @@ void* sEyeTextures[][PLAYER_EYES_MAX] = { { gLinkAdultEyesOpenTex, // PLAYER_EYES_OPEN gLinkAdultEyesHalfTex, // PLAYER_EYES_HALF - gLinkAdultEyesClosedfTex, // PLAYER_EYES_CLOSED + gLinkAdultEyesClosedTex, // PLAYER_EYES_CLOSED gLinkAdultEyesRightTex, // PLAYER_EYES_RIGHT gLinkAdultEyesLeftTex, // PLAYER_EYES_LEFT gLinkAdultEyesWideTex, // PLAYER_EYES_WIDE @@ -1035,9 +1035,9 @@ void* sEyeTextures[][PLAYER_EYES_MAX] = { gLinkAdultEyesWincingTex, // PLAYER_EYES_WINCING }, { - gLinkChildEyesOpenTex, // PLAYER_EYES_OPEN - gLinkChildEyesHalfTex, // PLAYER_EYES_HALF - gLinkChildEyesClosedfTex, // PLAYER_EYES_CLOSED + gLinkChildEyesOpenTex, // PLAYER_EYES_OPEN + gLinkChildEyesHalfTex, // PLAYER_EYES_HALF + gLinkChildEyesClosedTex, // PLAYER_EYES_CLOSED /* 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, 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 10c23e518..71aa22cd0 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 @@ -96,7 +96,7 @@ void BgYdanMaruta_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInit, this->colliderElements); - this->switchFlag = PARAMS_GET_U(this->dyna.actor.params, 0, 16); + this->switchFlag = PARAMS_GET_U(this->dyna.actor.params, 0, 8); thisx->params = PARAMS_GET_U(thisx->params, 8, 8); // thisx is required to match here if (this->dyna.actor.params == 0) { 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 dbe4193be..328e6ea20 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -622,7 +622,7 @@ void ObjSwitch_CrystalOffInit(ObjSwitch* this) { this->crystalColor.r = 0; this->crystalColor.g = 0; this->crystalColor.b = 0; - this->crystalSubtype1texture = gCrstalSwitchRedTex; + this->crystalSubtype1texture = gCrystalSwitchRedTex; this->actionFunc = ObjSwitch_CrystalOff; } @@ -677,7 +677,7 @@ void ObjSwitch_CrystalOnInit(ObjSwitch* this) { this->crystalColor.r = 255; this->crystalColor.g = 255; this->crystalColor.b = 255; - this->crystalSubtype1texture = gCrstalSwitchBlueTex; + this->crystalSubtype1texture = gCrystalSwitchBlueTex; this->actionFunc = ObjSwitch_CrystalOn; } diff --git a/tools/fix_bss.py b/tools/fix_bss.py index 743085cd1..6d13a794e 100755 --- a/tools/fix_bss.py +++ b/tools/fix_bss.py @@ -349,7 +349,7 @@ class BssSymbol: INCREMENT_BLOCK_NUMBER_RE = re.compile(r"increment_block_number_(\d+)_(\d+)") -# Find increment_block_number pragmas by parsing the symbol names generated by preprocess.py. +# Find increment_block_number pragmas by parsing the symbol names generated by preprocess.sh. # This is pretty ugly but it seems more reliable than trying to determine the line numbers of # BSS variables in the C file. def find_pragmas(symbol_table: list[SymbolTableEntry]) -> list[Pragma]: diff --git a/tools/ido_block_numbers.py b/tools/ido_block_numbers.py index 188cf8f36..dc7cc9954 100755 --- a/tools/ido_block_numbers.py +++ b/tools/ido_block_numbers.py @@ -497,7 +497,7 @@ def run_cfe( command_line: list[str], keep_files: bool ) -> Tuple[list[SymbolTableEntry], list[UcodeOp]]: # Assume command line is of the form: - # python3 tools/preprocess.py [COMPILER] [COMPILER_ARGS] [INPUT_FILE] + # python3 tools/preprocess.sh [COMPILER] [COMPILER_ARGS] [INPUT_FILE] input_file = Path(command_line[-1]) rest = command_line[:-1] diff --git a/undefined_syms.txt b/undefined_syms.txt index deba8affd..c40597854 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1,7 +1,7 @@ // z_kankyo, z_demo_kankyo, z_en_viewer, z_object_kankyo, z_eff_ss_dead_dd D_01000000 = 0x01000000; -// code_800AD920 +// z_viszbuf D_0E000000 = 0x0E000000; // z_vismono |