Skip to content

Commit a4acafc

Browse files
SezzarySezzary
committed
Prepare event state enums
1 parent 34023c1 commit a4acafc

4 files changed

Lines changed: 61 additions & 36 deletions

File tree

‎include/game.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ typedef struct _SysWork
15611561
e_SysWorkProcessFlags processFlags_2298;
15621562
s32 field_229C;
15631563
e_SysFlags sysFlags_22A0;
1564-
s32 flags_22A4; // (1 << 6) passed as "use through door cam" flag in `vcSetFirstCamWork`.
1564+
s32 flags_22A4; // (1 << 6) passed as "use through door cam" flag in `vcSetFirstCamWork`. Also `e_SysFlags` or different?
15651565
GsCOORDINATE2 coord_22A8; // For particles only?
15661566
GsCOORDINATE2 coord_22F8; // Likely related to above.
15671567
s8 field_2348 : 8;

‎src/maps/map2_s00/map2_s00.c‎

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,11 @@ void MapEvent_MapTake(void) // 0x800E81C4
914914

915915
void MapEvent_SteelPipeTake(void) // 0x800E81EC
916916
{
917-
#define STATE_TAKE_STEEL_PIPE 5
918-
#define STATE_DONT_TAKE_STEEL_PIPE 6
917+
typedef enum _EventState
918+
{
919+
EventState_TakeSteelPipe = 5,
920+
EventState_DontTakeSteelPipe = 6
921+
} e_EventState;
919922

920923
switch (g_SysWork.sysStateStep_C[0])
921924
{
@@ -941,16 +944,16 @@ void MapEvent_SteelPipeTake(void) // 0x800E81EC
941944

942945
if (Gfx_PickupItemAnimate(InventoryItemId_SteelPipe))
943946
{
944-
MapMsg_DisplayAndHandleSelection(true, 15, STATE_TAKE_STEEL_PIPE, STATE_DONT_TAKE_STEEL_PIPE, 0, false);
947+
MapMsg_DisplayAndHandleSelection(true, 15, EventState_TakeSteelPipe, EventState_DontTakeSteelPipe, 0, false);
945948
}
946949
break;
947950

948-
case STATE_TAKE_STEEL_PIPE:
951+
case EventState_TakeSteelPipe:
949952
func_80086470(3, InventoryItemId_SteelPipe, 1, false);
950953
SysWork_StateStepSet(0, 7);
951954
break;
952955

953-
case STATE_DONT_TAKE_STEEL_PIPE:
956+
case EventState_DontTakeSteelPipe:
954957
Savegame_EventFlagClear(EventFlag_M2S00_PickupSteelPipe);
955958
SysWork_StateStepIncrement(0);
956959

@@ -1421,8 +1424,11 @@ void MapEvent_DoghouseNote(void) // 0x800E95F8
14211424

14221425
void MapEvent_DoghouseKeyTake(void) // 0x800E97E4
14231426
{
1424-
#define STATE_TAKE_KEY 8
1425-
#define STATE_DONT_TAKE_KEY 9
1427+
typedef enum _EventState
1428+
{
1429+
EventState_TakeKey = 8,
1430+
EventState_DontTakeKey = 9
1431+
} e_EventState;
14261432

14271433
switch (g_SysWork.sysStateStep_C[0])
14281434
{
@@ -1457,16 +1463,16 @@ void MapEvent_DoghouseKeyTake(void) // 0x800E97E4
14571463

14581464
case 7:
14591465
func_800862F8(2, 0, false);
1460-
MapMsg_DisplayAndHandleSelection(true, 27, STATE_TAKE_KEY, STATE_DONT_TAKE_KEY, 0, false); // "House Key in doghouse. Take it?"
1466+
MapMsg_DisplayAndHandleSelection(true, 27, EventState_TakeKey, EventState_DontTakeKey, 0, false); // "House Key in doghouse. Take it?"
14611467
break;
14621468

1463-
case STATE_TAKE_KEY:
1469+
case EventState_TakeKey:
14641470
func_80086470(3, InventoryItemId_HouseKey, 1, false);
14651471
Savegame_EventFlagSet(EventFlag_M2S00_PickupDogHouseKey);
14661472
Player_ItemRemove(InventoryItemId_NoteDoghouse, 1);
14671473
SysWork_StateStepIncrement(0);
14681474

1469-
case STATE_DONT_TAKE_KEY:
1475+
case EventState_DontTakeKey:
14701476
func_800862F8(2, 0, false);
14711477
SysWork_StateStepIncrementAfterFade(2, true, 0, Q12(0.0f), false);
14721478
break;
@@ -1501,8 +1507,11 @@ void func_800E9A0C(void) // 0x800E9A0C
15011507

15021508
void func_800E9A74(void) // 0x800E9A74
15031509
{
1504-
#define STATE_TAKE_KEY 6
1505-
#define STATE_DONT_TAKE_KEY 7
1510+
typedef enum _EventState
1511+
{
1512+
EventState_TakeKey = 6,
1513+
EventState_DontTakeKey = 7
1514+
} e_EventState;
15061515

15071516
switch (g_SysWork.sysStateStep_C[0])
15081517
{
@@ -1530,13 +1539,13 @@ void func_800E9A74(void) // 0x800E9A74
15301539
case 5:
15311540
if (Gfx_PickupItemAnimate(InventoryItemId_KeyOfWoodman))
15321541
{
1533-
MapMsg_DisplayAndHandleSelection(true, 29, STATE_TAKE_KEY, STATE_DONT_TAKE_KEY, 0, false); // "Key of Woodman. Take it?"
1542+
MapMsg_DisplayAndHandleSelection(true, 29, EventState_TakeKey, EventState_DontTakeKey, 0, false); // "Key of Woodman. Take it?"
15341543
}
15351544

15361545
Savegame_EventFlagSet(EventFlag_M2S00_PickupKeyOfWoodman);
15371546
break;
15381547

1539-
case STATE_TAKE_KEY:
1548+
case EventState_TakeKey:
15401549
func_80086470(3, InventoryItemId_KeyOfWoodman, 1, false);
15411550

15421551
if (g_SavegamePtr->mapMarkingFlags_1D4[1] & 0x400000)
@@ -1547,7 +1556,7 @@ void func_800E9A74(void) // 0x800E9A74
15471556
SysWork_StateStepSet(0, 8);
15481557
break;
15491558

1550-
case STATE_DONT_TAKE_KEY:
1559+
case EventState_DontTakeKey:
15511560
Savegame_EventFlagClear(EventFlag_M2S00_PickupKeyOfWoodman);
15521561
SysWork_StateStepIncrement(0);
15531562

@@ -1729,8 +1738,11 @@ void MapEvent_KGordonKeyUse(void) // 0x800EA894
17291738

17301739
void func_800EA960(void) // 0x800EA960
17311740
{
1732-
#define STATE_PRESS_SWITCH 5
1733-
#define STATE_DONT_PRESS_SWITCH NO_VALUE
1741+
typedef enum _EventState
1742+
{
1743+
EventState_PressSwitch = 5,
1744+
EventState_DontPressSwitch = NO_VALUE
1745+
} e_EventState;
17341746

17351747
s32 vol;
17361748
s32 balance;
@@ -1764,10 +1776,10 @@ void func_800EA960(void) // 0x800EA960
17641776
g_SysWork.silentYesSelection_2350_4 = true;
17651777

17661778
// "The machinery is running. Do you want to press the switch?"
1767-
MapMsg_DisplayAndHandleSelection(true, 44, STATE_PRESS_SWITCH, STATE_DONT_PRESS_SWITCH, 0, false);
1779+
MapMsg_DisplayAndHandleSelection(true, 44, EventState_PressSwitch, EventState_DontPressSwitch, 0, false);
17681780
break;
17691781

1770-
case STATE_PRESS_SWITCH:
1782+
case EventState_PressSwitch:
17711783
func_8005DC1C(Sfx_Unk1483, &QVECTOR3(-41.576f, -3.619f, 345.992f), Q8_CLAMPED(0.5f), 0);
17721784
SysWork_StateStepIncrement(0);
17731785

@@ -1843,8 +1855,11 @@ void func_800EA960(void) // 0x800EA960
18431855

18441856
void func_800EAD2C(void) // 0x800EAD2C
18451857
{
1846-
#define STATE_PRESS_SWITCH 3
1847-
#define STATE_DONT_PRESS_SWITCH NO_VALUE
1858+
typedef enum _EventState
1859+
{
1860+
EventState_PressSwitch = 3,
1861+
EventState_DontPressSwitch = NO_VALUE
1862+
} e_EventState;
18481863

18491864
s32 vol;
18501865
s32 balance;
@@ -1862,10 +1877,10 @@ void func_800EAD2C(void) // 0x800EAD2C
18621877
g_SysWork.silentYesSelection_2350_4 = true;
18631878

18641879
// "The machinery is running. Do you want to press the switch?"
1865-
MapMsg_DisplayAndHandleSelection(true, 44, STATE_PRESS_SWITCH, STATE_DONT_PRESS_SWITCH, 0, false);
1880+
MapMsg_DisplayAndHandleSelection(true, 44, EventState_PressSwitch, EventState_DontPressSwitch, 0, false);
18661881
break;
18671882

1868-
case STATE_PRESS_SWITCH:
1883+
case EventState_PressSwitch:
18691884
SysWork_StateStepIncrementAfterFade(0, true, 3, Q12(0.0f), false);
18701885
SysWork_StateStepIncrement(0);
18711886

‎src/maps/map3_s01/map3_s01.c‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,11 @@ void func_800D279C(void) // 0x800D279C
356356

357357
void MapEvent_Generator0(void) // 0x800D27C8
358358
{
359-
#define STATE_PRESS_SWITCH 3
360-
#define STATE_DONT_PRESS_SWITCH NO_VALUE
359+
typedef enum _EventState
360+
{
361+
EventState_PressSwitch = 3,
362+
EventState_DontPressSwitch = NO_VALUE
363+
} e_EventState;
361364

362365
switch (g_SysWork.sysStateStep_C[0])
363366
{
@@ -371,10 +374,10 @@ void MapEvent_Generator0(void) // 0x800D27C8
371374

372375
case 2:
373376
g_SysWork.silentYesSelection_2350_4 = true;
374-
MapMsg_DisplayAndHandleSelection(true, 25, STATE_PRESS_SWITCH, STATE_DONT_PRESS_SWITCH, 0, false); // "Do you want to press the switch?"
377+
MapMsg_DisplayAndHandleSelection(true, 25, EventState_PressSwitch, EventState_DontPressSwitch, 0, false); // "Do you want to press the switch?"
375378
break;
376379

377-
case STATE_PRESS_SWITCH:
380+
case EventState_PressSwitch:
378381
func_8005DC1C(Sfx_Unk1494, &QVECTOR3(140.5f, -0.5f, -20.6f), Q8_CLAMPED(0.5f), 0);
379382
Sd_EngineCmd(Sfx_Unk1495);
380383
Savegame_EventFlagSet(EventFlag_M3S01_GeneratorOn);
@@ -392,7 +395,7 @@ void MapEvent_Generator0(void) // 0x800D27C8
392395
g_GeneratorMakeNoise = true;
393396
SysWork_StateStepIncrement(0);
394397

395-
default: // `STATE_DONT_PRESS_SWITCH`
398+
default: // `EventState_DontPressSwitch`
396399
sharedFunc_800D2244_0_s00(false);
397400
SysWork_StateSetNext(SysState_Gameplay);
398401
break;
@@ -585,7 +588,7 @@ void func_800D2E54(void) // 0x800D2E54
585588
}
586589
}
587590

588-
for (i = 0; i < 6; i++)
591+
for (i = 0; i < ARRAY_SIZE(g_WorldObject0); i++)
589592
{
590593
g_WorldGfx_ObjectAdd(&g_WorldObject0[i].object_0, &g_WorldObject0[i].position_1C, &(SVECTOR3){});
591594
}

‎src/maps/map6_s04/map6_s04_2.c‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -401,17 +401,20 @@ void func_800E1D48(void) {}
401401

402402
void func_800E1D50(void) // 0x800E1D50
403403
{
404-
#define STATE_SKIP 3
404+
typedef enum _EventState
405+
{
406+
EventState_Skip = 3
407+
} e_EventState;
405408

406409
VECTOR3 lintPos;
407410
SVECTOR3 lintRot;
408411
q19_12 rotX;
409412
q19_12 rotZ;
410413

411414
if (g_Controller0->btnsClicked_10 & g_GameWorkPtr->config_0.controllerConfig_0.skip_4 &&
412-
g_SysWork.sysStateStep_C[0] > 0 && g_SysWork.sysStateStep_C[0] < STATE_SKIP)
415+
g_SysWork.sysStateStep_C[0] > 0 && g_SysWork.sysStateStep_C[0] < EventState_Skip)
413416
{
414-
SysWork_StateStepSet(0, STATE_SKIP);
417+
SysWork_StateStepSet(0, EventState_Skip);
415418
}
416419

417420
switch (g_SysWork.sysStateStep_C[0])
@@ -716,7 +719,10 @@ void MapEvent_CutsceneCybilDeath(void) // 0x800E2CA0
716719

717720
void func_800E3244(void) // 0x800E3244
718721
{
719-
#define STATE_SKIP 28
722+
typedef enum _EventState
723+
{
724+
EventState_Skip = 28
725+
} e_EventState;
720726

721727
VECTOR3 lintPos;
722728
SVECTOR3 lintRot;
@@ -725,6 +731,7 @@ void func_800E3244(void) // 0x800E3244
725731
q19_12 rotX;
726732
q19_12 rotZ;
727733

734+
// Skip
728735
if (g_Controller0->btnsClicked_10 & g_GameWorkPtr->config_0.controllerConfig_0.skip_4)
729736
{
730737
if (g_SysWork.sysStateStep_C[0] >= 2)
@@ -733,7 +740,7 @@ void func_800E3244(void) // 0x800E3244
733740
g_SysWork.sysStateStep_C[0] != 20 &&
734741
g_SysWork.sysStateStep_C[0] != 22)
735742
{
736-
SysWork_StateStepSet(0, STATE_SKIP);
743+
SysWork_StateStepSet(0, EventState_Skip);
737744
}
738745
}
739746
}
@@ -938,7 +945,7 @@ void func_800E3244(void) // 0x800E3244
938945
SysWork_StateStepIncrementAfterFade(2, true, 0, Q12(0.8f), false);
939946
break;
940947

941-
case STATE_SKIP:
948+
case EventState_Skip:
942949
Sd_EngineCmd(19);
943950
SysWork_StateStepIncrementAfterFade(2, true, 0, Q12(0.0f), false);
944951
break;

0 commit comments

Comments
 (0)