From c2d120c29a4844d2f44d17fbe72cd885ef1c2085 Mon Sep 17 00:00:00 2001 From: HailSanta Date: Thu, 14 Mar 2024 01:39:52 -0400 Subject: [PATCH] remaining maps --- src/world/area_flo/flo_10/flo_10_4_fountain.c | 27 +++++-- src/world/area_flo/flo_14/flo_14_2_main.c | 52 +++++++------- src/world/area_flo/flo_16/flo_16_2_main.c | 24 ++++--- src/world/area_flo/flo_17/flo_17_2_main.c | 70 ++++++++++--------- 4 files changed, 98 insertions(+), 75 deletions(-) diff --git a/src/world/area_flo/flo_10/flo_10_4_fountain.c b/src/world/area_flo/flo_10/flo_10_4_fountain.c index 3ab0999c1e..e4269d8593 100644 --- a/src/world/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/area_flo/flo_10/flo_10_4_fountain.c @@ -38,7 +38,7 @@ EvtScript N(EVS_GrowFountain) = { }; EvtScript N(EVS_TexPan_Rainbow) = { - Call(EnableTexPanning, MODEL_o73, TRUE) + Call(SetTexPanner, MODEL_o73, TEX_PANNER_A) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_A) TEX_PAN_PARAMS_STEP( -150, 0, 0, 0) @@ -259,12 +259,15 @@ EvtScript N(EVS_SetupFountain) = { Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o86, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o87, COLLIDER_FLAGS_UPPER_MASK) EndIf - Call(EnableTexPanning, MODEL_o25, TRUE) - Call(EnableTexPanning, MODEL_o40, TRUE) - Call(EnableTexPanning, MODEL_o78, TRUE) - Call(EnableTexPanning, MODEL_o77, TRUE) - Call(EnableTexPanning, MODEL_o118, TRUE) - Call(EnableTexPanning, MODEL_o119, TRUE) + + + + + + + + // fountain + Call(SetTexPanner, MODEL_o25, TEX_PANNER_1) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) TEX_PAN_PARAMS_STEP( 0,-2000, 0, 0) @@ -272,6 +275,8 @@ EvtScript N(EVS_SetupFountain) = { TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) EndThread + // water edge + Call(SetTexPanner, MODEL_o40, TEX_PANNER_3) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_3) TEX_PAN_PARAMS_STEP( -100, 80, 0, 0) @@ -279,6 +284,8 @@ EvtScript N(EVS_SetupFountain) = { TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) EndThread + // fountain mist + Call(SetTexPanner, MODEL_o78, TEX_PANNER_5) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_5) TEX_PAN_PARAMS_STEP(-1000, 2000, 0, 0) @@ -286,6 +293,8 @@ EvtScript N(EVS_SetupFountain) = { TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) EndThread + // surface spread + Call(SetTexPanner, MODEL_o77, TEX_PANNER_6) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_6) TEX_PAN_PARAMS_STEP( 0,-2000, 0, 0) @@ -293,6 +302,8 @@ EvtScript N(EVS_SetupFountain) = { TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) EndThread + // small fountain + Call(SetTexPanner, MODEL_o118, TEX_PANNER_8) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_8) TEX_PAN_PARAMS_STEP( 0,-1500, 0, 0) @@ -300,6 +311,8 @@ EvtScript N(EVS_SetupFountain) = { TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) EndThread + // surface spread + Call(SetTexPanner, MODEL_o119, TEX_PANNER_9) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_9) TEX_PAN_PARAMS_STEP( 0,-1000, 0, 0) diff --git a/src/world/area_flo/flo_14/flo_14_2_main.c b/src/world/area_flo/flo_14/flo_14_2_main.c index d1823519e1..affad04a61 100644 --- a/src/world/area_flo/flo_14/flo_14_2_main.c +++ b/src/world/area_flo/flo_14/flo_14_2_main.c @@ -43,31 +43,20 @@ EvtScript N(EVS_Main) = { Thread Call(ResetFromLava, Ref(N(SafeFloorColliders))) EndThread - Call(EnableTexPanning, MODEL_o39, TRUE) - Call(EnableTexPanning, MODEL_o41, TRUE) - Call(EnableTexPanning, MODEL_o43, TRUE) - Call(EnableTexPanning, MODEL_o49, TRUE) - Call(EnableTexPanning, MODEL_o51, TRUE) - Call(EnableTexPanning, MODEL_o55, TRUE) - Call(EnableTexPanning, MODEL_o123, TRUE) - Call(EnableTexPanning, MODEL_o125, TRUE) - Call(EnableTexPanning, MODEL_o127, TRUE) - Call(EnableTexPanning, MODEL_o129, TRUE) - Call(EnableTexPanning, MODEL_o131, TRUE) - Call(EnableTexPanning, MODEL_o133, TRUE) - Call(EnableTexPanning, MODEL_o135, TRUE) - Call(EnableTexPanning, MODEL_o40, TRUE) - Call(EnableTexPanning, MODEL_o44, TRUE) - Call(EnableTexPanning, MODEL_o48, TRUE) - Call(EnableTexPanning, MODEL_o52, TRUE) - Call(EnableTexPanning, MODEL_o54, TRUE) - Call(EnableTexPanning, MODEL_o124, TRUE) - Call(EnableTexPanning, MODEL_o126, TRUE) - Call(EnableTexPanning, MODEL_o128, TRUE) - Call(EnableTexPanning, MODEL_o130, TRUE) - Call(EnableTexPanning, MODEL_o132, TRUE) - Call(EnableTexPanning, MODEL_o134, TRUE) - Call(EnableTexPanning, MODEL_o136, TRUE) + // vines scrolling left + Call(SetTexPanner, MODEL_o39, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o41, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o43, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o49, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o51, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o55, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o123, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o125, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o127, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o129, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o131, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o133, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o135, TEX_PANNER_1) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) TEX_PAN_PARAMS_STEP( 140, 0, 0, 0) @@ -75,6 +64,19 @@ EvtScript N(EVS_Main) = { TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) EndThread + // vines scrolling right + Call(SetTexPanner, MODEL_o40, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o44, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o48, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o52, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o54, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o124, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o126, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o128, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o130, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o132, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o134, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o136, TEX_PANNER_2) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_2) TEX_PAN_PARAMS_STEP( -200, 0, 0, 0) diff --git a/src/world/area_flo/flo_16/flo_16_2_main.c b/src/world/area_flo/flo_16/flo_16_2_main.c index 5366fc0653..b6fa8db704 100644 --- a/src/world/area_flo/flo_16/flo_16_2_main.c +++ b/src/world/area_flo/flo_16/flo_16_2_main.c @@ -35,22 +35,26 @@ EvtScript N(EVS_Main) = { Thread Call(ResetFromLava, Ref(N(SafeFloorColliders))) EndThread - Call(EnableTexPanning, MODEL_o59, TRUE) - Call(EnableTexPanning, MODEL_o142, TRUE) - Call(EnableTexPanning, MODEL_o58, TRUE) - Call(EnableTexPanning, MODEL_o136, TRUE) - Call(EnableTexPanning, MODEL_o146, TRUE) - Call(EnableTexPanning, MODEL_o143, TRUE) - Call(EnableTexPanning, MODEL_o135, TRUE) - Call(EnableTexPanning, MODEL_o138, TRUE) - Call(EnableTexPanning, MODEL_o139, TRUE) - Call(EnableTexPanning, MODEL_o140, TRUE) + // vines scrolling left + Call(SetTexPanner, MODEL_o59, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o142, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o58, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o136, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o146, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o139, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o143, TEX_PANNER_1) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) TEX_PAN_PARAMS_STEP( 140, 0, 0, 0) TEX_PAN_PARAMS_FREQ( 1, 0, 0, 0) TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) + EndThread + // vines scrolling right + Call(SetTexPanner, MODEL_o135, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o138, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o140, TEX_PANNER_2) + Thread TEX_PAN_PARAMS_ID(TEX_PANNER_2) TEX_PAN_PARAMS_STEP( -200, 0, 0, 0) TEX_PAN_PARAMS_FREQ( 1, 0, 0, 0) diff --git a/src/world/area_flo/flo_17/flo_17_2_main.c b/src/world/area_flo/flo_17/flo_17_2_main.c index 7f7b91f781..52a7e4a16b 100644 --- a/src/world/area_flo/flo_17/flo_17_2_main.c +++ b/src/world/area_flo/flo_17/flo_17_2_main.c @@ -68,45 +68,49 @@ EvtScript N(EVS_Main) = { Thread Call(ResetFromLava, Ref(N(SafeFloorColliders))) EndThread - Call(EnableTexPanning, MODEL_o34, TRUE) - Call(EnableTexPanning, MODEL_o36, TRUE) - Call(EnableTexPanning, MODEL_o37, TRUE) - Call(EnableTexPanning, MODEL_o40, TRUE) - Call(EnableTexPanning, MODEL_o41, TRUE) - Call(EnableTexPanning, MODEL_o44, TRUE) - Call(EnableTexPanning, MODEL_o45, TRUE) - Call(EnableTexPanning, MODEL_o47, TRUE) - Call(EnableTexPanning, MODEL_o48, TRUE) - Call(EnableTexPanning, MODEL_o51, TRUE) - Call(EnableTexPanning, MODEL_o52, TRUE) - Call(EnableTexPanning, MODEL_o55, TRUE) - Call(EnableTexPanning, MODEL_o23, TRUE) - Call(EnableTexPanning, MODEL_o25, TRUE) - Call(EnableTexPanning, MODEL_o26, TRUE) - Call(EnableTexPanning, MODEL_o29, TRUE) - Call(EnableTexPanning, MODEL_o30, TRUE) - Call(EnableTexPanning, MODEL_o33, TRUE) - Call(EnableTexPanning, MODEL_o35, TRUE) - Call(EnableTexPanning, MODEL_o38, TRUE) - Call(EnableTexPanning, MODEL_o39, TRUE) - Call(EnableTexPanning, MODEL_o42, TRUE) - Call(EnableTexPanning, MODEL_o43, TRUE) - Call(EnableTexPanning, MODEL_o46, TRUE) - Call(EnableTexPanning, MODEL_o49, TRUE) - Call(EnableTexPanning, MODEL_o50, TRUE) - Call(EnableTexPanning, MODEL_o53, TRUE) - Call(EnableTexPanning, MODEL_o54, TRUE) - Call(EnableTexPanning, MODEL_o24, TRUE) - Call(EnableTexPanning, MODEL_o27, TRUE) - Call(EnableTexPanning, MODEL_o28, TRUE) - Call(EnableTexPanning, MODEL_o31, TRUE) - Call(EnableTexPanning, MODEL_o32, TRUE) + // vines scrolling left + Call(SetTexPanner, MODEL_o34, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o36, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o37, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o40, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o41, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o44, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o45, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o47, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o48, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o51, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o52, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o55, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o23, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o25, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o26, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o29, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o30, TEX_PANNER_1) + Call(SetTexPanner, MODEL_o33, TEX_PANNER_1) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) TEX_PAN_PARAMS_STEP( 140, 0, 0, 0) TEX_PAN_PARAMS_FREQ( 1, 0, 0, 0) TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) Exec(N(EVS_UpdateTexturePan)) + EndThread + // vines scrolling right + Call(SetTexPanner, MODEL_o35, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o38, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o39, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o42, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o43, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o46, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o49, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o50, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o53, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o54, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o24, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o27, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o28, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o31, TEX_PANNER_2) + Call(SetTexPanner, MODEL_o32, TEX_PANNER_2) + Thread TEX_PAN_PARAMS_ID(TEX_PANNER_2) TEX_PAN_PARAMS_STEP( -200, 0, 0, 0) TEX_PAN_PARAMS_FREQ( 1, 0, 0, 0)