mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Document Surface Material (#1447)

Browse source 
* material

* cleanup

* iron boots

* climb

* more docs

* rename

* small fix

* comments

* adjust bug comment

* simplify comment
This commit is contained in:
engineer124 2022-11-26 18:11:06 -05:00 • committed by GitHub
parent 92f081d7f3
commit c7a61aa670
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 263 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

205
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -3040,53 +3040,56 @@ void BossMo_Unknown(void) {
// Appears to be a test function for sound effects.
static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
static u16 unkSfx[] = {
NA_SE_PL_WALK_GROUND,
NA_SE_PL_WALK_GROUND,
NA_SE_PL_WALK_GROUND,
NA_SE_PL_WALK_SAND,
NA_SE_PL_WALK_CONCRETE,
NA_SE_PL_WALK_DIRT,
NA_SE_PL_WALK_WATER0,
NA_SE_PL_WALK_WATER1,
NA_SE_PL_WALK_WATER2,
NA_SE_PL_WALK_MAGMA,
NA_SE_PL_WALK_GRASS,
NA_SE_PL_WALK_GLASS,
NA_SE_PL_WALK_LADDER,
NA_SE_PL_WALK_GLASS,
NA_SE_PL_WALK_WALL,
NA_SE_PL_WALK_HEAVYBOOTS,
NA_SE_PL_WALK_ICE,
NA_SE_PL_JUMP,
NA_SE_PL_JUMP,
NA_SE_PL_JUMP_SAND,
NA_SE_PL_JUMP_CONCRETE,
NA_SE_PL_JUMP_DIRT,
NA_SE_PL_JUMP_WATER0,
NA_SE_PL_JUMP_WATER1,
NA_SE_PL_JUMP_WATER2,
NA_SE_PL_JUMP_MAGMA,
NA_SE_PL_JUMP_GRASS,
NA_SE_PL_JUMP_GLASS,
NA_SE_PL_JUMP_LADDER,
NA_SE_PL_JUMP_GLASS,
NA_SE_PL_JUMP_HEAVYBOOTS,
NA_SE_PL_JUMP_ICE,
NA_SE_PL_LAND,
NA_SE_PL_LAND,
NA_SE_PL_LAND_SAND,
NA_SE_PL_LAND_CONCRETE,
NA_SE_PL_LAND_DIRT,
NA_SE_PL_LAND_WATER0,
NA_SE_PL_LAND_WATER1,
NA_SE_PL_LAND_WATER2,
NA_SE_PL_LAND_MAGMA,
NA_SE_PL_LAND_GRASS,
NA_SE_PL_LAND_GLASS,
NA_SE_PL_LAND_LADDER,
NA_SE_PL_LAND_GLASS,
NA_SE_PL_LAND_HEAVYBOOTS,
NA_SE_PL_LAND_ICE,
// Walking
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_SAND,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_WATER_SHALLOW,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_WATER_DEEP,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_TALL_GRASS,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_LAVA,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_WOOD,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_VINE,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_IRON_BOOTS,
NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_ICE,
// Jumping
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_SAND,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_STONE,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_JABU,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_WATER_SHALLOW,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_WATER_DEEP,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_TALL_GRASS,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_LAVA,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_GRASS,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_WOOD,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_IRON_BOOTS,
NA_SE_PL_JUMP + SURFACE_SFX_OFFSET_ICE,
// Landing
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_SAND,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_STONE,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_JABU,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_WATER_SHALLOW,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_WATER_DEEP,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_TALL_GRASS,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_LAVA,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_GRASS,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_WOOD,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_IRON_BOOTS,
NA_SE_PL_LAND + SURFACE_SFX_OFFSET_ICE,
NA_SE_PL_SLIPDOWN,
NA_SE_PL_CLIMB_CLIFF,
NA_SE_PL_CLIMB_CLIFF,
@ -3114,37 +3117,39 @@ void BossMo_Unknown(void) {
NA_SE_PL_SKIP,
NA_SE_PL_BODY_HIT,
NA_SE_PL_DAMAGE,
NA_SE_PL_SLIP,
NA_SE_PL_SLIP,
NA_SE_PL_SLIP,
NA_SE_PL_SLIP_SAND,
NA_SE_PL_SLIP_CONCRETE,
NA_SE_PL_SLIP_DIRT,
NA_SE_PL_SLIP_WATER0,
NA_SE_PL_SLIP_WATER1,
NA_SE_PL_SLIP_WATER2,
NA_SE_PL_SLIP_MAGMA,
NA_SE_PL_SLIP_GRASS,
NA_SE_PL_SLIP_GLASS,
NA_SE_PL_SLIP_LADDER,
NA_SE_PL_SLIP_GLASS,
NA_SE_PL_SLIP_HEAVYBOOTS,
NA_SE_PL_SLIP_ICE,
NA_SE_PL_BOUND,
NA_SE_PL_BOUND,
NA_SE_PL_BOUND_SAND,
NA_SE_PL_BOUND_CONCRETE,
NA_SE_PL_BOUND_DIRT,
NA_SE_PL_BOUND_WATER0,
NA_SE_PL_BOUND_WATER1,
NA_SE_PL_BOUND_WATER2,
NA_SE_PL_BOUND_MAGMA,
NA_SE_PL_BOUND_GRASS,
NA_SE_PL_BOUND_WOOD,
NA_SE_PL_BOUND_LADDER,
NA_SE_PL_BOUND_WOOD,
NA_SE_PL_BOUND_HEAVYBOOTS,
NA_SE_PL_BOUND_ICE,
// Slipping
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_SAND,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_STONE,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_JABU,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_WATER_SHALLOW,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_WATER_DEEP,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_TALL_GRASS,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_LAVA,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_GRASS,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_WOOD,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_IRON_BOOTS,
NA_SE_PL_SLIP + SURFACE_SFX_OFFSET_ICE,
// Bound
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_DIRT,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_SAND,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_STONE,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_JABU,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_WATER_SHALLOW,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_WATER_DEEP,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_TALL_GRASS,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_LAVA,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_WOOD,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_BRIDGE,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_IRON_BOOTS,
NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_ICE,
NA_SE_PL_FACE_UP,
NA_SE_PL_DIVE_BUBBLE,
NA_SE_PL_MOVE_BUBBLE,
@ -3175,8 +3180,8 @@ void BossMo_Unknown(void) {
NA_SE_IT_ARROW_STICK_CRE,
NA_SE_IT_ARROW_STICK_CRE,
NA_SE_IT_ARROW_STICK_OBJ,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_IT_SWORD_SWING_HARD,
NA_SE_IT_WALL_HIT_HARD,
NA_SE_IT_WALL_HIT_SOFT,
@ -3289,8 +3294,8 @@ void BossMo_Unknown(void) {
NA_SE_EV_TREE_CUT,
NA_SE_EV_WATERDROP,
NA_SE_EV_TORCH,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_EN_DODO_J_WALK,
NA_SE_EN_DODO_J_CRY,
NA_SE_EN_DODO_J_FIRE - SFX_FLAG,
@ -3441,13 +3446,13 @@ void BossMo_Unknown(void) {
NA_SE_EN_OCTAROCK_LAND,
NA_SE_EN_OCTAROCK_SINK,
NA_SE_EN_OCTAROCK_BUBLE,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_SY_WIN_OPEN,
NA_SE_SY_WIN_CLOSE,
NA_SE_SY_CORRECT_CHIME,
@ -3463,7 +3468,7 @@ void BossMo_Unknown(void) {
NA_SE_SY_HP_RECOVER,
NA_SE_SY_ATTENTION_ON,
NA_SE_SY_ATTENTION_ON,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_NONE,
NA_SE_SY_LOCK_ON,
NA_SE_SY_LOCK_ON,
NA_SE_SY_LOCK_OFF,
@ -3473,9 +3478,9 @@ void BossMo_Unknown(void) {
NA_SE_SY_ATTENTION_ON_OLD,
NA_SE_SY_ATTENTION_URGENCY,
NA_SE_SY_MESSAGE_PASS,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_SY_PIECE_OF_HEART,
NA_SE_SY_GET_ITEM,
NA_SE_SY_WIN_SCROLL_LEFT,
@ -3488,7 +3493,7 @@ void BossMo_Unknown(void) {
NA_SE_SY_ATTENTION_ON,
NA_SE_SY_ATTENTION_URGENCY,
NA_SE_OC_OCARINA,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_NONE,
NA_SE_PL_LAND - SFX_FLAG,
NA_SE_VO_LI_SWORD_N,
NA_SE_VO_LI_SWORD_N,
@ -3566,12 +3571,12 @@ void BossMo_Unknown(void) {
NA_SE_EN_DEADHAND_BITE,
NA_SE_EN_DEADHAND_WALK,
NA_SE_EN_DEADHAND_GRIP,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_PL_WALK_GROUND - SFX_FLAG,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
NA_SE_NONE,
};
if (BREG(32) != 0) {