Label some time freeze defines. (#341)

* Create defines for time freezes.

* Update SaveBlock.c

* Update state_pause.c

* Update 3251D0.c

* Update state_file_select.c

* Update HeartBlock.c

* Update goombario.c

* Update state_battle.c

* Update C4DEF0.c

* Update C4DEF0.c
This commit is contained in:
JoshDuMan 2021-07-24 12:34:55 -04:00 committed by GitHub
parent ed9727a34e
commit 763e071b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 15 deletions

View File

@ -1675,4 +1675,12 @@ enum PartnerAnims {
PARTNER_ANIM_HURT,
};
enum TimeFreezeMode {
TIME_FREEZE_NORMAL,
TIME_FREEZE_PARTIAL,
TIME_FREEZE_FULL,
TIME_FREEZE_PARTNER_MENU,
TIME_FREEZE_EXIT,
};
#endif

View File

@ -68,13 +68,13 @@ ApiStatus func_802BD388(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus func_802BD3E4(ScriptInstance* script, s32 isInitialCall) {
set_time_freeze_mode(2);
set_time_freeze_mode(TIME_FREEZE_FULL);
gOverrideFlags |= 0x200000;
return ApiStatus_DONE2;
}
ApiStatus func_802BD41C(ScriptInstance* script, s32 isInitialCall) {
set_time_freeze_mode(0);
set_time_freeze_mode(TIME_FREEZE_NORMAL);
gOverrideFlags &= ~0x200000;
return ApiStatus_DONE2;
}

View File

@ -99,7 +99,7 @@ void entity_HeartBlock_show_tutorial_message(Entity* entity) {
UNK_TYPE* ptr = &D_802EB3C0;
*ptr = 0;
msg_get_printer_for_string(0x1D0001, ptr);
set_time_freeze_mode(1);
set_time_freeze_mode(TIME_FREEZE_PARTIAL);
gOverrideFlags |= 0x40;
disable_player_input();
set_global_flag(SI_SAVE_FLAG(96));
@ -111,7 +111,7 @@ void entity_HeartBlock_show_tutorial_message(Entity* entity) {
void entity_HeartBlock_wait_for_close_tutorial(Entity* entity) {
if (D_802EB3C0) {
exec_entity_commandlist(entity);
set_time_freeze_mode(0);
set_time_freeze_mode(TIME_FREEZE_NORMAL);
gOverrideFlags &= ~0x40;
enable_player_input();
}

View File

@ -30,13 +30,13 @@ void entity_SaveBlock_idle(Entity* entity) {
}
void entity_SaveBlock_pause_game(void) {
set_time_freeze_mode(1);
set_time_freeze_mode(TIME_FREEZE_PARTIAL);
disable_player_input();
gPlayerStatusPtr->currentSpeed = 0.0f;
}
void entity_SaveBlock_resume_game(void) {
set_time_freeze_mode(0);
set_time_freeze_mode(TIME_FREEZE_NORMAL);
enable_player_input();
}

View File

@ -100,7 +100,7 @@ void state_step_battle(void) {
D_800A0904 = gPlayerStatusPtr->animFlags;
gPlayerStatusPtr->animFlags &= ~0x40;
D_800A0908 = get_time_freeze_mode();
set_time_freeze_mode(0);
set_time_freeze_mode(TIME_FREEZE_NORMAL);
gOverrideFlags &= ~0x8;
if (D_800A0900 >= 0) {

View File

@ -23,7 +23,7 @@ void state_init_language_select(void) {
D_800A0931 = 0;
D_800A0932[0] = 0;
disable_player_input();
set_time_freeze_mode(2);
set_time_freeze_mode(TIME_FREEZE_FULL);
set_screen_overlay_params_front(0, D_800A0932[0]);
}
@ -31,7 +31,7 @@ void state_init_file_select(void) {
D_800A0931 = 0;
D_800A0932[0] = 0;
disable_player_input();
set_time_freeze_mode(2);
set_time_freeze_mode(TIME_FREEZE_FULL);
general_heap_create();
set_hud_element_nonworld_cache(0, 0);
clear_hud_element_cache();

View File

@ -21,7 +21,7 @@ void state_init_pause(void) {
D_800A0921 = 0;
D_800A0922 = 0;
disable_player_input();
set_time_freeze_mode(3);
set_time_freeze_mode(TIME_FREEZE_PARTNER_MENU);
set_windows_visible(2);
}
@ -181,7 +181,7 @@ void state_step_unpause(void) {
npc_reload_all();
set_windows_visible(0);
func_800E98C4();
set_time_freeze_mode(1);
set_time_freeze_mode(TIME_FREEZE_PARTIAL);
D_800A0921 = 3;
gPlayerStatus.alpha2 = gPlayerStatus.alpha1 - 1;
D_802D9D71 = D_802D9D70 + 1;
@ -215,7 +215,7 @@ void state_step_unpause(void) {
}
break;
case 4:
set_time_freeze_mode(0);
set_time_freeze_mode(TIME_FREEZE_NORMAL);
update_encounters();
update_npcs();
update_player();

View File

@ -1,5 +1,6 @@
#include "dgb_12.h"
#include "message_ids.h"
#include "common.h"
EntryList N(entryList) = {
{ -500.0f, 0.0f, -40.0f, 0.0f },
@ -126,10 +127,10 @@ s32** N(D_80240870_C4E760) = NULL;
Script N(80240874) = SCRIPT({
group 0;
SetTimeFreezeMode(2);
SetTimeFreezeMode(TIME_FREEZE_FULL);
sleep 40;
ShowGotItem(SI_VAR(0), 0, 0);
SetTimeFreezeMode(0);
SetTimeFreezeMode(TIME_FREEZE_NORMAL);
return;
});

View File

@ -61,7 +61,7 @@ void world_goombario_pre_battle(Npc* partner) {
Temp8010EBB0* temp = &D_8010EBB0;
if (temp->unk_00 != 0) {
set_time_freeze_mode(0);
set_time_freeze_mode(TIME_FREEZE_NORMAL);
enable_player_input();
CancelMessageAndBlock();
partner_clear_player_tracking(partner);