diff --git a/include/enums.h b/include/enums.h index ccc8783b7d2..7447d741a72 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3462,7 +3462,7 @@ enum FirstStrikeType { }; enum TimeFreezeMode { - TIME_FREEZE_NORMAL = 0, + TIME_FREEZE_NONE = 0, TIME_FREEZE_PARTIAL = 1, TIME_FREEZE_FULL = 2, TIME_FREEZE_POPUP_MENU = 3, diff --git a/include/evt.h b/include/evt.h index 783119e85a4..785319d5808 100644 --- a/include/evt.h +++ b/include/evt.h @@ -125,29 +125,38 @@ enum EventCommandResults { EVT_CMD_RESULT_ERROR = 1, }; +// EventGroupFlags define categories that determine when a script is paused and resumed. +// Scripts are assigned groups consisting of flag combinations to only pause in certain circumstances. +// These group flags are inherited when one script launches another. enum EventGroupFlags { - EVT_GROUP_00 = 0x00, - EVT_GROUP_0A = 0x0A, // 8 | 2 - EVT_GROUP_0B = 0x0B, // 8 | 4 | 1 - EVT_GROUP_1B = 0x1B, // EVT_GOUP_EXIT_MAP? 10 | 8 | 4 | 1 - EVT_GROUP_EF = 0xEF, // ~10 - EVT_GROUP_01 = 0x01, - EVT_GROUP_02 = 0x02, - EVT_GROUP_SHAKE_CAM = 0x04, - EVT_GROUP_08 = 0x08, - EVT_GROUP_10 = 0x10, + // Each flag represents a distinct condition for suspending or resuming script execution. + // These flags are named based on the scenarios that trigger suspension. + EVT_GROUP_FLAG_INTERACT = 0x01, // Suspended during certain scenes, interactions, and NPC dialogue. + EVT_GROUP_FLAG_MENUS = 0x02, // Suspended when menus are open, during pause, item pickups, or "got item" scenes. + EVT_GROUP_FLAG_CAM = 0x04, // Never suspended; used exclusively with camera shake (ShakeCam) scripts. + EVT_GROUP_FLAG_UNUSED = 0x08, // Unused flag; its original purpose is unknown. + EVT_GROUP_FLAG_BATTLE = 0x10, // Suspended during battle entry and exit transitions. + + // Combinations of flags used to assign specific behaviors to scripts. + // These groups are named after their most common use-cases. + EVT_GROUP_NEVER_PAUSE = 0x00, // Never paused; default for map scripts derived from the main script, which always uses this group. + EVT_GROUP_PASSIVE_NPC = EVT_GROUP_FLAG_MENUS | EVT_GROUP_FLAG_UNUSED, // 0xA -- Pauses similar to passive NPC scripts. + EVT_GROUP_HOSTILE_NPC = EVT_GROUP_FLAG_INTERACT | EVT_GROUP_FLAG_MENUS | EVT_GROUP_FLAG_UNUSED, // 0xB -- Pauses similar to hostile NPC scripts; used for platforms, machinery, etc. + EVT_GROUP_EXIT_MAP = EVT_GROUP_FLAG_INTERACT | EVT_GROUP_FLAG_MENUS | EVT_GROUP_FLAG_UNUSED | EVT_GROUP_FLAG_BATTLE, // 0x1B -- Used for exit map scripts. + EVT_GROUP_SHAKE_CAM = EVT_GROUP_FLAG_CAM, // Only used by ShakeCam scripts. + EVT_GROUP_NOT_BATTLE = 0xFF & ~EVT_GROUP_FLAG_BATTLE, // 0xEF -- Pauses from anything except battles; default for scripts started via start_script, common in many battle scripts. }; enum EventPriority { - EVT_PRIORITY_0 = 0x00, // map main script - EVT_PRIORITY_1 = 0x01, - EVT_PRIORITY_A = 0x0A, - EVT_PRIORITY_14 = 0x14, + EVT_PRIORITY_0 = 0x00, // map main script + EVT_PRIORITY_1 = 0x01, + EVT_PRIORITY_A = 0x0A, + EVT_PRIORITY_14 = 0x14, }; enum EventStateFlags { EVT_FLAG_ACTIVE = 0x01, - EVT_FLAG_SUSPENDED_IN_GROUP = 0x02, + EVT_FLAG_PAUSED = 0x02, ///< paused through suspend_group_script / resume_group_script EVT_FLAG_BLOCKED_BY_CHILD = 0x10, EVT_FLAG_RUN_IMMEDIATELY = 0x20, ///< don't wait for next `update_scripts` call EVT_FLAG_THREAD = 0x40, diff --git a/include/script_api/macros.h b/include/script_api/macros.h index de355624f25..f24bd71f083 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -659,7 +659,7 @@ #define EVT_EXIT_WALK(walkDistance, exitIdx, map, entryIdx) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(UseExitHeading, walkDistance, exitIdx) \ Exec(ExitWalk) \ Call(GotoMap, Ref(map), entryIdx) \ @@ -668,7 +668,7 @@ End \ } -// alternate version of EVT_EXIT_WALK used on Pleasant Path which does not join EVT_GROUP_1B +// alternate version of EVT_EXIT_WALK used on Pleasant Path which does not join EVT_GROUP_EXIT_MAP #define EVT_EXIT_WALK_NOK(walkDistance, exitIdx, map, entryIdx) \ { \ Call(UseExitHeading, walkDistance, exitIdx) \ @@ -682,7 +682,7 @@ // alternate version of EVT_EXIT_WALK which includes a call to DisablePlayerInput #define EVT_EXIT_WALK_FIXED(walkDistance, exitIdx, map, entryIdx) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Call(UseExitHeading, walkDistance, exitIdx) \ Exec(ExitWalk) \ @@ -694,7 +694,7 @@ #define EVT_EXIT_SINGLE_DOOR(exitIdx, map, entryIdx, colliderID, modelID, swingDir) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Set(LVar0, exitIdx) \ Set(LVar1, colliderID) \ @@ -710,7 +710,7 @@ #define EVT_EXIT_SPLIT_SINGLE_DOOR(exitIdx, map, entryIdx, colliderID, topModelID, bottomModelID, swingDir) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Set(LVar0, exitIdx) \ Set(LVar1, colliderID) \ @@ -727,7 +727,7 @@ #define EVT_EXIT_DOUBLE_DOOR(exitIdx, map, entryIdx, colliderID, leftDoorModelID, rightDoorModelID) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Set(LVar0, exitIdx) \ Set(LVar1, colliderID) \ diff --git a/include/variables.h b/include/variables.h index 9fd021d9605..5cd6b316f56 100644 --- a/include/variables.h +++ b/include/variables.h @@ -93,7 +93,7 @@ extern Vec3s StandardActorHomePositions[]; extern SaveData gCurrentSaveFile; extern s32 gEncounterSubState; -extern s32 timeFreezeMode; +extern s32 gTimeFreezeMode; extern b32 EncounterStateChanged; extern u8 IntroMessageIdx; diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index e40213da4e8..c104a94fec4 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -40,7 +40,7 @@ void init_enter_world_shared(void) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; evt_set_variable(NULL, GB_Unused_EVT_01, gGameStatusPtr->unk_A9); - timeFreezeMode = 0; + gTimeFreezeMode = TIME_FREEZE_NONE; } void state_step_enter_world(void) { @@ -61,7 +61,7 @@ void state_step_enter_world(void) { } gGameStatusPtr->prevArea = gGameStatusPtr->areaID; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { disable_player_input(); } @@ -158,7 +158,7 @@ void state_step_change_map(void) { gGameStatusPtr->context = CONTEXT_WORLD; gGameStatusPtr->debugScripts = DEBUG_SCRIPTS_NONE; load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); nuContRmbForceStopEnd(); if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { disable_player_input(); diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index 5fe48592171..245006e1b5a 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -450,7 +450,7 @@ EvtScript N(EVS_AnimBowser_DeathMain) = { UseArray(FakeBowserAnimState) Call(N(StartRumbleWithParams), 256, 30) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 20, Float(3.0)) EndThread Call(SetPartFlagBits, ACTOR_SELF, PRT_HEAD, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) @@ -476,35 +476,35 @@ EvtScript N(EVS_AnimBowser_DeathMain) = { Wait(30) Call(PlaySoundAtModel, MODEL_k1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) EndThread Call(N(StartRumbleWithParams), 100, 20) Wait(20) Call(PlaySoundAtModel, MODEL_u1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(1.5)) EndThread Call(N(StartRumbleWithParams), 150, 20) Wait(30) Call(PlaySoundAtModel, MODEL_p1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(1.0)) EndThread Call(N(StartRumbleWithParams), 100, 20) Wait(30) Call(PlaySoundAtModel, MODEL_d1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(0.7)) EndThread Call(N(StartRumbleWithParams), 70, 20) Wait(20) Call(PlaySoundAtModel, MODEL_s1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(1.0)) EndThread Call(N(StartRumbleWithParams), 100, 20) @@ -512,12 +512,12 @@ EvtScript N(EVS_AnimBowser_DeathMain) = { Call(PlaySoundAtModel, MODEL_km1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Call(N(StartRumbleWithParams), 60, 20) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(0.6)) EndThread Wait(20) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(0.3)) EndThread Call(N(StartRumbleWithParams), 30, 20) diff --git a/src/bss/main_pre_bss.c b/src/bss/main_pre_bss.c index 890c307b965..66f5235b480 100644 --- a/src/bss/main_pre_bss.c +++ b/src/bss/main_pre_bss.c @@ -27,7 +27,7 @@ BSS s32 gEncounterSubState; BSS u32 __osBbRCountWraps; #endif BSS void *CurrentSefCmdHandler; -BSS s32 timeFreezeMode; +BSS s32 gTimeFreezeMode; #ifdef BBPLAYER BSS u32 __osBbLastRCount; #endif diff --git a/src/encounter.c b/src/encounter.c index 873e4347a8e..e80bd743090 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -1173,7 +1173,7 @@ void update_encounters_neutral(void) { gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; break; case ENCOUNTER_TRIGGER_CONVERSATION: - suspend_all_group(EVT_GROUP_01); + suspend_all_group(EVT_GROUP_FLAG_INTERACT); enemy = currentEncounter->curEnemy; if (enemy != NULL && enemy->aiScript != NULL) { suspend_all_script(enemy->aiScriptID); @@ -1276,7 +1276,7 @@ void update_encounters_pre_battle(void) { currentEncounter->unk_08 = -1; HasPreBattleSongPushed = FALSE; D_80077C40 = FALSE; - suspend_all_group(EVT_GROUP_10); + suspend_all_group(EVT_GROUP_FLAG_BATTLE); // suspend all ai scripts for (i = 0; i < currentEncounter->numEncounters; i++) { @@ -1674,7 +1674,7 @@ void update_encounters_post_battle(void) { if (currentEncounter->hasMerleeCoinBonus) { if (get_coin_drop_amount(currentEncounter->curEnemy) != 0) { MerleeDropCoinsEvt = start_script(&EVS_MerleeDropCoins, EVT_PRIORITY_A, 0); - MerleeDropCoinsEvt->groupFlags = EVT_GROUP_00; + MerleeDropCoinsEvt->groupFlags = EVT_GROUP_NEVER_PAUSE; MerleeDropCoinsEvtID = MerleeDropCoinsEvt->id; } else { playerData->merleeTurnCount = 0; @@ -1711,20 +1711,20 @@ void update_encounters_post_battle(void) { continue; } if (enemy->defeatBytecode != NULL) { - script = start_script_in_group(enemy->defeatBytecode, EVT_PRIORITY_A, 0, 0); + script = start_script_in_group(enemy->defeatBytecode, EVT_PRIORITY_A, 0, EVT_GROUP_NEVER_PAUSE); enemy->defeatScript = script; enemy->defeatScriptID = script->id; script->owner1.enemy = enemy; script->owner2.npcID = enemy->npcID; - script->groupFlags = EVT_GROUP_00; + script->groupFlags = EVT_GROUP_NEVER_PAUSE; currentEncounter->battleStartCountdown = 1; } else { - script = start_script_in_group(&EVS_NpcDefeat, EVT_PRIORITY_A, 0, 0); + script = start_script_in_group(&EVS_NpcDefeat, EVT_PRIORITY_A, 0, EVT_GROUP_NEVER_PAUSE); enemy->defeatScript = script; enemy->defeatScriptID = script->id; script->owner1.enemy = enemy; script->owner2.npcID = enemy->npcID; - script->groupFlags = EVT_GROUP_00; + script->groupFlags = EVT_GROUP_NEVER_PAUSE; } } if (!(currentEncounter->flags & ENCOUNTER_FLAG_THUMBS_UP) @@ -1844,7 +1844,7 @@ void update_encounters_post_battle(void) { suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; @@ -1976,7 +1976,7 @@ void update_encounters_post_battle(void) { if (!PendingPartnerAbilityResume && playerStatus->anim == ANIM_MarioB3_Hustled) { suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; @@ -2068,7 +2068,7 @@ void update_encounters_post_battle(void) { break; } } - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; @@ -2096,7 +2096,7 @@ void update_encounters_post_battle(void) { enable_player_input(); partner_enable_input(); set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; @@ -2199,7 +2199,7 @@ void update_encounters_post_battle(void) { enable_player_input(); partner_enable_input(); set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; @@ -2274,7 +2274,7 @@ void update_encounters_conversation(void) { } break; case ENCOUNTER_SUBSTATE_CONVERSATION_END: - resume_all_group(EVT_GROUP_01); + resume_all_group(EVT_GROUP_FLAG_INTERACT); currentEnemy = encounter->curEnemy; if (currentEnemy != NULL && currentEnemy->aiScript != NULL) { @@ -2290,7 +2290,7 @@ void update_encounters_conversation(void) { func_800EF3D4(0); encounter->hitType = 0; - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; @@ -2646,9 +2646,9 @@ void create_encounters(void) { if (enemy->flags & ENEMY_FLAG_DONT_UPDATE_SHADOW_Y) { newNpc->flags |= NPC_FLAG_DONT_UPDATE_SHADOW_Y; } - enemy->scriptGroup = EVT_GROUP_0B; + enemy->scriptGroup = EVT_GROUP_HOSTILE_NPC; if (enemy->flags & ENEMY_FLAG_PASSIVE) { - enemy->scriptGroup = EVT_GROUP_0A; + enemy->scriptGroup = EVT_GROUP_PASSIVE_NPC; } if (npcSettings->otherAI != NULL) { script = start_script(npcSettings->otherAI, EVT_PRIORITY_A, 0); @@ -2786,7 +2786,7 @@ void create_encounters(void) { } } } - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; diff --git a/src/encounter_api.c b/src/encounter_api.c index 504378faef4..f737f4f1e0c 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -199,7 +199,7 @@ void start_battle(Evt* script, s32 songID) { Encounter* encounter; s32 i; - resume_all_group(EVT_GROUP_01); + resume_all_group(EVT_GROUP_FLAG_INTERACT); currentEncounter->hitType = ENCOUNTER_TRIGGER_NONE; enemy->encountered = TRUE; @@ -270,7 +270,7 @@ API_CALLABLE(StartBossBattle) { Encounter* encounter; s32 i; - resume_all_group(EVT_GROUP_01); + resume_all_group(EVT_GROUP_FLAG_INTERACT); currentEncounter->hitType = ENCOUNTER_TRIGGER_NONE; enemy->encountered = TRUE; @@ -362,9 +362,9 @@ API_CALLABLE(BindNpcAI) { } if (enemy->flags & ENEMY_FLAG_PASSIVE) { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + groupFlags = EVT_GROUP_PASSIVE_NPC; } else { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; + groupFlags = EVT_GROUP_HOSTILE_NPC; } if (enemy->aiScript != NULL) { @@ -415,9 +415,9 @@ API_CALLABLE(RestartNpcAI) { enemy = get_enemy(npcID); if (enemy->flags & ENEMY_FLAG_PASSIVE) { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + groupFlags = EVT_GROUP_PASSIVE_NPC; } else { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; + groupFlags = EVT_GROUP_HOSTILE_NPC; } if (enemy->aiScript != NULL) { @@ -536,9 +536,9 @@ API_CALLABLE(RestartNpcAux) { enemy = get_enemy(npcID); if (enemy->flags & ENEMY_FLAG_PASSIVE) { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + groupFlags = EVT_GROUP_PASSIVE_NPC; } else { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; + groupFlags = EVT_GROUP_HOSTILE_NPC; } if (enemy->auxScript != NULL) { diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index 42d6effded8..aabb61d8165 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -285,7 +285,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { case 5: playerStatus->animFlags &= ~PA_FLAG_RAISED_ARMS; enable_player_input(); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; exec_entity_commandlist(entity); break; @@ -380,7 +380,7 @@ void entity_HeartBlock_show_tutorial_message(Entity* entity) { void entity_HeartBlock_wait_for_close_tutorial(Entity* entity) { if (HeartBlockPrinterClosed) { exec_entity_commandlist(entity); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; enable_player_input(); } diff --git a/src/entity/HiddenPanel.c b/src/entity/HiddenPanel.c index 1f234451fd4..c5d80f3b1dc 100644 --- a/src/entity/HiddenPanel.c +++ b/src/entity/HiddenPanel.c @@ -238,7 +238,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) { data->state = 0; exec_entity_commandlist(entity); if (data->unk_02) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gPlayerStatusPtr->animFlags &= ~PA_FLAG_OPENED_HIDDEN_PANEL; } entity->flags &= ~ENTITY_FLAG_DISABLE_COLLISION; diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index 364ca3e831c..ed9b0bdaee4 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -91,7 +91,7 @@ void entity_SaveBlock_pause_game(void) { } void entity_SaveBlock_resume_game(void) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); } diff --git a/src/entity/sbk_omo/Tweester.c b/src/entity/sbk_omo/Tweester.c index d426d3bdf97..d9f5c93aa03 100644 --- a/src/entity/sbk_omo/Tweester.c +++ b/src/entity/sbk_omo/Tweester.c @@ -207,7 +207,7 @@ void entity_Tweester_idle(Entity* entity) { f32 delta; f32 targetRotationSpeed; - if (get_time_freeze_mode() == TIME_FREEZE_NORMAL && + if (get_time_freeze_mode() == TIME_FREEZE_NONE && !is_picking_up_item() && !(playerStatus->flags & PS_FLAG_PAUSED) && (playerData->curPartner != PARTNER_GOOMBARIO || diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 219338082cc..6d9794719ba 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -2,14 +2,14 @@ #include "camera.h" EvtScript ShakeCam1 = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, LVar0, LVar1, LVar2, Float(1.0)) Return End }; EvtScript ShakeCamX = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, LVar0, LVar1, LVar2, LVar3) Return End diff --git a/src/evt/evt.c b/src/evt/evt.c index 949afc57725..25447ae6efd 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -920,11 +920,11 @@ ApiStatus evt_handle_call(Evt* script) { ApiStatus evt_handle_exec1(Evt* script) { Bytecode* args = script->ptrReadPos; + EvtScript* newSource = (EvtScript*)evt_get_variable(script, *args++); Evt* newScript; s32 i; - newScript = start_script_in_group((EvtScript*)evt_get_variable(script, *args++), script->priority, 0, - script->groupFlags); + newScript = start_script_in_group(newSource, script->priority, 0, script->groupFlags); newScript->owner1 = script->owner1; newScript->owner2 = script->owner2; @@ -947,7 +947,7 @@ ApiStatus evt_handle_exec1(Evt* script) { ApiStatus evt_handle_exec1_get_id(Evt* script) { Bytecode* args = script->ptrReadPos; EvtScript* newSource = (EvtScript*)evt_get_variable(script, *args++); - Bytecode arg2 = *args++; + Bytecode outVar = *args++; Evt* newScript; s32 i; @@ -967,15 +967,16 @@ ApiStatus evt_handle_exec1_get_id(Evt* script) { newScript->array = script->array; newScript->flagArray = script->flagArray; - evt_set_variable(script, arg2, newScript->id); + evt_set_variable(script, outVar, newScript->id); return ApiStatus_DONE2; } ApiStatus evt_handle_exec_wait(Evt* script) { Bytecode* args = script->ptrReadPos; + EvtScript* newSource = (EvtScript*)evt_get_variable(script, *args++); - start_child_script(script, (EvtScript*) evt_get_variable(script, *args++), 0); + start_child_script(script, newSource, 0); script->curOpcode = EVT_OP_INTERNAL_FETCH; return ApiStatus_FINISH; } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 1130be3c1a7..e73813434a5 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -218,23 +218,21 @@ void init_script_list(void) { init_model_animators(); } +// enforces current gTimeFreezeMode on newly created script void suspend_frozen_scripts(Evt* script) { - s32 groupFlags; - - switch (timeFreezeMode) { + switch (gTimeFreezeMode) { default: - case 0: - case 4: + case TIME_FREEZE_NONE: + case TIME_FREEZE_EXIT: + return; + case TIME_FREEZE_PARTIAL: + suspend_all_group(EVT_GROUP_FLAG_INTERACT); + return; + case TIME_FREEZE_FULL: + case TIME_FREEZE_POPUP_MENU: + suspend_all_group(EVT_GROUP_FLAG_MENUS); return; - case 1: - groupFlags = EVT_GROUP_01; - break; - case 2: - case 3: - groupFlags = EVT_GROUP_02; - break; } - suspend_all_group(groupFlags); } Evt* start_script(EvtScript* source, s32 priority, s32 flags) { @@ -271,7 +269,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 flags) { newScript->owner2.npcID = -1; newScript->loopDepth = -1; newScript->switchDepth = -1; - newScript->groupFlags = ~EVT_GROUP_10; + newScript->groupFlags = EVT_GROUP_NOT_BATTLE; newScript->ptrSavedPos = NULL; newScript->frameCounter = 0.0f; newScript->unk_158 = 0; @@ -593,7 +591,7 @@ void update_scripts(void) { if (script != NULL && script->id == gScriptIdList[i] && script->stateFlags != 0 && - !(script->stateFlags & (EVT_FLAG_SUSPENDED | EVT_FLAG_BLOCKED_BY_CHILD | EVT_FLAG_SUSPENDED_IN_GROUP))) + !(script->stateFlags & (EVT_FLAG_SUSPENDED | EVT_FLAG_BLOCKED_BY_CHILD | EVT_FLAG_PAUSED))) { s32 stop = FALSE; s32 status; @@ -801,7 +799,7 @@ void suspend_group_script(Evt* script, s32 groupFlags) { } if ((script->groupFlags & groupFlags) != 0) { - script->stateFlags |= EVT_FLAG_SUSPENDED_IN_GROUP; + script->stateFlags |= EVT_FLAG_PAUSED; } } @@ -822,7 +820,7 @@ void resume_group_script(Evt* script, s32 groupFlags) { } if ((script->groupFlags & groupFlags) != 0) { - script->stateFlags &= ~EVT_FLAG_SUSPENDED_IN_GROUP; + script->stateFlags &= ~EVT_FLAG_PAUSED; } } @@ -833,7 +831,7 @@ s32 suspend_all_script(s32 id) { Evt* scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->id == id) { - suspend_group_script(scriptContextPtr, 0xEF); + suspend_group_script(scriptContextPtr, EVT_GROUP_NOT_BATTLE); } } } @@ -845,7 +843,7 @@ s32 resume_all_script(s32 id) { for (i = 0; i < MAX_SCRIPTS; i++) { scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->id == id) { - resume_group_script(scriptContextPtr, 0xEF); + resume_group_script(scriptContextPtr, EVT_GROUP_NOT_BATTLE); } } } diff --git a/src/item_entity.c b/src/item_entity.c index 6027f0a3832..a7f4bb2471b 100644 --- a/src/item_entity.c +++ b/src/item_entity.c @@ -1378,7 +1378,7 @@ b32 test_item_player_collision(ItemEntity* item) { } hammerHitboxHeight = tmpYTopThreshold; - if (get_time_freeze_mode() != TIME_FREEZE_NORMAL) { + if (get_time_freeze_mode() != TIME_FREEZE_NONE) { return FALSE; } @@ -2036,7 +2036,7 @@ void update_item_entity_collectable(ItemEntity* item) { D_801565A8 = FALSE; #endif remove_item_entity_by_reference(item); - resume_all_group(EVT_GROUP_02); + resume_all_group(EVT_GROUP_FLAG_MENUS); } } @@ -2364,7 +2364,7 @@ void update_item_entity_pickup(ItemEntity* item) { } case ITEM_PICKUP_STATE_DONE: if (!(item->flags & ITEM_ENTITY_FLAG_2000000)) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); partner_enable_input(); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; @@ -2470,7 +2470,7 @@ void update_item_entity_pickup(ItemEntity* item) { break; case ITEM_PICKUP_STATE_THROW_AWAY_DONE: suggest_player_anim_always_forward(ANIM_Mario1_Idle); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); partner_enable_input(); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; diff --git a/src/main_loop.c b/src/main_loop.c index f26cba09a78..1231722247c 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -7,7 +7,7 @@ #include "game_modes.h" s32 gOverrideFlags; -s32 timeFreezeMode; +s32 gTimeFreezeMode; u16** nuGfxCfb; BSS s16 SoftResetDelay; @@ -273,7 +273,7 @@ void load_engine_data(void) { gGameStatusPtr->multiplayerEnabled = FALSE; gGameStatusPtr->altViewportOffset.x = -8; gGameStatusPtr->altViewportOffset.y = 4; - timeFreezeMode = 0; + gTimeFreezeMode = TIME_FREEZE_NONE; gGameStatusPtr->debugQuizmo = gGameStatusPtr->unk_13C = 0; gGameStepDelayCount = 5; gGameStatusPtr->saveCount = 0; @@ -321,45 +321,45 @@ void load_engine_data(void) { } /// Time freeze modes: -/// 0: normal +/// 0: none /// 1: NPCs move, can't be interacted with /// 2: NPCs don't move, no partner ability, can't interact, can't use exits /// 3: NPCs don't more or animate /// 4: NPCs can move, animations don't update, can use exits void set_time_freeze_mode(s32 mode) { switch (mode) { - case TIME_FREEZE_NORMAL: - timeFreezeMode = mode; + case TIME_FREEZE_NONE: + gTimeFreezeMode = mode; gOverrideFlags &= ~(GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES); - resume_all_group(EVT_GROUP_01 | EVT_GROUP_02); + resume_all_group(EVT_GROUP_FLAG_INTERACT | EVT_GROUP_FLAG_MENUS); break; case TIME_FREEZE_PARTIAL: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags &= ~(GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200); gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_BATTLES; - suspend_all_group(EVT_GROUP_01); + suspend_all_group(EVT_GROUP_FLAG_INTERACT); break; case TIME_FREEZE_FULL: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags &= ~(GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_800); gOverrideFlags |= GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES; - suspend_all_group(EVT_GROUP_02); + suspend_all_group(EVT_GROUP_FLAG_MENUS); break; case TIME_FREEZE_POPUP_MENU: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags &= ~GLOBAL_OVERRIDES_800; gOverrideFlags |= GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES; - suspend_all_group(EVT_GROUP_02); + suspend_all_group(EVT_GROUP_FLAG_MENUS); break; case TIME_FREEZE_EXIT: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags |= GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES; break; } } s32 get_time_freeze_mode(void) { - return timeFreezeMode; + return gTimeFreezeMode; } #if VERSION_IQUE diff --git a/src/state_battle.c b/src/state_battle.c index 63ee4687b65..cb7293554af 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -99,7 +99,7 @@ void state_step_battle(void) { D_800A0904 = gPlayerStatusPtr->animFlags; gPlayerStatusPtr->animFlags &= ~PA_FLAG_PULSE_STONE_VISIBLE; D_800A0908 = get_time_freeze_mode(); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; if (D_800A0900 >= 0) { diff --git a/src/state_file_select.c b/src/state_file_select.c index cef428fde21..a9a199659f1 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -364,7 +364,7 @@ void state_step_exit_language_select(void) { } break; case 4: - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); update_player(); update_npcs(); update_encounters(); @@ -407,7 +407,7 @@ void state_step_exit_file_select(void) { set_windows_visible(WINDOW_GROUP_ALL); D_800A0931 = 3; case 3: - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); if (temp_s0 == 0) { set_game_mode(GAME_MODE_TITLE_SCREEN); gOverrideFlags &= ~GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS; diff --git a/src/state_pause.c b/src/state_pause.c index 917dec7bf9b..ecddbc03361 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -240,7 +240,7 @@ void state_step_unpause(void) { } break; case 4: - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); update_encounters(); update_npcs(); update_player(); diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 751ea3da6b6..fa3944afd52 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -119,7 +119,7 @@ void state_init_title_screen(void) { void* titleData; gOverrideFlags = 0; - timeFreezeMode = 0; + gTimeFreezeMode = TIME_FREEZE_NONE; D_8014C248 = TRUE; general_heap_create(); clear_printers(); diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index cc56f2a888d..412ab2123fa 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -228,7 +228,7 @@ void action_update_parasol(void) { break; case SUBSTATE_DISGUISE_DONE: if (--playerStatus->curStateTime == 0) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); disguiseNpc->flags &= ~NPC_FLAG_IGNORE_CAMERA_FOR_YAW; playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; @@ -310,7 +310,7 @@ void action_update_parasol(void) { break; case SUBSTATE_REVERT_DONE: if (--playerStatus->curStateTime == 0) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; set_action_state(ACTION_STATE_IDLE); enable_player_static_collisions(); diff --git a/src/world/area_arn/arn_07/entity.c b/src/world/area_arn/arn_07/entity.c index e61017240c9..eac8159952d 100644 --- a/src/world/area_arn/arn_07/entity.c +++ b/src/world/area_arn/arn_07/entity.c @@ -7,18 +7,18 @@ MAP_RODATA_PAD(1,entity); #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockDoor) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(FindKeyItem, ITEM_MYSTICAL_KEY, LVar0) @@ -29,7 +29,7 @@ EvtScript N(EVS_UnlockDoor) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Unk_00) Call(N(RemovePadlock)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_arn/arn_08/main.c b/src/world/area_arn/arn_08/main.c index 7d14300ae01..4812a5218a4 100644 --- a/src/world/area_arn/arn_08/main.c +++ b/src/world/area_arn/arn_08/main.c @@ -1,7 +1,7 @@ #include "arn_08.h" EvtScript N(EVS_ExitDoor_arn_07_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(ClearDefeatedEnemies) Set(LVar0, arn_08_ENTRY_0) diff --git a/src/world/area_arn/arn_11/main.c b/src/world/area_arn/arn_11/main.c index cb7ec254a8d..e85891d032b 100644 --- a/src/world/area_arn/arn_11/main.c +++ b/src/world/area_arn/arn_11/main.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_MeetHeart) = { }; EvtScript N(EVS_ExitDoor_arn_13_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, arn_11_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_dgb/dgb_00/main.c b/src/world/area_dgb/dgb_00/main.c index 937ed3a7a4a..7858b4423c7 100644 --- a/src/world/area_dgb/dgb_00/main.c +++ b/src/world/area_dgb/dgb_00/main.c @@ -10,7 +10,7 @@ s32 N(map_init)(void) { EvtScript N(EVS_ExitWalk_arn_04_1) = EVT_EXIT_WALK(60, dgb_00_ENTRY_0, "arn_04", arn_04_ENTRY_1); EvtScript N(EVS_ExitDoors_dgb_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_00_ENTRY_1) diff --git a/src/world/area_dgb/dgb_00/npc.c b/src/world/area_dgb/dgb_00/npc.c index fe0d738970e..060926a4f5e 100644 --- a/src/world/area_dgb/dgb_00/npc.c +++ b/src/world/area_dgb/dgb_00/npc.c @@ -200,7 +200,7 @@ EvtScript N(EVS_LeaderBooShivering) = { }; EvtScript N(EVS_TubbaTaunting) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Loop(0) Call(RandInt, 50 * DT, LVar0) Add(LVar0, 80 * DT) diff --git a/src/world/area_dgb/dgb_01/entity.c b/src/world/area_dgb/dgb_01/entity.c index 6cb09d56669..542da53e5e3 100644 --- a/src/world/area_dgb/dgb_01/entity.c +++ b/src/world/area_dgb/dgb_01/entity.c @@ -5,18 +5,18 @@ #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockPrompt_Door) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_TUBBA_CASTLE_KEY, LVar0) @@ -27,7 +27,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_dgb/dgb_01/main.c b/src/world/area_dgb/dgb_01/main.c index 2f4f1d53df2..aa45ed80955 100644 --- a/src/world/area_dgb/dgb_01/main.c +++ b/src/world/area_dgb/dgb_01/main.c @@ -1,7 +1,7 @@ #include "dgb_01.h" EvtScript N(EVS_ExitDoors_dgb_00_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_00_1) = { }; EvtScript N(EVS_ExitDoors_dgb_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_dgb_02_1) = { }; EvtScript N(EVS_ExitDoors_dgb_08_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_2) @@ -49,7 +49,7 @@ EvtScript N(EVS_ExitDoors_dgb_08_0) = { }; EvtScript N(EVS_ExitDoors_dgb_09_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_3) @@ -65,7 +65,7 @@ EvtScript N(EVS_ExitDoors_dgb_09_1) = { }; EvtScript N(EVS_ExitDoors_dgb_08_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_4) @@ -81,7 +81,7 @@ EvtScript N(EVS_ExitDoors_dgb_08_1) = { }; EvtScript N(EVS_ExitDoors_dgb_17_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_5) @@ -97,7 +97,7 @@ EvtScript N(EVS_ExitDoors_dgb_17_1) = { }; EvtScript N(EVS_ExitDoors_dgb_18_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_6) diff --git a/src/world/area_dgb/dgb_02/main.c b/src/world/area_dgb/dgb_02/main.c index fbc360b0797..5b8fc76f6c9 100644 --- a/src/world/area_dgb/dgb_02/main.c +++ b/src/world/area_dgb/dgb_02/main.c @@ -1,7 +1,7 @@ #include "dgb_02.h" EvtScript N(EVS_ExitDoors_dgb_03_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_02_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_03_1) = { }; EvtScript N(EVS_ExitDoors_dgb_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_02_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_dgb_01_1) = { }; EvtScript N(EVS_ExitDoor_dgb_07_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_02_ENTRY_2) @@ -49,7 +49,7 @@ EvtScript N(EVS_ExitDoor_dgb_07_0) = { }; EvtScript N(EVS_ExitDoor_dgb_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_02_ENTRY_3) diff --git a/src/world/area_dgb/dgb_03/clock.c b/src/world/area_dgb/dgb_03/clock.c index 7527374288c..bed1975bc20 100644 --- a/src/world/area_dgb/dgb_03/clock.c +++ b/src/world/area_dgb/dgb_03/clock.c @@ -4,7 +4,7 @@ #include "world/common/todo/UnkFunc12.inc.c" EvtScript N(EVS_PushClock_Impl) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Loop(20) Call(GetPartnerInUse, LVarA) IfNe(LVarA, PARTNER_NONE) diff --git a/src/world/area_dgb/dgb_03/entity.c b/src/world/area_dgb/dgb_03/entity.c index 9e1b728d8e4..ebfe4f1cbda 100644 --- a/src/world/area_dgb/dgb_03/entity.c +++ b/src/world/area_dgb/dgb_03/entity.c @@ -5,18 +5,18 @@ #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockPrompt_UpperDoor) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_TUBBA_CASTLE_KEY, LVar0) @@ -27,7 +27,7 @@ EvtScript N(EVS_UnlockPrompt_UpperDoor) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_dgb/dgb_03/main.c b/src/world/area_dgb/dgb_03/main.c index d56b401beab..09cdea07e92 100644 --- a/src/world/area_dgb/dgb_03/main.c +++ b/src/world/area_dgb/dgb_03/main.c @@ -1,7 +1,7 @@ #include "dgb_03.h" EvtScript N(EVS_ExitDoors_dgb_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_1) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_02_0) = { }; EvtScript N(EVS_ExitDoors_dgb_09_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_4) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_dgb_09_0) = { }; EvtScript N(EVS_ExitDoors_dgb_04_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_0) @@ -51,7 +51,7 @@ EvtScript N(EVS_ExitDoors_dgb_04_0) = { EvtScript N(EVS_ExitWalk_dgb_13_0) = EVT_EXIT_WALK(26, dgb_03_ENTRY_2, "dgb_13", dgb_13_ENTRY_0); EvtScript N(EVS_ExitDoors_dgb_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_03_ENTRY_2) @@ -67,7 +67,7 @@ EvtScript N(EVS_ExitDoors_dgb_05_0) = { }; EvtScript N(EVS_ExitDoors_dgb_14_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_3) diff --git a/src/world/area_dgb/dgb_04/main.c b/src/world/area_dgb/dgb_04/main.c index 504e2a254cf..f317837d842 100644 --- a/src/world/area_dgb/dgb_04/main.c +++ b/src/world/area_dgb/dgb_04/main.c @@ -1,7 +1,7 @@ #include "dgb_04.h" EvtScript N(EVS_ExitDoor_dgb_06_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_04_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoor_dgb_06_0) = { }; EvtScript N(EVS_ExitDoors_dgb_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_04_ENTRY_1) diff --git a/src/world/area_dgb/dgb_05/main.c b/src/world/area_dgb/dgb_05/main.c index 59a4140bf14..9a91637df4b 100644 --- a/src/world/area_dgb/dgb_05/main.c +++ b/src/world/area_dgb/dgb_05/main.c @@ -1,7 +1,7 @@ #include "dgb_05.h" EvtScript N(EVS_ExitDoor_dgb_03_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_05_ENTRY_0) diff --git a/src/world/area_dgb/dgb_06/main.c b/src/world/area_dgb/dgb_06/main.c index bfa7fde0641..cfe056ec669 100644 --- a/src/world/area_dgb/dgb_06/main.c +++ b/src/world/area_dgb/dgb_06/main.c @@ -1,7 +1,7 @@ #include "dgb_06.h" EvtScript N(EVS_ExitDoor_dgb_04_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_06_ENTRY_0) diff --git a/src/world/area_dgb/dgb_07/main.c b/src/world/area_dgb/dgb_07/main.c index 08401b9ff56..07cd44ecd0e 100644 --- a/src/world/area_dgb/dgb_07/main.c +++ b/src/world/area_dgb/dgb_07/main.c @@ -1,7 +1,7 @@ #include "dgb_07.h" EvtScript N(EVS_ExitDoor_dgb_02_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_07_ENTRY_0) diff --git a/src/world/area_dgb/dgb_08/main.c b/src/world/area_dgb/dgb_08/main.c index fda02840c59..9747e812461 100644 --- a/src/world/area_dgb/dgb_08/main.c +++ b/src/world/area_dgb/dgb_08/main.c @@ -1,7 +1,7 @@ #include "dgb_08.h" EvtScript N(EVS_ExitDoors_dgb_01_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_08_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_01_2) = { }; EvtScript N(EVS_ExitDoors_dgb_01_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_08_ENTRY_1) diff --git a/src/world/area_dgb/dgb_09/main.c b/src/world/area_dgb/dgb_09/main.c index 791dd309159..72db2ed4218 100644 --- a/src/world/area_dgb/dgb_09/main.c +++ b/src/world/area_dgb/dgb_09/main.c @@ -1,7 +1,7 @@ #include "dgb_09.h" EvtScript N(exitDoubleDoor_80243920) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_09_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(exitDoubleDoor_80243920) = { }; EvtScript N(exitDoubleDoor_802439D4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_09_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(exitDoubleDoor_802439D4) = { }; EvtScript N(exitSingleDoor_80243A88) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_09_ENTRY_2) diff --git a/src/world/area_dgb/dgb_11/main.c b/src/world/area_dgb/dgb_11/main.c index 9ec444b0b43..f8d5e9482bb 100644 --- a/src/world/area_dgb/dgb_11/main.c +++ b/src/world/area_dgb/dgb_11/main.c @@ -1,7 +1,7 @@ #include "dgb_11.h" EvtScript N(EVS_ExitDoor_dgb_02_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_11_ENTRY_0) diff --git a/src/world/area_dgb/dgb_12/main.c b/src/world/area_dgb/dgb_12/main.c index f5187146c15..7a3be6cc8c3 100644 --- a/src/world/area_dgb/dgb_12/main.c +++ b/src/world/area_dgb/dgb_12/main.c @@ -1,7 +1,7 @@ #include "dgb_12.h" EvtScript N(EVS_ExitDoor_dgb_09_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_12_ENTRY_0) diff --git a/src/world/area_dgb/dgb_12/spikes.c b/src/world/area_dgb/dgb_12/spikes.c index 1d345591255..ea1eb225bf4 100644 --- a/src/world/area_dgb/dgb_12/spikes.c +++ b/src/world/area_dgb/dgb_12/spikes.c @@ -6,7 +6,7 @@ LavaReset N(SafeFloorColliders)[] = { }; EvtScript N(EVS_SetupSpikes) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o202, SURFACE_TYPE_SPIKES) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o215, SURFACE_TYPE_SPIKES) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o216, SURFACE_TYPE_SPIKES) diff --git a/src/world/area_dgb/dgb_14/main.c b/src/world/area_dgb/dgb_14/main.c index 3c6359551e4..f7a1168b8ce 100644 --- a/src/world/area_dgb/dgb_14/main.c +++ b/src/world/area_dgb/dgb_14/main.c @@ -2,7 +2,7 @@ #include "sprite/player.h" EvtScript N(EVS_ExitDoors_dgb_03_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_14_ENTRY_1) @@ -18,7 +18,7 @@ EvtScript N(EVS_ExitDoors_dgb_03_3) = { }; EvtScript N(EVS_ExitDoors_dgb_15_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_14_ENTRY_0) diff --git a/src/world/area_dgb/dgb_15/entity.c b/src/world/area_dgb/dgb_15/entity.c index a1e2c487c4d..477b5dfbf62 100644 --- a/src/world/area_dgb/dgb_15/entity.c +++ b/src/world/area_dgb/dgb_15/entity.c @@ -5,18 +5,18 @@ #include "world/common/todo/RemovePadlock.inc.c" EvtScript N(EVS_UnlockPrompt_Door) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_TUBBA_CASTLE_KEY, LVar0) @@ -27,7 +27,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_dgb/dgb_15/main.c b/src/world/area_dgb/dgb_15/main.c index 0431a57cc64..1d0905c0385 100644 --- a/src/world/area_dgb/dgb_15/main.c +++ b/src/world/area_dgb/dgb_15/main.c @@ -6,7 +6,7 @@ s32 N(KeyList)[] = { }; EvtScript N(EVS_ExitDoors_dgb_14_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_15_ENTRY_0) @@ -22,7 +22,7 @@ EvtScript N(EVS_ExitDoors_dgb_14_1) = { }; EvtScript N(EVS_ExitDoors_dgb_17_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_15_ENTRY_1) @@ -38,7 +38,7 @@ EvtScript N(EVS_ExitDoors_dgb_17_0) = { }; EvtScript N(EVS_ExitDoors_dgb_16_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_15_ENTRY_2) diff --git a/src/world/area_dgb/dgb_16/main.c b/src/world/area_dgb/dgb_16/main.c index e2d58a0f415..37f95d4b49c 100644 --- a/src/world/area_dgb/dgb_16/main.c +++ b/src/world/area_dgb/dgb_16/main.c @@ -1,7 +1,7 @@ #include "dgb_16.h" EvtScript N(EVS_ExitDoors_dgb_15_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_16_ENTRY_0) diff --git a/src/world/area_dgb/dgb_17/main.c b/src/world/area_dgb/dgb_17/main.c index a6202663036..7e5813bea3d 100644 --- a/src/world/area_dgb/dgb_17/main.c +++ b/src/world/area_dgb/dgb_17/main.c @@ -1,7 +1,7 @@ #include "dgb_17.h" EvtScript N(EVS_ExitDoors_dgb_15_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_17_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_15_1) = { }; EvtScript N(EVS_ExitDoors_dgb_01_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_17_ENTRY_1) diff --git a/src/world/area_dgb/dgb_18/main.c b/src/world/area_dgb/dgb_18/main.c index 252cb03ccc0..c6fb76efaef 100644 --- a/src/world/area_dgb/dgb_18/main.c +++ b/src/world/area_dgb/dgb_18/main.c @@ -1,7 +1,7 @@ #include "dgb_18.h" EvtScript N(EVS_ExitDoors_dgb_01_6) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_18_ENTRY_0) diff --git a/src/world/area_dgb/dgb_18/npc.c b/src/world/area_dgb/dgb_18/npc.c index 62a5b4dc4ee..b9faa650dc0 100644 --- a/src/world/area_dgb/dgb_18/npc.c +++ b/src/world/area_dgb/dgb_18/npc.c @@ -297,7 +297,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { }; EvtScript N(EVS_NpcAI_Tubba_WakeUp) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_SNORE_EXHALE, SOUND_SPACE_DEFAULT) Call(ShowSleepBubble, NPC_Tubba, 0, 50, 2, 552, 111, 128, 30, LVar0) Wait(360) @@ -322,7 +322,7 @@ EvtScript N(EVS_NpcAI_Tubba_WakeUp) = { }; EvtScript N(EVS_NpcAI_Tubba_Chase) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim0D) Thread Loop(0) diff --git a/src/world/area_dro/dro_01/main.c b/src/world/area_dro/dro_01/main.c index 5d3934130e3..607ceb62333 100644 --- a/src/world/area_dro/dro_01/main.c +++ b/src/world/area_dro/dro_01/main.c @@ -5,7 +5,7 @@ #include "world/common/atomic/ApplyTint.inc.c" EvtScript N(EVS_ExitWalk_sbk_36_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(GF_DRO01_HeardHintAboutSpinningRoof, 0) Call(UseExitHeading, 60, 0) Exec(ExitWalk) diff --git a/src/world/area_dro/dro_02/rooms.c b/src/world/area_dro/dro_02/rooms.c index ab14184a4a7..5e0ea567685 100644 --- a/src/world/area_dro/dro_02/rooms.c +++ b/src/world/area_dro/dro_02/rooms.c @@ -129,7 +129,7 @@ EvtScript N(EVS_RoomListener_Hideout) = { }; EvtScript N(EVS_OpenSecretDoor_FromOutside) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) Call(PlayerMoveTo, 230, 10, 20) @@ -163,7 +163,7 @@ EvtScript N(EVS_OpenSecretDoor_FromOutside) = { }; EvtScript N(EVS_OpenSecretDoor_FromInside) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) Call(PlayerMoveTo, 230, -70, 20) diff --git a/src/world/area_flo/common/FlowerSpawnRegion.inc.c b/src/world/area_flo/common/FlowerSpawnRegion.inc.c index 6cab4a68e6c..23e6fc220f9 100644 --- a/src/world/area_flo/common/FlowerSpawnRegion.inc.c +++ b/src/world/area_flo/common/FlowerSpawnRegion.inc.c @@ -2,7 +2,7 @@ #include "effects.h" EvtScript N(EVS_FlowerSpawnRegion) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) // save input args Set(LVarA, LVar0) // minX Set(LVarB, LVar1) // minZ diff --git a/src/world/area_flo/flo_00/beanstalk.c b/src/world/area_flo/flo_00/beanstalk.c index 369b7350ecb..2fe252d2f15 100644 --- a/src/world/area_flo/flo_00/beanstalk.c +++ b/src/world/area_flo/flo_00/beanstalk.c @@ -466,7 +466,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Call(func_802CF56C, 2) Call(DisablePlayerInput, FALSE) IfEq(GF_FLO00_PlacedFertileSoil, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(10) Call(ShowKeyChoicePopup) @@ -474,7 +474,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_FERTILE_SOIL) @@ -502,7 +502,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Set(GF_FLO00_PlacedFertileSoil, TRUE) EndIf IfEq(GF_FLO00_PlacedMagicalBean, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(20) Call(ShowKeyChoicePopup) @@ -510,7 +510,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MAGICAL_BEAN) @@ -539,7 +539,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EndIf Set(GF_FLO00_PlacedMagicalBean, TRUE) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(30) Call(ShowKeyChoicePopup) @@ -547,7 +547,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MIRACLE_WATER) diff --git a/src/world/area_flo/flo_10/npc.c b/src/world/area_flo/flo_10/npc.c index 493e6929716..8b321d28d96 100644 --- a/src/world/area_flo/flo_10/npc.c +++ b/src/world/area_flo/flo_10/npc.c @@ -36,14 +36,14 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Return EndIf Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) Switch(LVar2) CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Wait(10 * DT) Call(SpeakToPlayer, NPC_Lily, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 0, MSG_CH6_0081) CaseDefault @@ -59,7 +59,7 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Call(MakeItemEntity, ITEM_WATER_STONE, 0, -60, 6, ITEM_SPAWN_MODE_DECORATION, 0) Set(LVarA, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) ExecWait(N(EVS_Scene_ReleaseFountain)) EndSwitch Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_flo/flo_11/main.c b/src/world/area_flo/flo_11/main.c index 5b32316a720..2b78ee35736 100644 --- a/src/world/area_flo/flo_11/main.c +++ b/src/world/area_flo/flo_11/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_ExitWalk_flo_12_0) = EVT_EXIT_WALK(60, flo_11_ENTRY_1, "flo_12", // template for GotoMap exits used with pipes in the maze #define Goto_MAP(mapName, entry) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(GotoMap, Ref(mapName), entry) \ Wait(100) \ Return \ diff --git a/src/world/area_flo/flo_14/bubbles.c b/src/world/area_flo/flo_14/bubbles.c index 3bd9cc4543c..9f9aa61d9ff 100644 --- a/src/world/area_flo/flo_14/bubbles.c +++ b/src/world/area_flo/flo_14/bubbles.c @@ -291,7 +291,7 @@ void N(gfx_build_bubble_flower)(void) { } EvtScript N(EVS_ManageBlownBubble) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarF, LVar0) Label(0) IfEq(AF_FLO_PauseBlowingBubbles, TRUE) diff --git a/src/world/area_flo/flo_18/machine.c b/src/world/area_flo/flo_18/machine.c index 4c76ee36e77..0429c83de0a 100644 --- a/src/world/area_flo/flo_18/machine.c +++ b/src/world/area_flo/flo_18/machine.c @@ -22,7 +22,7 @@ API_CALLABLE(N(SetMachineLightningColor)) { } EvtScript N(EVS_AnimateMachineLightning) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) PlayEffect(EFFECT_LIGHTNING_BOLT, 0, Float(-16.0), Float(102.0), Float(-4.1), Float(80.9), Float(102.0), Float(-4.1), Float(0.5), 6) Call(N(SetMachineLightningColor)) diff --git a/src/world/area_flo/flo_19/clouds.c b/src/world/area_flo/flo_19/clouds.c index 8f15c319181..4b3aff5de8e 100644 --- a/src/world/area_flo/flo_19/clouds.c +++ b/src/world/area_flo/flo_19/clouds.c @@ -25,7 +25,7 @@ API_CALLABLE(N(CosInterpAbsMinMax)) { } EvtScript N(EVS_AnimatePlatforms) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Set(LVarF, 0) Label(0) SetF(LVar0, Float(-215.4375)) diff --git a/src/world/area_hos/common/FallingStars.inc.c b/src/world/area_hos/common/FallingStars.inc.c index d93ecf44009..6d11a239cea 100644 --- a/src/world/area_hos/common/FallingStars.inc.c +++ b/src/world/area_hos/common/FallingStars.inc.c @@ -127,9 +127,9 @@ EvtScript N(EVS_Starfall_Directed) = { #define LV_Time LVarD #define LV_SoundDelay LVarE #if VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #else - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) #endif Set(LV_Time, 0) Set(LV_SoundDelay, 0) @@ -194,7 +194,7 @@ EvtScript N(EVS_Starfall_Directed) = { }; EvtScript N(EVS_Starfall_Random) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Thread Label(0) Call(RandInt, 50, LVar0) diff --git a/src/world/area_hos/hos_00/main.c b/src/world/area_hos/hos_00/main.c index 7a7d2552929..b4a373c0de2 100644 --- a/src/world/area_hos/hos_00/main.c +++ b/src/world/area_hos/hos_00/main.c @@ -3,7 +3,7 @@ #include "../common/FallingStars.inc.c" EvtScript N(EVS_ExitWalk_osr) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, hos_00_ENTRY_0) Exec(ExitWalk) Switch(GB_StoryProgress) @@ -29,7 +29,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Unknown) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Loop(0) Call(SetTexPanOffset, TEX_PANNER_D, TEX_PANNER_MAIN, LVar0, 0) diff --git a/src/world/area_hos/hos_00/scenes.c b/src/world/area_hos/hos_00/scenes.c index 2ec8b94dc22..beed3bbd11b 100644 --- a/src/world/area_hos/hos_00/scenes.c +++ b/src/world/area_hos/hos_00/scenes.c @@ -572,7 +572,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { Call(SetPlayerAnimation, ANIM_Mario1_Idle) Thread Set(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(ResetCam, CAM_DEFAULT, Float(4.0 / DT)) EndThread Wait(10 * DT) diff --git a/src/world/area_hos/hos_01/main.c b/src/world/area_hos/hos_01/main.c index d793d795c80..e537a85403b 100644 --- a/src/world/area_hos/hos_01/main.c +++ b/src/world/area_hos/hos_01/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_GotoMap_kmr_24_0) = { EvtScript N(EVS_ExitWalk_hos_00_1) = EVT_EXIT_WALK(60, hos_01_ENTRY_0, "hos_00", hos_00_ENTRY_1); EvtScript N(EVS_ExitStarBeam) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) Return EndIf diff --git a/src/world/area_hos/hos_01/star_way.c b/src/world/area_hos/hos_01/star_way.c index 455a5c67a80..02ade9983ca 100644 --- a/src/world/area_hos/hos_01/star_way.c +++ b/src/world/area_hos/hos_01/star_way.c @@ -79,7 +79,7 @@ EvtScript N(EVS_Scene_StarWayOpened) = { Call(ResetCam, CAM_DEFAULT, Float(5.0)) Set(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, 8) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_hos/hos_02/main.c b/src/world/area_hos/hos_02/main.c index 9d51d953c12..628dded37a3 100644 --- a/src/world/area_hos/hos_02/main.c +++ b/src/world/area_hos/hos_02/main.c @@ -1,7 +1,7 @@ #include "hos_02.h" EvtScript N(EVS_ExitStarBeam) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(GetPartnerInUse, LVar0) IfNe(LVar0, PARTNER_NONE) diff --git a/src/world/area_hos/hos_04/main.c b/src/world/area_hos/hos_04/main.c index 357a071b3be..20365571e45 100644 --- a/src/world/area_hos/hos_04/main.c +++ b/src/world/area_hos/hos_04/main.c @@ -4,7 +4,7 @@ EvtScript N(EVS_ExitWalk_hos_03_1) = EVT_EXIT_WALK(60, hos_04_ENTRY_0, "hos_03", #if VERSION_JP EvtScript N(EVS_ExitWalk_hos_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) Call(UseExitHeading, 60, hos_04_ENTRY_1) Exec(ExitWalk) diff --git a/src/world/area_hos/hos_06/chest.c b/src/world/area_hos/hos_06/chest.c index 9af1627faa9..a9a9c1bfd8f 100644 --- a/src/world/area_hos/hos_06/chest.c +++ b/src/world/area_hos/hos_06/chest.c @@ -19,11 +19,11 @@ s32** N(varStash) = NULL; #define NAME_SUFFIX EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End @@ -190,10 +190,10 @@ EvtScript N(EVS_Interact_MagicChest_Mario) = { CaseOrEq(ITEM_POWER_RUSH) CaseOrEq(ITEM_DEEP_FOCUS_A) CaseOrEq(ITEM_LAST_STAND) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AddBadge, LVar0, LVar1) Call(N(SetItemRetrieved)) EndCaseGroup diff --git a/src/world/area_hos/hos_20/main.c b/src/world/area_hos/hos_20/main.c index 87017db43bf..7b37437963c 100644 --- a/src/world/area_hos/hos_20/main.c +++ b/src/world/area_hos/hos_20/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_TexPan_MotionLines) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(GetEntryID, LVar0) IfEq(LVar0, hos_20_ENTRY_2) Call(RotateModel, MODEL_h1, 180, 0, 0, 1) diff --git a/src/world/area_isk/isk_01/music.c b/src/world/area_isk/isk_01/music.c index c849dbb0fa7..719bd22123b 100644 --- a/src/world/area_isk/isk_01/music.c +++ b/src/world/area_isk/isk_01/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00DD, 160, 40) Set(GF_ISK01_FirstWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_04/music.c b/src/world/area_isk/isk_04/music.c index ba7f36c4ba2..7bc065ac0d1 100644 --- a/src/world/area_isk/isk_04/music.c +++ b/src/world/area_isk/isk_04/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00DE, 160, 40) Set(GF_ISK04_SecondWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_07/lock.c b/src/world/area_isk/isk_07/lock.c index a126a2bcb17..942afe203c8 100644 --- a/src/world/area_isk/isk_07/lock.c +++ b/src/world/area_isk/isk_07/lock.c @@ -8,18 +8,18 @@ s32 N(ItemList_RuinsKey)[] = { }; EvtScript N(EVS_UnlockPrompt_RuinsDoor) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Switch(LVar0) CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, -300, -380, 530) @@ -40,7 +40,7 @@ EvtScript N(EVS_UnlockPrompt_RuinsDoor) = { EndIf Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_isk/isk_07/npc.c b/src/world/area_isk/isk_07/npc.c index 76e275a4740..2cfa3fa086c 100644 --- a/src/world/area_isk/isk_07/npc.c +++ b/src/world/area_isk/isk_07/npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) EndIf EndThread diff --git a/src/world/area_isk/isk_09/music.c b/src/world/area_isk/isk_09/music.c index c6b19d93f0e..c549046b9a1 100644 --- a/src/world/area_isk/isk_09/music.c +++ b/src/world/area_isk/isk_09/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00DF, 160, 40) Set(GF_ISK09_ThirdWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_11/music.c b/src/world/area_isk/isk_11/music.c index 83ec829e9eb..a0f496aff41 100644 --- a/src/world/area_isk/isk_11/music.c +++ b/src/world/area_isk/isk_11/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00E0, 160, 40) Set(GF_ISK11_FourthWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_11/puzzle.c b/src/world/area_isk/isk_11/puzzle.c index a96d7c27574..2117042f0d7 100644 --- a/src/world/area_isk/isk_11/puzzle.c +++ b/src/world/area_isk/isk_11/puzzle.c @@ -63,7 +63,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket1, 0) Call(DisablePlayerInput, TRUE) @@ -82,7 +82,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -91,11 +91,11 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket1, LVar2) @@ -104,7 +104,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { Set(MV_Socket1_ItemEntity, LVar0) Call(CloseChoicePopup) Call(PlaySoundAtCollider, COLLIDER_o2087, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -114,7 +114,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket2, 0) Call(DisablePlayerInput, TRUE) @@ -133,7 +133,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -142,11 +142,11 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket2, LVar2) @@ -154,7 +154,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { Call(MakeItemEntity, GB_ISK11_ItemSocket2, -44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket2_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2091, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End @@ -165,7 +165,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket3, 0) Call(DisablePlayerInput, TRUE) @@ -184,7 +184,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -193,11 +193,11 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket3, LVar2) @@ -205,7 +205,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { Call(MakeItemEntity, GB_ISK11_ItemSocket3, 0, -508, 510, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket3_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2090, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End @@ -216,7 +216,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket4, 0) Call(DisablePlayerInput, TRUE) @@ -235,7 +235,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -244,11 +244,11 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket4, LVar2) @@ -256,7 +256,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { Call(MakeItemEntity, GB_ISK11_ItemSocket4, 44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket4_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2089, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End @@ -267,7 +267,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket5, 0) Call(DisablePlayerInput, TRUE) @@ -286,7 +286,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -295,11 +295,11 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket5, LVar2) @@ -307,7 +307,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { Call(MakeItemEntity, GB_ISK11_ItemSocket5, 88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket5_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2088, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End diff --git a/src/world/area_isk/isk_19/music.c b/src/world/area_isk/isk_19/music.c index 3a46a689635..1b4083b7426 100644 --- a/src/world/area_isk/isk_19/music.c +++ b/src/world/area_isk/isk_19/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00E1, 160, 40) Set(GF_ISK19_FinalWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_RUINS_BASEMENT, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_iwa/common/UnkScriptJP00.inc.c b/src/world/area_iwa/common/UnkScriptJP00.inc.c index ff40e727f96..28b5c5a3d3f 100644 --- a/src/world/area_iwa/common/UnkScriptJP00.inc.c +++ b/src/world/area_iwa/common/UnkScriptJP00.inc.c @@ -49,11 +49,11 @@ EvtScript N(EVS_UnkJP00) = { }; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_jan/jan_00/whale.c b/src/world/area_jan/jan_00/whale.c index 909acd1324a..a643088395a 100644 --- a/src/world/area_jan/jan_00/whale.c +++ b/src/world/area_jan/jan_00/whale.c @@ -216,7 +216,7 @@ EvtScript N(D_8024652C_B26A6C) = { }; EvtScript N(EVS_802467AC) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(MakeLocalVertexCopy, VTX_COPY_1, MODEL_karada, TRUE) Call(SetCustomGfxBuilders, CUSTOM_GFX_1, Ref(N(unkAngleFunc002)), NULL) Call(SetModelCustomGfx, MODEL_karada, CUSTOM_GFX_1, -1) diff --git a/src/world/area_jan/jan_01/npc.c b/src/world/area_jan/jan_01/npc.c index a983242d059..2464cdb0341 100644 --- a/src/world/area_jan/jan_01/npc.c +++ b/src/world/area_jan/jan_01/npc.c @@ -91,7 +91,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(DisablePlayerInput, FALSE) EndIf CaseEq(1) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(func_802D2C14, 1) Wait(10 * DT) @@ -101,8 +101,8 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Set(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES) ExecWait(N(EVS_Kolorado_RunToVillage)) Call(func_802D2C14, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - SetGroup(EVT_GROUP_0B) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(DisablePlayerInput, FALSE) EndSwitch Call(GetSelfVar, 0, LVar0) diff --git a/src/world/area_jan/jan_02/main.c b/src/world/area_jan/jan_02/main.c index eabe51719b4..21f39814719 100644 --- a/src/world/area_jan/jan_02/main.c +++ b/src/world/area_jan/jan_02/main.c @@ -33,7 +33,7 @@ API_CALLABLE(N(SpawnSunEffect)) { } EvtScript N(EVS_ExitWalk_jan_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(N(ClearTrackVols)) Call(UseExitHeading, 60, jan_02_ENTRY_0) Exec(ExitWalk) diff --git a/src/world/area_jan/jan_04/main.c b/src/world/area_jan/jan_04/main.c index 3c1ff168bfa..98a2ff3be0d 100644 --- a/src/world/area_jan/jan_04/main.c +++ b/src/world/area_jan/jan_04/main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_GotoMap_kmr_24_0) = { }; //@bug script not terminated EvtScript N(EVS_ExitWalk_jan_05_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, jan_04_ENTRY_0) Exec(ExitWalk) Call(GotoMap, Ref("jan_05"), jan_05_ENTRY_2) diff --git a/src/world/area_jan/jan_06/statue.c b/src/world/area_jan/jan_06/statue.c index 5c32fc09cdb..ccdd59811d0 100644 --- a/src/world/area_jan/jan_06/statue.c +++ b/src/world/area_jan/jan_06/statue.c @@ -105,7 +105,7 @@ EvtScript N(EVS_Scene_MoveStatue) = { }; EvtScript N(ItemPrompt_Statue) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfLe(LVar0, 0) @@ -113,7 +113,7 @@ EvtScript N(ItemPrompt_Statue) = { Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_RaphaelStatue, 160, 40) EndIf Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(DisablePlayerInput, TRUE) @@ -121,7 +121,7 @@ EvtScript N(ItemPrompt_Statue) = { Call(MakeItemEntity, ITEM_JADE_RAVEN, 0, 15, -400, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_JadeRavenItemIdx, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(SetPlayerAnimation, ANIM_MarioW1_PlaceItem | SPRITE_ID_BACK_FACING) Wait(20) Call(SetPlayerAnimation, ANIM_Mario1_Still) diff --git a/src/world/area_jan/jan_09/main.c b/src/world/area_jan/jan_09/main.c index c0d8b6909aa..3f9d5e66692 100644 --- a/src/world/area_jan/jan_09/main.c +++ b/src/world/area_jan/jan_09/main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_ExitWalk_jan_08_2) = EVT_EXIT_WALK(60, jan_09_ENTRY_0, "jan_08", EvtScript N(EVS_ExitWalk_jan_06_3) = EVT_EXIT_WALK(60, jan_09_ENTRY_1, "jan_06", jan_06_ENTRY_3); EvtScript N(EVS_GotoMap_jan_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(GotoMap, Ref("jan_11"), jan_11_ENTRY_0) Wait(100) Return @@ -17,7 +17,7 @@ EvtScript N(EVS_GotoMap_jan_11_0) = { }; EvtScript N(EVS_TouchFloor_Pipe) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, LVar0) Set(LVarB, LVar1) Set(LVarC, LVar2) diff --git a/src/world/area_jan/jan_15/main.c b/src/world/area_jan/jan_15/main.c index 39efe142cdb..18aa1bf0978 100644 --- a/src/world/area_jan/jan_15/main.c +++ b/src/world/area_jan/jan_15/main.c @@ -1,7 +1,7 @@ #include "jan_15.h" EvtScript N(EVS_ExitWalk_jan_16) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, jan_15_ENTRY_1) Exec(ExitWalk) IfLt(GB_StoryProgress, STORY_CH5_REACHED_RAPHAELS_TREE) diff --git a/src/world/area_jan/jan_22/main.c b/src/world/area_jan/jan_22/main.c index 4a22bef9bef..2724216d763 100644 --- a/src/world/area_jan/jan_22/main.c +++ b/src/world/area_jan/jan_22/main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_LavaFalls) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o262, TEX_PANNER_1) Call(SetTexPanner, MODEL_o269, TEX_PANNER_1) Call(SetTexPanner, MODEL_o261, TEX_PANNER_1) @@ -30,7 +30,7 @@ EvtScript N(EVS_TexPan_LavaFalls) = { }; EvtScript N(EVS_TexPan_LavaSpread) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o275, TEX_PANNER_2) Call(SetTexPanner, MODEL_o274, TEX_PANNER_2) Set(LVar0, 0) @@ -44,7 +44,7 @@ EvtScript N(EVS_TexPan_LavaSpread) = { }; EvtScript N(EVS_TexPan_LavaFlow) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o263, TEX_PANNER_3) Call(SetTexPanner, MODEL_o271, TEX_PANNER_3) Set(LVar0, 0) @@ -58,7 +58,7 @@ EvtScript N(EVS_TexPan_LavaFlow) = { }; EvtScript N(EVS_TexPan_LavaGather) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o267, TEX_PANNER_4) Call(SetTexPanner, MODEL_o272, TEX_PANNER_4) Set(LVar0, 0) diff --git a/src/world/area_jan/jan_22/npc.c b/src/world/area_jan/jan_22/npc.c index 04296c2412e..1af06dc8130 100644 --- a/src/world/area_jan/jan_22/npc.c +++ b/src/world/area_jan/jan_22/npc.c @@ -749,7 +749,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { Call(DisablePlayerInput, FALSE) EndIf CaseEq(1) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(func_802D2C14, 1) Wait(10 * DT) @@ -760,8 +760,8 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EndIf Call(SetSelfVar, 0, 2) Call(func_802D2C14, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - SetGroup(EVT_GROUP_0B) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(DisablePlayerInput, FALSE) CaseEq(2) Call(DisablePlayerInput, TRUE) diff --git a/src/world/area_kkj/kkj_00/main.c b/src/world/area_kkj/kkj_00/main.c index e72d52f8567..c56ab61554e 100644 --- a/src/world/area_kkj/kkj_00/main.c +++ b/src/world/area_kkj/kkj_00/main.c @@ -1,7 +1,7 @@ #include "kkj_00.h" EvtScript N(D_80241140_ABC3D0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_00_ENTRY_1) @@ -17,7 +17,7 @@ EvtScript N(D_80241140_ABC3D0) = { }; EvtScript N(D_802411F4_ABC484) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_00_ENTRY_3) diff --git a/src/world/area_kkj/kkj_01/main.c b/src/world/area_kkj/kkj_01/main.c index 42c8c656db5..d4ff2693dae 100644 --- a/src/world/area_kkj/kkj_01/main.c +++ b/src/world/area_kkj/kkj_01/main.c @@ -1,7 +1,7 @@ #include "kkj_01.h" EvtScript N(EVS_ExitDoors_kkj_00_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_01_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_kkj_00_1) = { }; EvtScript N(EVS_ExitDoors_kkj_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_01_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_kkj_02_0) = { }; EvtScript N(EVS_ExitDoors_kkj_14_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_01_ENTRY_4) diff --git a/src/world/area_kkj/kkj_10/main.c b/src/world/area_kkj/kkj_10/main.c index f3ecfb9162f..cb8b1fd5031 100644 --- a/src/world/area_kkj/kkj_10/main.c +++ b/src/world/area_kkj/kkj_10/main.c @@ -13,7 +13,7 @@ API_CALLABLE(N(DisableAllLightSources)) { #include "../common/SetAvailableDisguise.inc.c" EvtScript N(EVS_ExitDoors_osr_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_10_ENTRY_0) @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitDoors_osr_02_1) = { }; EvtScript N(EVS_ExitDoors_kkj_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_10_ENTRY_1) @@ -45,7 +45,7 @@ EvtScript N(EVS_ExitDoors_kkj_11_0) = { }; EvtScript N(EVS_ExitDoors_kkj_21_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_2) @@ -61,7 +61,7 @@ EvtScript N(EVS_ExitDoors_kkj_21_0) = { }; EvtScript N(EVS_ExitDoors_kkj_19_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_3) @@ -77,7 +77,7 @@ EvtScript N(EVS_ExitDoors_kkj_19_0) = { }; EvtScript N(EVS_ExitDoors_kkj_20_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_4) @@ -93,7 +93,7 @@ EvtScript N(EVS_ExitDoors_kkj_20_0) = { }; EvtScript N(EVS_ExitDoors_kkj_29_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_2) diff --git a/src/world/area_kkj/kkj_10/npcs_early.c b/src/world/area_kkj/kkj_10/npcs_early.c index 2bee4f74538..e52bdb38fc7 100644 --- a/src/world/area_kkj/kkj_10/npcs_early.c +++ b/src/world/area_kkj/kkj_10/npcs_early.c @@ -9,7 +9,7 @@ EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -32,7 +32,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kkj/kkj_10/npcs_later.c b/src/world/area_kkj/kkj_10/npcs_later.c index 46edc18eab6..b59705217af 100644 --- a/src/world/area_kkj/kkj_10/npcs_later.c +++ b/src/world/area_kkj/kkj_10/npcs_later.c @@ -27,7 +27,7 @@ AnimID N(ExtraAnims_Koopatrol)[] = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(N(PreventNextPeachDisguise)) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) @@ -51,7 +51,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kkj/kkj_11/main.c b/src/world/area_kkj/kkj_11/main.c index ca90239d5a5..23579730942 100644 --- a/src/world/area_kkj/kkj_11/main.c +++ b/src/world/area_kkj/kkj_11/main.c @@ -13,7 +13,7 @@ API_CALLABLE(N(DisableAllLightSources)) { #include "../common/SetAvailableDisguise.inc.c" EvtScript N(EVS_ExitDoors_kkj_10_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_11_ENTRY_0) @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitDoors_kkj_10_1) = { }; EvtScript N(EVS_ExitDoors_kkj_12_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_11_ENTRY_1) @@ -45,7 +45,7 @@ EvtScript N(EVS_ExitDoors_kkj_12_0) = { }; EvtScript N(EVS_ExitDoor_kkj_14_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_4) @@ -61,7 +61,7 @@ EvtScript N(EVS_ExitDoor_kkj_14_0) = { }; EvtScript N(EVS_ExitDoor_kkj_16_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_2) @@ -77,7 +77,7 @@ EvtScript N(EVS_ExitDoor_kkj_16_0) = { }; EvtScript N(EVS_ExitDoor_kkj_15_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_3) @@ -93,7 +93,7 @@ EvtScript N(EVS_ExitDoor_kkj_15_0) = { }; EvtScript N(EVS_ExitDoor_kkj_17_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_5) @@ -109,7 +109,7 @@ EvtScript N(EVS_ExitDoor_kkj_17_0) = { }; EvtScript N(EVS_ExitDoor_kkj_18_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_6) diff --git a/src/world/area_kkj/kkj_11/npcs_early.c b/src/world/area_kkj/kkj_11/npcs_early.c index cb369a807ba..e00a70f2170 100644 --- a/src/world/area_kkj/kkj_11/npcs_early.c +++ b/src/world/area_kkj/kkj_11/npcs_early.c @@ -10,7 +10,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -33,7 +33,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -160,7 +160,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { Wait(1) EndLoop Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -175,7 +175,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kkj/kkj_11/npcs_later.c b/src/world/area_kkj/kkj_11/npcs_later.c index a98c13721b9..da5aff312ad 100644 --- a/src/world/area_kkj/kkj_11/npcs_later.c +++ b/src/world/area_kkj/kkj_11/npcs_later.c @@ -27,7 +27,7 @@ AnimID N(ExtraAnims_Koopatrol)[] = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -50,7 +50,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kkj/kkj_12/npc.c b/src/world/area_kkj/kkj_12/npc.c index daf8dff1e7b..837570b8eb1 100644 --- a/src/world/area_kkj/kkj_12/npc.c +++ b/src/world/area_kkj/kkj_12/npc.c @@ -115,7 +115,7 @@ EvtScript N(EVS_NpcInteract_Koopatrol_02) = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -138,7 +138,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kkj/kkj_14/main.c b/src/world/area_kkj/kkj_14/main.c index 3e914657d79..6b5016b54ac 100644 --- a/src/world/area_kkj/kkj_14/main.c +++ b/src/world/area_kkj/kkj_14/main.c @@ -36,7 +36,7 @@ EvtScript N(EVS_EndPeachChapter7) = { }; EvtScript N(EVS_ExitDoor_GrandHall) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(AF_KKJ_13, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) @@ -57,7 +57,7 @@ EvtScript N(EVS_ExitDoor_GrandHall) = { }; EvtScript N(EVS_ExitDoors_Balcony) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(AF_KKJ_13, FALSE) Call(UseDoorSounds, DOOR_SOUNDS_DOOR) @@ -76,7 +76,7 @@ EvtScript N(EVS_ExitDoors_Balcony) = { }; EvtScript N(EVS_ExitWalk_SecretPassage) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(AF_KKJ_13, FALSE) Call(UseExitHeading, 60, kkj_14_ENTRY_2) Exec(ExitWalk) diff --git a/src/world/area_kkj/kkj_15/main.c b/src/world/area_kkj/kkj_15/main.c index c987277d69d..a6e0a741a4d 100644 --- a/src/world/area_kkj/kkj_15/main.c +++ b/src/world/area_kkj/kkj_15/main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_EndPeachChapter3) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoor_kkj_11_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_15_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_16/main.c b/src/world/area_kkj/kkj_16/main.c index 8cc2178deea..cff33e31476 100644 --- a/src/world/area_kkj/kkj_16/main.c +++ b/src/world/area_kkj/kkj_16/main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_EndPeachChapter2) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoor_kkj_11_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_16_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_16/npcs_early.c b/src/world/area_kkj/kkj_16/npcs_early.c index a8206c6464e..bc64997c895 100644 --- a/src/world/area_kkj/kkj_16/npcs_early.c +++ b/src/world/area_kkj/kkj_16/npcs_early.c @@ -11,7 +11,7 @@ EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_kkj/kkj_16/npcs_later.c b/src/world/area_kkj/kkj_16/npcs_later.c index 49ec201938b..6108be7e5c9 100644 --- a/src/world/area_kkj/kkj_16/npcs_later.c +++ b/src/world/area_kkj/kkj_16/npcs_later.c @@ -69,7 +69,7 @@ EvtScript N(EVS_NpcInteract_HammerBros_03) = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_kkj/kkj_17/chest.c b/src/world/area_kkj/kkj_17/chest.c index bf8f9ae7c9f..891507d0151 100644 --- a/src/world/area_kkj/kkj_17/chest.c +++ b/src/world/area_kkj/kkj_17/chest.c @@ -18,11 +18,11 @@ extern IconHudScriptPair gItemHudScripts[]; s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End @@ -236,10 +236,10 @@ EvtScript N(EVS_UseMagicChest_Mario) = { CaseOrEq(269) CaseOrEq(297) CaseOrEq(273) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AddBadge, LVar0, LVar1) Call(N(SetItemRetrieved)) EndCaseGroup diff --git a/src/world/area_kkj/kkj_17/main.c b/src/world/area_kkj/kkj_17/main.c index 7537013ef0b..73f90df0bc4 100644 --- a/src/world/area_kkj/kkj_17/main.c +++ b/src/world/area_kkj/kkj_17/main.c @@ -1,7 +1,7 @@ #include "kkj_17.h" EvtScript N(EVS_ExitDoors_kkj_11_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_17_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_18/main.c b/src/world/area_kkj/kkj_18/main.c index 38626555717..6aeaa897677 100644 --- a/src/world/area_kkj/kkj_18/main.c +++ b/src/world/area_kkj/kkj_18/main.c @@ -56,7 +56,7 @@ EvtScript N(EVS_UpdateClockPendulum) = { }; EvtScript N(EVS_ExitDoor_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_18_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_19/baking.c b/src/world/area_kkj/kkj_19/baking.c index 96ec8ead56d..e315d83ba17 100644 --- a/src/world/area_kkj/kkj_19/baking.c +++ b/src/world/area_kkj/kkj_19/baking.c @@ -522,18 +522,18 @@ EvtScript N(EVS_ItemPrompt_AddIngredient) = { IfEq(AB_KKJ19_CurrentBakeStep, BAKE_STEP_DONE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) Switch(LVar2) CaseEq(0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Call(RemoveKeyItemAt, LVar1) @@ -603,7 +603,7 @@ EvtScript N(EVS_ItemPrompt_AddIngredient) = { EndSwitch Add(AB_KKJ19_BakeStepProgress, 1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kkj/kkj_19/main.c b/src/world/area_kkj/kkj_19/main.c index cf88129a90d..b3fd8bfc148 100644 --- a/src/world/area_kkj/kkj_19/main.c +++ b/src/world/area_kkj/kkj_19/main.c @@ -161,7 +161,7 @@ API_CALLABLE(N(CreateIngredientInfoWindows)) { } EvtScript N(EVS_ExitDoor_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_19_ENTRY_0) Set(LVar1, COLLIDER_ttse) diff --git a/src/world/area_kkj/kkj_20/main.c b/src/world/area_kkj/kkj_20/main.c index ecec77b7631..7d80b5bd4fb 100644 --- a/src/world/area_kkj/kkj_20/main.c +++ b/src/world/area_kkj/kkj_20/main.c @@ -1,7 +1,7 @@ #include "kkj_20.h" EvtScript N(EVS_ExitDoor_kkj_10_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_20_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_21/main.c b/src/world/area_kkj/kkj_21/main.c index 9ad73dc6db7..3cc38ad5562 100644 --- a/src/world/area_kkj/kkj_21/main.c +++ b/src/world/area_kkj/kkj_21/main.c @@ -1,7 +1,7 @@ #include "kkj_21.h" EvtScript N(EVS_ExitDoor_kkj_10_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_21_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_23/main.c b/src/world/area_kkj/kkj_23/main.c index ba4ef7e837d..7304a8566eb 100644 --- a/src/world/area_kkj/kkj_23/main.c +++ b/src/world/area_kkj/kkj_23/main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_EndPeachChapter6) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoors_kkj_22_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_23_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_23/npcs_peach.c b/src/world/area_kkj/kkj_23/npcs_peach.c index 04497cefa9c..9efbac613e0 100644 --- a/src/world/area_kkj/kkj_23/npcs_peach.c +++ b/src/world/area_kkj/kkj_23/npcs_peach.c @@ -45,7 +45,7 @@ EvtScript N(EVS_NpcInteract_Koopatrol_01) = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_kkj/kkj_26/main.c b/src/world/area_kkj/kkj_26/main.c index a655a05357a..5ef1b7ac8ab 100644 --- a/src/world/area_kkj/kkj_26/main.c +++ b/src/world/area_kkj/kkj_26/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_GotoMap_hos_00_1) = { }; EvtScript N(EVS_ExitDoors_kkj_14_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_26_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_27/rotating_wall.c b/src/world/area_kkj/kkj_27/rotating_wall.c index b44779ea89f..096cff77d01 100644 --- a/src/world/area_kkj/kkj_27/rotating_wall.c +++ b/src/world/area_kkj/kkj_27/rotating_wall.c @@ -73,7 +73,7 @@ EvtScript N(EVS_Scene_RotatingWall) = { }; EvtScript N(EVS_UseRotatingWall) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(PlayerMoveTo, -205, -10, 15 * DT) Call(InterpPlayerYaw, 270, 5) @@ -93,7 +93,7 @@ EvtScript N(EVS_UseRotatingWall) = { }; EvtScript N(EVS_UseRotatingWall_FirstTime) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(FacePlayerTowardPoint, -222, 0, 5) Wait(10 * DT) diff --git a/src/world/area_kkj/kkj_28/main.c b/src/world/area_kkj/kkj_28/main.c index d6c91ecec70..e04d96d06ef 100644 --- a/src/world/area_kkj/kkj_28/main.c +++ b/src/world/area_kkj/kkj_28/main.c @@ -1,7 +1,7 @@ #include "kkj_28.h" EvtScript N(EVS_ExitDoor_kkj_10_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_28_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_29/main.c b/src/world/area_kkj/kkj_29/main.c index 47dacb9c59f..145f9d18b9a 100644 --- a/src/world/area_kkj/kkj_29/main.c +++ b/src/world/area_kkj/kkj_29/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_EndPeachChapter5) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoor_kkj_10_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_29_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kmr/kmr_06/sticker_sign.c b/src/world/area_kmr/kmr_06/sticker_sign.c index da53b68626f..ad13ce70a55 100644 --- a/src/world/area_kmr/kmr_06/sticker_sign.c +++ b/src/world/area_kmr/kmr_06/sticker_sign.c @@ -218,8 +218,8 @@ API_CALLABLE(N(DeleteSticker)) { } EvtScript N(EVS_OnInspect_StickerSign) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_EatMushroomsTip, 160, 40) IfEq(GF_KMR06_Item_Mushroom, FALSE) @@ -244,7 +244,7 @@ EvtScript N(EVS_OnInspect_StickerSign) = { Wait(10) EndIf EndIf - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_kmr/kmr_07/npc.c b/src/world/area_kmr/kmr_07/npc.c index 86e8c8d0ef7..68be2069c7f 100644 --- a/src/world/area_kmr/kmr_07/npc.c +++ b/src/world/area_kmr/kmr_07/npc.c @@ -34,7 +34,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { Goto(0) EndIf Call(SetMusicTrack, 0, SONG_MINIBOSS_BATTLE, 0, 8) - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Thread Wait(3) Call(DisablePlayerInput, TRUE) diff --git a/src/world/area_kmr/kmr_09/npc.c b/src/world/area_kmr/kmr_09/npc.c index 9009ec44759..594db71b745 100644 --- a/src/world/area_kmr/kmr_09/npc.c +++ b/src/world/area_kmr/kmr_09/npc.c @@ -54,11 +54,11 @@ API_CALLABLE(N(GetAmbushEnemy)) { } EvtScript N(EVS_OnReadBillboard) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_BewareOfGoombas, 160, 40) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Set(LFlag0, FALSE) Call(N(GetAmbushEnemy)) IfNe(LVar0, NULL) diff --git a/src/world/area_kmr/kmr_11/main.c b/src/world/area_kmr/kmr_11/main.c index 7bcddcfbbbf..821ba15ed98 100644 --- a/src/world/area_kmr/kmr_11/main.c +++ b/src/world/area_kmr/kmr_11/main.c @@ -42,7 +42,7 @@ EvtScript N(EVS_BadExit_kmr_24_0) = { }; EvtScript N(EVS_ExitWalk_kmr_12_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kmr_11_ENTRY_0) Exec(ExitWalk) Call(GotoMap, Ref("kmr_12"), kmr_12_ENTRY_1) @@ -52,7 +52,7 @@ EvtScript N(EVS_ExitWalk_kmr_12_1) = { }; EvtScript N(EVS_ExitWalk_kmr_10_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kmr_11_ENTRY_1) Exec(ExitWalk) IfGe(GB_StoryProgress, STORY_CH0_KAMMY_RETURNED_TO_BOWSER) diff --git a/src/world/area_kmr/kmr_12/entity.c b/src/world/area_kmr/kmr_12/entity.c index ae2ba1c8daa..eb295ee4db2 100644 --- a/src/world/area_kmr/kmr_12/entity.c +++ b/src/world/area_kmr/kmr_12/entity.c @@ -6,12 +6,12 @@ EvtScript N(EVS_ReadSign) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_GoombaKingsFortress, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kmr/kmr_12/npc.c b/src/world/area_kmr/kmr_12/npc.c index 95f24d3be7f..91ad776e397 100644 --- a/src/world/area_kmr/kmr_12/npc.c +++ b/src/world/area_kmr/kmr_12/npc.c @@ -9,11 +9,11 @@ API_CALLABLE(N(GetAmbushEnemy)) { } EvtScript N(EVS_OnReadBillboard) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_EatMushroomsTrap, 160, 40) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Set(LFlag0, FALSE) Call(N(GetAmbushEnemy)) IfNe(LVar0, NULL) diff --git a/src/world/area_kmr/kmr_20/main.c b/src/world/area_kmr/kmr_20/main.c index 9c1afec5e5d..69ccf4df0ec 100644 --- a/src/world/area_kmr/kmr_20/main.c +++ b/src/world/area_kmr/kmr_20/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_GotoMap_mac_00_4) = { }; EvtScript N(EVS_ExitPipe_mac_00_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, kmr_20_ENTRY_4) Set(LVarB, COLLIDER_o244) Set(LVarC, Ref(N(EVS_GotoMap_mac_00_4))) diff --git a/src/world/area_kpa/kpa_01/main.c b/src/world/area_kpa/kpa_01/main.c index fd5e9553c28..620d28053c8 100644 --- a/src/world/area_kpa/kpa_01/main.c +++ b/src/world/area_kpa/kpa_01/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/CreateDarkness.inc.c" EvtScript N(EVS_ExitDoor_kpa_14_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_01_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kpa/kpa_08/entity.c b/src/world/area_kpa/kpa_08/entity.c index f2ef4c78ddb..1dac8451f19 100644 --- a/src/world/area_kpa/kpa_08/entity.c +++ b/src/world/area_kpa/kpa_08/entity.c @@ -22,7 +22,7 @@ EvtScript N(EVS_ActivateSwitch) = { Set(AF_KPA08_PlatformRaised, TRUE) Call(N(EnableCameraFollowPlayerY)) Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) Loop(0) @@ -50,7 +50,7 @@ EvtScript N(EVS_ActivateSwitch) = { EndLoop EndThread Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(DisablePlayerInput, TRUE) Call(PlaySoundAtCollider, COLLIDER_o90, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(MakeLerp, -99, 0, 15, EASING_COS_IN_OUT) diff --git a/src/world/area_kpa/kpa_09/entity.c b/src/world/area_kpa/kpa_09/entity.c index 600d5781afa..af88cf2a024 100644 --- a/src/world/area_kpa/kpa_09/entity.c +++ b/src/world/area_kpa/kpa_09/entity.c @@ -22,7 +22,7 @@ EvtScript N(EVS_ActivateSwitch) = { Set(AF_KPA09_PlatformRaised, TRUE) Call(N(EnableCameraFollowPlayerY)) Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) Loop(0) @@ -50,7 +50,7 @@ EvtScript N(EVS_ActivateSwitch) = { EndLoop EndThread Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(DisablePlayerInput, TRUE) Call(PlaySoundAtCollider, COLLIDER_o106, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(EnableGroup, MODEL_move2, TRUE) diff --git a/src/world/area_kpa/kpa_111/statues.c b/src/world/area_kpa/kpa_111/statues.c index ff5bd413290..b7457dfc7d0 100644 --- a/src/world/area_kpa/kpa_111/statues.c +++ b/src/world/area_kpa/kpa_111/statues.c @@ -5,7 +5,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { #if !VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #endif Loop(20) #if !VERSION_JP diff --git a/src/world/area_kpa/kpa_113/statues.c b/src/world/area_kpa/kpa_113/statues.c index a5905b48cfb..b05c30d4d7c 100644 --- a/src/world/area_kpa/kpa_113/statues.c +++ b/src/world/area_kpa/kpa_113/statues.c @@ -5,7 +5,7 @@ EvtScript N(EVS_PushLeftStatue_Impl) = { #if !VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #endif Loop(20) #if !VERSION_JP diff --git a/src/world/area_kpa/kpa_115/statues.c b/src/world/area_kpa/kpa_115/statues.c index 69963773b0e..7d540e6a37d 100644 --- a/src/world/area_kpa/kpa_115/statues.c +++ b/src/world/area_kpa/kpa_115/statues.c @@ -5,7 +5,7 @@ EvtScript N(EVS_PushMiddleStatue_Impl) = { #if !VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #endif Loop(20) #if !VERSION_JP diff --git a/src/world/area_kpa/kpa_12/main.c b/src/world/area_kpa/kpa_12/main.c index b980b9c263a..dd241734aa6 100644 --- a/src/world/area_kpa/kpa_12/main.c +++ b/src/world/area_kpa/kpa_12/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_12_ENTRY_0) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_12_ENTRY_2) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) diff --git a/src/world/area_kpa/kpa_12/platforms.c b/src/world/area_kpa/kpa_12/platforms.c index 31adbe1d9db..7178967246b 100644 --- a/src/world/area_kpa/kpa_12/platforms.c +++ b/src/world/area_kpa/kpa_12/platforms.c @@ -38,7 +38,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_SinkingPlatform_Update) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) SetF(LVar0, Float(0.0)) Label(0) Call(TranslateGroup, LVar1, 0, LVar0, 0) @@ -107,7 +107,7 @@ EvtScript N(EVS_Touch_SinkingPlatform4) = { }; EvtScript N(EVS_SinkingPlatform_Idle) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Label(0) Call(MakeLerp, 0, -3, 20, EASING_LINEAR) Label(1) @@ -153,7 +153,7 @@ EvtScript N(EVS_SetupSinkingPlatforms) = { }; EvtScript N(EVS_SetupMovingPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o414, MODEL_o522) Set(LVar0, 0) Set(LVar3, 0) diff --git a/src/world/area_kpa/kpa_121/main.c b/src/world/area_kpa/kpa_121/main.c index d578c62e6fc..794b2b8c476 100644 --- a/src/world/area_kpa/kpa_121/main.c +++ b/src/world/area_kpa/kpa_121/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitDoors_kpa_83_1) = EVT_EXIT_DOUBLE_DOOR(kpa_121_ENTRY_0, "kpa_83", kpa_83_ENTRY_1, COLLIDER_deilitw, MODEL_o348, MODEL_o356); EvtScript N(EVS_ExitDoor_osr_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) IfLt(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) Set(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) diff --git a/src/world/area_kpa/kpa_13/platforms.c b/src/world/area_kpa/kpa_13/platforms.c index 4d6d3d3ca7c..985e7a46096 100644 --- a/src/world/area_kpa/kpa_13/platforms.c +++ b/src/world/area_kpa/kpa_13/platforms.c @@ -38,7 +38,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_SetupPlatforms) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Thread Call(ParentColliderToModel, COLLIDER_o1070, MODEL_o1083) Call(TranslateGroup, MODEL_dai05, 125, 0, 0) diff --git a/src/world/area_kpa/kpa_133/main.c b/src/world/area_kpa/kpa_133/main.c index 47c57d5b89e..74025551fb4 100644 --- a/src/world/area_kpa/kpa_133/main.c +++ b/src/world/area_kpa/kpa_133/main.c @@ -47,8 +47,8 @@ BombTrigger N(BombPos_Wall) = { EvtScript N(EVS_BlastWall) = { PlayEffect(EFFECT_BOMBETTE_BREAKING, 0, 56, 56, 1, 10, 30) - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(EnableModel, MODEL_o235, TRUE) Loop(10) Call(EnableModel, MODEL_o477, TRUE) @@ -60,7 +60,7 @@ EvtScript N(EVS_BlastWall) = { EndLoop Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttae, COLLIDER_FLAGS_UPPER_MASK) Set(GF_KPA133_Item_BombedWall, TRUE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_kpa/kpa_14/entity.c b/src/world/area_kpa/kpa_14/entity.c index f986c8a540b..074e1f8e9d2 100644 --- a/src/world/area_kpa/kpa_14/entity.c +++ b/src/world/area_kpa/kpa_14/entity.c @@ -11,11 +11,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_kpa/kpa_14/main.c b/src/world/area_kpa/kpa_14/main.c index 02bff3e8132..6c4ec423d0b 100644 --- a/src/world/area_kpa/kpa_14/main.c +++ b/src/world/area_kpa/kpa_14/main.c @@ -16,7 +16,7 @@ API_CALLABLE(N(GetActingPartner)) { EvtScript N(EVS_ExitWalk_kpa_13_1) = EVT_EXIT_WALK(60, kpa_14_ENTRY_0, "kpa_13", kpa_13_ENTRY_1); EvtScript N(EVS_ExitDoor_kpa_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_14_ENTRY_1) Set(LVar1, COLLIDER_deilitte) @@ -126,7 +126,7 @@ EvtScript N(EVS_MakeSmokeEffects) = { }; EvtScript N(EVS_SetupLavaFall) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o854, COLLIDER_FLAGS_UPPER_MASK) Call(N(GetActingPartner)) diff --git a/src/world/area_kpa/kpa_14/platforms.c b/src/world/area_kpa/kpa_14/platforms.c index 4171fe374c7..b9128d79ca8 100644 --- a/src/world/area_kpa/kpa_14/platforms.c +++ b/src/world/area_kpa/kpa_14/platforms.c @@ -44,7 +44,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_SetupPlatforms) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o852, MODEL_o860) Set(LVar0, 0) Set(LVar3, 0) diff --git a/src/world/area_kpa/kpa_17/main.c b/src/world/area_kpa/kpa_17/main.c index b39d202a081..d4ce29c60b4 100644 --- a/src/world/area_kpa/kpa_17/main.c +++ b/src/world/area_kpa/kpa_17/main.c @@ -1,7 +1,7 @@ #include "kpa_17.h" EvtScript N(EVS_ExitWalk_kpa_1X_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_17_ENTRY_1) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) diff --git a/src/world/area_kpa/kpa_40/main.c b/src/world/area_kpa/kpa_40/main.c index 9905c1c0ac5..825804971d4 100644 --- a/src/world/area_kpa/kpa_40/main.c +++ b/src/world/area_kpa/kpa_40/main.c @@ -5,7 +5,7 @@ EvtScript N(EVS_ExitDoors_kpa_52_1) = EVT_EXIT_DOUBLE_DOOR(kpa_40_ENTRY_0, "kpa_ EvtScript N(EVS_ExitWalk_kpa_40_3) = EVT_EXIT_WALK(60, kpa_40_ENTRY_1, "kpa_40", kpa_40_ENTRY_3); EvtScript N(EVS_ExitWalk_kpa_41_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_40_ENTRY_2) Exec(ExitWalk) Set(AB_KPA_MazeProgress, 1) diff --git a/src/world/area_kpa/kpa_41/main.c b/src/world/area_kpa/kpa_41/main.c index 9e312f9d285..9007ae25ecb 100644 --- a/src/world/area_kpa/kpa_41/main.c +++ b/src/world/area_kpa/kpa_41/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitWalk_LowerLeft) = EVT_EXIT_WALK(60, kpa_41_ENTRY_0, "kpa_40", kpa_40_ENTRY_1); EvtScript N(EVS_ExitWalk_LowerRight) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_41_ENTRY_1) Exec(ExitWalk) Switch(AB_KPA_MazeProgress) @@ -27,7 +27,7 @@ EvtScript N(EVS_ExitWalk_LowerRight) = { EvtScript N(EVS_ExitWalk_UpperLeft) = EVT_EXIT_WALK(60, kpa_41_ENTRY_3, "kpa_40", kpa_40_ENTRY_2); EvtScript N(EVS_ExitWalk_UpperRight) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_41_ENTRY_2) Exec(ExitWalk) Switch(AB_KPA_MazeProgress) diff --git a/src/world/area_kpa/kpa_60/main.c b/src/world/area_kpa/kpa_60/main.c index 51ab6e75137..b4e3a81673b 100644 --- a/src/world/area_kpa/kpa_60/main.c +++ b/src/world/area_kpa/kpa_60/main.c @@ -53,7 +53,7 @@ EvtScript N(EVS_CloseAirshipDockDoor) = { }; EvtScript N(EVS_ExitDoor_kpa_70_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_METAL) Set(LVar0, kpa_60_ENTRY_0) @@ -69,7 +69,7 @@ EvtScript N(EVS_ExitDoor_kpa_70_0) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_60_ENTRY_1) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -83,7 +83,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_60_ENTRY_2) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -97,7 +97,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { }; EvtScript N(EVS_ExitDoor_kpa_63_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) ExecWait(N(EVS_OpenAirshipDockDoor)) Wait(15) diff --git a/src/world/area_kpa/kpa_62/main.c b/src/world/area_kpa/kpa_62/main.c index f19fdd1b224..a66a8e58550 100644 --- a/src/world/area_kpa/kpa_62/main.c +++ b/src/world/area_kpa/kpa_62/main.c @@ -53,7 +53,7 @@ EvtScript N(EVS_CloseAirshipDockDoor) = { }; EvtScript N(EVS_ExitDoors_kpa_70_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_METAL) Set(LVar0, kpa_62_ENTRY_0) @@ -69,7 +69,7 @@ EvtScript N(EVS_ExitDoors_kpa_70_0) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_62_ENTRY_1) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -83,7 +83,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_62_ENTRY_2) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -97,7 +97,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { }; EvtScript N(EVS_ExitDoor_kpa_63_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) ExecWait(N(EVS_OpenAirshipDockDoor)) Wait(15) diff --git a/src/world/area_kpa/kpa_63/main.c b/src/world/area_kpa/kpa_63/main.c index e868c89dc4d..70a524c20f0 100644 --- a/src/world/area_kpa/kpa_63/main.c +++ b/src/world/area_kpa/kpa_63/main.c @@ -35,7 +35,7 @@ EvtScript N(EVS_CloseHangerDoor) = { }; EvtScript N(EVS_ExitDoor_kpa_62_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Exec(N(EVS_OpenHangerDoor)) Wait(15) diff --git a/src/world/area_kpa/kpa_70/main.c b/src/world/area_kpa/kpa_70/main.c index a99395eacd2..02417706696 100644 --- a/src/world/area_kpa/kpa_70/main.c +++ b/src/world/area_kpa/kpa_70/main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SetupChainDrive) = { }; EvtScript N(EVS_ExitDoors_kpa_62_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Wait(3) Set(LVar0, kpa_70_ENTRY_0) diff --git a/src/world/area_kpa/kpa_81/main.c b/src/world/area_kpa/kpa_81/main.c index 0d84eaf9fad..7866a7e24a9 100644 --- a/src/world/area_kpa/kpa_81/main.c +++ b/src/world/area_kpa/kpa_81/main.c @@ -29,7 +29,7 @@ s32 N(LeftDoorModels)[] = { EvtScript N(EVS_ExitDoors_kpa_50_1) = EVT_EXIT_DOUBLE_DOOR(kpa_81_ENTRY_0, "kpa_50", kpa_50_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); EvtScript N(EVS_ExitDoors_kpa_32_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_81_ENTRY_2) Set(LVar1, COLLIDER_o166) diff --git a/src/world/area_kpa/kpa_82/main.c b/src/world/area_kpa/kpa_82/main.c index aed021c7611..265af0da41e 100644 --- a/src/world/area_kpa/kpa_82/main.c +++ b/src/world/area_kpa/kpa_82/main.c @@ -29,7 +29,7 @@ s32 N(LeftDoorModels)[] = { EvtScript N(EVS_ExitDoors_kpa_113_1) = EVT_EXIT_DOUBLE_DOOR(kpa_82_ENTRY_0, "kpa_113", kpa_113_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); EvtScript N(EVS_ExitDoors_kpa_61_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_82_ENTRY_1) Set(LVar1, COLLIDER_o166) diff --git a/src/world/area_kpa/kpa_83/main.c b/src/world/area_kpa/kpa_83/main.c index a6e1f59f6a8..e0d8573d4a0 100644 --- a/src/world/area_kpa/kpa_83/main.c +++ b/src/world/area_kpa/kpa_83/main.c @@ -29,7 +29,7 @@ s32 N(LeftDoorModels)[] = { EvtScript N(EVS_ExitDoors_kpa_53_1) = EVT_EXIT_DOUBLE_DOOR(kpa_83_ENTRY_0, "kpa_53", kpa_53_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); EvtScript N(EVS_ExitDoors_kpa_121_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_83_ENTRY_1) Set(LVar1, COLLIDER_o166) diff --git a/src/world/area_kzn/common/SmokeTexPanners.inc.c b/src/world/area_kzn/common/SmokeTexPanners.inc.c index 1725fb66b94..def62a99da1 100644 --- a/src/world/area_kzn/common/SmokeTexPanners.inc.c +++ b/src/world/area_kzn/common/SmokeTexPanners.inc.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_StartTexPanner_SmokeLeft) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_3) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_3) @@ -17,7 +17,7 @@ EvtScript N(EVS_StartTexPanner_SmokeLeft) = { }; EvtScript N(EVS_StartTexPanner_SmokeRight) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_4) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_4) diff --git a/src/world/area_kzn/kzn_02/main.c b/src/world/area_kzn/kzn_02/main.c index 015435c0c64..4dbb06d871c 100644 --- a/src/world/area_kzn/kzn_02/main.c +++ b/src/world/area_kzn/kzn_02/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_UpdateTexPanner3) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_3) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_3) @@ -17,7 +17,7 @@ EvtScript N(EVS_UpdateTexPanner3) = { }; EvtScript N(EVS_UpdateTexPanner4) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_4) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_4) @@ -53,7 +53,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Call(EnableTexPanning, MODEL_yougan1_2, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/area_kzn/kzn_02/platforms.c b/src/world/area_kzn/kzn_02/platforms.c index c4d4b2a1b0f..1311f062da5 100644 --- a/src/world/area_kzn/kzn_02/platforms.c +++ b/src/world/area_kzn/kzn_02/platforms.c @@ -85,7 +85,7 @@ EvtScript N(EVS_KoloradoSinkingPlatform) = { }; EvtScript N(EVS_UpdateSinkingPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(N(GetCurrentFloor), LVarA) SetF(LVar0, Float(0.0)) Label(0) @@ -273,7 +273,7 @@ EvtScript N(EVS_OnTouchSinkingPlatform6) = { }; EvtScript N(EVS_UpdatePlatformBobbing) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Label(0) Call(MakeLerp, 0, -3, 30, EASING_LINEAR) Label(1) @@ -361,7 +361,7 @@ EvtScript N(EVS_StartBobbingPlatform6) = { }; EvtScript N(EVS_UpdateMovingPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o128, MODEL_o123) Call(ParentColliderToModel, COLLIDER_o129, MODEL_o124) Call(ParentColliderToModel, COLLIDER_o130, MODEL_o125) diff --git a/src/world/area_kzn/kzn_03/main.c b/src/world/area_kzn/kzn_03/main.c index 32ca55eee29..261f593e5c9 100644 --- a/src/world/area_kzn/kzn_03/main.c +++ b/src/world/area_kzn/kzn_03/main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_BindTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_o112, TRUE) Call(EnableTexPanning, MODEL_o151, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/area_kzn/kzn_06/extra.c b/src/world/area_kzn/kzn_06/extra.c index 3271869ea06..a9c714a390e 100644 --- a/src/world/area_kzn/kzn_06/extra.c +++ b/src/world/area_kzn/kzn_06/extra.c @@ -179,7 +179,7 @@ EvtScript N(EVS_SetupLavaPuzzle) = { SetF(MV_GlowIntensity, Float(0.5)) EndIf Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(ApplyLavaGlowLighting), LAVA_GLOW_MODE_1, NULL) EndThread Thread diff --git a/src/world/area_kzn/kzn_06/main.c b/src/world/area_kzn/kzn_06/main.c index 3a2bfafccd1..3cdbec94ca1 100644 --- a/src/world/area_kzn/kzn_06/main.c +++ b/src/world/area_kzn/kzn_06/main.c @@ -17,7 +17,7 @@ EvtScript N(EVS_BindExitTriggers) = { MAP_RODATA_PAD(1, unk); // can be fixed with subalign 16 for this map EvtScript N(EVS_StartTexPanners) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yo1, TEX_PANNER_0) Call(SetTexPanner, MODEL_o349, TEX_PANNER_0) Thread diff --git a/src/world/area_kzn/kzn_07/main.c b/src/world/area_kzn/kzn_07/main.c index ea29f4d33a5..39ad1ff6014 100644 --- a/src/world/area_kzn/kzn_07/main.c +++ b/src/world/area_kzn/kzn_07/main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_SetupTexPanners) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan, TEX_PANNER_0) Call(SetTexPanner, MODEL_yougan1, TEX_PANNER_1) Call(SetTexPanner, MODEL_spot, TEX_PANNER_1) @@ -66,7 +66,7 @@ EvtScript N(EVS_Main) = { Exec(EnterWalk) Wait(1) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(ApplyLavaGlowLighting), LAVA_GLOW_MODE_0, NULL) EndThread Thread diff --git a/src/world/area_kzn/kzn_08/main.c b/src/world/area_kzn/kzn_08/main.c index e8ab5e512a8..14d38753f65 100644 --- a/src/world/area_kzn/kzn_08/main.c +++ b/src/world/area_kzn/kzn_08/main.c @@ -23,7 +23,7 @@ API_CALLABLE(func_80240718_C71B98) { } EvtScript N(EVS_StartTexPanner_SmokeLeft) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_3) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_3) @@ -37,7 +37,7 @@ EvtScript N(EVS_StartTexPanner_SmokeLeft) = { }; EvtScript N(EVS_StartTexPanner_SmokeRight) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_4) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_4) @@ -64,7 +64,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanner0) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1, TEX_PANNER_0) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_0) @@ -78,7 +78,7 @@ EvtScript N(EVS_StartTexPanner0) = { }; EvtScript N(EVS_StartTexPanner1) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan, TEX_PANNER_1) Call(SetTexPanner, MODEL_o640, TEX_PANNER_1) Thread @@ -158,7 +158,7 @@ EvtScript N(EVS_Main) = { Call(TranslateModel, MODEL_yougan, 0, 40, 0) Set(MV_GlowIntensity, 0) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(ApplyLavaGlowLighting), LAVA_GLOW_MODE_2, NULL) EndThread Thread diff --git a/src/world/area_kzn/kzn_10/tromp.c b/src/world/area_kzn/kzn_10/tromp.c index 970bf161a8d..ff5f980c662 100644 --- a/src/world/area_kzn/kzn_10/tromp.c +++ b/src/world/area_kzn/kzn_10/tromp.c @@ -51,7 +51,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { }; EvtScript N(D_80241224_C7F3A4) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) Loop(5) PlayEffect(EFFECT_DUST, 1, -430, 100, 0, 30) Wait(2) @@ -85,7 +85,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { }; EvtScript N(EVS_SetupSpinyTromp) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) Call(EnableModel, MODEL_me, FALSE) Call(TranslateGroup, MODEL_goron, 0, 0, 0) diff --git a/src/world/area_kzn/kzn_11/main.c b/src/world/area_kzn/kzn_11/main.c index 2ceba2a6dd2..3f362e6d10e 100644 --- a/src/world/area_kzn/kzn_11/main.c +++ b/src/world/area_kzn/kzn_11/main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) diff --git a/src/world/area_kzn/kzn_11/platforms.c b/src/world/area_kzn/kzn_11/platforms.c index 85733123bf3..45c187f86af 100644 --- a/src/world/area_kzn/kzn_11/platforms.c +++ b/src/world/area_kzn/kzn_11/platforms.c @@ -40,7 +40,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_UpdateLeftPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o67, MODEL_o67) Call(ParentColliderToModel, COLLIDER_o68, MODEL_o68) Call(ParentColliderToModel, COLLIDER_o69, MODEL_o69) @@ -105,7 +105,7 @@ EvtScript N(EVS_UpdateLeftPlatform) = { }; EvtScript N(EVS_UpdateRightPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o26, MODEL_o26) Call(ParentColliderToModel, COLLIDER_o27, MODEL_o27) Call(ParentColliderToModel, COLLIDER_o28, MODEL_o28) diff --git a/src/world/area_kzn/kzn_17/tromp.c b/src/world/area_kzn/kzn_17/tromp.c index 2e86db95e9c..e59e9fc3801 100644 --- a/src/world/area_kzn/kzn_17/tromp.c +++ b/src/world/area_kzn/kzn_17/tromp.c @@ -46,7 +46,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { }; EvtScript N(EVS_SetupSpinyTromp) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) IfGe(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) Call(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) Call(EnableModel, MODEL_me, FALSE) diff --git a/src/world/area_kzn/kzn_18/main.c b/src/world/area_kzn/kzn_18/main.c index ff8482ec8f0..3c5192d7535 100644 --- a/src/world/area_kzn/kzn_18/main.c +++ b/src/world/area_kzn/kzn_18/main.c @@ -18,7 +18,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Call(EnableTexPanning, MODEL_off1, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/area_kzn/kzn_19/main.c b/src/world/area_kzn/kzn_19/main.c index 817f4cf19da..3e2a61b1f03 100644 --- a/src/world/area_kzn/kzn_19/main.c +++ b/src/world/area_kzn/kzn_19/main.c @@ -99,7 +99,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) @@ -139,7 +139,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Loop(0) Call(MakeLerp, 0, 180, 40, EASING_COS_IN) Loop(0) diff --git a/src/world/area_kzn/kzn_20/main.c b/src/world/area_kzn/kzn_20/main.c index c488795198a..8f83f7d3e85 100644 --- a/src/world/area_kzn/kzn_20/main.c +++ b/src/world/area_kzn/kzn_20/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yu, TRUE) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) @@ -77,7 +77,7 @@ EvtScript N(EVS_InterruptPartnersInLava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(EnableModel, MODEL_yu, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_yu, COLLIDER_FLAGS_UPPER_MASK) Call(ParentColliderToModel, COLLIDER_yu, MODEL_yu) diff --git a/src/world/area_kzn/kzn_20/npc.c b/src/world/area_kzn/kzn_20/npc.c index b7a8688cc88..0b159fc8eed 100644 --- a/src/world/area_kzn/kzn_20/npc.c +++ b/src/world/area_kzn/kzn_20/npc.c @@ -33,7 +33,7 @@ EVT_LETTER_PROMPT(Kolorado, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle EVT_LETTER_REWARD(Kolorado); EvtScript N(EVS_SpawnFallingDust) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) Call(RandInt, 100, LVar0) Sub(LVar0, 100) @@ -48,7 +48,7 @@ EvtScript N(EVS_SpawnFallingDust) = { }; EvtScript N(EVS_ShakingWorld) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) IfGe(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) Exec(N(EVS_SpawnFallingDust)) Else @@ -104,7 +104,7 @@ s32 N(Kolorado_Wander2)[] = { }; EvtScript N(EVS_Kolorado_CalmIdle) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Label(0) Call(RandInt, 1, LVar1) IfEq(LVar1, 0) @@ -135,7 +135,7 @@ EvtScript N(EVS_Kolorado_CalmIdle) = { Wait(20) EndLoop Wait(LVar2) - Goto(10) + Goto(10) Return End }; diff --git a/src/world/area_kzn/kzn_22/main.c b/src/world/area_kzn/kzn_22/main.c index d16e6bdb989..ca359eed69b 100644 --- a/src/world/area_kzn/kzn_22/main.c +++ b/src/world/area_kzn/kzn_22/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_LavaRiver) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -29,7 +29,7 @@ EvtScript N(EVS_UpdateTexPan_LavaRiver) = { }; EvtScript N(EVS_UpdateTexPan_LavaFall) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan2_2, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -73,7 +73,7 @@ API_CALLABLE(N(GetFloorCollider1)) { } EvtScript N(EVS_UpdateLavaLevel) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(SetTexPanner, MODEL_yu1, TEX_PANNER_2) Call(SetTexPanner, MODEL_yu, TEX_PANNER_2) Call(EnableModel, MODEL_yu, FALSE) diff --git a/src/world/area_kzn/kzn_23/main.c b/src/world/area_kzn/kzn_23/main.c index 8e60aa16546..52b2f50f08b 100644 --- a/src/world/area_kzn/kzn_23/main.c +++ b/src/world/area_kzn/kzn_23/main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_ModulateLavaLevel) = { EvtScript N(EVS_RaiseLava) = { Exec(N(EVS_ModulateLavaLevel)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yu, TEX_PANNER_0) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_mac/mac_01/main.c b/src/world/area_mac/mac_01/main.c index 3d44c9fe740..c47f506fba2 100644 --- a/src/world/area_mac/mac_01/main.c +++ b/src/world/area_mac/mac_01/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitWalk_mac_00_1) = EVT_EXIT_WALK(60, mac_01_ENTRY_0, "mac_00", mac_00_ENTRY_1); EvtScript N(EVS_ExitWalk_nok_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mac_01_ENTRY_1) Exec(ExitWalk) IfEq(GF_StartedChapter1, FALSE) @@ -32,7 +32,7 @@ s32 N(Models_CastleGateR)[] = { }; EvtScript N(EVS_ExitDoors_osr_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, 2) @@ -167,7 +167,7 @@ EvtScript N(EVS_Main) = { Wait(1) Call(EnableTexPanning, MODEL_hikari, TRUE) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Set(LVar1, 0) Label(0) diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index d693005871c..25bce869eaf 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -637,7 +637,7 @@ EvtScript N(EVS_NpcInit_MinhT) = { // FLOWER GATE EvtScript N(EVS_ExitFlowerGate) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Wait(2) Call(GetPlayerActionState, LVar3) diff --git a/src/world/area_mac/mac_01/rooms.c b/src/world/area_mac/mac_01/rooms.c index a04387b6b74..25ad89161fc 100644 --- a/src/world/area_mac/mac_01/rooms.c +++ b/src/world/area_mac/mac_01/rooms.c @@ -176,7 +176,7 @@ EvtScript N(EVS_RoomListener_MerlonHouse) = { }; EvtScript N(EVS_SpinRoof) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Label(0) AddF(LVar0, Float(3.0)) diff --git a/src/world/area_mac/mac_02/main.c b/src/world/area_mac/mac_02/main.c index 360807b902d..9275fbf2a03 100644 --- a/src/world/area_mac/mac_02/main.c +++ b/src/world/area_mac/mac_02/main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_GotoMap_tik_15_1) = { }; EvtScript N(EVS_SetupPipe) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, LVar0) Set(LVarB, LVar1) Set(LVarC, LVar2) diff --git a/src/world/area_mac/mac_03/npc.c b/src/world/area_mac/mac_03/npc.c index ed693e54979..fca40e516d3 100644 --- a/src/world/area_mac/mac_03/npc.c +++ b/src/world/area_mac/mac_03/npc.c @@ -318,7 +318,7 @@ EvtScript N(EVS_NpcInit_Toad_02) = { }; EvtScript N(EVS_NpcInteract_ToadKid_02) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Call(EnableNpcAI, NPC_ToadKid_01, FALSE) Call(EnableNpcAI, NPC_ToadKid_02, FALSE) @@ -393,7 +393,7 @@ EvtScript N(EVS_NpcInteract_ToadKid_02) = { Call(SetNpcAnimation, NPC_ToadKid_02, LVar3) Call(EnableNpcAI, NPC_ToadKid_01, TRUE) Call(EnableNpcAI, NPC_ToadKid_02, TRUE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_mac/mac_03/oinks.c b/src/world/area_mac/mac_03/oinks.c index 63d2b07a904..34b352ac862 100644 --- a/src/world/area_mac/mac_03/oinks.c +++ b/src/world/area_mac/mac_03/oinks.c @@ -178,7 +178,7 @@ EvtScript N(EVS_TurnCrank) = { EndIf Call(PlaySound, SOUND_FLOOR_SWITCH_ACTIVATE) Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(AddCoin, -LIL_OINK_COIN_COST) Wait(20) @@ -277,13 +277,13 @@ EvtScript N(EVS_TurnCrank) = { Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; EvtScript N(EVS_LilOinkExplanation) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetNpcSpeed, NPC_Toad_03, Float(4.0)) Call(SetNpcAnimation, NPC_Toad_03, ANIM_Toad_Red_Run) Call(NpcMoveTo, NPC_Toad_03, 157, -310, 0) @@ -393,7 +393,7 @@ EvtScript N(EVS_OpenCapsule) = { Return EndIf Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Set(MF_Unk_07, TRUE) SetF(LVar0, Float(1.0)) @@ -503,7 +503,7 @@ EvtScript N(EVS_OpenCapsule) = { Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -532,7 +532,7 @@ EvtScript N(EVS_LilOinkFlee) = { EvtScript N(EVS_EnterPen) = { Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) Call(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_DEFAULT) @@ -557,7 +557,7 @@ EvtScript N(EVS_EnterPen) = { EndLoop Call(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_DEFAULT) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(func_802D2C14, 0) Call(DisablePlayerInput, FALSE) IfEq(GB_MAC03_LilOinkCount, 0) @@ -578,14 +578,14 @@ EvtScript N(EVS_EnterPen) = { EndIf Wait(1) EndLoop - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) Return End }; EvtScript N(EVS_ExitPen) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliu, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_mac/mac_04/npc.c b/src/world/area_mac/mac_04/npc.c index ee8536c2708..1cad3423ad7 100644 --- a/src/world/area_mac/mac_04/npc.c +++ b/src/world/area_mac/mac_04/npc.c @@ -54,7 +54,7 @@ EvtScript N(EVS_TossTrainInToybox) = { }; EvtScript N(EVS_ItemPrompt_ToyTrain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) @@ -63,7 +63,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_Toybox, 160, 40) EndIf Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(DisablePlayerInput, TRUE) @@ -97,7 +97,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { Call(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_OMO_TOYBOX_LID, SOUND_SPACE_DEFAULT) Call(CloseChoicePopup) Set(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Call(GotoMap, Ref("omo_03"), omo_03_ENTRY_6) Wait(100) diff --git a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c index d429c4150c0..cde7cd1fcf4 100644 --- a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c +++ b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c @@ -125,7 +125,7 @@ EvtScript N(EVS_SuspiciousGuy_RunAway) = { }; EvtScript N(EVS_HiddenRoom_WaitForOuttaSight) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) IfNe(GB_StoryProgress, STORY_CH4_MET_WITH_TWINK) Return EndIf diff --git a/src/world/area_mac/mac_05/main.c b/src/world/area_mac/mac_05/main.c index e892187e67d..93bfd42f584 100644 --- a/src/world/area_mac/mac_05/main.c +++ b/src/world/area_mac/mac_05/main.c @@ -12,7 +12,7 @@ API_CALLABLE(N(func_8024047C_8525EC)) { } EvtScript N(D_8024457C_8566EC) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarC, 0) Label(0) IfGe(LVarC, 60) @@ -57,7 +57,7 @@ EvtScript N(D_80244648_8567B8) = { EvtScript N(EVS_ExitWalk_mac_04_1) = EVT_EXIT_WALK(60, mac_05_ENTRY_0, "mac_04", mac_04_ENTRY_1); EvtScript N(D_80244810_856980) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mac_05_ENTRY_3) Exec(ExitWalk) Set(GB_StoryProgress, STORY_CH5_ENTERED_WHALE) diff --git a/src/world/area_mac/mac_05/whale.c b/src/world/area_mac/mac_05/whale.c index 6f35bc0b610..dc8fd097c73 100644 --- a/src/world/area_mac/mac_05/whale.c +++ b/src/world/area_mac/mac_05/whale.c @@ -227,7 +227,7 @@ EvtScript N(D_802516CC_86383C) = { }; EvtScript N(EVS_SetupWhale) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(MakeLocalVertexCopy, VTX_COPY_1, MODEL_karada, TRUE) Call(SetCustomGfxBuilders, CUSTOM_GFX_1, Ref(N(unkAngleFunc002)), NULL) Call(SetModelCustomGfx, MODEL_karada, CUSTOM_GFX_1, -1) diff --git a/src/world/area_mac/mac_06/main.c b/src/world/area_mac/mac_06/main.c index 56c6f6a3039..ba022202f88 100644 --- a/src/world/area_mac/mac_06/main.c +++ b/src/world/area_mac/mac_06/main.c @@ -30,7 +30,7 @@ API_CALLABLE(N(GetWaveAmplitude)) { #include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_AnimateWaves) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarC, 0) Label(0) IfGe(LVarC, 60) diff --git a/src/world/area_mac/mac_06/npc.c b/src/world/area_mac/mac_06/npc.c index 3150fd47bfc..c06f285be52 100644 --- a/src/world/area_mac/mac_06/npc.c +++ b/src/world/area_mac/mac_06/npc.c @@ -360,7 +360,7 @@ Vec3f N(FlightPath)[] = { }; EvtScript N(EVS_FlyingGull) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(CloneModel, MODEL_hontai, CLONED_MODEL_GULL) Set(LFlag0, TRUE) Set(LFlag1, FALSE) diff --git a/src/world/area_mac/mac_06/whale.c b/src/world/area_mac/mac_06/whale.c index b5565b92faf..8d2386ffacf 100644 --- a/src/world/area_mac/mac_06/whale.c +++ b/src/world/area_mac/mac_06/whale.c @@ -223,7 +223,7 @@ EvtScript N(EVS_WhaleState_Walk) = { }; EvtScript N(EVS_WhaleMain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(MakeLocalVertexCopy, VTX_COPY_1, MODEL_karada, TRUE) Call(SetCustomGfxBuilders, CUSTOM_GFX_1, Ref(N(unkAngleFunc002)), NULL) Call(SetModelCustomGfx, MODEL_karada, CUSTOM_GFX_1, -1) diff --git a/src/world/area_mgm/mgm_00/main.c b/src/world/area_mgm/mgm_00/main.c index 27394974938..c422ecf4530 100644 --- a/src/world/area_mgm/mgm_00/main.c +++ b/src/world/area_mgm/mgm_00/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_GotoMap_ToadTown) = { }; EvtScript N(EVS_OnEnterPipe_ToadTown) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, mgm_00_ENTRY_0) Set(LVarB, COLLIDER_deili1) Set(LVarC, Ref(N(EVS_GotoMap_ToadTown))) @@ -45,7 +45,7 @@ EvtScript N(EVS_GotoMap_SmashAttack) = { MAP_RODATA_PAD(1, unk); EvtScript N(EVS_OnEnterPipe_SmashAttack) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, mgm_00_ENTRY_2) Set(LVarB, COLLIDER_deili3) Set(LVarC, Ref(N(EVS_GotoMap_SmashAttack))) diff --git a/src/world/area_mim/mim_01/entity.c b/src/world/area_mim/mim_01/entity.c index 11b7b9b6aea..133a9f99a5f 100644 --- a/src/world/area_mim/mim_01/entity.c +++ b/src/world/area_mim/mim_01/entity.c @@ -7,12 +7,12 @@ EvtScript N(EVS_ReadSign) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_017E, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_mim/mim_02/hint.c b/src/world/area_mim/mim_02/hint.c index b9359cdf201..e05b0408718 100644 --- a/src/world/area_mim/mim_02/hint.c +++ b/src/world/area_mim/mim_02/hint.c @@ -1,7 +1,7 @@ #include "mim_02.h" EvtScript N(EVS_SetupExitHint) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Call(EnableModel, MODEL_o414, TRUE) Call(EnableModel, MODEL_me, FALSE) diff --git a/src/world/area_mim/mim_07/entity.c b/src/world/area_mim/mim_07/entity.c index 3d271febb55..8b2f16a0398 100644 --- a/src/world/area_mim/mim_07/entity.c +++ b/src/world/area_mim/mim_07/entity.c @@ -6,12 +6,12 @@ EvtScript N(EVS_ReadSign) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_017F, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_mim/mim_10/main.c b/src/world/area_mim/mim_10/main.c index 3ed65c8204f..423ce349775 100644 --- a/src/world/area_mim/mim_10/main.c +++ b/src/world/area_mim/mim_10/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitWalk_mac_02_1) = EVT_EXIT_WALK(60, mim_10_ENTRY_0, "mac_02", mac_02_ENTRY_1); EvtScript N(EVS_ExitWalk_mim_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mim_10_ENTRY_1) Exec(ExitWalk) IfEq(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION) diff --git a/src/world/area_mim/mim_11/main.c b/src/world/area_mim/mim_11/main.c index 1861243c603..22d808ab5c4 100644 --- a/src/world/area_mim/mim_11/main.c +++ b/src/world/area_mim/mim_11/main.c @@ -138,7 +138,7 @@ EvtScript N(EVS_ExitWarp_osr_03_4) = { }; EvtScript N(EVS_ExitWalk_mim_07_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mim_11_ENTRY_0) Exec(ExitWalk) Set(GF_MIM_ChoosingPath, FALSE) @@ -151,7 +151,7 @@ EvtScript N(EVS_ExitWalk_mim_07_3) = { EvtScript N(EVS_ExitWalk_mim_12_0) = EVT_EXIT_WALK(60, mim_11_ENTRY_1, "mim_12", mim_12_ENTRY_0); EvtScript N(EVS_ExitWalk_obk_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, mim_11_ENTRY_2) diff --git a/src/world/area_nok/nok_01/main.c b/src/world/area_nok/nok_01/main.c index c7e78571c1d..e9f94b55949 100644 --- a/src/world/area_nok/nok_01/main.c +++ b/src/world/area_nok/nok_01/main.c @@ -59,7 +59,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o298, TEX_PANNER_0) Call(SetTexPanner, MODEL_o320, TEX_PANNER_0) Call(SetTexPanner, MODEL_o402, TEX_PANNER_0) diff --git a/src/world/area_nok/nok_01/npcs_crisis.inc.c b/src/world/area_nok/nok_01/npcs_crisis.inc.c index 0099abd9b93..ecd74f601d6 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -316,7 +316,7 @@ EvtScript N(EVS_NpcIdle_Koover_Crisis) = { }; EvtScript N(EVS_NpcIdle_FuzzyWithShell) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) IfEq(GF_NOK01_RecoveredShellA, TRUE) Call(SetNpcPos, NPC_FuzzyWithShell, NPC_DISPOSE_LOCATION) Call(SetNpcPos, NPC_KooversShell, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_nok/nok_02/main.c b/src/world/area_nok/nok_02/main.c index 166ac1bc1dd..1fab4b95430 100644 --- a/src/world/area_nok/nok_02/main.c +++ b/src/world/area_nok/nok_02/main.c @@ -37,7 +37,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o312, TEX_PANNER_0) Call(SetTexPanner, MODEL_o460, TEX_PANNER_0) Call(SetTexPanner, MODEL_o461, TEX_PANNER_0) diff --git a/src/world/area_nok/nok_02/npcs_crisis.inc.c b/src/world/area_nok/nok_02/npcs_crisis.inc.c index de8d1fada57..d96e9c5c453 100644 --- a/src/world/area_nok/nok_02/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_02/npcs_crisis.inc.c @@ -244,7 +244,7 @@ EvtScript N(EVS_FuzzyThief_AvoidCapture) = { }; EvtScript N(EVS_Koopa_01_ChaseThief) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Label(0) Call(GetNpcPos, NPC_KoopaShell_01, LVar0, LVar1, LVar2) Call(GetNpcAnimation, NPC_Koopa_01, LVarF) @@ -270,7 +270,7 @@ EvtScript N(EVS_Koopa_01_FaceShell) = { }; EvtScript N(D_8024BDB0_9E2DD0) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Set(LVar3, 0) Set(LVar4, 0) Loop(0) diff --git a/src/world/area_nok/nok_02/rooms.c b/src/world/area_nok/nok_02/rooms.c index 53a5579aa44..bc4cb13bf20 100644 --- a/src/world/area_nok/nok_02/rooms.c +++ b/src/world/area_nok/nok_02/rooms.c @@ -36,7 +36,7 @@ EvtScript N(EVS_UpdateKooperFightSounds) = { }; EvtScript N(EVS_PlayKooperVsFuzzyEffects) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) ExecGetTID(N(EVS_UpdateKooperFightSounds), MV_KooperFightSoundsScript) Label(0) Switch(GB_StoryProgress) diff --git a/src/world/area_nok/nok_12/bridge.c b/src/world/area_nok/nok_12/bridge.c index 8c235b4ad5f..62b665da258 100644 --- a/src/world/area_nok/nok_12/bridge.c +++ b/src/world/area_nok/nok_12/bridge.c @@ -7,7 +7,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { Call(DisablePlayerInput, TRUE) Wait(20) Call(DisablePlayerPhysics, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(N(DisableCameraLeadingPlayer)) Call(InterpCamTargetPos, CAM_DEFAULT, 1, -272, 0, -56, 20) @@ -91,7 +91,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(InterpCamTargetPos, CAM_DEFAULT, 1, LVar0, LVar1, LVar2, 10) Call(N(EnableCameraLeadingPlayer)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Set(GB_StoryProgress, STORY_CH1_MADE_FIRST_BRIDGE) diff --git a/src/world/area_nok/nok_12/entity.c b/src/world/area_nok/nok_12/entity.c index ae2ec99a076..684ba576e6b 100644 --- a/src/world/area_nok/nok_12/entity.c +++ b/src/world/area_nok/nok_12/entity.c @@ -32,7 +32,7 @@ EvtScript N(EVS_OnShakeTree_DropSwitch) = { IfLt(GB_StoryProgress, STORY_CH1_KNOCKED_SWITCH_FROM_TREE) Set(GB_StoryProgress, STORY_CH1_KNOCKED_SWITCH_FROM_TREE) Wait(15) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(MakeLerp, 95, 0, 12, EASING_QUADRATIC_IN) @@ -47,7 +47,7 @@ EvtScript N(EVS_OnShakeTree_DropSwitch) = { Call(ShakeCam, CAM_DEFAULT, 0, 5, Float(1.0)) Thread Wait(5) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) EndThread Call(DisablePlayerInput, FALSE) EndIf diff --git a/src/world/area_nok/nok_12/main.c b/src/world/area_nok/nok_12/main.c index d9023db0405..f6a7edc45b8 100644 --- a/src/world/area_nok/nok_12/main.c +++ b/src/world/area_nok/nok_12/main.c @@ -40,7 +40,7 @@ EvtScript N(EVS_UpdateEnounterStages) = { }; EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_hana1, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana2, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana3, TEX_PANNER_0) @@ -64,7 +64,7 @@ EvtScript N(EVS_TexPan_Flowers) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Thread Call(SetTexPanner, MODEL_suimen1, TEX_PANNER_1) Set(LVar0, 0) diff --git a/src/world/area_nok/nok_13/entity.c b/src/world/area_nok/nok_13/entity.c index f4f97a92e1f..d789c5b7595 100644 --- a/src/world/area_nok/nok_13/entity.c +++ b/src/world/area_nok/nok_13/entity.c @@ -32,12 +32,12 @@ EvtScript N(EVS_BreakBlock_Third) = { }; EvtScript N(EVS_ReadSign_Directions) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_0178, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_nok/nok_14/bridge.c b/src/world/area_nok/nok_14/bridge.c index d3cfe61bf95..f1403846dc1 100644 --- a/src/world/area_nok/nok_14/bridge.c +++ b/src/world/area_nok/nok_14/bridge.c @@ -4,7 +4,7 @@ #include "world/common/EnableCameraLeadingPlayer.inc.c" EvtScript N(EVS_Scene_BuildBridge) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Wait(10) @@ -120,7 +120,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { Call(N(EnableCameraLeadingPlayer)) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_nok/nok_14/entity.c b/src/world/area_nok/nok_14/entity.c index 4d13c630052..4a955e686e2 100644 --- a/src/world/area_nok/nok_14/entity.c +++ b/src/world/area_nok/nok_14/entity.c @@ -6,12 +6,12 @@ EvtScript N(EVS_ReadSign_NoEntry) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_0179, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_nok/nok_14/main.c b/src/world/area_nok/nok_14/main.c index 06c41dae0b9..47457ac79ac 100644 --- a/src/world/area_nok/nok_14/main.c +++ b/src/world/area_nok/nok_14/main.c @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitWalk_nok_13_2) = EVT_EXIT_WALK_NOK(60, nok_14_ENTRY_0, "nok_ EvtScript N(EVS_ExitWalk_nok_15_0) = EVT_EXIT_WALK_NOK(60, nok_14_ENTRY_1, "nok_15", nok_15_ENTRY_0); EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_hana1, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana3, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana4, TEX_PANNER_0) @@ -48,7 +48,7 @@ EvtScript N(EVS_TexPan_Flowers) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Thread Call(SetTexPanner, MODEL_suimen1, TEX_PANNER_1) Call(SetTexPanner, MODEL_suimen2, TEX_PANNER_1) diff --git a/src/world/area_obk/obk_01/main.c b/src/world/area_obk/obk_01/main.c index c5a22ba13c3..d92b8e735d9 100644 --- a/src/world/area_obk/obk_01/main.c +++ b/src/world/area_obk/obk_01/main.c @@ -1,7 +1,7 @@ #include "obk_01.h" EvtScript N(EVS_ExitDoors_mim_11_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_01_ENTRY_0) @@ -20,7 +20,7 @@ EvtScript N(EVS_ExitDoor_obk_02_0) = { IfLt(GB_StoryProgress, STORY_CH3_WEIGHED_DOWN_CHANDELIER) Return EndIf - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, obk_01_ENTRY_1) @@ -36,7 +36,7 @@ EvtScript N(EVS_ExitDoor_obk_02_0) = { }; EvtScript N(EVS_ExitDoor_obk_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE) Exec(N(EVS_Scene_JumpScareBoo)) Return @@ -56,7 +56,7 @@ EvtScript N(EVS_ExitDoor_obk_05_0) = { }; EvtScript N(EVS_ExitDoor_obk_07_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE) Exec(N(EVS_Scene_JumpScareBoo)) Return @@ -76,7 +76,7 @@ EvtScript N(EVS_ExitDoor_obk_07_0) = { }; EvtScript N(EVS_ExitDoor_obk_08_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE) Exec(N(EVS_Scene_JumpScareBoo)) Return @@ -96,7 +96,7 @@ EvtScript N(EVS_ExitDoor_obk_08_0) = { }; EvtScript N(EVS_ExitDoor_obk_09_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_01_ENTRY_5) @@ -112,7 +112,7 @@ EvtScript N(EVS_ExitDoor_obk_09_0) = { }; EvtScript N(EVS_ExitDoor_obk_09_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_01_ENTRY_6) diff --git a/src/world/area_obk/obk_02/main.c b/src/world/area_obk/obk_02/main.c index b3603d76b6d..1a262b1b9a5 100644 --- a/src/world/area_obk/obk_02/main.c +++ b/src/world/area_obk/obk_02/main.c @@ -9,7 +9,7 @@ enum { }; EvtScript N(EVS_ExitDoor_obk_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_02_ENTRY_0) Set(LVar1, COLLIDER_tt1) @@ -24,7 +24,7 @@ EvtScript N(EVS_ExitDoor_obk_01_1) = { }; EvtScript N(EVS_ExitDoor_obk_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_02_ENTRY_1) Set(LVar1, COLLIDER_tt2) diff --git a/src/world/area_obk/obk_03/main.c b/src/world/area_obk/obk_03/main.c index 5e5074413aa..57752abf506 100644 --- a/src/world/area_obk/obk_03/main.c +++ b/src/world/area_obk/obk_03/main.c @@ -1,7 +1,7 @@ #include "obk_03.h" EvtScript N(EVS_ExitDoor_obk_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_03_ENTRY_0) Set(LVar1, COLLIDER_tt2) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoor_obk_02_1) = { }; EvtScript N(EVS_ExitDoor_obk_04_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_03_ENTRY_1) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_05/main.c b/src/world/area_obk/obk_05/main.c index cbd4dec13d6..ce32a65d594 100644 --- a/src/world/area_obk/obk_05/main.c +++ b/src/world/area_obk/obk_05/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_EnterDoor_obk_05_0) = { }; EvtScript N(EVS_ExitDoor_obk_01_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_05_ENTRY_0) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_07/main.c b/src/world/area_obk/obk_07/main.c index eace8368ae5..c6dd77c1521 100644 --- a/src/world/area_obk/obk_07/main.c +++ b/src/world/area_obk/obk_07/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitDoors_obk_01_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_07_ENTRY_0) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_08/main.c b/src/world/area_obk/obk_08/main.c index 91e5c1c4cbb..90951f60cfc 100644 --- a/src/world/area_obk/obk_08/main.c +++ b/src/world/area_obk/obk_08/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitMap_obk_01_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_08_ENTRY_0) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_09/main.c b/src/world/area_obk/obk_09/main.c index cb4488ecb00..19a59a05b42 100644 --- a/src/world/area_obk/obk_09/main.c +++ b/src/world/area_obk/obk_09/main.c @@ -25,7 +25,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitDoors_obk_01_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_09_ENTRY_0) @@ -41,7 +41,7 @@ EvtScript N(EVS_ExitDoors_obk_01_5) = { }; EvtScript N(EVS_ExitDoors_obk_01_6) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_09_ENTRY_1) diff --git a/src/world/area_omo/omo_09/conveyors.c b/src/world/area_omo/omo_09/conveyors.c index db27e438e2a..16703947f6f 100644 --- a/src/world/area_omo/omo_09/conveyors.c +++ b/src/world/area_omo/omo_09/conveyors.c @@ -105,7 +105,7 @@ API_CALLABLE(N(AddConveyorPush)) { } EvtScript N(EVS_SetupConveyors) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(EnableTexPanning, MODEL_1, TRUE) Call(EnableTexPanning, MODEL_3, TRUE) Call(EnableTexPanning, MODEL_4, TRUE) diff --git a/src/world/area_omo/omo_09/gizmos.c b/src/world/area_omo/omo_09/gizmos.c index 5688d0c3cc7..4c3b4cb0ea9 100644 --- a/src/world/area_omo/omo_09/gizmos.c +++ b/src/world/area_omo/omo_09/gizmos.c @@ -97,7 +97,7 @@ API_CALLABLE(N(AwaitPlayerNearPlatforms)) { } EvtScript N(EVS_Gizmos_MovingBlocks) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(N(AwaitPlayerNearPlatforms)) Wait(LVar9) Call(ParentColliderToModel, LVar6, LVar7) diff --git a/src/world/area_omo/omo_11/gizmos.c b/src/world/area_omo/omo_11/gizmos.c index d41c618c1d5..da47d4ba5e7 100644 --- a/src/world/area_omo/omo_11/gizmos.c +++ b/src/world/area_omo/omo_11/gizmos.c @@ -302,7 +302,7 @@ EvtScript N(EVS_UpdateBasicPlatform_Audible) = { }; EvtScript N(EVS_SetupGizmos) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_1_0, MODEL_1_0) Call(ParentColliderToModel, COLLIDER_fl, MODEL_fl) Call(ParentColliderToModel, COLLIDER_1_1, MODEL_1_1) diff --git a/src/world/area_omo/omo_12/npc.c b/src/world/area_omo/omo_12/npc.c index 762e48cf430..79962b3ebf9 100644 --- a/src/world/area_omo/omo_12/npc.c +++ b/src/world/area_omo/omo_12/npc.c @@ -51,7 +51,7 @@ enum { }; EvtScript N(EVS_ManageLanternLight) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Label(0) Switch(AB_OMO12_LightSource) CaseEq(LIGHT_FROM_DEFAULT) diff --git a/src/world/area_osr/osr_00/main.c b/src/world/area_osr/osr_00/main.c index ce1b25ddfe7..974f44822d1 100644 --- a/src/world/area_osr/osr_00/main.c +++ b/src/world/area_osr/osr_00/main.c @@ -41,7 +41,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_TexPan_Fountain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_fw1, TEX_PANNER_1) Call(SetTexPanner, MODEL_w2, TEX_PANNER_2) Thread diff --git a/src/world/area_osr/osr_01/main.c b/src/world/area_osr/osr_01/main.c index 6ee6dd79345..7263661e838 100644 --- a/src/world/area_osr/osr_01/main.c +++ b/src/world/area_osr/osr_01/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Fountain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o501, TEX_PANNER_1) Call(SetTexPanner, MODEL_w2, TEX_PANNER_2) Thread diff --git a/src/world/area_osr/osr_02/main.c b/src/world/area_osr/osr_02/main.c index 2ab8517be1b..7e7eb17164d 100644 --- a/src/world/area_osr/osr_02/main.c +++ b/src/world/area_osr/osr_02/main.c @@ -9,7 +9,7 @@ API_CALLABLE(N(SetAvailableDisguise)) { } EvtScript N(EVS_ExitDoor_kpa_121_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_METAL) Set(LVar0, osr_02_ENTRY_0) @@ -25,7 +25,7 @@ EvtScript N(EVS_ExitDoor_kpa_121_1) = { }; EvtScript N(EVS_ExitDoor_kkj_10_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, osr_02_ENTRY_1) diff --git a/src/world/area_osr/osr_04/main.c b/src/world/area_osr/osr_04/main.c index 805584a39f7..b3048f86a6e 100644 --- a/src/world/area_osr/osr_04/main.c +++ b/src/world/area_osr/osr_04/main.c @@ -1,7 +1,7 @@ #include "osr_04.h" EvtScript N(EVS_TexPan_Smoke) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_ke1, TEX_PANNER_0) Call(SetTexPanner, MODEL_ke2, TEX_PANNER_1) Call(SetTexPanner, MODEL_ke3, TEX_PANNER_2) diff --git a/src/world/area_pra/pra_01/main.c b/src/world/area_pra/pra_01/main.c index 0ffbd68ff8e..c4830cd9240 100644 --- a/src/world/area_pra/pra_01/main.c +++ b/src/world/area_pra/pra_01/main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_ExitWalk_sam_10_1) = EVT_EXIT_WALK(60, pra_01_ENTRY_0, "sam_10", EvtScript N(EVS_ExitWalk_pra_15_0) = EVT_EXIT_WALK(60, pra_01_ENTRY_3, "pra_15", pra_15_ENTRY_0); EvtScript N(EVS_ExitDoor_pra_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_01_ENTRY_1) Set(LVar1, COLLIDER_deilittse) @@ -35,7 +35,7 @@ EvtScript N(EVS_ExitDoor_pra_02_0) = { }; EvtScript N(EVS_ExitDoor_pra_02_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_01_ENTRY_2) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_02/entity.c b/src/world/area_pra/pra_02/entity.c index 19fd50818e0..4477d65fd68 100644 --- a/src/world/area_pra/pra_02/entity.c +++ b/src/world/area_pra/pra_02/entity.c @@ -162,18 +162,18 @@ EvtScript N(EVS_UpdatePadlockPositions) = { #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_ItemPrompt_RedPadlock) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(FindKeyItem, ITEM_RED_KEY, LVar0) @@ -192,25 +192,25 @@ EvtScript N(EVS_ItemPrompt_RedPadlock) = { Set(LVar0, MV_FarRedPadlock) Set(MV_FarRedPadlock, -1) Call(N(RemovePadlock)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End }; EvtScript N(EVS_ItemPrompt_BluePadlock) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(FindKeyItem, ITEM_BLUE_KEY, LVar0) @@ -229,7 +229,7 @@ EvtScript N(EVS_ItemPrompt_BluePadlock) = { Set(LVar0, MV_FarBluePadlock) Set(MV_FarBluePadlock, -1) Call(N(RemovePadlock)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_pra/pra_02/main.c b/src/world/area_pra/pra_02/main.c index e231a60d45d..e908a4df6e4 100644 --- a/src/world/area_pra/pra_02/main.c +++ b/src/world/area_pra/pra_02/main.c @@ -38,7 +38,7 @@ s32 N(FarCenterDoorModels)[] = { MODEL_o774, -1 }; s32 N(EmptyModelList)[] = { -1 }; EvtScript N(EVS_ExitDoors_pra_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_0) @@ -59,7 +59,7 @@ EvtScript N(EVS_ExitDoors_pra_01_1) = { }; EvtScript N(EVS_ExitDoors_pra_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_1) @@ -80,7 +80,7 @@ EvtScript N(EVS_ExitDoors_pra_03_0) = { }; EvtScript N(EVS_ExitDoors_pra_16_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_2) @@ -101,7 +101,7 @@ EvtScript N(EVS_ExitDoors_pra_16_0) = { }; EvtScript N(EVS_ExitDoors_pra_13_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_2) @@ -122,7 +122,7 @@ EvtScript N(EVS_ExitDoors_pra_13_0) = { }; EvtScript N(EVS_ExitDoors_pra_16_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_3) @@ -143,7 +143,7 @@ EvtScript N(EVS_ExitDoors_pra_16_3) = { }; EvtScript N(EVS_ExitDoors_pra_13_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_3) @@ -165,7 +165,7 @@ End }; EvtScript N(EVS_ExitDoors_pra_04_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_4) @@ -186,7 +186,7 @@ EvtScript N(EVS_ExitDoors_pra_04_0) = { }; EvtScript N(EVS_ExitDoors_pra_01_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_5) diff --git a/src/world/area_pra/pra_03/main.c b/src/world/area_pra/pra_03/main.c index 9d8a79b18ca..8c4eed77ac0 100644 --- a/src/world/area_pra/pra_03/main.c +++ b/src/world/area_pra/pra_03/main.c @@ -1,7 +1,7 @@ #include "pra_03.h" EvtScript N(EVS_ExitDoors_pra_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_03_ENTRY_0) Set(LVar1, COLLIDER_deilittnnw) diff --git a/src/world/area_pra/pra_04/main.c b/src/world/area_pra/pra_04/main.c index e719bc16084..41a7fac7d89 100644 --- a/src/world/area_pra/pra_04/main.c +++ b/src/world/area_pra/pra_04/main.c @@ -1,7 +1,7 @@ #include "pra_04.h" EvtScript N(EVS_ExitDoor_pra_02_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_04_ENTRY_0) Set(LVar1, COLLIDER_deilittssw) diff --git a/src/world/area_pra/pra_05/main.c b/src/world/area_pra/pra_05/main.c index afa02025a6f..2db546f6557 100644 --- a/src/world/area_pra/pra_05/main.c +++ b/src/world/area_pra/pra_05/main.c @@ -4,7 +4,7 @@ #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_38_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_05_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_06/main.c b/src/world/area_pra/pra_06/main.c index 0355cc293da..9dc6fa1d18c 100644 --- a/src/world/area_pra/pra_06/main.c +++ b/src/world/area_pra/pra_06/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_39_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_06_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_09/main.c b/src/world/area_pra/pra_09/main.c index 79d69acd9c1..4ca12bb77ed 100644 --- a/src/world/area_pra/pra_09/main.c +++ b/src/world/area_pra/pra_09/main.c @@ -5,7 +5,7 @@ #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_03_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_09_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_10/main.c b/src/world/area_pra/pra_10/main.c index de64046bc1f..271638a4fa4 100644 --- a/src/world/area_pra/pra_10/main.c +++ b/src/world/area_pra/pra_10/main.c @@ -4,7 +4,7 @@ #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_04_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_10_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -21,7 +21,7 @@ EvtScript N(EVS_ExitDoors_pra_04_2) = { }; EvtScript N(EVS_ExitDoors_pra_12_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_10_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_12/main.c b/src/world/area_pra/pra_12/main.c index 1c059a149b4..88bfdbaf046 100644 --- a/src/world/area_pra/pra_12/main.c +++ b/src/world/area_pra/pra_12/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_10_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_12_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_13/main.c b/src/world/area_pra/pra_13/main.c index 8ebd3a6d0b4..3c17e3aaf79 100644 --- a/src/world/area_pra/pra_13/main.c +++ b/src/world/area_pra/pra_13/main.c @@ -16,7 +16,7 @@ s32 N(BothLeftDoorModelsL)[] = { MODEL_o772, MODEL_o844, MODEL_o859, MODEL_o860, s32 N(BothLeftDoorModelsR)[] = { MODEL_o768, MODEL_o846, MODEL_o861, MODEL_o862, -1 }; EvtScript N(EVS_ExitDoors_pra_02_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, 0) @@ -51,7 +51,7 @@ EvtScript N(EVS_Unused_2) = { }; EvtScript N(EVS_ExitDoors_pra_02_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, 3) diff --git a/src/world/area_pra/pra_13/npc.c b/src/world/area_pra/pra_13/npc.c index a312d2b9ced..0b8be263288 100644 --- a/src/world/area_pra/pra_13/npc.c +++ b/src/world/area_pra/pra_13/npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_Scene_DefeatImposters) = { Call(SetNpcPos, NPC_Duplighost_02, 370, 0, -70) Call(SetNpcAnimation, NPC_Duplighost_01, ANIM_Duplighost_Anim02) Call(SetNpcAnimation, NPC_Duplighost_02, ANIM_Duplighost_Anim02) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(SetNpcPos, NPC_FakeBombette, NPC_DISPOSE_LOCATION) Wait(10) @@ -157,8 +157,8 @@ EvtScript N(EVS_Scene_DefeatImposters) = { Call(NpcMoveTo, NPC_Duplighost_02, -30, -70, 45) Call(SetNpcPos, NPC_Duplighost_02, -30, -1000, 0) Set(GB_StoryProgress, STORY_CH7_DEFEATED_MIRROR_DUPLIGHOSTS) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - SetGroup(EVT_GROUP_0B) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_pra/pra_16/main.c b/src/world/area_pra/pra_16/main.c index cacf8cfdb84..d605401be4a 100644 --- a/src/world/area_pra/pra_16/main.c +++ b/src/world/area_pra/pra_16/main.c @@ -21,7 +21,7 @@ s32 N(BothLeftDoorModelsL)[] = { MODEL_o874, MODEL_o875, MODEL_o880, MODEL_o881, s32 N(BothLeftDoorModelsR)[] = { MODEL_o876, MODEL_o877, MODEL_o878, MODEL_o879, -1 }; EvtScript N(EVS_ExitDoors_pra_02_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_16_ENTRY_0) @@ -42,7 +42,7 @@ EvtScript N(EVS_ExitDoors_pra_02_2) = { }; EvtScript N(EVS_ExitDoors_pra_18_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_16_ENTRY_1) @@ -63,7 +63,7 @@ EvtScript N(EVS_ExitDoors_pra_18_0) = { }; EvtScript N(EVS_ExitDoors_pra_18_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_16_ENTRY_2) @@ -84,7 +84,7 @@ EvtScript N(EVS_ExitDoors_pra_18_2) = { }; EvtScript N(EVS_ExitDoors_pra_02_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_16_ENTRY_3) diff --git a/src/world/area_pra/pra_18/main.c b/src/world/area_pra/pra_18/main.c index e7088d6f396..b8f12bce1f8 100644 --- a/src/world/area_pra/pra_18/main.c +++ b/src/world/area_pra/pra_18/main.c @@ -16,7 +16,7 @@ s32 N(LeftDoorModelsL)[] = { MODEL_o995, MODEL_o996, -1 }; s32 N(LeftDoorModelsR)[] = { MODEL_o997, MODEL_o998, -1 }; EvtScript N(EVS_ExitDoors_pra_16_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_18_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -36,7 +36,7 @@ EvtScript N(EVS_ExitDoors_pra_16_1) = { }; EvtScript N(EVS_ExitDoors_pra_33_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_18_ENTRY_1) Set(LVar1, COLLIDER_deilittne) @@ -51,7 +51,7 @@ EvtScript N(EVS_ExitDoors_pra_33_1) = { }; EvtScript N(EVS_ExitDoors_pra_16_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_18_ENTRY_2) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_19/main.c b/src/world/area_pra/pra_19/main.c index 042b572b068..5eb44343c8b 100644 --- a/src/world/area_pra/pra_19/main.c +++ b/src/world/area_pra/pra_19/main.c @@ -8,7 +8,7 @@ s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 }; s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 }; EvtScript N(EVS_ExitDoor_pra_35_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_19_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_20/main.c b/src/world/area_pra/pra_20/main.c index 1b514abcf38..8e1b6953140 100644 --- a/src/world/area_pra/pra_20/main.c +++ b/src/world/area_pra/pra_20/main.c @@ -21,7 +21,7 @@ s32 N(ModelListNone)[] = { -1 }; EvtScript N(EVS_ExitWalk_pra_19_1) = EVT_EXIT_WALK(60, pra_20_ENTRY_0, "pra_19", pra_19_ENTRY_1); EvtScript N(EVS_ExitDoor_pra_21_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_1) Set(LVar1, COLLIDER_deilittssw) @@ -41,7 +41,7 @@ EvtScript N(EVS_ExitDoor_pra_21_0) = { }; EvtScript N(EVS_ExitDoors_pra_29_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_2) Set(LVar1, COLLIDER_deilittse) @@ -61,7 +61,7 @@ EvtScript N(EVS_ExitDoors_pra_29_0) = { }; EvtScript N(EVS_ExitDoors_pra_29_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_3) Set(LVar1, COLLIDER_deilittne) @@ -81,7 +81,7 @@ EvtScript N(EVS_ExitDoors_pra_29_3) = { }; EvtScript N(EVS_ExitDoor_pra_22_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_4) Set(LVar1, COLLIDER_deilittnnw) diff --git a/src/world/area_pra/pra_21/main.c b/src/world/area_pra/pra_21/main.c index df4dc8bab4e..0c2ceb6a087 100644 --- a/src/world/area_pra/pra_21/main.c +++ b/src/world/area_pra/pra_21/main.c @@ -4,7 +4,7 @@ s32 N(DoorModelsL)[] = { MODEL_o977, -1 }; s32 N(DoorModelsR)[] = { MODEL_o976, -1 }; EvtScript N(EVS_ExitDoor_pra_20_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_21_ENTRY_0) Set(LVar1, COLLIDER_deilittnnw) @@ -19,7 +19,7 @@ EvtScript N(EVS_ExitDoor_pra_20_1) = { }; EvtScript N(EVS_ExitDoors_pra_36_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_21_ENTRY_1) Set(LVar1, COLLIDER_deilittnne) diff --git a/src/world/area_pra/pra_22/main.c b/src/world/area_pra/pra_22/main.c index 0f05c0d2967..bf22a7c4c23 100644 --- a/src/world/area_pra/pra_22/main.c +++ b/src/world/area_pra/pra_22/main.c @@ -32,7 +32,7 @@ s32 N(DoorModelsL)[] = { MODEL_o1001, -1 }; s32 N(DoorModelsR)[] = { MODEL_o1002, -1 }; EvtScript N(EVS_ExitDoors_pra_20_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_22_ENTRY_0) Set(LVar1, COLLIDER_deilittssw) @@ -47,7 +47,7 @@ EvtScript N(EVS_ExitDoors_pra_20_4) = { }; EvtScript N(EVS_ExitDoors_pra_37_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_22_ENTRY_1) Set(LVar1, COLLIDER_deilittsse) diff --git a/src/world/area_pra/pra_27/main.c b/src/world/area_pra/pra_27/main.c index e9e2c06b36f..9ea93daaa16 100644 --- a/src/world/area_pra/pra_27/main.c +++ b/src/world/area_pra/pra_27/main.c @@ -14,7 +14,7 @@ s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 }; s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 }; EvtScript N(EVS_ExitDoors_pra_36_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_27_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_28/main.c b/src/world/area_pra/pra_28/main.c index 5544c1dbd1c..b07a9ecc2ef 100644 --- a/src/world/area_pra/pra_28/main.c +++ b/src/world/area_pra/pra_28/main.c @@ -14,7 +14,7 @@ s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 }; s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 }; EvtScript N(EVS_ExitDoors_pra_37_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_28_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_29/main.c b/src/world/area_pra/pra_29/main.c index ed3ca82c917..4d99a3a7a90 100644 --- a/src/world/area_pra/pra_29/main.c +++ b/src/world/area_pra/pra_29/main.c @@ -20,7 +20,7 @@ s32 N(BothRightDoorModelsL)[] = { MODEL_o995, MODEL_o1096, -1 }; s32 N(BothRightDoorModelsR)[] = { MODEL_o997, MODEL_o1094, -1 }; EvtScript N(EVS_ExitDoors_pra_20_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -40,7 +40,7 @@ EvtScript N(EVS_ExitDoors_pra_20_2) = { }; EvtScript N(EVS_ExitDoors_pra_34_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_1) Set(LVar1, COLLIDER_deilittse) @@ -60,7 +60,7 @@ EvtScript N(EVS_ExitDoors_pra_34_0) = { }; EvtScript N(EVS_ExitDoors_pra_34_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_2) Set(LVar1, COLLIDER_deilittne) @@ -80,7 +80,7 @@ EvtScript N(EVS_ExitDoors_pra_34_3) = { }; EvtScript N(EVS_ExitDoors_pra_20_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_3) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_31/main.c b/src/world/area_pra/pra_31/main.c index a99b6368c38..01e20058200 100644 --- a/src/world/area_pra/pra_31/main.c +++ b/src/world/area_pra/pra_31/main.c @@ -8,7 +8,7 @@ s32 N(FarLeftDoorModelsL)[] = { MODEL_o859, -1 }; s32 N(FarLeftDoorModelsR)[] = { MODEL_o861, -1 }; EvtScript N(EVS_ExitDoors_pra_34_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_31_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -23,7 +23,7 @@ EvtScript N(EVS_ExitDoors_pra_34_1) = { }; EvtScript N(EVS_ExitDoors_pra_40_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_31_ENTRY_1) Set(LVar1, COLLIDER_deilitte) @@ -38,7 +38,7 @@ EvtScript N(EVS_ExitDoors_pra_40_0) = { }; EvtScript N(EVS_ExitDoors_pra_34_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_31_ENTRY_2) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_31/puzzle.c b/src/world/area_pra/pra_31/puzzle.c index 20403972221..f971aef8524 100644 --- a/src/world/area_pra/pra_31/puzzle.c +++ b/src/world/area_pra/pra_31/puzzle.c @@ -398,7 +398,7 @@ EvtScript N(EVS_Scene_PuzzleSolved) = { }; EvtScript N(EVS_UpdateStatuePositions) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(GetDinoStatuePosRot), NPC_AlbinoDino_01) Set(MV_StatueYaw_01, LVar2) Call(N(GetDinoStatuePosRot), NPC_AlbinoDino_02) diff --git a/src/world/area_pra/pra_32/main.c b/src/world/area_pra/pra_32/main.c index 8a680560666..f495b731dd1 100644 --- a/src/world/area_pra/pra_32/main.c +++ b/src/world/area_pra/pra_32/main.c @@ -142,7 +142,7 @@ s32 N(DoorModelsR)[] = { }; EvtScript N(EVS_ExitDoors_pra_40_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_32_ENTRY_0) Set(LVar1, COLLIDER_deilittw) diff --git a/src/world/area_pra/pra_33/main.c b/src/world/area_pra/pra_33/main.c index 9fcb29adee8..475a5fdca20 100644 --- a/src/world/area_pra/pra_33/main.c +++ b/src/world/area_pra/pra_33/main.c @@ -12,7 +12,7 @@ s32 N(LeftDoorModelsL)[] = { MODEL_o859, -1 }; s32 N(LeftDoorModelsR)[] = { MODEL_o861, -1 }; EvtScript N(EVS_ExitDoors_pra_35_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_33_ENTRY_0) Set(LVar1, COLLIDER_deilittse) @@ -27,7 +27,7 @@ EvtScript N(EVS_ExitDoors_pra_35_0) = { }; EvtScript N(EVS_ExitDoors_pra_18_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_33_ENTRY_1) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_34/main.c b/src/world/area_pra/pra_34/main.c index dc784e5a1ef..4f58a7374d8 100644 --- a/src/world/area_pra/pra_34/main.c +++ b/src/world/area_pra/pra_34/main.c @@ -20,7 +20,7 @@ s32 N(BothRightDoorModelsL)[] = { MODEL_o874, MODEL_o875, MODEL_o880, MODEL_o881 s32 N(BothRightDoorModelsR)[] = { MODEL_o876, MODEL_o877, MODEL_o878, MODEL_o879, -1 }; EvtScript N(EVS_ExitDoors_pra_29_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -40,7 +40,7 @@ EvtScript N(EVS_ExitDoors_pra_29_1) = { }; EvtScript N(EVS_ExitDoors_pra_31_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_1) Set(LVar1, COLLIDER_deilittse) @@ -60,7 +60,7 @@ EvtScript N(EVS_ExitDoors_pra_31_0) = { }; EvtScript N(EVS_ExitDoors_pra_31_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_2) Set(LVar1, COLLIDER_deilittne) @@ -80,7 +80,7 @@ EvtScript N(EVS_ExitDoors_pra_31_2) = { }; EvtScript N(EVS_ExitDoors_pra_29_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_3) Set(LVar1, COLLIDER_deilittnw) @@ -108,18 +108,18 @@ s32 N(PalaceKeyList)[] = { }; EvtScript N(EVS_UnlockPrompt_Doors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -133,7 +133,7 @@ EvtScript N(EVS_UnlockPrompt_Doors) = { Call(N(RemovePadlock)) Set(LVar0, MV_NearPadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_pra/pra_35/main.c b/src/world/area_pra/pra_35/main.c index e0c4dc68a57..f2791066567 100644 --- a/src/world/area_pra/pra_35/main.c +++ b/src/world/area_pra/pra_35/main.c @@ -12,7 +12,7 @@ s32 N(RightDoorModelsL)[] = { MODEL_o861, MODEL_o862, -1 }; s32 N(RightDoorModelsR)[] = { MODEL_o859, MODEL_o860, -1 }; EvtScript N(EVS_ExitWalk_pra_33_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_35_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -27,7 +27,7 @@ EvtScript N(EVS_ExitWalk_pra_33_0) = { }; EvtScript N(EVS_ExitWalk_pra_19_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_35_ENTRY_1) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_36/main.c b/src/world/area_pra/pra_36/main.c index 457b3e404b2..bf98d0e69d0 100644 --- a/src/world/area_pra/pra_36/main.c +++ b/src/world/area_pra/pra_36/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_21_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_36_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_21_1) = { }; EvtScript N(EVS_ExitDoors_pra_27_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_36_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_37/main.c b/src/world/area_pra/pra_37/main.c index 56258d6cc97..677f1a6bd50 100644 --- a/src/world/area_pra/pra_37/main.c +++ b/src/world/area_pra/pra_37/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_22_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_37_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_22_1) = { }; EvtScript N(EVS_ExitDoors_pra_28_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_37_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_38/main.c b/src/world/area_pra/pra_38/main.c index 03c470d27cc..8c5108c695f 100644 --- a/src/world/area_pra/pra_38/main.c +++ b/src/world/area_pra/pra_38/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_03_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_38_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_03_1) = { }; EvtScript N(EVS_ExitDoors_pra_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_38_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_39/main.c b/src/world/area_pra/pra_39/main.c index aa4e37e5d9c..fd029ebc5df 100644 --- a/src/world/area_pra/pra_39/main.c +++ b/src/world/area_pra/pra_39/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_04_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_39_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_04_1) = { }; EvtScript N(EVS_ExitDoors_pra_06_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_39_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_sam/sam_10/entity.c b/src/world/area_sam/sam_10/entity.c index 41d0ab8cadd..c82361b7805 100644 --- a/src/world/area_sam/sam_10/entity.c +++ b/src/world/area_sam/sam_10/entity.c @@ -9,11 +9,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_sam/sam_11/entity.c b/src/world/area_sam/sam_11/entity.c index 2c610fa550d..aeab2d0fffc 100644 --- a/src/world/area_sam/sam_11/entity.c +++ b/src/world/area_sam/sam_11/entity.c @@ -341,7 +341,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { }; EvtScript N(EVS_LandOnRightRoof) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) IfEq(MF_Unk_00, TRUE) Return EndIf diff --git a/src/world/area_sam/sam_11/main.c b/src/world/area_sam/sam_11/main.c index b1000e26851..bd25a9e7950 100644 --- a/src/world/area_sam/sam_11/main.c +++ b/src/world/area_sam/sam_11/main.c @@ -54,7 +54,7 @@ EvtScript N(EVS_ExitWalk_sam_02_1) = { IfEq(MV_ThrownOut, 1) Return EndIf - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sam_11_ENTRY_0) Exec(ExitWalk) Call(GotoMap, Ref("sam_02"), sam_02_ENTRY_1) @@ -64,7 +64,7 @@ EvtScript N(EVS_ExitWalk_sam_02_1) = { }; EvtScript N(EVS_ExitWalk_sam_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH7_MAYOR_MURDER_SOLVED) Return EndIf diff --git a/src/world/area_sam/sam_11/rooms.c b/src/world/area_sam/sam_11/rooms.c index 115f9556049..7f0b3a91fd4 100644 --- a/src/world/area_sam/sam_11/rooms.c +++ b/src/world/area_sam/sam_11/rooms.c @@ -116,18 +116,18 @@ s32 N(KeyList)[] = { #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockPrompt_LeftHouse) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -137,7 +137,7 @@ EvtScript N(EVS_UnlockPrompt_LeftHouse) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_sbk/sbk_36/entity.c b/src/world/area_sbk/sbk_36/entity.c index af1aaf0d2a2..44c0646fe74 100644 --- a/src/world/area_sbk/sbk_36/entity.c +++ b/src/world/area_sbk/sbk_36/entity.c @@ -2,12 +2,12 @@ #include "entity.h" EvtScript N(ReadSign) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_017A, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_sbk/sbk_56/main.c b/src/world/area_sbk/sbk_56/main.c index 14b3d7cb76d..77332fae172 100644 --- a/src/world/area_sbk/sbk_56/main.c +++ b/src/world/area_sbk/sbk_56/main.c @@ -33,7 +33,7 @@ API_CALLABLE(N(StopOasisSongVariation)) { } EvtScript N(EVS_ExitWalk_sbk_55_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sbk_56_ENTRY_0) Exec(ExitWalk) Call(N(StopOasisSongVariation)) @@ -44,7 +44,7 @@ EvtScript N(EVS_ExitWalk_sbk_55_1) = { }; EvtScript N(EVS_ExitWalk_sbk_46_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sbk_56_ENTRY_2) Exec(ExitWalk) Call(N(StopOasisSongVariation)) @@ -55,7 +55,7 @@ EvtScript N(EVS_ExitWalk_sbk_46_3) = { }; EvtScript N(EVS_ExitWalk_sbk_66_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sbk_56_ENTRY_3) Exec(ExitWalk) Call(N(StopOasisSongVariation)) diff --git a/src/world/area_tik/common/DripVolumes.inc.c b/src/world/area_tik/common/DripVolumes.inc.c index db3f2a1f002..b0f19731b14 100644 --- a/src/world/area_tik/common/DripVolumes.inc.c +++ b/src/world/area_tik/common/DripVolumes.inc.c @@ -124,7 +124,7 @@ EvtScript N(EVS_UpdateDripSplash) = { }; EvtScript N(EVS_UpdateDripVolume) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) UseArray(LVarA) Set(LVar5, ArrayVar(5)) Loop(5) diff --git a/src/world/area_tik/tik_03/platforms.c b/src/world/area_tik/tik_03/platforms.c index 1a29dcc86c0..cb5fe216801 100644 --- a/src/world/area_tik/tik_03/platforms.c +++ b/src/world/area_tik/tik_03/platforms.c @@ -23,7 +23,7 @@ API_CALLABLE(N(PausePlatformsDuringPound)) { } EvtScript N(EVS_UpdatePlatform) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(ParentColliderToModel, LVarB, LVarA) SetF(LVar0, Float(0.0)) SetF(LVarD, Float(-300.0)) diff --git a/src/world/area_tik/tik_07/platforms.c b/src/world/area_tik/tik_07/platforms.c index 813d9838db6..40286d72160 100644 --- a/src/world/area_tik/tik_07/platforms.c +++ b/src/world/area_tik/tik_07/platforms.c @@ -23,7 +23,7 @@ API_CALLABLE(N(PausePlatformsDuringPound)) { } EvtScript N(EVS_UpdatePlatform) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(ParentColliderToModel, LVarB, LVarA) SetF(LVar0, Float(0.0)) SetF(LVarD, Float(-90.0)) diff --git a/src/world/area_tik/tik_09/main.c b/src/world/area_tik/tik_09/main.c index 5daf4216d67..f2234bd769a 100644 --- a/src/world/area_tik/tik_09/main.c +++ b/src/world/area_tik/tik_09/main.c @@ -6,7 +6,7 @@ EvtScript N(EVS_CloseGates) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) Call(PlaySoundAtCollider, COLLIDER_o59, SOUND_LARGE_GATE_OPEN, SOUND_SPACE_DEFAULT) @@ -26,7 +26,7 @@ EvtScript N(EVS_CloseGates) = { Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o59, COLLIDER_FLAGS_UPPER_MASK) Call(DisablePlayerInput, FALSE) Wait(1) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_tik/tik_12/entity.c b/src/world/area_tik/tik_12/entity.c index 1f2a9508d1c..e59d252575b 100644 --- a/src/world/area_tik/tik_12/entity.c +++ b/src/world/area_tik/tik_12/entity.c @@ -12,11 +12,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_tik/tik_21/main.c b/src/world/area_tik/tik_21/main.c index fcdff09f1f1..f3667cefe38 100644 --- a/src/world/area_tik/tik_21/main.c +++ b/src/world/area_tik/tik_21/main.c @@ -7,7 +7,7 @@ EvtScript N(EVS_ExitWalk_tik_20_1) = EVT_EXIT_WALK(60, tik_21_ENTRY_0, "tik_20", tik_20_ENTRY_1); EvtScript N(EVS_ExitDoors_tik_22_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(DisablePlayerInput, TRUE) Set(LVar0, tik_21_ENTRY_1) diff --git a/src/world/area_tik/tik_22/main.c b/src/world/area_tik/tik_22/main.c index b7b71893a02..06dd0583d4e 100644 --- a/src/world/area_tik/tik_22/main.c +++ b/src/world/area_tik/tik_22/main.c @@ -10,7 +10,7 @@ API_CALLABLE(N(ResetTrackVolumes)) { } EvtScript N(EVS_ExitDoors_tik_21_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(N(ResetTrackVolumes)) Set(LVar0, tik_22_ENTRY_0) diff --git a/src/world/area_trd/trd_00/main.c b/src/world/area_trd/trd_00/main.c index 1f2f1d7a279..8fe3baba9f3 100644 --- a/src/world/area_trd/trd_00/main.c +++ b/src/world/area_trd/trd_00/main.c @@ -59,8 +59,8 @@ EvtScript N(D_80240B34_99A7A4) = { }; EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetLoadType, LVar1) IfEq(LVar1, 1) Exec(EnterSavePoint) @@ -97,13 +97,13 @@ EvtScript N(EVS_EnterMap) = { CaseEq(trd_00_ENTRY_5) Exec(N(EVS_BindExitTriggers)) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; EvtScript N(EVS_TexPan_WaterEdge) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_ue, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_01/entity.c b/src/world/area_trd/trd_01/entity.c index 84f7229cd34..3609373366d 100644 --- a/src/world/area_trd/trd_01/entity.c +++ b/src/world/area_trd/trd_01/entity.c @@ -27,18 +27,18 @@ EvtScript N(EVS_FocusCamOnLock) = { #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockDoors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_KOOPA_FORTRESS_KEY, LVar0) @@ -50,7 +50,7 @@ EvtScript N(EVS_UnlockDoors) = { Set(LVar0, MV_Padlock_EntityIndex) Call(N(RemovePadlock)) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_01/main.c b/src/world/area_trd/trd_01/main.c index f558fe7b0f1..fe6f726156c 100644 --- a/src/world/area_trd/trd_01/main.c +++ b/src/world/area_trd/trd_01/main.c @@ -10,8 +10,8 @@ extern NpcGroupList N(DefaultNPCs); #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_01_ENTRY_0) @@ -31,7 +31,7 @@ EvtScript N(EVS_EnterMap) = { Set(LVar3, MODEL_e4_doa2) ExecWait(EnterDoubleDoor) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; @@ -44,7 +44,7 @@ EvtScript N(EVS_ExitDoors_trd_09_0) = EVT_EXIT_DOUBLE_DOOR(trd_01_ENTRY_3, "trd_ EvtScript N(EVS_Scene_RaiseStairs) = { Call(DisablePlayerInput, TRUE) Set(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Wait(1) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Wait(20 * DT) @@ -62,7 +62,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { Call(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) Call(PlaySound, SOUND_LOOP_TRD_FLOWING_WATER) ChildThread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Wait(4 * DT) Call(EnableModel, MODEL_sui1, TRUE) Call(EnableModel, MODEL_sui2, TRUE) @@ -271,14 +271,14 @@ EvtScript N(EVS_Scene_RaiseStairs) = { Call(ResetCam, CAM_DEFAULT, Float(1.5 / DT)) Call(StopSound, SOUND_LOOP_TRD_FLOWING_WATER) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimenn, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_02/entity.c b/src/world/area_trd/trd_02/entity.c index 1736248915b..34afe8593d4 100644 --- a/src/world/area_trd/trd_02/entity.c +++ b/src/world/area_trd/trd_02/entity.c @@ -7,18 +7,18 @@ extern EvtScript N(EVS_ExitDoors_trd_01_2); #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(D_80242890_9A3870) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -28,7 +28,7 @@ EvtScript N(D_80242890_9A3870) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Padlock_EntityIndex) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_02/main.c b/src/world/area_trd/trd_02/main.c index 7299edb557a..b5dbf9bbf29 100644 --- a/src/world/area_trd/trd_02/main.c +++ b/src/world/area_trd/trd_02/main.c @@ -19,8 +19,8 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_02_ENTRY_0) @@ -47,15 +47,15 @@ EvtScript N(EVS_EnterMap) = { Set(LVar0, Ref(N(EVS_BindExitTriggers))) Exec(EnterWalk) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; EvtScript N(EVS_Scene_LowerStairs) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, 0) - SuspendGroup(EVT_GROUP_01) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Wait(30) Call(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) @@ -112,7 +112,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { Set(GB_StoryProgress, STORY_CH1_LOWERED_SECOND_STAIRS) Call(DisablePlayerInput, FALSE) Call(SetTimeFreezeMode, 0) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End @@ -124,8 +124,8 @@ BombTrigger N(D_8024240C_9A33EC) = { }; EvtScript N(D_8024241C_9A33FC) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) PlayEffect(EFFECT_BOMBETTE_BREAKING, 0, 17, 11, 1, 10, 30) Call(EnableModel, MODEL_anaaki, TRUE) Loop(10) @@ -136,7 +136,7 @@ EvtScript N(D_8024241C_9A33FC) = { EndLoop Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) Set(GF_TRD02_BombedWall, TRUE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_04/entity.c b/src/world/area_trd/trd_04/entity.c index d41cba43ba0..c00590ddcbb 100644 --- a/src/world/area_trd/trd_04/entity.c +++ b/src/world/area_trd/trd_04/entity.c @@ -33,18 +33,18 @@ s32 N(missing_80244D70_4D70)[] = { }; EvtScript N(EVS_UnlockUpperLeftDoors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -54,25 +54,25 @@ EvtScript N(EVS_UnlockUpperLeftDoors) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Unk_00) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End }; EvtScript N(EVS_UnlockLowerRightDoors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -82,7 +82,7 @@ EvtScript N(EVS_UnlockLowerRightDoors) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Unk_01) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_04/main.c b/src/world/area_trd/trd_04/main.c index eb6dcd77563..0ec1fc88cf5 100644 --- a/src/world/area_trd/trd_04/main.c +++ b/src/world/area_trd/trd_04/main.c @@ -61,8 +61,8 @@ EvtScript N(EVS_EnterMap) = { Exec(N(EVS_BindExitTriggers)) Return EndIf - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_04_ENTRY_0) @@ -94,14 +94,14 @@ EvtScript N(EVS_EnterMap) = { ExecWait(EnterDoubleDoor) Exec(N(EVS_BindExitTriggers)) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; EvtScript N(EVS_Scene_LowerStairs) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Set(GB_StoryProgress, STORY_CH1_LOWERED_FIRST_STAIRS) Call(DisablePlayerInput, TRUE) Wait(30 * DT) @@ -210,14 +210,14 @@ EvtScript N(EVS_Scene_LowerStairs) = { Call(EnableModel, MODEL_o7, TRUE) Call(EnableModel, MODEL_bero2, TRUE) Call(DisablePlayerInput, FALSE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_05/main.c b/src/world/area_trd/trd_05/main.c index abd4509feb4..b041f6ddb2d 100644 --- a/src/world/area_trd/trd_05/main.c +++ b/src/world/area_trd/trd_05/main.c @@ -26,8 +26,8 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_05_ENTRY_0) @@ -49,7 +49,7 @@ EvtScript N(EVS_EnterMap) = { ExecWait(EnterDoubleDoor) Exec(N(EVS_BindExitTriggers)) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; @@ -61,8 +61,8 @@ BombTrigger N(BombPos_Wall) = { EvtScript N(EVS_BombWall) = { PlayEffect(EFFECT_BOMBETTE_BREAKING, 0, 29, 0, 1, 10, 30) - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_VISIBLE) Loop(10) Call(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_VISIBLE) @@ -72,14 +72,14 @@ EvtScript N(EVS_BombWall) = { EndLoop Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) Set(GF_TRD05_BombedWall, TRUE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_06/main.c b/src/world/area_trd/trd_06/main.c index 0723ad5ec97..5b73786f47e 100644 --- a/src/world/area_trd/trd_06/main.c +++ b/src/world/area_trd/trd_06/main.c @@ -118,7 +118,7 @@ EvtScript N(EVS_BombWall_Cell) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_07/magic_doors.c b/src/world/area_trd/trd_07/magic_doors.c index f3a86e237a7..ca2c9d000f6 100644 --- a/src/world/area_trd/trd_07/magic_doors.c +++ b/src/world/area_trd/trd_07/magic_doors.c @@ -205,8 +205,8 @@ EvtScript N(EVS_RaiseMagicDoors) = { Wait(1) Goto(10) EndIf - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) @@ -243,8 +243,8 @@ EvtScript N(EVS_RaiseMagicDoors) = { Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) Call(DisablePlayerInput, FALSE) - ResumeGroup(EVT_GROUP_01) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -254,7 +254,7 @@ EvtScript N(EVS_LowerMagicDoors) = { Wait(15) Call(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) Wait(15) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_VEC3I_SET(LVar0, 220, 0, 0) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -286,7 +286,7 @@ EvtScript N(EVS_LowerMagicDoors) = { Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_trd/trd_07/main.c b/src/world/area_trd/trd_07/main.c index 633404a18ea..c6203dcf903 100644 --- a/src/world/area_trd/trd_07/main.c +++ b/src/world/area_trd/trd_07/main.c @@ -17,7 +17,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_1) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Set(LVar1, 0) Label(10) diff --git a/src/world/area_trd/trd_08/main.c b/src/world/area_trd/trd_08/main.c index dbb73504d8a..48614c5fc01 100644 --- a/src/world/area_trd/trd_08/main.c +++ b/src/world/area_trd/trd_08/main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_09/main.c b/src/world/area_trd/trd_09/main.c index 619780ae479..e613e704c0c 100644 --- a/src/world/area_trd/trd_09/main.c +++ b/src/world/area_trd/trd_09/main.c @@ -25,8 +25,8 @@ EvtScript N(EVS_EnterMap) = { Exec(N(EVS_BindExitTriggers)) Return EndIf - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Exec(N(EVS_BindExitTriggers)) Call(GetEntryID, LVar0) Switch(LVar0) @@ -39,7 +39,7 @@ EvtScript N(EVS_EnterMap) = { Set(LVar3, MODEL_o65) ExecWait(EnterDoubleDoor) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; diff --git a/src/world/area_trd/trd_10/main.c b/src/world/area_trd/trd_10/main.c index f02fb160f4e..db50df9b3d1 100644 --- a/src/world/area_trd/trd_10/main.c +++ b/src/world/area_trd/trd_10/main.c @@ -109,7 +109,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitDoors_trd_09_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, trd_10_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_tst/tst_10/main.c b/src/world/area_tst/tst_10/main.c index ad8090e704c..06511ae699b 100644 --- a/src/world/area_tst/tst_10/main.c +++ b/src/world/area_tst/tst_10/main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .background = &gBackgroundImage, }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_2) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_0) @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitWalk_tst_10_2) = { End }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_3) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_1) @@ -40,7 +40,7 @@ EvtScript N(EVS_ExitWalk_tst_10_3) = { End }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_0) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_2) @@ -51,7 +51,7 @@ EvtScript N(EVS_ExitWalk_tst_10_0) = { End }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_1) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_3) diff --git a/src/world/area_tst/tst_12/main.c b/src/world/area_tst/tst_12/main.c index 7cf5ea281af..d32c6a3d657 100644 --- a/src/world/area_tst/tst_12/main.c +++ b/src/world/area_tst/tst_12/main.c @@ -15,7 +15,7 @@ MapSettings N(settings) = { }; EvtScript N(D_80240050_B1D340) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Set(LVarA, LVar0) Set(LVarB, LVar1) Set(LVarC, LVar2) diff --git a/src/world/common/atomic/TexturePan.inc.c b/src/world/common/atomic/TexturePan.inc.c index 20ee1ddac4c..4dd37c9edab 100644 --- a/src/world/common/atomic/TexturePan.inc.c +++ b/src/world/common/atomic/TexturePan.inc.c @@ -110,7 +110,7 @@ API_CALLABLE(N(UpdateTexturePanStepped)) { } EvtScript N(EVS_UpdateTexturePan) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) IfEq(LVar5, 1) IfEq(LVar6, 1) IfEq(LVar7, 1) diff --git a/src/world/common/enemy/HurtPlant.inc.c b/src/world/common/enemy/HurtPlant.inc.c index 30fa73236a7..1a421ff3a38 100644 --- a/src/world/common/enemy/HurtPlant.inc.c +++ b/src/world/common/enemy/HurtPlant.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_NpcAI_HurtPlant) = { Wait(1) Goto(0) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(NpcFacePlayer, NPC_SELF, 0) @@ -23,7 +23,7 @@ EvtScript N(EVS_NpcAI_HurtPlant) = { Wait(5) Call(SetNpcAnimation, NPC_SELF, ANIM_HurtPlant_Anim02) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(StartBattle) Return End diff --git a/src/world/common/enemy/MBush.inc.c b/src/world/common/enemy/MBush.inc.c index 86f721dad84..5b7dda9aab5 100644 --- a/src/world/common/enemy/MBush.inc.c +++ b/src/world/common/enemy/MBush.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_NpcAI_MBush) = { Wait(1) Goto(0) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(PlaySoundAtNpc, NPC_SELF, SOUND_SEARCH_BUSH, SOUND_SPACE_DEFAULT) @@ -52,7 +52,7 @@ EvtScript N(EVS_NpcAI_MBush) = { Call(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim07) Wait(2) Call(SetPlayerAnimation, ANIM_Mario1_Flail) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) Call(StartBattle) }; // fallthrough :( diff --git a/src/world/common/enemy/Sentinel.inc.c b/src/world/common/enemy/Sentinel.inc.c index dc38f57ca02..5fbe20cd127 100644 --- a/src/world/common/enemy/Sentinel.inc.c +++ b/src/world/common/enemy/Sentinel.inc.c @@ -44,7 +44,7 @@ EvtScript N(EVS_NpcAI_Sentinel) = { Call(DisablePlayerPhysics, TRUE) Call(InterruptUsePartner) Call(DisablePartnerAI, 0) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(GetPlayerPos, LVar0, LVar1, LVar2) Add(LVar1, 20) diff --git a/src/world/common/enemy/ai/FireBarAI.inc.c b/src/world/common/enemy/ai/FireBarAI.inc.c index 77aeb74c40d..666b1d93f58 100644 --- a/src/world/common/enemy/ai/FireBarAI.inc.c +++ b/src/world/common/enemy/ai/FireBarAI.inc.c @@ -51,7 +51,7 @@ API_CALLABLE(N(FireBarAI_Main)) { data->settings = settings; } - if (get_time_freeze_mode() != TIME_FREEZE_NORMAL) { + if (get_time_freeze_mode() != TIME_FREEZE_NONE) { return 0; } diff --git a/src/world/common/entity/Chest.inc.c b/src/world/common/entity/Chest.inc.c index c619c9efc7e..61aed3a21f4 100644 --- a/src/world/common/entity/Chest.inc.c +++ b/src/world/common/entity/Chest.inc.c @@ -8,11 +8,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index d9d57b9062e..e344bff2836 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -7,7 +7,7 @@ #define EVT_EXIT_PIPE_HORIZONTAL(entry, collider, script) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Set(LVarA, entry) \ Set(LVarB, collider) \ Set(LVarC, Ref(script)) \ @@ -18,7 +18,7 @@ #define EVT_EXIT_PIPE_VERTICAL(entry, collider, script) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Set(LVarA, entry) \ Set(LVarB, collider) \ Set(LVarC, Ref(script)) \ @@ -255,7 +255,7 @@ EvtScript N(EVS_Pipe_ExitVertical) = { EvtScript N(EVS_Pipe_ExitVertical_Impl) = { Call(N(Pipe_SetAnimFlag)) - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerPhysics, TRUE) Call(HidePlayerShadow, TRUE) Set(LVar0, LVarA) @@ -308,7 +308,7 @@ EvtScript N(EVS_Pipe_ExitHorizontal) = { Else Call(DisablePlayerInput, TRUE) EndIf - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(N(Pipe_SetAnimFlag)) Call(DisablePlayerPhysics, TRUE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/dead/area_flo/flo_00/beanstalk.c b/src/world/dead/area_flo/flo_00/beanstalk.c index 369b7350ecb..2fe252d2f15 100644 --- a/src/world/dead/area_flo/flo_00/beanstalk.c +++ b/src/world/dead/area_flo/flo_00/beanstalk.c @@ -466,7 +466,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Call(func_802CF56C, 2) Call(DisablePlayerInput, FALSE) IfEq(GF_FLO00_PlacedFertileSoil, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(10) Call(ShowKeyChoicePopup) @@ -474,7 +474,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_FERTILE_SOIL) @@ -502,7 +502,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Set(GF_FLO00_PlacedFertileSoil, TRUE) EndIf IfEq(GF_FLO00_PlacedMagicalBean, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(20) Call(ShowKeyChoicePopup) @@ -510,7 +510,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MAGICAL_BEAN) @@ -539,7 +539,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EndIf Set(GF_FLO00_PlacedMagicalBean, TRUE) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(30) Call(ShowKeyChoicePopup) @@ -547,7 +547,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MIRACLE_WATER) diff --git a/src/world/dead/area_flo/flo_10/npc.c b/src/world/dead/area_flo/flo_10/npc.c index 36d39b32d57..337452e36d5 100644 --- a/src/world/dead/area_flo/flo_10/npc.c +++ b/src/world/dead/area_flo/flo_10/npc.c @@ -36,14 +36,14 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Return EndIf Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) Switch(LVar2) CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Wait(10) Call(SpeakToPlayer, NPC_Lily, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 0, MSG_CH6_0081) CaseDefault @@ -59,7 +59,7 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Call(MakeItemEntity, ITEM_WATER_STONE, 0, -60, 6, ITEM_SPAWN_MODE_DECORATION, 0) Set(LVarA, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) ExecWait(N(EVS_Scene_ReleaseFountain)) EndSwitch Call(DisablePlayerInput, FALSE) diff --git a/src/world/dead/area_flo/flo_11/main.c b/src/world/dead/area_flo/flo_11/main.c index 73df110d8c4..aae206ca094 100644 --- a/src/world/dead/area_flo/flo_11/main.c +++ b/src/world/dead/area_flo/flo_11/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_ExitWalk_flo_12_0) = EVT_EXIT_WALK(60, flo_11_ENTRY_1, "flo_12", // template for GotoMap exits used with pipes in the maze #define Goto_MAP(mapName, entry) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(GotoMap, Ref(mapName), entry) \ Wait(100) \ Return \ diff --git a/src/world/dead/area_flo/flo_14/bubbles.c b/src/world/dead/area_flo/flo_14/bubbles.c index 47dd8ff83ef..507bf9f2299 100644 --- a/src/world/dead/area_flo/flo_14/bubbles.c +++ b/src/world/dead/area_flo/flo_14/bubbles.c @@ -291,7 +291,7 @@ void N(gfx_build_bubble_flower)(void) { } EvtScript N(EVS_ManageBlownBubble) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarF, LVar0) Label(0) IfEq(AF_FLO_PauseBlowingBubbles, TRUE) diff --git a/src/world/dead/area_flo/flo_18/machine.c b/src/world/dead/area_flo/flo_18/machine.c index e3d1b97785b..a00f55704e9 100644 --- a/src/world/dead/area_flo/flo_18/machine.c +++ b/src/world/dead/area_flo/flo_18/machine.c @@ -22,7 +22,7 @@ API_CALLABLE(N(SetMachineLightningColor)) { } EvtScript N(EVS_AnimateMachineLightning) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) PlayEffect(EFFECT_LIGHTNING_BOLT, 0, Float(-16.0), Float(102.0), Float(-4.1), Float(80.9), Float(102.0), Float(-4.1), Float(0.5), 6) Call(N(SetMachineLightningColor)) diff --git a/src/world/dead/area_flo/flo_19/clouds.c b/src/world/dead/area_flo/flo_19/clouds.c index 89625c016e2..093208fb497 100644 --- a/src/world/dead/area_flo/flo_19/clouds.c +++ b/src/world/dead/area_flo/flo_19/clouds.c @@ -25,7 +25,7 @@ API_CALLABLE(N(CosInterpAbsMinMax)) { } EvtScript N(EVS_AnimatePlatforms) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Set(LVarF, 0) Label(0) SetF(LVar0, Float(-215.4375)) diff --git a/src/world/dead/area_flo/flo_19/main.c b/src/world/dead/area_flo/flo_19/main.c index 8ea9b7b6f4b..7b85d0abe4f 100644 --- a/src/world/dead/area_flo/flo_19/main.c +++ b/src/world/dead/area_flo/flo_19/main.c @@ -9,7 +9,7 @@ API_CALLABLE(N(SpawnSunEffect)) { } EvtScript N(EVS_ExitWalk_flo_21_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, flo_19_ENTRY_1) Exec(ExitWalk) Call(GotoMap, 0x80243000, flo_21_ENTRY_0) // raw pointer to missing string "flo_21" diff --git a/src/world/dead/area_kzn/kzn_11/main.c b/src/world/dead/area_kzn/kzn_11/main.c index 5ecc049ee55..35a7032219c 100644 --- a/src/world/dead/area_kzn/kzn_11/main.c +++ b/src/world/dead/area_kzn/kzn_11/main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) diff --git a/src/world/dead/area_kzn/kzn_11/platforms.c b/src/world/dead/area_kzn/kzn_11/platforms.c index 85733123bf3..45c187f86af 100644 --- a/src/world/dead/area_kzn/kzn_11/platforms.c +++ b/src/world/dead/area_kzn/kzn_11/platforms.c @@ -40,7 +40,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_UpdateLeftPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o67, MODEL_o67) Call(ParentColliderToModel, COLLIDER_o68, MODEL_o68) Call(ParentColliderToModel, COLLIDER_o69, MODEL_o69) @@ -105,7 +105,7 @@ EvtScript N(EVS_UpdateLeftPlatform) = { }; EvtScript N(EVS_UpdateRightPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o26, MODEL_o26) Call(ParentColliderToModel, COLLIDER_o27, MODEL_o27) Call(ParentColliderToModel, COLLIDER_o28, MODEL_o28) diff --git a/src/world/dead/area_kzn/kzn_17/tromp.c b/src/world/dead/area_kzn/kzn_17/tromp.c index 0073638ba2f..719825023c3 100644 --- a/src/world/dead/area_kzn/kzn_17/tromp.c +++ b/src/world/dead/area_kzn/kzn_17/tromp.c @@ -46,7 +46,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { }; EvtScript N(EVS_SetupSpinyTromp) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) IfGe(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) Call(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) Call(EnableModel, MODEL_me, FALSE) diff --git a/src/world/dead/area_kzn/kzn_18/main.c b/src/world/dead/area_kzn/kzn_18/main.c index e5df608a282..bafc654010c 100644 --- a/src/world/dead/area_kzn/kzn_18/main.c +++ b/src/world/dead/area_kzn/kzn_18/main.c @@ -18,7 +18,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Call(EnableTexPanning, MODEL_off1, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/dead/area_kzn/kzn_19/main.c b/src/world/dead/area_kzn/kzn_19/main.c index 694a2b16540..13725260b07 100644 --- a/src/world/dead/area_kzn/kzn_19/main.c +++ b/src/world/dead/area_kzn/kzn_19/main.c @@ -99,7 +99,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) @@ -139,7 +139,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Loop(0) Call(MakeLerp, 0, 180, 40, EASING_COS_IN) Loop(0) diff --git a/src/world/dead/area_kzn/kzn_20/main.c b/src/world/dead/area_kzn/kzn_20/main.c index c488795198a..8f83f7d3e85 100644 --- a/src/world/dead/area_kzn/kzn_20/main.c +++ b/src/world/dead/area_kzn/kzn_20/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yu, TRUE) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) @@ -77,7 +77,7 @@ EvtScript N(EVS_InterruptPartnersInLava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(EnableModel, MODEL_yu, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_yu, COLLIDER_FLAGS_UPPER_MASK) Call(ParentColliderToModel, COLLIDER_yu, MODEL_yu) diff --git a/src/world/dead/area_kzn/kzn_20/npc.c b/src/world/dead/area_kzn/kzn_20/npc.c index b7a8688cc88..536014d08c7 100644 --- a/src/world/dead/area_kzn/kzn_20/npc.c +++ b/src/world/dead/area_kzn/kzn_20/npc.c @@ -33,7 +33,7 @@ EVT_LETTER_PROMPT(Kolorado, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle EVT_LETTER_REWARD(Kolorado); EvtScript N(EVS_SpawnFallingDust) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) Call(RandInt, 100, LVar0) Sub(LVar0, 100) @@ -48,7 +48,7 @@ EvtScript N(EVS_SpawnFallingDust) = { }; EvtScript N(EVS_ShakingWorld) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) IfGe(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) Exec(N(EVS_SpawnFallingDust)) Else @@ -104,38 +104,38 @@ s32 N(Kolorado_Wander2)[] = { }; EvtScript N(EVS_Kolorado_CalmIdle) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Label(0) - Call(RandInt, 1, LVar1) - IfEq(LVar1, 0) - UseBuf(N(Kolorado_Wander1)) - Else - UseBuf(N(Kolorado_Wander2)) - EndIf - Label(10) - BufRead3(LVar1, LVar2, LVar3) - IfEq(LVar1, -1) - Goto(0) + Call(RandInt, 1, LVar1) + IfEq(LVar1, 0) + UseBuf(N(Kolorado_Wander1)) + Else + UseBuf(N(Kolorado_Wander2)) EndIf - Call(SetNpcSpeed, NPC_Kolorado, LVar1) - Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Walk) - Call(NpcMoveTo, NPC_Kolorado, LVar2, LVar3, 0) - BufRead1(LVar2) - Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) - Wait(5) - Call(RandInt, 2, LVar4) - Add(LVar4, 1) - Loop(LVar4) - Call(GetNpcYaw, NPC_Kolorado, LVar5) - Add(LVar5, 180) - IfGt(LVar5, 360) - Sub(LVar5, 360) + Label(10) + BufRead3(LVar1, LVar2, LVar3) + IfEq(LVar1, -1) + Goto(0) EndIf - Call(InterpNpcYaw, NPC_Kolorado, LVar5, 1) - Wait(20) - EndLoop - Wait(LVar2) - Goto(10) + Call(SetNpcSpeed, NPC_Kolorado, LVar1) + Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Walk) + Call(NpcMoveTo, NPC_Kolorado, LVar2, LVar3, 0) + BufRead1(LVar2) + Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) + Wait(5) + Call(RandInt, 2, LVar4) + Add(LVar4, 1) + Loop(LVar4) + Call(GetNpcYaw, NPC_Kolorado, LVar5) + Add(LVar5, 180) + IfGt(LVar5, 360) + Sub(LVar5, 360) + EndIf + Call(InterpNpcYaw, NPC_Kolorado, LVar5, 1) + Wait(20) + EndLoop + Wait(LVar2) + Goto(10) Return End }; diff --git a/src/world/dead/area_kzn/kzn_22/main.c b/src/world/dead/area_kzn/kzn_22/main.c index 186ce20e99e..bbcd561e2e5 100644 --- a/src/world/dead/area_kzn/kzn_22/main.c +++ b/src/world/dead/area_kzn/kzn_22/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_LavaRiver) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -29,7 +29,7 @@ EvtScript N(EVS_UpdateTexPan_LavaRiver) = { }; EvtScript N(EVS_UpdateTexPan_LavaFall) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan2_2, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -73,7 +73,7 @@ API_CALLABLE(N(GetFloorCollider1)) { } EvtScript N(EVS_UpdateLavaLevel) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(SetTexPanner, MODEL_yu1, TEX_PANNER_2) Call(SetTexPanner, MODEL_yu, TEX_PANNER_2) Call(EnableModel, MODEL_yu, FALSE) diff --git a/src/world/dead/area_kzn/kzn_23/main.c b/src/world/dead/area_kzn/kzn_23/main.c index 8482aebede8..41644524240 100644 --- a/src/world/dead/area_kzn/kzn_23/main.c +++ b/src/world/dead/area_kzn/kzn_23/main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_ModulateLavaLevel) = { EvtScript N(EVS_RaiseLava) = { Exec(N(EVS_ModulateLavaLevel)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yu, TEX_PANNER_0) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/menus.c b/src/world/menus.c index ddd446a9850..5407ef10278 100644 --- a/src/world/menus.c +++ b/src/world/menus.c @@ -252,7 +252,7 @@ void check_input_open_menus(void) { reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); } } else { numEntries = setup_partner_popup(popup); @@ -294,7 +294,7 @@ void check_input_open_menus(void) { reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); } } else { WorldMenuDelay--; @@ -374,7 +374,7 @@ void check_input_open_menus(void) { reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); break; case WORLD_MENU_STATE_UNPAUSE: WorldMenuDelay--; diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index ca6bd7261dc..3d4afa04a80 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -446,7 +446,7 @@ API_CALLABLE(N(SelectTattleMsg)) { API_CALLABLE(N(TattleEnd)) { PartnerStatus* partnerStatus = &gPartnerStatus; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); if (N(IsTattleActive)) { N(IsTattleActive) = FALSE; @@ -504,7 +504,7 @@ void N(pre_battle)(Npc* goombario) { PartnerStatus* partnerStatus = &gPartnerStatus; if (partnerStatus->partnerActionState != PARTNER_ACTION_NONE) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); cancel_current_message(); partner_clear_player_tracking(goombario); diff --git a/src/world/partners.c b/src/world/partners.c index 953cee3b369..0128db624c1 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -651,7 +651,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->putAway, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; set_time_freeze_mode(TIME_FREEZE_PARTIAL); break; @@ -659,7 +659,7 @@ void _use_partner_ability(void) { if (does_script_exist(wPartnerCurrentScriptID)) { break; } - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); partner_free_npc(); playerData->curPartner = wCurrentPartnerId = NextPartnerID; create_partner_npc(); @@ -671,7 +671,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->takeOut, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; set_time_freeze_mode(TIME_FREEZE_PARTIAL); break; @@ -682,10 +682,10 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; enable_player_input(); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); break; } break; @@ -716,7 +716,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; break; } @@ -730,7 +730,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->putAway, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; break; case 1: // free old partner and resume game @@ -766,7 +766,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->takeOut, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; break; case 2: // resume standard partner behaviour @@ -776,7 +776,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; enable_player_input(); break; @@ -803,7 +803,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; wPartnerNpc->curAnim = gPartnerAnimations[wCurrentPartnerId].fly; enable_player_input(); @@ -817,7 +817,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->useAbility, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; break; case 1: @@ -827,7 +827,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; break; } @@ -851,7 +851,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; } enable_player_input(); PartnerCommand = PARTNER_CMD_INIT; @@ -1063,7 +1063,7 @@ void partner_handle_after_battle(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; NextPartnerCommand = PARTNER_CMD_INIT; diff --git a/src/world/script_api/rooms.c b/src/world/script_api/rooms.c index 8f94667d75a..d37d22cf8fc 100644 --- a/src/world/script_api/rooms.c +++ b/src/world/script_api/rooms.c @@ -574,7 +574,7 @@ EvtScript EVS_Default_AnimateDropDoor = { // executed from trigger activatation with MapRoom* stored in LVar1 EvtScript EVS_EnterRoomDoor = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) // ensure valid player action state Call(GetPlayerActionState, LVar3) Set(LVar4, 0) @@ -753,7 +753,7 @@ EvtScript EVS_EnterRoomDoor = { // executed from trigger activatation with MapRoom* stored in LVar1 EvtScript EVS_ExitRoomDoor = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) // ensure valid player action state Call(GetPlayerActionState, LVar3) Set(LVar4, 0) diff --git a/src/world/world.c b/src/world/world.c index efc4661281e..d65d0574922 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -232,7 +232,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { initialize_status_bar(); gGameStatusPtr->unk_90 = 1000; gGameStatusPtr->unk_92 = 1000; - gGameStatusPtr->mainScriptID = start_script_in_group(mapSettings->main, EVT_PRIORITY_0, 0, 0)->id; + gGameStatusPtr->mainScriptID = start_script_in_group(mapSettings->main, EVT_PRIORITY_0, 0, EVT_GROUP_NEVER_PAUSE)->id; } MapConfig* get_current_map_config(void) { diff --git a/src/world_use_item.c b/src/world_use_item.c index 862e4900719..0720937e4ee 100644 --- a/src/world_use_item.c +++ b/src/world_use_item.c @@ -76,7 +76,7 @@ API_CALLABLE(WorldItem_PauseTime) { } API_CALLABLE(WorldItem_UnpauseTime) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); #if !VERSION_JP gOverrideFlags &= ~GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; #endif @@ -110,7 +110,7 @@ API_CALLABLE(WorldItem_ConsumeItem) { } EvtScript EVS_WorldItem_ShowUsedItem = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetPlayerAnimation, ANIM_Mario1_UsePower) Call(GetPlayerPos, LVar0, LVar1, LVar2) Add(LVar1, 45) @@ -152,7 +152,7 @@ EvtScript EVS_WorldItem_PlayDrinkingSounds = { }; EvtScript EVS_World_UseItem = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(GetPartnerInUse, LVar0) IfNe(LVar0, 0) diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index ebc1261fc9e..393da6c28be 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -192,7 +192,7 @@ D_80095938 = 0x800958C8; D_80099AA0 = 0x80099A80; main_BSS_START = 0x8009A590; D_8009A5B8 = 0x8009A598; -timeFreezeMode = 0x8009A5B8; +gTimeFreezeMode = 0x8009A5B8; nuGfxZBuffer = 0x8009A5BC; CamLengthScale = 0x8009A5CC; nuGfxCfbCounter = 0x8009A5D0; diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index fe8d3aff161..8b0cd19d0f1 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -273,7 +273,7 @@ gMessageBoxFrameParts = 0x8008C280; gAreas = 0x8008F890; EVS_800936C0 = 0x8008FA60; EVS_NpcHitRecoil = 0x8008FA7C; -timeFreezeMode = 0x800969AC; +gTimeFreezeMode = 0x800969AC; nuGfxZBuffer = 0x800969B0; gCurrentModelTreeNodeInfo = 0x800969C8; gEncounterState = 0x800969D4; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 9766d63941f..b2bf1338655 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2555,7 +2555,7 @@ __osBaseCounter = 0x8009A5C8; // rom:0x759C8 gBGMPlayerC = 0x8009A5CC; // rom:0x759CC gEncounterSubState = 0x8009A5D0; // rom:0x759D0 CurrentSefCmdHandler = 0x8009A5D4; // rom:0x759D4 -timeFreezeMode = 0x8009A5D8; // rom:0x759D8 +gTimeFreezeMode = 0x8009A5D8; // rom:0x759D8 nuGfxZBuffer = 0x8009A5DC; // rom:0x759DC nuContDataLockKey = 0x8009A5E0; // rom:0x759E0 __osViIntrCount = 0x8009A5E4; // rom:0x759E4