From 5dbb7e875eab0adc9e939b2c2b00c70928e2b34e Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 19 Sep 2025 15:06:44 -0400 Subject: [PATCH] Added enums for all used event/tmp bits/regs (#893) --- include/d/actor/d_a_coming2.h | 6 +- include/d/actor/d_a_npc_cb1.h | 2 +- include/d/d_save.h | 4 +- include/d/d_save_event_bit.inc | 48 --- include/d/d_save_event_flag.inc | 630 ++++++++++++++++++++++++++++ include/d/d_save_event_tmp_flag.inc | 54 +++ src/JAZelAudio/JAIZelBasic.cpp | 6 +- src/d/actor/d_a_agb.cpp | 36 +- src/d/actor/d_a_agbsw0.cpp | 44 +- src/d/actor/d_a_andsw0.cpp | 8 +- src/d/actor/d_a_auction.cpp | 28 +- src/d/actor/d_a_bb.cpp | 2 +- src/d/actor/d_a_bdk.cpp | 4 +- src/d/actor/d_a_bk.cpp | 10 +- src/d/actor/d_a_bmd.cpp | 6 +- src/d/actor/d_a_boko.cpp | 2 +- src/d/actor/d_a_bpw.cpp | 8 +- src/d/actor/d_a_btd.cpp | 6 +- src/d/actor/d_a_bwd.cpp | 6 +- src/d/actor/d_a_cc.cpp | 2 +- src/d/actor/d_a_deku_item.cpp | 2 +- src/d/actor/d_a_demo00.cpp | 100 ++--- src/d/actor/d_a_dk.cpp | 4 +- src/d/actor/d_a_door12.cpp | 4 +- src/d/actor/d_a_fganon.cpp | 6 +- src/d/actor/d_a_ghostship.cpp | 8 +- src/d/actor/d_a_himo2.cpp | 10 +- src/d/actor/d_a_himo3.cpp | 2 +- src/d/actor/d_a_jbo.cpp | 2 +- src/d/actor/d_a_knob00.cpp | 38 +- src/d/actor/d_a_lbridge.cpp | 8 +- src/d/actor/d_a_lod_bg.cpp | 4 +- src/d/actor/d_a_mdoor.cpp | 8 +- src/d/actor/d_a_mflft.cpp | 6 +- src/d/actor/d_a_mmusic.cpp | 6 +- src/d/actor/d_a_npc_bmsw.cpp | 54 +-- src/d/actor/d_a_npc_bs1.cpp | 70 ++-- src/d/actor/d_a_npc_btsw.cpp | 28 +- src/d/actor/d_a_npc_btsw2.cpp | 6 +- src/d/actor/d_a_npc_cb1.cpp | 42 +- src/d/actor/d_a_npc_ji1.cpp | 132 +++--- src/d/actor/d_a_npc_md.cpp | 78 ++-- src/d/actor/d_a_npc_mt.cpp | 36 +- src/d/actor/d_a_npc_os.cpp | 38 +- src/d/actor/d_a_npc_people.cpp | 306 +++++++------- src/d/actor/d_a_npc_photo.cpp | 52 +-- src/d/actor/d_a_npc_roten.cpp | 32 +- src/d/actor/d_a_obj_Yboil.cpp | 2 +- src/d/actor/d_a_obj_Ygush00.cpp | 2 +- src/d/actor/d_a_obj_adnno.cpp | 20 +- src/d/actor/d_a_obj_barrel.cpp | 2 +- src/d/actor/d_a_obj_barrier.cpp | 10 +- src/d/actor/d_a_obj_bscurtain.cpp | 2 +- src/d/actor/d_a_obj_doguu.cpp | 26 +- src/d/actor/d_a_obj_ferris.cpp | 2 +- src/d/actor/d_a_obj_figure.cpp | 42 +- src/d/actor/d_a_obj_hbrf1.cpp | 16 +- src/d/actor/d_a_obj_homen.cpp | 4 +- src/d/actor/d_a_obj_mknjd.cpp | 4 +- src/d/actor/d_a_obj_pbco.cpp | 4 +- src/d/actor/d_a_obj_pirateship.cpp | 12 +- src/d/actor/d_a_obj_rcloud.cpp | 4 +- src/d/actor/d_a_obj_shelf.cpp | 2 +- src/d/actor/d_a_obj_tide.cpp | 6 +- src/d/actor/d_a_obj_toripost.cpp | 44 +- src/d/actor/d_a_obj_tower.cpp | 2 +- src/d/actor/d_a_obj_vfan.cpp | 2 +- src/d/actor/d_a_obj_vgnfd.cpp | 12 +- src/d/actor/d_a_obj_vmc.cpp | 2 +- src/d/actor/d_a_obj_vmsms.cpp | 2 +- src/d/actor/d_a_obj_warpt.cpp | 9 +- src/d/actor/d_a_pedestal.cpp | 12 +- src/d/actor/d_a_player_grab.inc | 2 +- src/d/actor/d_a_player_main.cpp | 20 +- src/d/actor/d_a_player_sword.inc | 10 +- src/d/actor/d_a_salvage.cpp | 2 +- src/d/actor/d_a_ship.cpp | 180 ++++---- src/d/actor/d_a_spc_item01.cpp | 2 +- src/d/actor/d_a_tag_event.cpp | 44 +- src/d/actor/d_a_tag_ghostship.cpp | 10 +- src/d/actor/d_a_tag_hint.cpp | 30 +- src/d/actor/d_a_tag_island.cpp | 18 +- src/d/actor/d_a_tag_msg.cpp | 2 +- src/d/actor/d_a_tag_photo.cpp | 2 +- src/d/actor/d_a_tag_volcano.cpp | 8 +- src/d/actor/d_a_tornado.cpp | 6 +- src/d/actor/d_a_warpdm20.cpp | 8 +- src/d/actor/d_a_warphr.cpp | 6 +- src/d/actor/d_a_ygcwp.cpp | 4 +- src/d/d_com_inf_game.cpp | 72 ++-- src/d/d_com_static.cpp | 87 ++-- src/d/d_door.cpp | 16 +- src/d/d_event_manager.cpp | 4 +- src/d/d_item.cpp | 38 +- src/d/d_kankyo.cpp | 2 +- src/d/d_kankyo_dayproc.inc | 138 +++--- src/d/d_menu_collect.cpp | 6 +- src/d/d_mesg.cpp | 4 +- src/d/d_npc.cpp | 2 +- src/d/d_resorce.cpp | 2 +- src/d/d_s_menu.cpp | 6 +- src/d/d_s_name.cpp | 6 +- src/d/d_s_play.cpp | 16 +- src/d/d_s_room.cpp | 12 +- src/d/d_save.cpp | 36 +- src/d/d_save_init.cpp | 4 +- src/d/d_shop.cpp | 8 +- src/d/d_stage.cpp | 10 +- src/d/d_throwstone.cpp | 2 +- src/f_op/f_op_msg_mng.cpp | 20 +- 110 files changed, 1906 insertions(+), 1178 deletions(-) delete mode 100644 include/d/d_save_event_bit.inc create mode 100644 include/d/d_save_event_flag.inc create mode 100644 include/d/d_save_event_tmp_flag.inc diff --git a/include/d/actor/d_a_coming2.h b/include/d/actor/d_a_coming2.h index affce4363..ceb8adca9 100644 --- a/include/d/actor/d_a_coming2.h +++ b/include/d/actor/d_a_coming2.h @@ -36,13 +36,13 @@ namespace daComing2 { virtual ~Act_c() {} s32 get_coming_point() { - return dComIfGs_getEventReg(0x7EFF); + return dComIfGs_getEventReg(dSv_event_flag_c::UNK_7EFF); } void init_coming_point() {} void minus_coming_point1() { - s32 evnt = dComIfGs_getEventReg(0x7EFF); + s32 evnt = dComIfGs_getEventReg(dSv_event_flag_c::UNK_7EFF); u8 evnt2 = (evnt - 1 < 0) ? 0 : evnt - 1; - dComIfGs_setEventReg(0x7EFF, evnt2); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_7EFF, evnt2); } void minus_coming_point2() { minus_coming_point1(); diff --git a/include/d/actor/d_a_npc_cb1.h b/include/d/actor/d_a_npc_cb1.h index 951b24f0f..b6f72f471 100644 --- a/include/d/actor/d_a_npc_cb1.h +++ b/include/d/actor/d_a_npc_cb1.h @@ -36,7 +36,7 @@ public: MtxP getRightHandMatrix() { return cullMtx; } s16 XyCheckCB(int i_itemBtn) { - if(dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e && dComIfGs_isEventBit(0x1880)) { + if(dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1880)) { return true; } diff --git a/include/d/d_save.h b/include/d/d_save.h index ece6041f1..7708dec2d 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -969,6 +969,8 @@ public: STATIC_ASSERT(sizeof(dSv_info_c) == 0x12A0); #endif -#include "d/d_save_event_bit.inc" +#include "d/d_save_event_flag.inc" + +#include "d/d_save_event_tmp_flag.inc" #endif /* D_SAVE_D_SAVE_H */ diff --git a/include/d/d_save_event_bit.inc b/include/d/d_save_event_bit.inc deleted file mode 100644 index e93825eda..000000000 --- a/include/d/d_save_event_bit.inc +++ /dev/null @@ -1,48 +0,0 @@ -// All names in this file are fake. - -class dSv_evtBit_c { -public: - enum { - UNK_1 = 0x01, - UNK_310 = 0x310, - ENDLESS_NIGHT = 0x0A02, - MEDLI_GAVE_FATHERS_LETTER = 0x0E02, - MET_KORL = 0x0F80, - PLACED_NAYRUS_PEARL = 0x1410, - PLACED_FARORES_PEARL = 0x1440, - PLACED_DINS_PEARL = 0x1480, - UNK_1A01 = 0x1A01, - UNK_1A02 = 0x1A02, - UNLOCK_TING_DISCOUNT = 0x1A08, - UNLOCK_TINGLE_BALLOON_DISCOUNT = 0x1A10, - UNK_2701 = 0x2701, - UNK_2702 = 0x2702, - UNK_2704 = 0x2704, - RODE_KORL = 0x2A08, - BARRIER_BREAK = 0x2C02, - UNK_3104 = 0x3104, - LITHOGRAPH_1 = 0x3508, - LITHOGRAPH_2 = 0x3504, - LITHOGRAPH_3 = 0x3502, - LITHOGRAPH_4 = 0x3501, - LITHOGRAPH_5 = 0x3680, - LITHOGRAPH_6 = 0x3640, - LITHOGRAPH_7 = 0x3620, - LITHOGRAPH_8 = 0x3610, - LITHOGRAPH_9 = 0x3608, - LITHOGRAPH_10 = 0x3604, - COLORS_IN_HYRULE = 0x3802, - LETTER_ROCK_SPIRE_SHOP_AD = 0x7A03, - LETTER_ORCA = 0x7B03, - LETTER_BAITO = 0x7C03, - LETTER_BOMBS_AD = 0x7D03, - LETTER_ARYLL = 0x8B03, - LETTER_GRANDMA = 0x9D03, - LETTER_BAITOS_MOM = 0xAC03, - LETTER_HOSKITS_GIRLFRIEND = 0xAE03, - LETTER_GOLD_MEMBERSHIP = 0xAF03, - LETTER_SILVER_MEMBERSHIP = 0xB003, - LETTER_TINGLE = 0xB203, - LETTER_KOMALIS_FATHER = 0xB503, - }; -}; diff --git a/include/d/d_save_event_flag.inc b/include/d/d_save_event_flag.inc new file mode 100644 index 000000000..1bfe0f1b2 --- /dev/null +++ b/include/d/d_save_event_flag.inc @@ -0,0 +1,630 @@ +// All names in this file are fake. + +class dSv_event_flag_c { +public: + // Event bits. + enum { + /* 0x0080 */ UNK_0080 = 0x0080, + /* 0x0020 */ UNK_0020 = 0x0020, + /* 0x0010 */ UNK_0010 = 0x0010, + /* 0x0008 */ UNK_0008 = 0x0008, + /* 0x0004 */ UNK_0004 = 0x0004, + /* 0x0002 */ UNK_0002 = 0x0002, + /* 0x0001 */ UNK_0001 = 0x0001, + /* 0x0180 */ UNK_0180 = 0x0180, + /* 0x0140 */ UNK_0140 = 0x0140, + /* 0x0120 */ UNK_0120 = 0x0120, + /* 0x0108 */ UNK_0108 = 0x0108, + /* 0x0104 */ UNK_0104 = 0x0104, + /* 0x0102 */ UNK_0102 = 0x0102, + /* 0x0101 */ UNK_0101 = 0x0101, + /* 0x0280 */ UNK_0280 = 0x0280, + /* 0x0240 */ UNK_0240 = 0x0240, + /* 0x0220 */ UNK_0220 = 0x0220, + /* 0x0210 */ UNK_0210 = 0x0210, + /* 0x0208 */ UNK_0208 = 0x0208, + /* 0x0201 */ UNK_0201 = 0x0201, + /* 0x0380 */ UNK_0380 = 0x0380, + /* 0x0340 */ UNK_0340 = 0x0340, + /* 0x0310 */ UNK_0310 = 0x0310, + /* 0x0308 */ UNK_0308 = 0x0308, + /* 0x0304 */ UNK_0304 = 0x0304, + /* 0x0302 */ UNK_0302 = 0x0302, + /* 0x0301 */ UNK_0301 = 0x0301, + /* 0x0480 */ UNK_0480 = 0x0480, + /* 0x0420 */ UNK_0420 = 0x0420, + /* 0x0404 */ UNK_0404 = 0x0404, + /* 0x0402 */ UNK_0402 = 0x0402, + /* 0x0401 */ UNK_0401 = 0x0401, + /* 0x0580 */ UNK_0580 = 0x0580, + /* 0x0540 */ UNK_0540 = 0x0540, + /* 0x0520 */ UNK_0520 = 0x0520, + /* 0x0510 */ UNK_0510 = 0x0510, + /* 0x0508 */ UNK_0508 = 0x0508, + /* 0x0504 */ UNK_0504 = 0x0504, + /* 0x0502 */ UNK_0502 = 0x0502, + /* 0x0501 */ UNK_0501 = 0x0501, + /* 0x0640 */ UNK_0640 = 0x0640, + /* 0x0608 */ UNK_0608 = 0x0608, + /* 0x0604 */ UNK_0604 = 0x0604, + /* 0x0602 */ UNK_0602 = 0x0602, + /* 0x0601 */ UNK_0601 = 0x0601, + /* 0x0780 */ UNK_0780 = 0x0780, + /* 0x0740 */ UNK_0740 = 0x0740, + /* 0x0720 */ UNK_0720 = 0x0720, + /* 0x0710 */ UNK_0710 = 0x0710, + /* 0x0704 */ UNK_0704 = 0x0704, + /* 0x0702 */ UNK_0702 = 0x0702, + /* 0x0701 */ UNK_0701 = 0x0701, + /* 0x0880 */ UNK_0880 = 0x0880, + /* 0x0840 */ UNK_0840 = 0x0840, + /* 0x0820 */ UNK_0820 = 0x0820, + /* 0x0810 */ UNK_0810 = 0x0810, + /* 0x0808 */ UNK_0808 = 0x0808, + /* 0x0804 */ UNK_0804 = 0x0804, + /* 0x0802 */ UNK_0802 = 0x0802, + /* 0x0801 */ UNK_0801 = 0x0801, + /* 0x0940 */ UNK_0940 = 0x0940, + /* 0x0920 */ UNK_0920 = 0x0920, + /* 0x0910 */ UNK_0910 = 0x0910, + /* 0x0908 */ UNK_0908 = 0x0908, + /* 0x0904 */ UNK_0904 = 0x0904, + /* 0x0902 */ UNK_0902 = 0x0902, + /* 0x0901 */ UNK_0901 = 0x0901, + /* 0x0A80 */ UNK_0A80 = 0x0A80, + /* 0x0A40 */ UNK_0A40 = 0x0A40, + /* 0x0A20 */ UNK_0A20 = 0x0A20, + /* 0x0A10 */ UNK_0A10 = 0x0A10, + /* 0x0A08 */ UNK_0A08 = 0x0A08, + /* 0x0A04 */ UNK_0A04 = 0x0A04, + /* 0x0A02 */ ENDLESS_NIGHT = 0x0A02, + /* 0x0A01 */ UNK_0A01 = 0x0A01, + /* 0x0B80 */ UNK_0B80 = 0x0B80, + /* 0x0B40 */ UNK_0B40 = 0x0B40, + /* 0x0B20 */ UNK_0B20 = 0x0B20, + /* 0x0B08 */ UNK_0B08 = 0x0B08, + /* 0x0B04 */ UNK_0B04 = 0x0B04, + /* 0x0B02 */ UNK_0B02 = 0x0B02, + /* 0x0B01 */ UNK_0B01 = 0x0B01, + /* 0x0C80 */ UNK_0C80 = 0x0C80, + /* 0x0C40 */ UNK_0C40 = 0x0C40, + /* 0x0C20 */ UNK_0C20 = 0x0C20, + /* 0x0C10 */ UNK_0C10 = 0x0C10, + /* 0x0C08 */ UNK_0C08 = 0x0C08, + /* 0x0C04 */ UNK_0C04 = 0x0C04, + /* 0x0C02 */ UNK_0C02 = 0x0C02, + /* 0x0D80 */ UNK_0D80 = 0x0D80, + /* 0x0D40 */ UNK_0D40 = 0x0D40, + /* 0x0D20 */ UNK_0D20 = 0x0D20, + /* 0x0D10 */ UNK_0D10 = 0x0D10, + /* 0x0D08 */ UNK_0D08 = 0x0D08, + /* 0x0D04 */ UNK_0D04 = 0x0D04, + /* 0x0D02 */ UNK_0D02 = 0x0D02, + /* 0x0E80 */ UNK_0E80 = 0x0E80, + /* 0x0E40 */ UNK_0E40 = 0x0E40, + /* 0x0E20 */ UNK_0E20 = 0x0E20, + /* 0x0E10 */ UNK_0E10 = 0x0E10, + /* 0x0E08 */ UNK_0E08 = 0x0E08, + /* 0x0E04 */ UNK_0E04 = 0x0E04, + /* 0x0E02 */ MEDLI_GAVE_FATHERS_LETTER = 0x0E02, + /* 0x0E01 */ UNK_0E01 = 0x0E01, + /* 0x0F80 */ MET_KORL = 0x0F80, + /* 0x0F40 */ UNK_0F40 = 0x0F40, + /* 0x0F20 */ UNK_0F20 = 0x0F20, + /* 0x0F10 */ UNK_0F10 = 0x0F10, + /* 0x0F08 */ UNK_0F08 = 0x0F08, + /* 0x0F04 */ UNK_0F04 = 0x0F04, + /* 0x0F02 */ UNK_0F02 = 0x0F02, + /* 0x0F01 */ UNK_0F01 = 0x0F01, + /* 0x1080 */ UNK_1080 = 0x1080, + /* 0x1040 */ UNK_1040 = 0x1040, + /* 0x1020 */ UNK_1020 = 0x1020, + /* 0x1010 */ UNK_1010 = 0x1010, + /* 0x1008 */ UNK_1008 = 0x1008, + /* 0x1004 */ UNK_1004 = 0x1004, + /* 0x1002 */ UNK_1002 = 0x1002, + /* 0x1001 */ UNK_1001 = 0x1001, + /* 0x1140 */ UNK_1140 = 0x1140, + /* 0x1120 */ UNK_1120 = 0x1120, + /* 0x1110 */ UNK_1110 = 0x1110, + /* 0x1108 */ UNK_1108 = 0x1108, + /* 0x1104 */ UNK_1104 = 0x1104, + /* 0x1102 */ UNK_1102 = 0x1102, + /* 0x1101 */ UNK_1101 = 0x1101, + /* 0x1280 */ UNK_1280 = 0x1280, + /* 0x1240 */ UNK_1240 = 0x1240, + /* 0x1220 */ UNK_1220 = 0x1220, + /* 0x1210 */ UNK_1210 = 0x1210, + /* 0x1208 */ UNK_1208 = 0x1208, + /* 0x1204 */ UNK_1204 = 0x1204, + /* 0x1202 */ UNK_1202 = 0x1202, + /* 0x1201 */ UNK_1201 = 0x1201, + /* 0x1380 */ UNK_1380 = 0x1380, + /* 0x1340 */ UNK_1340 = 0x1340, + /* 0x1320 */ UNK_1320 = 0x1320, + /* 0x1310 */ UNK_1310 = 0x1310, + /* 0x1308 */ UNK_1308 = 0x1308, + /* 0x1304 */ UNK_1304 = 0x1304, + /* 0x1302 */ UNK_1302 = 0x1302, + /* 0x1301 */ UNK_1301 = 0x1301, + /* 0x1480 */ PLACED_DINS_PEARL = 0x1480, + /* 0x1440 */ PLACED_FARORES_PEARL = 0x1440, + /* 0x1420 */ UNK_1420 = 0x1420, + /* 0x1410 */ PLACED_NAYRUS_PEARL = 0x1410, + /* 0x1408 */ UNK_1408 = 0x1408, + /* 0x1404 */ UNK_1404 = 0x1404, + /* 0x1402 */ UNK_1402 = 0x1402, + /* 0x1401 */ UNK_1401 = 0x1401, + /* 0x1580 */ UNK_1580 = 0x1580, + /* 0x1540 */ UNK_1540 = 0x1540, + /* 0x1520 */ UNK_1520 = 0x1520, + /* 0x1510 */ UNK_1510 = 0x1510, + /* 0x1508 */ UNK_1508 = 0x1508, + /* 0x1504 */ UNK_1504 = 0x1504, + /* 0x1502 */ UNK_1502 = 0x1502, + /* 0x1501 */ UNK_1501 = 0x1501, + /* 0x1680 */ UNK_1680 = 0x1680, + /* 0x1640 */ UNK_1640 = 0x1640, + /* 0x1620 */ UNK_1620 = 0x1620, + /* 0x1610 */ UNK_1610 = 0x1610, + /* 0x1608 */ UNK_1608 = 0x1608, + /* 0x1604 */ UNK_1604 = 0x1604, + /* 0x1602 */ UNK_1602 = 0x1602, + /* 0x1601 */ UNK_1601 = 0x1601, + /* 0x1780 */ UNK_1780 = 0x1780, + /* 0x1740 */ UNK_1740 = 0x1740, + /* 0x1720 */ UNK_1720 = 0x1720, + /* 0x1710 */ UNK_1710 = 0x1710, + /* 0x1708 */ UNK_1708 = 0x1708, + /* 0x1704 */ UNK_1704 = 0x1704, + /* 0x1701 */ UNK_1701 = 0x1701, + /* 0x1880 */ UNK_1880 = 0x1880, + /* 0x1840 */ UNK_1840 = 0x1840, + /* 0x1820 */ UNK_1820 = 0x1820, + /* 0x1810 */ UNK_1810 = 0x1810, + /* 0x1808 */ UNK_1808 = 0x1808, + /* 0x1804 */ UNK_1804 = 0x1804, + /* 0x1802 */ UNK_1802 = 0x1802, + /* 0x1801 */ UNK_1801 = 0x1801, + /* 0x1980 */ UNK_1980 = 0x1980, + /* 0x1940 */ UNK_1940 = 0x1940, + /* 0x1920 */ UNK_1920 = 0x1920, + /* 0x1910 */ UNK_1910 = 0x1910, + /* 0x1908 */ UNK_1908 = 0x1908, + /* 0x1904 */ UNK_1904 = 0x1904, + /* 0x1902 */ UNK_1902 = 0x1902, + /* 0x1901 */ UNK_1901 = 0x1901, + /* 0x1A80 */ UNK_1A80 = 0x1A80, + /* 0x1A20 */ UNK_1A20 = 0x1A20, + /* 0x1A10 */ UNLOCK_TINGLE_BALLOON_DISCOUNT = 0x1A10, + /* 0x1A08 */ UNLOCK_TING_DISCOUNT = 0x1A08, + /* 0x1A04 */ UNK_1A04 = 0x1A04, + /* 0x1A02 */ UNK_1A02 = 0x1A02, + /* 0x1A01 */ UNK_1A01 = 0x1A01, + /* 0x1B80 */ UNK_1B80 = 0x1B80, + /* 0x1B40 */ UNK_1B40 = 0x1B40, + /* 0x1B20 */ UNK_1B20 = 0x1B20, + /* 0x1B10 */ UNK_1B10 = 0x1B10, + /* 0x1B04 */ UNK_1B04 = 0x1B04, + /* 0x1B01 */ UNK_1B01 = 0x1B01, + /* 0x1C80 */ UNK_1C80 = 0x1C80, + /* 0x1C40 */ UNK_1C40 = 0x1C40, + /* 0x1C20 */ UNK_1C20 = 0x1C20, + /* 0x1C08 */ UNK_1C08 = 0x1C08, + /* 0x1C04 */ UNK_1C04 = 0x1C04, + /* 0x1C02 */ UNK_1C02 = 0x1C02, + /* 0x1C01 */ UNK_1C01 = 0x1C01, + /* 0x1D80 */ UNK_1D80 = 0x1D80, + /* 0x1D40 */ UNK_1D40 = 0x1D40, + /* 0x1D20 */ UNK_1D20 = 0x1D20, + /* 0x1D10 */ UNK_1D10 = 0x1D10, + /* 0x1D08 */ UNK_1D08 = 0x1D08, + /* 0x1D04 */ UNK_1D04 = 0x1D04, + /* 0x1D02 */ UNK_1D02 = 0x1D02, + /* 0x1D01 */ UNK_1D01 = 0x1D01, + /* 0x1E80 */ UNK_1E80 = 0x1E80, + /* 0x1E40 */ UNK_1E40 = 0x1E40, + /* 0x1E20 */ UNK_1E20 = 0x1E20, + /* 0x1E10 */ UNK_1E10 = 0x1E10, + /* 0x1E08 */ UNK_1E08 = 0x1E08, + /* 0x1E04 */ UNK_1E04 = 0x1E04, + /* 0x1E02 */ UNK_1E02 = 0x1E02, + /* 0x1E01 */ UNK_1E01 = 0x1E01, + /* 0x1F80 */ UNK_1F80 = 0x1F80, + /* 0x1F40 */ UNK_1F40 = 0x1F40, + /* 0x1F20 */ UNK_1F20 = 0x1F20, + /* 0x1F10 */ UNK_1F10 = 0x1F10, + /* 0x1F08 */ UNK_1F08 = 0x1F08, + /* 0x1F04 */ UNK_1F04 = 0x1F04, + /* 0x1F02 */ UNK_1F02 = 0x1F02, + /* 0x1F01 */ UNK_1F01 = 0x1F01, + /* 0x2080 */ UNK_2080 = 0x2080, + /* 0x2040 */ UNK_2040 = 0x2040, + /* 0x2020 */ UNK_2020 = 0x2020, + /* 0x2010 */ UNK_2010 = 0x2010, + /* 0x2008 */ UNK_2008 = 0x2008, + /* 0x2004 */ UNK_2004 = 0x2004, + /* 0x2002 */ UNK_2002 = 0x2002, + /* 0x2001 */ UNK_2001 = 0x2001, + /* 0x2180 */ UNK_2180 = 0x2180, + /* 0x2140 */ UNK_2140 = 0x2140, + /* 0x2120 */ UNK_2120 = 0x2120, + /* 0x2110 */ UNK_2110 = 0x2110, + /* 0x2108 */ UNK_2108 = 0x2108, + /* 0x2104 */ UNK_2104 = 0x2104, + /* 0x2102 */ UNK_2102 = 0x2102, + /* 0x2101 */ UNK_2101 = 0x2101, + /* 0x2280 */ UNK_2280 = 0x2280, + /* 0x2240 */ UNK_2240 = 0x2240, + /* 0x2220 */ UNK_2220 = 0x2220, + /* 0x2210 */ UNK_2210 = 0x2210, + /* 0x2208 */ UNK_2208 = 0x2208, + /* 0x2204 */ UNK_2204 = 0x2204, + /* 0x2202 */ UNK_2202 = 0x2202, + /* 0x2201 */ UNK_2201 = 0x2201, + /* 0x2340 */ UNK_2340 = 0x2340, + /* 0x2320 */ UNK_2320 = 0x2320, + /* 0x2310 */ UNK_2310 = 0x2310, + /* 0x2308 */ UNK_2308 = 0x2308, + /* 0x2304 */ UNK_2304 = 0x2304, + /* 0x2302 */ UNK_2302 = 0x2302, + /* 0x2301 */ UNK_2301 = 0x2301, + /* 0x2480 */ UNK_2480 = 0x2480, + /* 0x2440 */ UNK_2440 = 0x2440, + /* 0x2420 */ UNK_2420 = 0x2420, + /* 0x2410 */ UNK_2410 = 0x2410, + /* 0x2408 */ UNK_2408 = 0x2408, + /* 0x2404 */ UNK_2404 = 0x2404, + /* 0x2402 */ UNK_2402 = 0x2402, + /* 0x2401 */ UNK_2401 = 0x2401, + /* 0x2580 */ UNK_2580 = 0x2580, + /* 0x2540 */ UNK_2540 = 0x2540, + /* 0x2520 */ UNK_2520 = 0x2520, + /* 0x2510 */ UNK_2510 = 0x2510, + /* 0x2508 */ UNK_2508 = 0x2508, + /* 0x2504 */ UNK_2504 = 0x2504, + /* 0x2502 */ UNK_2502 = 0x2502, + /* 0x2501 */ UNK_2501 = 0x2501, + /* 0x2680 */ UNK_2680 = 0x2680, + /* 0x2640 */ UNK_2640 = 0x2640, + /* 0x2620 */ UNK_2620 = 0x2620, + /* 0x2608 */ UNK_2608 = 0x2608, + /* 0x2604 */ UNK_2604 = 0x2604, + /* 0x2602 */ UNK_2602 = 0x2602, + /* 0x2601 */ UNK_2601 = 0x2601, + /* 0x2780 */ UNK_2780 = 0x2780, + /* 0x2740 */ UNK_2740 = 0x2740, + /* 0x2710 */ UNK_2710 = 0x2710, + /* 0x2708 */ UNK_2708 = 0x2708, + /* 0x2704 */ UNK_2704 = 0x2704, + /* 0x2702 */ UNK_2702 = 0x2702, + /* 0x2701 */ UNK_2701 = 0x2701, + /* 0x2880 */ UNK_2880 = 0x2880, + /* 0x2840 */ UNK_2840 = 0x2840, + /* 0x2820 */ UNK_2820 = 0x2820, + /* 0x2810 */ UNK_2810 = 0x2810, + /* 0x2808 */ UNK_2808 = 0x2808, + /* 0x2804 */ UNK_2804 = 0x2804, + /* 0x2802 */ UNK_2802 = 0x2802, + /* 0x2801 */ UNK_2801 = 0x2801, + /* 0x2980 */ UNK_2980 = 0x2980, + /* 0x2940 */ UNK_2940 = 0x2940, + /* 0x2920 */ UNK_2920 = 0x2920, + /* 0x2910 */ UNK_2910 = 0x2910, + /* 0x2908 */ UNK_2908 = 0x2908, + /* 0x2904 */ UNK_2904 = 0x2904, + /* 0x2902 */ UNK_2902 = 0x2902, + /* 0x2901 */ UNK_2901 = 0x2901, + /* 0x2A80 */ UNK_2A80 = 0x2A80, + /* 0x2A40 */ UNK_2A40 = 0x2A40, + /* 0x2A20 */ UNK_2A20 = 0x2A20, + /* 0x2A10 */ UNK_2A10 = 0x2A10, + /* 0x2A08 */ RODE_KORL = 0x2A08, + /* 0x2A04 */ UNK_2A04 = 0x2A04, + /* 0x2A02 */ UNK_2A02 = 0x2A02, + /* 0x2A01 */ UNK_2A01 = 0x2A01, + /* 0x2B80 */ UNK_2B80 = 0x2B80, + /* 0x2B40 */ UNK_2B40 = 0x2B40, + /* 0x2B20 */ UNK_2B20 = 0x2B20, + /* 0x2B10 */ UNK_2B10 = 0x2B10, + /* 0x2B08 */ UNK_2B08 = 0x2B08, + /* 0x2B04 */ UNK_2B04 = 0x2B04, + /* 0x2C80 */ UNK_2C80 = 0x2C80, + /* 0x2C40 */ UNK_2C40 = 0x2C40, + /* 0x2C20 */ UNK_2C20 = 0x2C20, + /* 0x2C08 */ UNK_2C08 = 0x2C08, + /* 0x2C04 */ UNK_2C04 = 0x2C04, + /* 0x2C02 */ BARRIER_BREAK = 0x2C02, + /* 0x2C01 */ UNK_2C01 = 0x2C01, + /* 0x2D80 */ UNK_2D80 = 0x2D80, + /* 0x2D40 */ UNK_2D40 = 0x2D40, + /* 0x2D20 */ UNK_2D20 = 0x2D20, + /* 0x2D10 */ UNK_2D10 = 0x2D10, + /* 0x2D08 */ UNK_2D08 = 0x2D08, + /* 0x2D04 */ UNK_2D04 = 0x2D04, + /* 0x2D02 */ UNK_2D02 = 0x2D02, + /* 0x2D01 */ UNK_2D01 = 0x2D01, + /* 0x2E80 */ UNK_2E80 = 0x2E80, + /* 0x2E40 */ UNK_2E40 = 0x2E40, + /* 0x2E20 */ UNK_2E20 = 0x2E20, + /* 0x2E10 */ UNK_2E10 = 0x2E10, + /* 0x2E08 */ UNK_2E08 = 0x2E08, + /* 0x2E04 */ UNK_2E04 = 0x2E04, + /* 0x2E02 */ UNK_2E02 = 0x2E02, + /* 0x2E01 */ UNK_2E01 = 0x2E01, + /* 0x2F80 */ UNK_2F80 = 0x2F80, + /* 0x2F40 */ UNK_2F40 = 0x2F40, + /* 0x2F20 */ UNK_2F20 = 0x2F20, + /* 0x2F10 */ UNK_2F10 = 0x2F10, + /* 0x2F08 */ UNK_2F08 = 0x2F08, + /* 0x2F04 */ UNK_2F04 = 0x2F04, + /* 0x2F02 */ UNK_2F02 = 0x2F02, + /* 0x2F01 */ UNK_2F01 = 0x2F01, + /* 0x3080 */ UNK_3080 = 0x3080, + /* 0x3040 */ UNK_3040 = 0x3040, + /* 0x3020 */ UNK_3020 = 0x3020, + /* 0x3010 */ UNK_3010 = 0x3010, + /* 0x3008 */ UNK_3008 = 0x3008, + /* 0x3004 */ UNK_3004 = 0x3004, + /* 0x3002 */ UNK_3002 = 0x3002, + /* 0x3001 */ UNK_3001 = 0x3001, + /* 0x3180 */ UNK_3180 = 0x3180, + /* 0x3140 */ UNK_3140 = 0x3140, + /* 0x3120 */ UNK_3120 = 0x3120, + /* 0x3104 */ UNK_3104 = 0x3104, + /* 0x3102 */ UNK_3102 = 0x3102, + /* 0x3101 */ UNK_3101 = 0x3101, + /* 0x3280 */ UNK_3280 = 0x3280, + /* 0x3240 */ UNK_3240 = 0x3240, + /* 0x3220 */ UNK_3220 = 0x3220, + /* 0x3210 */ UNK_3210 = 0x3210, + /* 0x3208 */ UNK_3208 = 0x3208, + /* 0x3204 */ UNK_3204 = 0x3204, + /* 0x3202 */ UNK_3202 = 0x3202, + /* 0x3201 */ UNK_3201 = 0x3201, + /* 0x3380 */ UNK_3380 = 0x3380, + /* 0x3340 */ UNK_3340 = 0x3340, + /* 0x3320 */ UNK_3320 = 0x3320, + /* 0x3310 */ UNK_3310 = 0x3310, + /* 0x3308 */ UNK_3308 = 0x3308, + /* 0x3304 */ UNK_3304 = 0x3304, + /* 0x3302 */ UNK_3302 = 0x3302, + /* 0x3301 */ UNK_3301 = 0x3301, + /* 0x3480 */ UNK_3480 = 0x3480, + /* 0x3440 */ UNK_3440 = 0x3440, + /* 0x3420 */ UNK_3420 = 0x3420, + /* 0x3410 */ UNK_3410 = 0x3410, + /* 0x3408 */ UNK_3408 = 0x3408, + /* 0x3404 */ UNK_3404 = 0x3404, + /* 0x3402 */ UNK_3402 = 0x3402, + /* 0x3401 */ UNK_3401 = 0x3401, + /* 0x3580 */ UNK_3580 = 0x3580, + /* 0x3540 */ UNK_3540 = 0x3540, + /* 0x3520 */ UNK_3520 = 0x3520, + /* 0x3510 */ UNK_3510 = 0x3510, + /* 0x3508 */ LITHOGRAPH_1 = 0x3508, + /* 0x3504 */ LITHOGRAPH_2 = 0x3504, + /* 0x3502 */ LITHOGRAPH_3 = 0x3502, + /* 0x3501 */ LITHOGRAPH_4 = 0x3501, + /* 0x3680 */ LITHOGRAPH_5 = 0x3680, + /* 0x3640 */ LITHOGRAPH_6 = 0x3640, + /* 0x3620 */ LITHOGRAPH_7 = 0x3620, + /* 0x3610 */ LITHOGRAPH_8 = 0x3610, + /* 0x3608 */ LITHOGRAPH_9 = 0x3608, + /* 0x3604 */ LITHOGRAPH_10 = 0x3604, + /* 0x3602 */ UNK_3602 = 0x3602, + /* 0x3601 */ UNK_3601 = 0x3601, + /* 0x3780 */ UNK_3780 = 0x3780, + /* 0x3740 */ UNK_3740 = 0x3740, + /* 0x3720 */ UNK_3720 = 0x3720, + /* 0x3710 */ UNK_3710 = 0x3710, + /* 0x3708 */ UNK_3708 = 0x3708, + /* 0x3704 */ UNK_3704 = 0x3704, + /* 0x3702 */ UNK_3702 = 0x3702, + /* 0x3701 */ UNK_3701 = 0x3701, + /* 0x3880 */ UNK_3880 = 0x3880, + /* 0x3840 */ UNK_3840 = 0x3840, + /* 0x3820 */ UNK_3820 = 0x3820, + /* 0x3810 */ UNK_3810 = 0x3810, + /* 0x3808 */ UNK_3808 = 0x3808, + /* 0x3804 */ UNK_3804 = 0x3804, + /* 0x3802 */ COLORS_IN_HYRULE = 0x3802, + /* 0x3801 */ UNK_3801 = 0x3801, + /* 0x3980 */ UNK_3980 = 0x3980, + /* 0x3940 */ UNK_3940 = 0x3940, + /* 0x3920 */ UNK_3920 = 0x3920, + /* 0x3910 */ UNK_3910 = 0x3910, + /* 0x3908 */ UNK_3908 = 0x3908, + /* 0x3904 */ UNK_3904 = 0x3904, + /* 0x3902 */ UNK_3902 = 0x3902, + /* 0x3901 */ UNK_3901 = 0x3901, + /* 0x3A80 */ UNK_3A80 = 0x3A80, + /* 0x3A40 */ UNK_3A40 = 0x3A40, + /* 0x3A20 */ UNK_3A20 = 0x3A20, + /* 0x3A10 */ UNK_3A10 = 0x3A10, + /* 0x3A08 */ UNK_3A08 = 0x3A08, + /* 0x3A04 */ UNK_3A04 = 0x3A04, + /* 0x3A02 */ UNK_3A02 = 0x3A02, + /* 0x3A01 */ UNK_3A01 = 0x3A01, + /* 0x3B80 */ UNK_3B80 = 0x3B80, + /* 0x3B40 */ UNK_3B40 = 0x3B40, + /* 0x3B20 */ UNK_3B20 = 0x3B20, + /* 0x3B10 */ UNK_3B10 = 0x3B10, + /* 0x3B08 */ UNK_3B08 = 0x3B08, + /* 0x3B04 */ UNK_3B04 = 0x3B04, + /* 0x3B02 */ UNK_3B02 = 0x3B02, + /* 0x3B01 */ UNK_3B01 = 0x3B01, + /* 0x3C80 */ UNK_3C80 = 0x3C80, + /* 0x3C40 */ UNK_3C40 = 0x3C40, + /* 0x3C20 */ UNK_3C20 = 0x3C20, + /* 0x3C10 */ UNK_3C10 = 0x3C10, + /* 0x3C08 */ UNK_3C08 = 0x3C08, + /* 0x3C04 */ UNK_3C04 = 0x3C04, + /* 0x3C02 */ UNK_3C02 = 0x3C02, + /* 0x3C01 */ UNK_3C01 = 0x3C01, + /* 0x3D80 */ UNK_3D80 = 0x3D80, + /* 0x3D40 */ UNK_3D40 = 0x3D40, + /* 0x3D20 */ UNK_3D20 = 0x3D20, + /* 0x3D10 */ UNK_3D10 = 0x3D10, + /* 0x3D08 */ UNK_3D08 = 0x3D08, + /* 0x3D04 */ UNK_3D04 = 0x3D04, + /* 0x3D02 */ UNK_3D02 = 0x3D02, + /* 0x3D01 */ UNK_3D01 = 0x3D01, + /* 0x3E80 */ UNK_3E80 = 0x3E80, + /* 0x3E40 */ UNK_3E40 = 0x3E40, + /* 0x3E20 */ UNK_3E20 = 0x3E20, + /* 0x3E10 */ UNK_3E10 = 0x3E10, + /* 0x3E04 */ UNK_3E04 = 0x3E04, + /* 0x3E02 */ UNK_3E02 = 0x3E02, + /* 0x3E01 */ UNK_3E01 = 0x3E01, + /* 0x3F80 */ UNK_3F80 = 0x3F80, + /* 0x3F40 */ UNK_3F40 = 0x3F40, + /* 0x3F20 */ UNK_3F20 = 0x3F20, + /* 0x3F10 */ UNK_3F10 = 0x3F10, + /* 0x3F02 */ UNK_3F02 = 0x3F02, + /* 0x3F01 */ UNK_3F01 = 0x3F01, + /* 0x4080 */ UNK_4080 = 0x4080, + /* 0x4040 */ UNK_4040 = 0x4040, + /* 0x4020 */ UNK_4020 = 0x4020, + /* 0x4008 */ UNK_4008 = 0x4008, + /* 0x4004 */ UNK_4004 = 0x4004, + /* 0x4002 */ UNK_4002 = 0x4002, + /* 0x4001 */ UNK_4001 = 0x4001, + /* 0x4180 */ UNK_4180 = 0x4180, + }; + + // Event registers. + enum { + /* 0x790F */ UNK_790F = 0x790F, + /* 0x7A03 */ LETTER_ROCK_SPIRE_SHOP_AD = 0x7A03, + /* 0x7B03 */ LETTER_ORCA = 0x7B03, + /* 0x7C03 */ LETTER_BAITO = 0x7C03, + /* 0x7D03 */ LETTER_BOMBS_AD = 0x7D03, + /* 0x7EFF */ UNK_7EFF = 0x7EFF, + /* 0x7F0F */ UNK_7F0F = 0x7F0F, + /* 0x80FF */ UNK_80FF = 0x80FF, + /* 0x81FF */ UNK_81FF = 0x81FF, + /* 0x82FF */ UNK_82FF = 0x82FF, + /* 0x83FF */ UNK_83FF = 0x83FF, + /* 0x84FF */ UNK_84FF = 0x84FF, + /* 0x85FF */ UNK_85FF = 0x85FF, + /* 0x86FF */ UNK_86FF = 0x86FF, + /* 0x870F */ UNK_870F = 0x870F, + /* 0x8803 */ UNK_8803 = 0x8803, + /* 0x89FF */ UNK_89FF = 0x89FF, + /* 0x8AFF */ UNK_8AFF = 0x8AFF, + /* 0x8B03 */ LETTER_ARYLL = 0x8B03, + /* 0x8CFF */ UNK_8CFF = 0x8CFF, + /* 0x8DFF */ UNK_8DFF = 0x8DFF, + /* 0x8EFF */ UNK_8EFF = 0x8EFF, + /* 0x8FFF */ UNK_8FFF = 0x8FFF, + /* 0x90FF */ UNK_90FF = 0x90FF, + /* 0x91FF */ UNK_91FF = 0x91FF, + /* 0x92FF */ UNK_92FF = 0x92FF, + /* 0x93FF */ UNK_93FF = 0x93FF, + /* 0x94FF */ UNK_94FF = 0x94FF, + /* 0x95FF */ UNK_95FF = 0x95FF, + /* 0x96FF */ UNK_96FF = 0x96FF, + /* 0x97FF */ UNK_97FF = 0x97FF, + /* 0x98FF */ UNK_98FF = 0x98FF, + /* 0x99FF */ UNK_99FF = 0x99FF, + /* 0x9AFF */ UNK_9AFF = 0x9AFF, + /* 0x9B07 */ UNK_9B07 = 0x9B07, + /* 0x9CFF */ UNK_9CFF = 0x9CFF, + /* 0x9D03 */ LETTER_GRANDMA = 0x9D03, + /* 0x9EFF */ UNK_9EFF = 0x9EFF, + /* 0x9F07 */ UNK_9F07 = 0x9F07, + /* 0xA007 */ UNK_A007 = 0xA007, + /* 0xA107 */ UNK_A107 = 0xA107, + /* 0xA207 */ UNK_A207 = 0xA207, + /* 0xA307 */ UNK_A307 = 0xA307, + /* 0xA407 */ UNK_A407 = 0xA407, + /* 0xA507 */ UNK_A507 = 0xA507, + /* 0xA60F */ UNK_A60F = 0xA60F, + /* 0xA7FF */ UNK_A7FF = 0xA7FF, + /* 0xA8FF */ UNK_A8FF = 0xA8FF, + /* 0xA9FF */ UNK_A9FF = 0xA9FF, + /* 0xAAFF */ UNK_AAFF = 0xAAFF, + /* 0xAB03 */ UNK_AB03 = 0xAB03, + /* 0xAC03 */ LETTER_BAITOS_MOM = 0xAC03, + /* 0xADFF */ UNK_ADFF = 0xADFF, + /* 0xAE03 */ LETTER_HOSKITS_GIRLFRIEND = 0xAE03, + /* 0xAF03 */ LETTER_GOLD_MEMBERSHIP = 0xAF03, + /* 0xB003 */ LETTER_SILVER_MEMBERSHIP = 0xB003, + /* 0xB1FF */ UNK_B1FF = 0xB1FF, + /* 0xB203 */ LETTER_TINGLE = 0xB203, + /* 0xB503 */ LETTER_KOMALIS_FATHER = 0xB503, + /* 0xB6FF */ UNK_B6FF = 0xB6FF, + /* 0xB703 */ UNK_B703 = 0xB703, + /* 0xB8FF */ UNK_B8FF = 0xB8FF, + /* 0xB907 */ UNK_B907 = 0xB907, + /* 0xBA0F */ UNK_BA0F = 0xBA0F, + /* 0xBB07 */ UNK_BB07 = 0xBB07, + /* 0xBCFF */ UNK_BCFF = 0xBCFF, + /* 0xBEFF */ UNK_BEFF = 0xBEFF, + /* 0xBFFF */ UNK_BFFF = 0xBFFF, + /* 0xC0FF */ UNK_C0FF = 0xC0FF, + /* 0xC103 */ UNK_C103 = 0xC103, + /* 0xC203 */ UNK_C203 = 0xC203, + /* 0xC3FF */ UNK_C3FF = 0xC3FF, + /* 0xC407 */ UNK_C407 = 0xC407, + /* 0xC5FF */ UNK_C5FF = 0xC5FF, + /* 0xC603 */ UNK_C603 = 0xC603, // Unused? + /* 0xC703 */ UNK_C703 = 0xC703, // Unused? + /* 0xC803 */ UNK_C803 = 0xC803, // Unused? + /* 0xC903 */ UNK_C903 = 0xC903, + /* 0xCA03 */ UNK_CA03 = 0xCA03, + /* 0xCB03 */ UNK_CB03 = 0xCB03, + /* 0xCCFF */ UNK_CCFF = 0xCCFF, + /* 0xCD03 */ UNK_CD03 = 0xCD03, + /* 0xCF03 */ UNK_CF03 = 0xCF03, + /* 0xD003 */ UNK_D003 = 0xD003, + /* 0xD1FF */ UNK_D1FF = 0xD1FF, + /* 0xD2FF */ UNK_D2FF = 0xD2FF, + /* 0xD3FF */ UNK_D3FF = 0xD3FF, + /* 0xD4FF */ UNK_D4FF = 0xD4FF, + /* 0xD5FF */ UNK_D5FF = 0xD5FF, + /* 0xD6FF */ UNK_D6FF = 0xD6FF, + /* 0xD7FF */ UNK_D7FF = 0xD7FF, + /* 0xD8FF */ UNK_D8FF = 0xD8FF, + /* 0xD9FF */ UNK_D9FF = 0xD9FF, + /* 0xDAFF */ UNK_DAFF = 0xDAFF, + /* 0xDBFF */ UNK_DBFF = 0xDBFF, + /* 0xDCFF */ UNK_DCFF = 0xDCFF, + /* 0xDDFF */ UNK_DDFF = 0xDDFF, + /* 0xDEFF */ UNK_DEFF = 0xDEFF, + /* 0xDFFF */ UNK_DFFF = 0xDFFF, + /* 0xE0FF */ UNK_E0FF = 0xE0FF, + /* 0xE1FF */ UNK_E1FF = 0xE1FF, + /* 0xE2FF */ UNK_E2FF = 0xE2FF, + /* 0xE3FF */ UNK_E3FF = 0xE3FF, + /* 0xE4FF */ UNK_E4FF = 0xE4FF, + /* 0xE5FF */ UNK_E5FF = 0xE5FF, + /* 0xE6FF */ UNK_E6FF = 0xE6FF, + /* 0xE7FF */ UNK_E7FF = 0xE7FF, + /* 0xE8FF */ UNK_E8FF = 0xE8FF, + /* 0xE9FF */ UNK_E9FF = 0xE9FF, + /* 0xEAFF */ UNK_EAFF = 0xEAFF, + /* 0xEBFF */ UNK_EBFF = 0xEBFF, + /* 0xECFF */ UNK_ECFF = 0xECFF, + /* 0xEDFF */ UNK_EDFF = 0xEDFF, + /* 0xEEFF */ UNK_EEFF = 0xEEFF, + /* 0xEFFF */ UNK_EFFF = 0xEFFF, + /* 0xF0FF */ UNK_F0FF = 0xF0FF, + /* 0xF1FF */ UNK_F1FF = 0xF1FF, + /* 0xF2FF */ UNK_F2FF = 0xF2FF, + /* 0xF3FF */ UNK_F3FF = 0xF3FF, + /* 0xF4FF */ UNK_F4FF = 0xF4FF, + /* 0xF5FF */ UNK_F5FF = 0xF5FF, + /* 0xF6FF */ UNK_F6FF = 0xF6FF, + /* 0xF7FF */ UNK_F7FF = 0xF7FF, + /* 0xF8FF */ UNK_F8FF = 0xF8FF, + /* 0xF903 */ UNK_F903 = 0xF903, + /* 0xFAFF */ UNK_FAFF = 0xFAFF, + /* 0xFBFF */ UNK_FBFF = 0xFBFF, + /* 0xFC03 */ UNK_FC03 = 0xFC03, + /* 0xFD07 */ UNK_FD07 = 0xFD07, + /* 0xFE07 */ UNK_FE07 = 0xFE07, + /* 0xFF07 */ UNK_FF07 = 0xFF07, + }; +}; diff --git a/include/d/d_save_event_tmp_flag.inc b/include/d/d_save_event_tmp_flag.inc new file mode 100644 index 000000000..1f5e7ac56 --- /dev/null +++ b/include/d/d_save_event_tmp_flag.inc @@ -0,0 +1,54 @@ +// All names in this file are fake. + +class dSv_event_tmp_flag_c { +public: + // Tmp bits. + enum { + /* 0x0040 */ UNK_0040 = 0x0040, + /* 0x0020 */ UNK_0020 = 0x0020, + /* 0x0010 */ UNK_0010 = 0x0010, + /* 0x0008 */ UNK_0008 = 0x0008, + /* 0x0004 */ UNK_0004 = 0x0004, + /* 0x0002 */ UNK_0002 = 0x0002, + /* 0x0001 */ UNK_0001 = 0x0001, + /* 0x0180 */ UNK_0180 = 0x0180, + /* 0x0140 */ UNK_0140 = 0x0140, + /* 0x0120 */ UNK_0120 = 0x0120, + /* 0x0110 */ UNK_0110 = 0x0110, + /* 0x0108 */ UNK_0108 = 0x0108, + /* 0x0104 */ UNK_0104 = 0x0104, + /* 0x0102 */ UNK_0102 = 0x0102, + /* 0x0101 */ UNK_0101 = 0x0101, + /* 0x0280 */ UNK_0280 = 0x0280, + /* 0x0240 */ UNK_0240 = 0x0240, + /* 0x0210 */ UNK_0210 = 0x0210, + /* 0x0208 */ UNK_0208 = 0x0208, + /* 0x0202 */ UNK_0202 = 0x0202, + /* 0x0320 */ UNK_0320 = 0x0320, + /* 0x0310 */ UNK_0310 = 0x0310, + /* 0x0308 */ UNK_0308 = 0x0308, + /* 0x0304 */ UNK_0304 = 0x0304, + /* 0x0302 */ UNK_0302 = 0x0302, + /* 0x0301 */ UNK_0301 = 0x0301, + /* 0x0480 */ UNK_0480 = 0x0480, + /* 0x0440 */ UNK_0440 = 0x0440, + /* 0x0420 */ UNK_0420 = 0x0420, + /* 0x0410 */ UNK_0410 = 0x0410, + /* 0x0408 */ UNK_0408 = 0x0408, + /* 0x0404 */ UNK_0404 = 0x0404, + /* 0x0402 */ UNK_0402 = 0x0402, + /* 0x0401 */ UNK_0401 = 0x0401, + /* 0x0580 */ UNK_0580 = 0x0580, + }; + + // Tmp registers. + enum { + /* 0xF903 */ UNK_F903 = 0xF903, + /* 0xFAFF */ UNK_FAFF = 0xFAFF, + /* 0xFBFF */ UNK_FBFF = 0xFBFF, + /* 0xFC03 */ UNK_FC03 = 0xFC03, + /* 0xFD07 */ UNK_FD07 = 0xFD07, + /* 0xFE03 */ UNK_FE03 = 0xFE03, + /* 0xFF03 */ UNK_FF03 = 0xFF03, + }; +}; diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp index a9c0269da..e432fe9aa 100644 --- a/src/JAZelAudio/JAIZelBasic.cpp +++ b/src/JAZelAudio/JAIZelBasic.cpp @@ -1036,7 +1036,7 @@ void JAIZelBasic::changeSeaBgm() { if (field_0x0224 != 0x12) { return; } if (mIslandRoomNo == dIsleRoom_SeaFloor_e) { return; } if (mMainBgmNum == JA_BGM_DIE_LINK) { return; } - if (!checkEventBit(dSv_evtBit_c::MET_KORL)) { return; } + if (!checkEventBit(dSv_event_flag_c::MET_KORL)) { return; } if (mAudioCamera->field_0x0 == NULL) { return; } if (field_0x022d == 0) { return; } if (field_0x01f8 != 0) { return; } @@ -1335,7 +1335,7 @@ void JAIZelBasic::setScene(s32 sceneNum, s32 roomNo, s32 param_3, s32 layerNo) { bgmNum = expandSceneBgmNum(bgmNum); } } else if (sceneNum == 32) { - if (checkEventBit(0x2110) == 0 && checkEventBit(dSv_evtBit_c::ENDLESS_NIGHT) == 1) { + if (checkEventBit(0x2110) == 0 && checkEventBit(dSv_event_flag_c::ENDLESS_NIGHT) == 1) { bgmNum = JA_BGM_PIRATE_DEMO5; } else { bgmNum = m_scene_info[sceneNum].bgmNum; @@ -1737,7 +1737,7 @@ BOOL JAIZelBasic::isDemo() { /* 802AC788-802AC7E8 .text checkSeaBgmID__11JAIZelBasicFv */ u32 JAIZelBasic::checkSeaBgmID() { - if (checkEventBit(dSv_evtBit_c::ENDLESS_NIGHT) == 1 && checkEventBit(0x3920) == 0) { + if (checkEventBit(dSv_event_flag_c::ENDLESS_NIGHT) == 1 && checkEventBit(0x3920) == 0) { return JA_BGM_SEA_STORM; } else { return JA_BGM_SEA; diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 21ca37f6e..1b6a34a9a 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -542,7 +542,7 @@ int daAgb_c::uploadMessageSend() { mUploadAction = UpAct_UNKB; field_0x664 = 60; - dComIfGs_onEventBit(0x1A20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A20); dComIfGp_particle_set(dPa_name::ID_COMMON_02E7, ¤t.pos, NULL, NULL, 255, &field_0x684); JKRHeap::free(l_gbaCommand->getMemAddress(), NULL); @@ -812,16 +812,16 @@ void daAgb_c::FlagsRecv() { field_0x632 = BigLittleChange(mGbaFlg.field_0x6) >> 0x10; field_0x67a = mGbaFlg.field_0x2.m2; - if (!dComIfGs_isEventBit(0x1708) && mGbaFlg.field_0x2.m3) { - dComIfGs_onEventBit(0x1708); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && mGbaFlg.field_0x2.m3) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1708); } - if (!dComIfGs_isEventBit(0x1A10) && mGbaFlg.field_0x2.m4) { - dComIfGs_onEventBit(0x1A10); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT) && mGbaFlg.field_0x2.m4) { + dComIfGs_onEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT); } - if (!dComIfGs_isEventBit(0x1A08) && mGbaFlg.field_0x2.m5) { - dComIfGs_onEventBit(0x1A08); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT) && mGbaFlg.field_0x2.m5) { + dComIfGs_onEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT); } } @@ -872,7 +872,7 @@ void daAgb_c::GbaItemUse() { var_r28 = 0xA; } else if (temp_f1 < 70.0) { var_r28 = 0xD; - } else if (dComIfGs_isEventBit(0x2E08)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E08)) { var_r28 = 0xC; } else { var_r28 = 0xD; @@ -1157,11 +1157,11 @@ void daAgb_c::FlagsSend(u32 stage_type) { mFlags.field_0x6_3 = dKy_getdaytime_hour(); mFlags.field_0x7_2 = dKy_getdaytime_minute(); mFlags.field_0x8_1 = dComIfGs_getLife(); - mFlags.field_0xa_1 = dComIfGs_isEventBit(0x1708); - mFlags.field_0x7_1 = dComIfGs_isEventBit(dSv_evtBit_c::UNLOCK_TINGLE_BALLOON_DISCOUNT); - mFlags.field_0x7_0 = dComIfGs_isEventBit(dSv_evtBit_c::UNLOCK_TING_DISCOUNT); + mFlags.field_0xa_1 = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708); + mFlags.field_0x7_1 = dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT); + mFlags.field_0x7_0 = dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT); - if (!dComIfGs_isEventBit(dSv_evtBit_c::MET_KORL) || dComIfGs_isEventBit(0x1E80)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::MET_KORL) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E80)) { mFlags.field_0x9_7 = 0; mFlags.field_0x9_6 = 0; mFlags.field_0x9_5 = 0; @@ -1179,24 +1179,24 @@ void daAgb_c::FlagsSend(u32 stage_type) { mFlags.field_0x9_5 = 0; } - if (dComIfGs_isEventBit(0x3920)) { - mFlags.field_0x9_4 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_DINS_PEARL); - mFlags.field_0x9_3 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_FARORES_PEARL); - mFlags.field_0x9_2 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_NAYRUS_PEARL); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3920)) { + mFlags.field_0x9_4 = !dComIfGs_isEventBit(dSv_event_flag_c::PLACED_DINS_PEARL); + mFlags.field_0x9_3 = !dComIfGs_isEventBit(dSv_event_flag_c::PLACED_FARORES_PEARL); + mFlags.field_0x9_2 = !dComIfGs_isEventBit(dSv_event_flag_c::PLACED_NAYRUS_PEARL); } else { mFlags.field_0x9_4 = 0; mFlags.field_0x9_3 = 0; mFlags.field_0x9_2 = 0; } - if (dComIfGs_isEventBit(0x1820)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { mFlags.field_0x9_1 = !dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_WT); mFlags.field_0x9_0 = !dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_ET); } else { mFlags.field_0x9_1 = 0; mFlags.field_0x9_0 = 0; } - mFlags.field_0xa_3 = dComIfGs_isEventBit(0x1E40); + mFlags.field_0xa_3 = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E40); mFlags.field_0xa_0 = mIsFree; mFlags.field_0xb_7 = getFollowTarget(); if (stage_type == dStageType_MINIBOSS_e) { diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index f1f44d5b9..f98755e19 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -93,12 +93,12 @@ BOOL daAgbsw0_c::draw() { } } else if(type == daAgbsw0Type_UNK_0xD_e) { - if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) || dComIfGs_isEventBit(0x2D01)) { + if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { return true; } } else if(type == daAgbsw0Type_UNK_0xE_e) { - if(!dComIfGs_isEventBit(0x1820) || dComIfGs_getTriforceNum() == 8) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) || dComIfGs_getTriforceNum() == 8) { return true; } } @@ -197,7 +197,7 @@ cPhs_State daAgbsw0_c::create() { } } else if(type == daAgbsw0Type_UNK_0xD_e) { - if(dComIfGs_isEventBit(0x2D01)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { return cPhs_ERROR_e; } } @@ -771,7 +771,7 @@ BOOL daAgbsw0_c::ExeSubM() { /* 00001198-00001368 .text ExeSubM3__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubM2() { - if(dComIfGs_isEventBit(0x2D01)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { if(field_0x298 == 1) { if(mDoGaC_GbaLink()) { if(!mDoGac_SendStatusCheck(5)) { @@ -830,7 +830,7 @@ BOOL daAgbsw0_c::ExeSubM3() { return true; } else { - if(!dComIfGs_isEventBit(0x1820)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { return true; } else { @@ -867,7 +867,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) { for(int i = 0; i < 8; i++) { if(dComIfGs_isCollectMapTriforce(i + 1) && !dComIfGs_isTriforce(i)) { - return dComIfGs_isEventBit(0x3E02) ? 0x304 : 0x303; + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E02) ? 0x304 : 0x303; } } @@ -992,7 +992,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) } } if(!dComIfGs_isGetCollectMap(5)) { - if(dComIfGs_isEventBit(0x3E80)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E80)) { #if VERSION <= VERSION_JPN if (!dComIfGs_isGetCollectMap(0x1C)) { return 0x31E; @@ -1293,9 +1293,9 @@ BOOL daAgbsw0_c::ExeSubB() { fopAc_ac_c* player = dComIfGp_getPlayer(0); if(restriction == 4) { - if(!dComIfGs_isEventBit(0x2E08)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E08)) { if(HitCheck(player->current.pos, 60.0f)) { - dComIfGs_onEventBit(0x2E08); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2E08); } } if(agb) { @@ -1705,7 +1705,7 @@ BOOL daAgbsw0_c::HitCheck(cXyz param_1, f32 param_2) { BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { switch(conditionNo) { case 1: - if(dComIfGs_isEventBit(0xF80)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::MET_KORL)) { return FALSE; } @@ -1717,13 +1717,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 3: - if(dComIfGs_isEventBit(0x1E40)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E40)) { return FALSE; } break; case 4: - if(dComIfGs_isEventBit(0x1820)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { return FALSE; } @@ -1737,19 +1737,19 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; } case 6: - if(dComIfGs_isEventBit(0x1A10)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT)) { return FALSE; } break; case 7: - if(dComIfGs_isEventBit(0x1A08)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT)) { return FALSE; } break; case 8: - if(dComIfGs_isEventBit(0x1708)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708)) { return FALSE; } @@ -1900,13 +1900,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x20: - if(dComIfGs_isEventBit(0x1708) && dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) { return FALSE; } break; case 0x21: - if(dComIfGs_isEventBit(0x1708) && dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) { return FALSE; } @@ -1998,19 +1998,19 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x2F: - if(dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(0x1A08)) { + if(dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT)) { return FALSE; } break; case 0x30: - if(dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(0x1A10)) { + if(dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT)) { return FALSE; } break; case 0x31: - if(!dComIfGs_isEventBit(0x1708)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708)) { return FALSE; } @@ -2236,7 +2236,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x56: - if(!dComIfGs_isEventBit(0x2E08)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E08)) { return FALSE; } @@ -2498,7 +2498,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x7E: - if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) && !dComIfGs_isEventBit(0x2D01)) { + if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { return FALSE; } diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index 32454b769..4056c78bb 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -236,7 +236,7 @@ static void hajimarinomori_check(andsw0_class* i_this) { else { for(int i = 0; i < 7; i++) {} - if (dComIfGs_isEventBit(4)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0004)) { bb_class* kargaroc = (bb_class*)ac[5]; fopAcM_delete(&kargaroc->actor); kargaroc = (bb_class*)ac[6]; @@ -247,15 +247,15 @@ static void hajimarinomori_check(andsw0_class* i_this) { bokoblin = (bk_class*)ac[4]; bokoblin->m121C = 1; - if (dComIfGs_isEventBit(0x301)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0301)) { bokoblin = (bk_class*)ac[0]; bokoblin->m121C = 1; } - if (dComIfGs_isEventBit(0x480)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0480)) { bokoblin = (bk_class*)ac[1]; bokoblin->m121C = 1; } - if (dComIfGs_isEventBit(0x301) && dComIfGs_isEventBit(0x480)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0301) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0480)) { bokoblin = (bk_class*)ac[2]; bokoblin->m121C = 1; } diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 2bb602947..8c4346f43 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -49,15 +49,15 @@ static daAuction_HIO_c l_HIO; static daAuction_c::ItemData l_item_dat[] = { - {dItem_JOY_PENDANT_e, 0x1D10, 40, 0x0F01}, - {dItem_COLLECT_MAP_27_e, 0x1D11, 5, 0x1080}, - {dItem_COLLECT_MAP_18_e, 0x1D12, 60, 0x1040}, - {dItem_HEART_PIECE_e, 0x1D13, 80, 0x1020}, + {dItem_JOY_PENDANT_e, 0x1D10, 40, dSv_event_flag_c::UNK_0F01}, + {dItem_COLLECT_MAP_27_e, 0x1D11, 5, dSv_event_flag_c::UNK_1080}, + {dItem_COLLECT_MAP_18_e, 0x1D12, 60, dSv_event_flag_c::UNK_1040}, + {dItem_HEART_PIECE_e, 0x1D13, 80, dSv_event_flag_c::UNK_1020}, }; static daAuction_c::ItemData l_item_dat2[] = { - {POSTMAN_STATUE, 0x1D14, 30, 0x1008}, - {PRESIDENT_STATUE, 0x1D15, 40, 0x1004}, + {POSTMAN_STATUE, 0x1D14, 30, dSv_event_flag_c::UNK_1008}, + {PRESIDENT_STATUE, 0x1D15, 40, dSv_event_flag_c::UNK_1004}, }; static s16 l_item_dat22[] = {0x002A, 0x00F9}; @@ -420,8 +420,8 @@ void daAuction_c::eventOrder() { fopAcM_orderSpeakEvent(this); } } else if (m838 == 3) { - if (dComIfGs_isEventBit(0x4008)) { - mCurrAuctionItemIndex = dComIfGs_getEventReg(0xCD03); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_4008)) { + mCurrAuctionItemIndex = dComIfGs_getEventReg(dSv_event_flag_c::UNK_CD03); mCurrBid += 10; } else { mCurrAuctionItemIndex = getItemNo(); @@ -1313,8 +1313,8 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { break; } - if (dComIfGs_isEventBit(0x4008)) { - dComIfGp_setNpcNameMessageID(l_npc_msg_dat[dComIfGs_getEventReg(0x790F)].field_0x00); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_4008)) { + dComIfGp_setNpcNameMessageID(l_npc_msg_dat[dComIfGs_getEventReg(dSv_event_flag_c::UNK_790F)].field_0x00); *pMsgNo = 0x1CF6; } else { *pMsgNo = 0x1CF5; @@ -1444,11 +1444,11 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) { *pMsgNo = 0x1D1C; } else { if (m824 != 0) { - dComIfGs_onEventBit(0x4008); - dComIfGs_setEventReg(0x790F, getAucMdlNo(m824)); - dComIfGs_setEventReg(0xCD03, mCurrAuctionItemIndex); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_4008); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_790F, getAucMdlNo(m824)); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_CD03, mCurrAuctionItemIndex); } else { - dComIfGs_offEventBit(0x4008); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_4008); } fopAcM_delete(mCurrAuctionItemPID); diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index 1a4688095..8ec7eb782 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -2713,7 +2713,7 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) { i_this->unk_2DC = 0; } - if (dComIfGs_isEventBit(0x1101) && i_this->unk_2DC != 0 && dComIfGs_isSwitch(i_this->unk_2DC, fopAcM_GetRoomNo(a_this))) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101) && i_this->unk_2DC != 0 && dComIfGs_isSwitch(i_this->unk_2DC, fopAcM_GetRoomNo(a_this))) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index d687a9439..8bc6a6f54 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -1557,7 +1557,7 @@ void damage_check(bdk_class* i_this) { dScnPly_ply_c::setPauseTimer(8); mDoAud_bgmStop(0x1E); } else { - dComIfGs_onEventBit(0x3C01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3C01); #if VERSION > VERSION_DEMO dScnPly_ply_c::setPauseTimer(5); #endif @@ -2891,7 +2891,7 @@ void demo_camera(bdk_class* i_this) { if (std::fabsf(i_this->m6320) < 1.0f) { cLib_addCalc0(&i_this->m6324, 1.0f, REG0_F(12) + 1.0f); if (i_this->m25A0 == 0xF) { - dComIfGs_onTmpBit(0x401); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0401); dComIfGs_onStageBossDemo(); fpcM_Search(ep_delete_sub, actor); diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 6c6321e8a..ecdfaf8bf 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -2646,10 +2646,10 @@ static void fail(bk_class* i_this) { fopAcM_onActor(i_this); if (i_this->mType != 4) { - if (dComIfGs_isEventBit(0x0301)) { - dComIfGs_onEventBit(0x0480); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0301)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0480); } else { - dComIfGs_onEventBit(0x0301); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0301); } } break; @@ -2899,7 +2899,7 @@ static void d_dozou(bk_class* i_this) { case 1: if ( (i_this->m02B7 != 0xFF && dComIfGs_isSwitch(i_this->m02B7, fopAcM_GetRoomNo(i_this))) || - (i_this->m02B7 == 0xFF && dComIfGs_isEventBit(0x3802)) + (i_this->m02B7 == 0xFF && dComIfGs_isEventBit(dSv_event_flag_c::COLORS_IN_HYRULE)) ) { i_this->mpMorf->setPlaySpeed(1.0f); i_this->dr.mMode = 2; @@ -2933,7 +2933,7 @@ static void carry_drop(bk_class* i_this) { switch (i_this->dr.mMode) { case 0: - dComIfGs_onEventBit(0x0004); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0004); i_this->dr.mMode = 1; anm_init(i_this, BK_BCK_BK_KOUKA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); // Fall-through diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 9bf2a93b9..9fb7d52b7 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -529,8 +529,8 @@ void end(bmd_class* i_this) { if (dComIfGp_getStartStageName()[0] == 'X') { dLib_setNextStageBySclsNum(0, actor->current.roomNo); mDoAud_seStart(JA_SE_LK_B_BOSS_WARP, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); - dComIfGs_onEventBit(0x3220); - dComIfGs_onTmpBit(0x480); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3220); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0480); return; } #if VERSION > VERSION_DEMO @@ -2013,7 +2013,7 @@ static cPhs_State daBmd_Create(fopAc_ac_c* a_this) { i_this->mCoCyl.Set(co_cyl_src); i_this->m308[2] = 200; if (!dComIfGs_isStageBossDemo() && (dComIfGp_getStartStageName()[0] != 'X')) { - dComIfGs_offTmpBit(0x480); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0480); i_this->mMode = 10; i_this->mBE0 = 1; i_this->mBDC = 1.0f; diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index 045f160f9..a62cb668f 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -795,7 +795,7 @@ BOOL daBoko_c::execute() { } if (fopAcM_GetParam(this) == Type_PGANON_SWORD_e) { - if (dComIfGs_isEventBit(0x3a08)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3A08)) { mBrkAnm.play(); bVar4 = true; if (mBrkAnm.isStop()) { diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 5f9bd10ed..a42e4eff8 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -2105,8 +2105,8 @@ void action_bunri_dousa(bpw_class* i_this) { currHp = actor->health; if (currHp < 1) { if (dComIfGp_getStartStageName()[0] == 'X') { - dComIfGs_onEventBit(0x3210); - dComIfGs_onTmpBit(0x480); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3210); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0480); dLib_setNextStageBySclsNum(0, actor->current.roomNo); mDoAud_seStart(JA_SE_LK_B_BOSS_WARP, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } else { @@ -3293,8 +3293,8 @@ void body_execute(bpw_class* i_this) { if (CPad_CHECK_HOLD_Z(0) && CPad_CHECK_HOLD_DOWN(0)) { dComIfGs_onStageBossEnemy(); if (dComIfGp_getStartStageName()[0] == 'X') { - dComIfGs_onEventBit(0x3210); - dComIfGs_onTmpBit(0x0480); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3210); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0480); dLib_setNextStageBySclsNum(0, actor->current.roomNo); mDoAud_seStart(JA_SE_LK_B_BOSS_WARP, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); fopAcM_delete(actor); diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index 8274b781e..13482812f 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -851,8 +851,8 @@ void end(btd_class* i_this) { if (dComIfGp_getStartStageName()[0] == 'X') { dLib_setNextStageBySclsNum(0, i_this->current.roomNo); mDoAud_seStart(JA_SE_LK_B_BOSS_WARP, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); - dComIfGs_onEventBit(0x3240); - dComIfGs_onTmpBit(0x480); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3240); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0480); mDoAud_bgmStop(30); } else { i_this->mGohmaState = 0x33; @@ -2894,7 +2894,7 @@ static cPhs_State daBtd_Create(fopAc_ac_c* a_this) { i_this->health = 10; i_this->max_health = 10; if ((dComIfGs_isStageBossDemo()) || (dComIfGp_getStartStageName()[0] == 'X')) { - dComIfGs_offTmpBit(0x480); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0480); i_this->m6E80 = -50.0f; i_this->m6E84 = 0.0f; if (dComIfGp_getStartStageName()[0] == 'X') { diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 91de730c9..3d4865b0b 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -1051,8 +1051,8 @@ void end(bwd_class* i_this) { if (dComIfGp_getStartStageName()[0] == 'X') { dLib_setNextStageBySclsNum(0, actor->current.roomNo); mDoAud_seStart(JA_SE_LK_B_BOSS_WARP, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); - dComIfGs_onEventBit(0x3208); - dComIfGs_onTmpBit(0x480); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3208); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0480); return; } #if VERSION != VERSION_USA @@ -2627,7 +2627,7 @@ static cPhs_State daBwd_Create(fopAc_ac_c* a_this) { i_this->m17E0 = REG0_F(0xb) + 400.0f; i_this->m3C15 = 5; } else { - dComIfGs_offTmpBit(0x480); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0480); fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e); i_this->m18AE = 1; i_this->m18B0 = -10; diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 8a623982c..45dec4a4d 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -1513,7 +1513,7 @@ void deku_come_demo(cc_class* i_this) { dComIfGp_event_reset(); i_this->m2FC = 0; DEMO_COME_START_FLAG = 0; - dComIfGs_onTmpBit(0x304); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0304); } break; } diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index f8f5eea98..a90e2db68 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -115,7 +115,7 @@ cPhs_State daDekuItem_c::_create() { return cPhs_ERROR_e; } - if (!dComIfGs_isEventBit(0x1801U)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1801)) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 9663d91d5..e075db21c 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -235,56 +235,56 @@ BOOL daDemo00_c::execute() { field_0x29c = demo_actor->getPrm()->getId(); if (field_0x29c == 4) { static const u16 l_eventBit[] = { - 0xFFFF, - 0x2A80, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0x2401, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0x2110, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0x2D01, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0xFFFF, - 0x3802, + -1, + dSv_event_flag_c::UNK_2A80, + -1, + -1, + -1, + dSv_event_flag_c::UNK_2401, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + dSv_event_flag_c::UNK_2110, + -1, + -1, + -1, + -1, + -1, + dSv_event_flag_c::UNK_2D01, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + dSv_event_flag_c::COLORS_IN_HYRULE, }; dDemo_prm_data* data = demo_actor->getPrm()->getData(); JStudio::stb::TParseData_fixed<49, TValueIterator_raw > spCC(data); diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index 1830a8911..55478a4ea 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -256,7 +256,7 @@ static BOOL daDk_Execute(dk_class* a_this) { switch (a_this->field_0xAC5) { case 0: - if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_310)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0310)) { a_this->field_0xAC5 = 2; } break; @@ -266,7 +266,7 @@ static BOOL daDk_Execute(dk_class* a_this) { } // fallthrough case 3: - if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_1)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { a_this->field_0xAC5 = -1; } break; diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp index ff4aed23f..955df5f6f 100644 --- a/src/d/actor/d_a_door12.cpp +++ b/src/d/actor/d_a_door12.cpp @@ -586,7 +586,7 @@ cPhs_State daDoor12_c::create() { } if (getArg1() == 8) { - dComIfGs_offTmpBit(0x440); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0440); } if (chkMakeKey()) { @@ -682,7 +682,7 @@ void daDoor12_c::demoProc() { case 2: iVar1 = mStopBars.closeProc(this); if (iVar1 == 2 && getArg1() == 8) { - dComIfGs_onTmpBit(0x440); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0440); } if (iVar1 != 0) { diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index d7247aec6..0e8cc4107 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -1162,7 +1162,7 @@ void end(fganon_class* i_this) { i_this->mMode = 1; anm_init(i_this, FGANON_BCK_LAST_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mB54 = 50; - dComIfGs_onEventBit(0x3f20); // PG_DEFEATED? It appears further down in `energy_ball_move` + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3F20); // PG_DEFEATED? It appears further down in `energy_ball_move` break; case 1: { if (mFrame == 104) { @@ -2183,7 +2183,7 @@ void energy_ball_move(fganon_class* i_this) { } mDoAud_changeSubBgmStatus(lVar11); i_this->m688++; - dComIfGs_onEventBit(0x3f20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3F20); } else if (bVar5) { local_5c = player->eyePos - i_this->m3E0; local_5c.y -= REG0_F(18) + 50.0f; @@ -2759,7 +2759,7 @@ static cPhs_State daFganon_Create(fopAc_ac_c* i_act) { } if ((i_this->mSwitchNo != 0xFF) && (dComIfGs_isSwitch(i_this->mSwitchNo, dComIfGp_roomControl_getStayNo()) != 0)) { - if (((fopAcM_GetParam(i_this) & 0xF) == 2) && !(dComIfGs_isEventBit(0x3A08))) { // Probably a flag to do with beating FF1 so PG spawns? + if (((fopAcM_GetParam(i_this) & 0xF) == 2) && !(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3A08))) { // Probably a flag to do with beating FF1 so PG spawns? fopAcM_create(PROC_BOKO, daBoko_c::Type_PGANON_SWORD_e, &i_this->current.pos, i_this->current.roomNo); } return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index a24466e4c..af15c2023 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -250,7 +250,7 @@ cPhs_State daGhostship_c::_create() { getArg(); - if((s32)dComIfGs_getEventReg(0x8803) == 3) { + if((s32)dComIfGs_getEventReg(dSv_event_flag_c::UNK_8803) == 3) { return cPhs_ERROR_e; } @@ -360,7 +360,7 @@ bool daGhostship_c::_execute() { } if(mAlpha == l_HIO.shipAlpha && dist < l_HIO.shipEnterDist) { - u8 r29 = dComIfGs_getEventReg(0x8803); + u8 r29 = dComIfGs_getEventReg(dSv_event_flag_c::UNK_8803); if (r29 < 3 #if VERSION > VERSION_DEMO && !mbEnteredShip @@ -371,8 +371,8 @@ bool daGhostship_c::_execute() { JUT_ASSERT(DEMO_SELECT(457, 463), scls_data != NULL) u8 startCode = scls_data->mStart; - dComIfGs_setEventReg(0xC3FF, scls_data->mRoom); - dComIfGs_setEventReg(0x85FF, startCode); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C3FF, scls_data->mRoom); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_85FF, startCode); #if VERSION == VERSION_DEMO dComIfGp_setNextStage("PShip", 0, r29); #else diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 298793b84..b52657486 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -1179,9 +1179,9 @@ void new_himo2_move(himo2_class* i_this) { if (fopAcM_GetParam(actor) == 3) { i_this->m02DC = 11; if ((fopAcM_GetParam(i_this->m217C) & 0xF0) != 0) { - dComIfGs_onEventBit(0x540); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0540); } else { - dComIfGs_onEventBit(0x580); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0580); } } i_this->m217C->health = 1; @@ -1370,7 +1370,7 @@ void new_himo2_move(himo2_class* i_this) { if (i_this->m029C == 30) { fopAcM_seStartCurrent((fopAc_ac_c*)dr, JA_SE_CM_BTD_ROPE_SET, 0); } - if (((dComIfGp_getStartStageName()[0] != 'X') && (i_this->m029C <= 1)) && (!dComIfGs_isEventBit(0x420))) { + if (((dComIfGp_getStartStageName()[0] != 'X') && (i_this->m029C <= 1)) && (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0420))) { dKy_custom_colset(0, 4, 1.0f); } if ((i_this->m029C != 0) || (REG0_S(8) != 0)) { @@ -1382,10 +1382,10 @@ void new_himo2_move(himo2_class* i_this) { btd->m6E15 = 1; #endif i_this->m24D9 = 4; - if ((dComIfGp_getStartStageName()[0] == 'X') || (dComIfGs_isEventBit(0x420))) { + if ((dComIfGp_getStartStageName()[0] == 'X') || (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0420))) { i_this->m029C = 0; } else { - dComIfGs_onEventBit(0x420); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0420); i_this->m029C = REG0_S(2) + 62; daYkgr_c::hide(); } diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index 7d3c56d2c..18743a3ee 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/src/d/actor/d_a_himo3.cpp @@ -133,7 +133,7 @@ void himo3_control(himo3_class* i_this, himo3_s* arg1) { if (strcmp(dComIfGp_getStartStageName(), "majroom") == 0 || strcmp(dComIfGp_getStartStageName(), "Majroom") == 0 || strcmp(dComIfGp_getStartStageName(), "MajyuE") == 0) { - dComIfGs_onEventBit(0x402); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0402); } } else if (fopAcM_GetParam(i_this) == 2) { i_this->m02BE = 2; diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index c3279e475..08b452a41 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -124,7 +124,7 @@ void jbo_move(jbo_class* i_this) { static BOOL daJBO_Execute(jbo_class* i_this) { fopAc_ac_c* actor = &i_this->actor; if (i_this->mType == daJbo_Type_APPEAR_AFTER_DEKU_TREE_e) { - if (dComIfGs_isEventBit(0x1801)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1801)) { i_this->mType = daJbo_Type_NORMAL_e; i_this->mCoSph.OnCoSetBit(); } diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index 4f2bb79a6..718956618 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -171,11 +171,11 @@ s32 daKnob00_c::chkPassward() { strcpy(acStack_24, dComIfGp_getInputPassword()); #endif - if (!dComIfGs_isEventBit(0x2110)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2110)) { return -1; } - s32 uVar3 = dComIfGs_getEventReg(0xba0f); + s32 uVar3 = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BA0F); fopMsgM_passwordGet(acStack_38, uVar3 + 0x1b37); #if VERSION > VERSION_JPN daKnob00_charactorExchange(acStack_38); @@ -292,29 +292,29 @@ BOOL daKnob00_c::chkException() { return 1; } - if (!dComIfGs_isEventBit(0x2110)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2110)) { return 1; } break; case 0x6A7: - if (!dComIfGs_isEventBit(0x520)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { return 1; } break; case 0x6A8: - if (!dComIfGs_isEventBit(0xa02)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT)) { return 1; } - if (dComIfGs_isEventBit(0x2110)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2110)) { return 1; } break; case 0x6A9: - if (dComIfGs_isEventBit(0x1701)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1701)) { return 1; } break; @@ -324,7 +324,7 @@ BOOL daKnob00_c::chkException() { return 1; } - if (dComIfGs_isEventBit(0x1a80)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) { return 1; } break; @@ -614,15 +614,15 @@ BOOL daKnob00_c::actionPassward2() { case 0: if (demoProc2()) { m316++; - if (!dComIfGs_isEventBit(0x3b20)) { - dComIfGs_onEventBit(0x3b20); - dComIfGs_setEventReg(0xba0f, (s8)cM_rndF(6.0f)); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B20)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3B20); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_BA0F, (s8)cM_rndF(6.0f)); } #if VERSION == VERSION_DEMO - s32 tmp = dComIfGs_getEventReg(0xba0f); + s32 tmp = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BA0F); m2D0.init(tmp + 0x1b1a); #else - s32 tmp = dComIfGs_getEventReg(0xba0f); + s32 tmp = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BA0F); tmp += 0x1b1a; m2D0.init(tmp); #endif @@ -643,7 +643,7 @@ BOOL daKnob00_c::actionPassward2() { m316 = 10; m2D0.init(0x1b19); } else { - dComIfGs_onEventBit(0x1910); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1910); m316++; m2D0.init(0x1b18); } @@ -681,7 +681,7 @@ BOOL daKnob00_c::actionVilla() { initOpenDemo(0); setAction(7); demoProc(); - } else if (dComIfGs_isEventBit(0x2d80)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D80)) { setAction(1); } else { setEventPrm(); @@ -708,20 +708,20 @@ BOOL daKnob00_c::actionInit() { dComIfG_Bgsp()->Regist(mpBgW, this); } - if (mDoorType == 6 && !dComIfGs_isEventBit(0x3401)) { + if (mDoorType == 6 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3401)) { actionFigure(); setAction(10); return TRUE; } - if (mDoorType == 5 && !dComIfGs_isEventBit(0x2d80)) { + if (mDoorType == 5 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D80)) { actionVilla(); setAction(8); return TRUE; } if (mDoorType == 4) { - if (!dComIfGs_isEventBit(0x1910)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1910)) { setAction(5); actionPassward(); return TRUE; @@ -757,7 +757,7 @@ BOOL daKnob00_c::actionFigure() { initOpenDemo(0); setAction(9); demoProc(); - } else if (dComIfGs_isEventBit(0x3401)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3401)) { setAction(1); } else { setEventPrm(); diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index f1db1d587..c36ddc7cb 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -203,18 +203,18 @@ void daLbridge_c::demo() { if (dComIfGp_evmng_endCheck(mAppearEventIdx)) { dComIfGp_event_reset(); - dComIfGs_onEventBit(0xE01U); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0E01); } if (dComIfGp_evmng_endCheck(mDisappearEventIdx)) { dComIfGp_event_reset(); - dComIfGs_onEventBit(0xF40U); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0F40); } } else { - if (dComIfGs_isEventBit(0xE01U) == FALSE && this->unk31C == 1) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E01) == FALSE && this->unk31C == 1) { fopAcM_orderOtherEventId(this, mAppearEventIdx); eventInfo.onCondition(dEvtCnd_UNK2_e); - } else if (dComIfGs_isEventBit(0xF40U) == FALSE && this->unk31C == 2) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F40) == FALSE && this->unk31C == 2) { fopAcM_orderOtherEventId(this, mDisappearEventIdx); eventInfo.onCondition(dEvtCnd_UNK2_e); } diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp index 1fb25659b..d79b52838 100644 --- a/src/d/actor/d_a_lod_bg.cpp +++ b/src/d/actor/d_a_lod_bg.cpp @@ -165,7 +165,7 @@ BOOL daLodbg_c::createModelData() { return FALSE; } #if VERSION > VERSION_JPN - else if (getRoomNo() == dIsleRoom_ForsakenFortress_e && !dComIfGs_isEventBit(0x1820)) { + else if (getRoomNo() == dIsleRoom_ForsakenFortress_e && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { if (!loadModelData("/lod01/bdl/model1.bdl", mModelData2, mDataHeap2, mDataSize2)) return FALSE; } @@ -329,7 +329,7 @@ BOOL daLodbg_c::draw() { return TRUE; s32 roomNo = getRoomNo(); - if (roomNo == dIsleRoom_ToweroftheGods_e && !dComIfGs_isEventBit(0x1e40)) + if (roomNo == dIsleRoom_ToweroftheGods_e && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E40)) return TRUE; g_env_light.settingTevStruct(TEV_TYPE_BG0, NULL, &tevStr); diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index 07edde385..3249b2168 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/src/d/actor/d_a_mdoor.cpp @@ -126,7 +126,7 @@ BOOL daMdoor_c::CreateInit() { switch (bVar5) { case 0: - if (dComIfGs_isEventBit(0x1101)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101)) { setAction(daMdoor_c::ACT_WAIT3_e); } else { setAction(daMdoor_c::ACT_DEMO_WAIT_e); @@ -136,11 +136,11 @@ BOOL daMdoor_c::CreateInit() { break; case 1: - if (dComIfGs_isEventBit(0x1101)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101)) { setAction(daMdoor_c::ACT_WAIT7_e); m2CC = 280.0f; } else { - dComIfGs_offEventBit(0x1140); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_1140); setAction(daMdoor_c::ACT_GENOCIDE_e); m2C6 = dComIfGp_evmng_getEventIdx("DEFAULT_STOP_OPEN", 0xFF); m2C4 = 1; @@ -349,7 +349,7 @@ BOOL daMdoor_actionReady(daMdoor_c* i_this) { switch (i_this->getType()) { case 1: - dComIfGs_onEventBit(0x1140); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1140); break; } } else { diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index 574c33280..4c3dfa62b 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/src/d/actor/d_a_mflft.cpp @@ -206,7 +206,7 @@ void mflft_move(mflft_class* i_this) { if (uVar6 == 7) { i_this->m29A = 1; - dComIfGs_onEventBit(0x2a10); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2A10); dBgS_ObjGndChk_Yogan gndChk; Vec pos; pos.x = i_this->actor.current.pos.x; @@ -227,10 +227,10 @@ void mflft_move(mflft_class* i_this) { if (i_this->m6F5 != 0) { i_this->m6F5--; if ((i_this->m6F5 == 0) && (uVar6 != 0)) { - u8 eventReg = dComIfGs_getEventReg(0xa507); + u8 eventReg = dComIfGs_getEventReg(dSv_event_flag_c::UNK_A507); if (eventReg < 6) { eventReg++; - dComIfGs_setEventReg(0xa507, eventReg); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_A507, eventReg); } } } diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 4632229d7..79b543785 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -40,9 +40,9 @@ bool daMmusic::Act_c::create_heap() { /* 000000A4-0000013C .text Macore_is_playing__Q28daMmusic5Act_cFv */ BOOL daMmusic::Act_c::Macore_is_playing() { if (dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_WT) || - dComIfGs_isEventBit(0x2910) || - dComIfGs_isEventBit(0x2e02) || - dComIfGs_isEventBit(0x1610) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_2910) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E02) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610) || !dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e)) return FALSE; diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index fda6ad7cc..a09e7e815 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -188,7 +188,7 @@ static BOOL nodeCallBackArm(J3DNode* node, int calcTiming) { /* 00000550-000006F4 .text daNpc_Bmsw_getGameEndMsg__Fs */ static u32 daNpc_Bmsw_getGameEndMsg(short rupees) { - u8 reg_val = dComIfGs_getEventReg(0xC203); + u8 reg_val = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203); u32 msgNo; switch (reg_val) { case 0: @@ -226,15 +226,15 @@ static u32 daNpc_Bmsw_getGameEndMsg(short rupees) { break; case 3: default: - if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { if (rupees == 0) { msgNo = 0x1A69; } else if (rupees == 1) { msgNo = 0x1A6A; - } else if (rupees <= dComIfGs_getEventReg(0x8AFF)) { + } else if (rupees <= dComIfGs_getEventReg(dSv_event_flag_c::UNK_8AFF)) { msgNo = 0x1A6B; } else { - dComIfGs_setEventReg(0x8AFF, rupees); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_8AFF, rupees); msgNo = 0x1A6D; } } else { @@ -400,7 +400,7 @@ u16 daNpc_Bmsw_c::next_msgStatus(unsigned long* currMsgNo) { break; case 0x1A2E: if (mpCurrMsg->mSelectNum == 0) { - dComIfGs_onEventBit(dSv_evtBit_c::UNK_1A01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A01); *currMsgNo = 0x1A31; } else if (mpCurrMsg->mSelectNum == 1) { if (dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_DRC)) { @@ -418,7 +418,7 @@ u16 daNpc_Bmsw_c::next_msgStatus(unsigned long* currMsgNo) { } break; case 0x1A34: - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_1A01)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A01)) { *currMsgNo = 0x1A32; } else { *currMsgNo = 0x1A42; @@ -426,25 +426,25 @@ u16 daNpc_Bmsw_c::next_msgStatus(unsigned long* currMsgNo) { break; case 0x1A38: (*currMsgNo)++; - dComIfGs_setEventReg(0xC203, 1); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C203, 1); break; case 0x1A3D: if (mpCurrMsg->mSelectNum == 0) { - dComIfGs_onEventBit(dSv_evtBit_c::UNK_1A01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A01); *currMsgNo = 0x1A31; } else { *currMsgNo = 0x1A3E; } break; case 0x1A4D: - dComIfGs_setEventReg(0xC203, 2); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C203, 2); // fallthrough case 0x1A51: case 0x1A53: *currMsgNo = 0x1A4E; break; case 0x1A58: - dComIfGs_setEventReg(0xC203, 3); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C203, 3); (*currMsgNo)++; break; case 0x1A5E: @@ -518,22 +518,22 @@ u32 daNpc_Bmsw_c::getMsg() { if (field_0x9C0 != fpcM_ERROR_PROCESS_ID_e) { field_0x9C0 = fpcM_ERROR_PROCESS_ID_e; } else { - if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { - if (!dComIfGs_isTmpBit(800)) { - dComIfGs_onTmpBit(800); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { + if (!dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0320)) { + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0320); msg = 0x1A63; } else { msg = 0x1A66; } } else { - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_1A02)) { - dComIfGs_onEventBit(dSv_evtBit_c::UNK_1A02); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A02)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A02); msg = 0x1A2D; } else { - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_1A01)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A01)) { msg = 0x1A3D; } else { - u8 reg = dComIfGs_getEventReg(0xC203); + u8 reg = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203); switch (reg) { case 0: msg = 0x1A3F; @@ -606,7 +606,7 @@ BOOL daNpc_Bmsw_c::CreateInit() { mpMorfHand->calc(); dKy_tevstr_init(&field_0x6E0, home.roomNo, 0xFF); - if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { field_0x9E0 = fopAcM_createChild( "Btsw", fopAcM_GetID(this), @@ -672,7 +672,7 @@ void daNpc_Bmsw_c::lookBack() { vec = current.pos; vec.y = eyePos.y; } else { - if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701) && field_0x9E0 != fpcM_ERROR_PROCESS_ID_e) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701) && field_0x9E0 != fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* ac = fopAcM_SearchByID(field_0x9E0); if (ac != NULL) { vec2 = ac->eyePos; @@ -705,7 +705,7 @@ void daNpc_Bmsw_c::wait01() { field_0x9D7 = 2; } - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { if (mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { if (--field_0x9D6 <= 0) { if (field_0x9D5 == 5) { @@ -745,7 +745,7 @@ void daNpc_Bmsw_c::talk01() { field_0x9DA = 1; dComIfGp_event_reset(); - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { setAnm(0); } else { setAnm(1); @@ -764,7 +764,7 @@ BOOL daNpc_Bmsw_c::wait_action(void*) { if (mActionStatus == ACTION_STARTING) { field_0x9DA = 1; field_0x9D6 = 1; - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { setAnm(FALSE); } else { setAnm(TRUE); @@ -809,7 +809,7 @@ BOOL daNpc_Bmsw_c::checkNextMailThrowOK() { /* 00001C70-00001DA4 .text setGameGetRupee__12daNpc_Bmsw_cFs */ void daNpc_Bmsw_c::setGameGetRupee(short rupees) { - u8 reg_val = dComIfGs_getEventReg(0xC203); + u8 reg_val = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203); switch (reg_val) { case 0: if (rupees < 10) { @@ -839,7 +839,7 @@ void daNpc_Bmsw_c::setGameGetRupee(short rupees) { break; case 3: default: - if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { field_0x960 = rupees; } else { field_0x960 = rupees * 3; @@ -888,7 +888,7 @@ BOOL daNpc_Bmsw_c::shiwake_game_action(void*) { field_0x9B1 = 0; if (!eventInfo.checkCommandDemoAccrpt()) { - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { field_0x9D8 = dComIfGp_evmng_getEventIdx("SHIWAKEGAME"); } else { field_0x9D8 = dComIfGp_evmng_getEventIdx("SHIWAKEGAME2"); @@ -1133,8 +1133,8 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) { cPhs_State daNpc_Bmsw_c::_create() { fopAcM_SetupActor(this, daNpc_Bmsw_c); - u8 reg_val = dComIfGs_getEventReg(0xC203); - if (reg_val >= 3 && !dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + u8 reg_val = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203); + if (reg_val >= 3 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { fopAcM_create( "Btsw", fopAcM_GetParam(this), diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 15b13e650..cc77afdae 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -611,22 +611,22 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { dComIfGp_setItemBeastNumCount(idx, -getBuyItem()); if(*pMsgNo == 0xFD3) { - u8 r3 = dComIfGs_getEventReg(0x7F0F); + u8 r3 = dComIfGs_getEventReg(dSv_event_flag_c::UNK_7F0F); r3 += getBuyItem(); u8 temp = cLib_maxLimit(r3, 0xF); - dComIfGs_setEventReg(0x7F0F, temp); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_7F0F, temp); if(temp < 0xA) { *pMsgNo = 0xFD5; break; } - if(dComIfGs_isEventBit(0x3B04)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B04)) { *pMsgNo = 0xFD9; break; } - dComIfGs_onEventBit(0x3B04); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3B04); *pMsgNo = 0xFD6; break; } @@ -711,7 +711,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; case 0xF3E: if(CPad_CHECK_TRIG_B(0)) { - u8 points = dComIfGs_getEventReg(0x86FF); + u8 points = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); if(mShopItems.isSoldOutItemAll()) { *pMsgNo = 0xF62; break; @@ -748,7 +748,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { case 0xF65: case 0xF66: if(CPad_CHECK_TRIG_B(0)) { - u8 points = dComIfGs_getEventReg(0x86FF); + u8 points = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); if(mShopItems.isSoldOutItemAll()) { *pMsgNo = 0xF62; break; @@ -785,7 +785,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { case 0xF6B: case 0xF6D: if(CPad_CHECK_TRIG_B(0)) { - u8 points = dComIfGs_getEventReg(0x86FF); + u8 points = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); if(mShopItems.isSoldOutItemAll()) { *pMsgNo = 0xF62; break; @@ -875,7 +875,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { execItemGet(itemNo); if(mType == 0) { - if(dComIfGs_getEventReg(0x86FF) != 0) { + if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF) != 0) { *pMsgNo = 0xF4C; break; } @@ -928,13 +928,13 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { switch(itemNo) { case dItem_EMPTY_BOTTLE_e: - dComIfGs_onEventBit(0x2020); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2020); break; case dItem_HEART_PIECE_e: - dComIfGs_onEventBit(0x2010); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2010); break; case dItem_COLLECT_MAP_30_e: - dComIfGs_onEventBit(0x2008); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2008); break; } } @@ -966,9 +966,9 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; case 0xF4C: case 0xF4E: { - int points = dComIfGs_getEventReg(0x86FF) + 1; + int points = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF) + 1; points = cLib_maxLimit(points, 0xFF); - dComIfGs_setEventReg(0x86FF, points); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_86FF, points); if(points > 60) { *pMsgNo = 0xF3E; @@ -976,7 +976,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { } if(points == 60) { - dLetter_send(0xAF03); + dLetter_send(dSv_event_flag_c::LETTER_GOLD_MEMBERSHIP); *pMsgNo = 0xF53; break; } @@ -987,7 +987,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { } if(points == 30) { - dLetter_send(0xB003); + dLetter_send(dSv_event_flag_c::LETTER_SILVER_MEMBERSHIP); *pMsgNo = 0xF50; break; } @@ -1039,7 +1039,7 @@ u32 daNpc_Bs1_c::getMsg() { msgNo = 0xF99; break; default: - if(dComIfGs_getEventReg(0x7F0F) < 10) { + if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_7F0F) < 10) { msgNo = 0xF9E; break; } @@ -1069,12 +1069,12 @@ u32 daNpc_Bs1_c::getMsg() { } } else if(mType == 0) { - u8 points = dComIfGs_getEventReg(0x86FF); + u8 points = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); if(mShopItems.isSoldOutItemAll()) { msgNo = 0xF3D; } - else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(0x1F20) && isSellBomb()) { - dComIfGs_onEventBit(0x1F20); + else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F20) && isSellBomb()) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F20); m837 = 1; msgNo = 0xF55; } @@ -1110,16 +1110,16 @@ u32 daNpc_Bs1_c::getMsg() { else if(mShopItems.isSoldOutItemAll()) { msgNo = 0x2F62; } - else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(0x1F20) && isSellBomb()) { - dComIfGs_onEventBit(0x1F20); + else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F20) && isSellBomb()) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F20); m837 = 1; msgNo = 0x2F64; } else if(m837) { msgNo = 0x2F67; } - else if(dComIfGs_isEventBit(0x1F08)) { - if(dComIfGs_isEventBit(0x2040)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F08)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2040)) { if(m838 == 1) { msgNo = 0x2F60; } @@ -1128,20 +1128,20 @@ u32 daNpc_Bs1_c::getMsg() { } } else { - dComIfGs_onEventBit(0x2040); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2040); msgNo = 0x2F5F; m838 = 1; } } else { - switch(dComIfGs_getEventReg(0xBB07)) { + switch(dComIfGs_getEventReg(dSv_event_flag_c::UNK_BB07)) { case 0: - if(m836 || dComIfGs_isEventBit(0x1F10)) { + if(m836 || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F10)) { msgNo = 0x2F46; break; } - dComIfGs_onEventBit(0x1F10); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F10); msgNo = 0x2F45; break; case 1: @@ -1202,8 +1202,8 @@ u32 daNpc_Bs1_c::getMsg() { break; } - if(dComIfGs_isEventBit(0x1F10)) { - dComIfGs_onEventBit(0x1F10); + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F10)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F10); } m836 = 1; @@ -1257,7 +1257,7 @@ u32 daNpc_Bs1_c::getDefaultMsg() { u32 msgNo; if(mType == 0) { - u8 points = dComIfGs_getEventReg(0x86FF); + u8 points = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); if(mShopItems.isSoldOutItemAll()) { msgNo = 0xF5E; } @@ -1271,11 +1271,11 @@ u32 daNpc_Bs1_c::getDefaultMsg() { msgNo = 0xF3F; } } - else if(!dComIfGs_isEventBit(0x1F08)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F08)) { msgNo = 0x2F48; } - else if(!dComIfGs_isEventBit(0x2108)) { - dComIfGs_onEventBit(0x2108); + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2108)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2108); msgNo = 0x2F54; } else { @@ -1533,7 +1533,7 @@ void daNpc_Bs1_c::createShopList() { int dataIdx = 0; for(int i = 0; i < 3; i++) { u8 itemNo = temp[i]->mpItemData->mItemNo; - if((i == 0 && dComIfGs_isEventBit(0x2020)) || (i == 1 && dComIfGs_isEventBit(0x2010)) || (i == 2 && dComIfGs_isEventBit(0x2008))) { + if((i == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2020)) || (i == 1 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2010)) || (i == 2 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2008))) { itemNo = dataSet[dataIdx]->mpItemData->mItemNo; mpItemSetList[i] = dataSet[dataIdx]; dataIdx++; @@ -1800,7 +1800,7 @@ BOOL daNpc_Bs1_c::getdemo_action(void*) { if (dComIfGp_evmng_endCheck(m83A)) { m82A = 1; if (mType == 0) { - u8 someVal = dComIfGs_getEventReg(0x86FF); + u8 someVal = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); if (someVal != 0) { m740 = 0xF4C; } else { diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index b6be40032..5432ffb86 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -332,7 +332,7 @@ u16 daNpc_Btsw_c::next_msgStatus(unsigned long* currMsgNo) { break; case 0x1A93: if (mpCurrMsg->mSelectNum == 0) { - dComIfGs_onEventBit(dSv_evtBit_c::UNK_2702); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2702); *currMsgNo = 0x1A94; } else { *currMsgNo = 0x1AA0; @@ -340,7 +340,7 @@ u16 daNpc_Btsw_c::next_msgStatus(unsigned long* currMsgNo) { break; case 0x1AA1: if (mpCurrMsg->mSelectNum == 0) { - dComIfGs_onEventBit(dSv_evtBit_c::UNK_2702); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2702); *currMsgNo = 0x1A94; } else { *currMsgNo = 0x1AA2; @@ -356,17 +356,17 @@ u16 daNpc_Btsw_c::next_msgStatus(unsigned long* currMsgNo) { case 0x1AA4: case 0x1AA5: case 0x1AA6: - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) { *currMsgNo = 0x1AA7; - } else if (dLetter_isNoSend(0xAC03)) { + } else if (dLetter_isNoSend(dSv_event_flag_c::LETTER_BAITOS_MOM)) { *currMsgNo = 0x1AAB; } else if (!dComIfGs_isSymbol(1)) { *currMsgNo = 0x1AB4; - } else if (!dLetter_isRead(0xAC03)) { + } else if (!dLetter_isRead(dSv_event_flag_c::LETTER_BAITOS_MOM)) { *currMsgNo = 0x1AAD; - } else if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_3104)) { + } else if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3104)) { *currMsgNo = 0x1AAC; - dComIfGs_onEventBit(dSv_evtBit_c::UNK_3104); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3104); } else { *currMsgNo = 0x1AB3; } @@ -394,23 +394,23 @@ u32 daNpc_Btsw_c::getMsg() { if (dComIfGp_event_chkTalkXY()) { msg = 0x1AA3; } else { - if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2704)) { - dComIfGs_onEventBit(dSv_evtBit_c::UNK_2704); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2704)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2704); if (dComIfGs_getClearCount() == 0) { msg = 0x1A91; } else { msg = 0x1AB5; } - } else if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2702)) { + } else if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2702)) { msg = 0x1AA1; } else { - if (dComIfGs_getEventReg(0xAB03) < 3) { + if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_AB03) < 3) { msg = 0x1AA5; } else { msg = 0x1AA4; } } - dComIfGs_setEventReg(0xAB03, 0); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_AB03, 0); } } @@ -872,8 +872,8 @@ BOOL daNpc_Btsw_c::getdemo_action(void*) { field_0x9C7 = 1; field_0x9B0 = 0x1A9C; - dComIfGs_onEventBit(dSv_evtBit_c::UNK_2701); - dComIfGs_setEventReg(0x8AFF, 25); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2701); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_8AFF, 25); setAction(&daNpc_Btsw_c::wait_action, NULL); } diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 71e406de1..63e8ab017 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -294,8 +294,8 @@ void daNpc_Btsw2_c::anmAtr(u16) { /* 0000097C-000009EC .text getMsg__13daNpc_Btsw2_cFv */ u32 daNpc_Btsw2_c::getMsg() { u32 msgNo; - if (!dComIfGs_isEventBit(0x3102)) { - dComIfGs_onEventBit(0x3102); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3102)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3102); msgNo = 0x1AB0; } else if (dKy_daynight_check() != dKy_TIME_DAY_e) { msgNo = 0x1AB2; @@ -544,7 +544,7 @@ BOOL daNpc_Btsw2_c::wait_action(void*) { cPhs_State daNpc_Btsw2_c::_create() { fopAcM_SetupActor(this, daNpc_Btsw2_c); - if (dComIfGs_getEventReg(0xC203) == 3 || !checkItemGet(dItem_PEARL_DIN_e, TRUE)) { + if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203) == 3 || !checkItemGet(dItem_PEARL_DIN_e, TRUE)) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index 77b755805..56153ec7e 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -205,18 +205,18 @@ cPhs_State daNpc_Cb1_c::create() { return cPhs_ERROR_e; } } - else if(dComIfGs_isEventBit(0x2910)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2910)) { if(!isTypeKaze()) { return cPhs_ERROR_e; } } - else if(dComIfGs_isEventBit(0x2E02)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E02)) { if(!isTypeEkaze()) { return cPhs_ERROR_e; } } - else if(dComIfGs_isEventBit(0x1610)) { - if(strcmp(dComIfGp_getStartStageName(), "sea") != 0 || !dComIfGs_isEventBit(0x1604)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610)) { + if(strcmp(dComIfGp_getStartStageName(), "sea") != 0 || !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1604)) { return cPhs_ERROR_e; } } @@ -225,7 +225,7 @@ cPhs_State daNpc_Cb1_c::create() { return cPhs_ERROR_e; } } - else if(dComIfGs_isEventBit(0x1820)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { return cPhs_ERROR_e; } else if(dComIfGs_checkGetItem(dItem_PEARL_FARORE_e)) { @@ -895,7 +895,7 @@ BOOL daNpc_Cb1_c::sowCheck() { /* 00002A2C-00002AD8 .text shipRideCheck__11daNpc_Cb1_cFv */ BOOL daNpc_Cb1_c::shipRideCheck() { - if(dComIfGs_isEventBit(0x1604) && dComIfGp_getShipActor()) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1604) && dComIfGp_getShipActor()) { setNpcAction(&daNpc_Cb1_c::shipNpcAction, NULL); onShipRide(); fopDwTg_DrawQTo(&draw_tag); @@ -1119,7 +1119,7 @@ void daNpc_Cb1_c::evInitMsgSet(int staffIdx) { if(pMsgNo) { mMsgNo = *pMsgNo; - if(mMsgNo == 0x1520 && dComIfGs_isEventBit(0x1840)) { + if(mMsgNo == 0x1520 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1840)) { mMsgNo = 0x1522; } } @@ -1519,8 +1519,8 @@ void daNpc_Cb1_c::evInitEnd(int staffIdx) { if(mode == -2) { if(mMsgNo == 0x1526) { dComIfGp_setNextStage("Otkura", 0xE6, 0, 8); - dComIfGs_onEventBit(0x1610); - dComIfGs_onEventBit(0x1604); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1610); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1604); } dComIfGp_event_reset(); @@ -1611,7 +1611,7 @@ BOOL daNpc_Cb1_c::execTalk(BOOL param_1) { /* 00004358-0000461C .text waitNpcAction__11daNpc_Cb1_cFPv */ BOOL daNpc_Cb1_c::waitNpcAction(void* param_1) { if(m8F0 == 0) { - if(dComIfGs_isEventBit(0x1610)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610)) { cLib_onBit(attention_info.flags, fopAc_Attn_ACTION_CARRY_e); } @@ -1659,7 +1659,7 @@ BOOL daNpc_Cb1_c::waitNpcAction(void* param_1) { f32 dist_sq = fopAcM_searchActorDistance2(this, dComIfGp_getPlayer(0)); if(!checkNpcCallCommand()) { - if(dComIfGs_isEventBit(0x1610) && dist_sq < SQUARE(l_HIO.field_0xC0)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610) && dist_sq < SQUARE(l_HIO.field_0xC0)) { daPy_getPlayerLinkActorClass()->onNpcCall(); temp = TRUE; @@ -2146,7 +2146,7 @@ BOOL daNpc_Cb1_c::shipNpcAction(void*) { m8F0++; } else if(m8F0 != -1) { - if(!dComIfGs_isEventBit(0x1604)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1604)) { setNpcAction(&daNpc_Cb1_c::waitNpcAction, NULL); offShipRide(); } @@ -2622,15 +2622,15 @@ u16 daNpc_Cb1_c::next_msgStatus(u32* pMsgNo) { *pMsgNo += 1; } else if(*pMsgNo == 0x151E) { - dComIfGs_onEventBit(0x1880); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1880); return fopMsgStts_MSG_ENDS_e; } else if(*pMsgNo == 0x1521) { - dComIfGs_onEventBit(0x1840); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1840); return fopMsgStts_MSG_ENDS_e; } else if(*pMsgNo == 0x14C4) { - dComIfGs_onEventBit(0x1904); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1904); return fopMsgStts_MSG_ENDS_e; } else { @@ -2653,15 +2653,15 @@ u32 daNpc_Cb1_c::getMsg() { } if(isTypeForest()) { - return dComIfGs_isEventBit(0x1904) ? 0x14C5 : 0x14C2; + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1904) ? 0x14C5 : 0x14C2; } if(isTypeWaterFall()) { if(isTact()) { - return dComIfGs_isEventBit(0x1840) ? 0x1522 : 0x1520; + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1840) ? 0x1522 : 0x1520; } - return dComIfGs_isEventBit(0x1880) ? 0x151F : 0x1519; + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1880) ? 0x151F : 0x1519; } #if VERSION > VERSION_DEMO @@ -2780,7 +2780,7 @@ BOOL daNpc_Cb1_c::init() { attention_info.distances[fopAc_Attn_TYPE_CARRY_e] = 8; #if VERSION == VERSION_DEMO - if(!dComIfGs_isEventBit(0x1610)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610)) { onNpcNotChange(); } @@ -2839,7 +2839,7 @@ BOOL daNpc_Cb1_c::init() { attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0xAF; } else { - if(dComIfGs_isEventBit(0x1610)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610)) { offNpcNotChange(); } @@ -3229,7 +3229,7 @@ BOOL daNpc_Cb1_c::execute() { else { m8E1 = chkMoveBlock(&m91C); - if(dComIfGs_isEventBit(0x1610)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610)) { fopAcM_SetStatusMap(this, 0xD); } else { diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index ef4639666..082c6a3a6 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -322,11 +322,11 @@ BOOL daNpc_Ji1_c::isItemWaitAnim() { /* 000005A0-00000630 .text isClearRecord__11daNpc_Ji1_cFs */ BOOL daNpc_Ji1_c::isClearRecord(s16 param_1) { - if(dComIfGs_isEventBit(0xF20)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F20)) { return false; } - u8 level = dComIfGs_getEventReg(0xD003); + u8 level = dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003); if (param_1 >= l_HIO.field_0x60[level]) { return TRUE; } @@ -336,7 +336,7 @@ BOOL daNpc_Ji1_c::isClearRecord(s16 param_1) { /* 00000630-000006F8 .text setClearRecord__11daNpc_Ji1_cFs */ void daNpc_Ji1_c::setClearRecord(s16 hits) { - u8 oldLevel = dComIfGs_getEventReg(0xD003); + u8 oldLevel = dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003); u8 newLevel = 0; while(hits >= l_HIO.field_0x60[newLevel] && newLevel <= 3) { @@ -344,9 +344,9 @@ void daNpc_Ji1_c::setClearRecord(s16 hits) { } if(oldLevel < newLevel) { - dComIfGs_setEventReg(0xD003, newLevel); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_D003, newLevel); if(hits >= l_HIO.field_0x60[3]) { - dComIfGs_onEventBit(0xF20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0F20); } } } @@ -496,7 +496,7 @@ BOOL daNpc_Ji1_c::normalAction(void*) { setAnm(1, 8.0f, 0); } - if(dComIfGs_isEventBit(0x520)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { eventInfo.setXyCheckCB(&daNpc_Ji1_XyCheckCB); } @@ -518,7 +518,7 @@ BOOL daNpc_Ji1_c::normalAction(void*) { if(temp < l_HIO.field_0x2C && isGuardAnim() == 0 && mAnimation != 0xD) { eventInfo.onCondition(dEvtCnd_CANTALK_e); - if(dComIfGs_isEventBit(0x520)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { eventInfo.onCondition(dEvtCnd_CANTALKITEM_e); } } @@ -622,7 +622,7 @@ BOOL daNpc_Ji1_c::kaitenwaitAction(void*) { f32 temp = delta.absXZ(); if(field_0xC78 == 0) { - if(!dComIfGs_isEventBit(0x501)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0501)) { setAnm(0x12, 16.0f, 0); } else { @@ -632,7 +632,7 @@ BOOL daNpc_Ji1_c::kaitenwaitAction(void*) { field_0xC78 += 1; } else if(field_0xC78 != -1) { - if(!dComIfGs_isEventBit(0x501) && daNpc_Ji1_plRoomOutCheck()) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0501) && daNpc_Ji1_plRoomOutCheck()) { field_0xC84 = 9; setAction(&daNpc_Ji1_c::eventAction, 0); field_0x2C8 = &daNpc_Ji1_c::kaitenwaitAction; @@ -644,7 +644,7 @@ BOOL daNpc_Ji1_c::kaitenwaitAction(void*) { cXyz delta2 = player->current.pos - current.pos; s16 temp2 = cM_atan2s(delta2.x, delta2.z); - if(!dComIfGs_isEventBit(0x501) && isGuardAnim() == 0) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0501) && isGuardAnim() == 0) { cXyz delta3 = r27->current.pos - current.pos; s16 temp3 = cM_atan2s(delta3.x, delta3.z); cLib_addCalcAngleS2(¤t.angle.y, temp3, 0x10, 0x800); @@ -670,7 +670,7 @@ BOOL daNpc_Ji1_c::kaitenwaitAction(void*) { eventInfo.onCondition(dEvtCnd_CANTALK_e); } - if(player->checkFrontRollCrash() && (!dComIfGs_isEventBit(0x501) || l_HIO.field_0x30)) { + if(player->checkFrontRollCrash() && (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0501) || l_HIO.field_0x30)) { field_0xD79 = 1; dComIfGp_getDetect().set_quake(0); @@ -759,7 +759,7 @@ BOOL daNpc_Ji1_c::kaitenAction(void*) { } if(dComIfGp_evmng_endCheck(mEventIdx[5])) { - dComIfGs_onEventBit(0x501); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0501); field_0xD28 = home.pos; home.angle.y = 0; l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; @@ -797,17 +797,17 @@ BOOL daNpc_Ji1_c::kaitenAction(void*) { /* 00002738-00002870 .text getMsg1stType__11daNpc_Ji1_cFv */ u32 daNpc_Ji1_c::getMsg1stType() { - if(!dComIfGs_isEventBit(1)) { - if(!dComIfGs_isEventBit(0x501)) { - if(dComIfGs_isEventBit(0x640)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0501)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0640)) { return 0x964; } - dComIfGs_onEventBit(0x640); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0640); return 0x961; } - if(dComIfGs_isEventBit(0x2F40)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F40)) { return 0x95B; } @@ -823,12 +823,12 @@ u32 daNpc_Ji1_c::getMsg1stType() { return 0x97B; } - if(dComIfGs_isEventBit(0x2F10)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F10)) { return 0x973; } - if(!dComIfGs_isEventBit(0x108)) { - dComIfGs_onEventBit(0x108); + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0108)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0108); eventInfo.setEventId(-1); return 0x965; @@ -843,8 +843,8 @@ u32 daNpc_Ji1_c::getMsg2ndType() { if(dComIfGp_event_chkTalkXY()) { m_jnt.offBackBoneLock(); - if(!dComIfGs_isEventBit(0xD80)) { - dComIfGs_onEventBit(0xD80); + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0D80)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0D80); msgNo = 0x9AE; } #if VERSION == VERSION_DEMO @@ -856,23 +856,23 @@ u32 daNpc_Ji1_c::getMsg2ndType() { msgNo = 0x9BB; } #endif - else if(dComIfGs_isEventBit(0xB20)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B20)) { msgNo = 0x9BC; } else { msgNo = 0x9B0; } } - else if(dComIfGs_isEventBit(0x2)) { - if(dComIfGs_isEventBit(0xF20)) { - if(dComIfGs_getEventReg(0xCF03) >= 3) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0002)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F20)) { + if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_CF03) >= 3) { msgNo = 0x9AC; } else { msgNo = 0x9AD; } } - else if(dComIfGs_getEventReg(0xCF03) >= 3) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_CF03) >= 3) { msgNo = 0x9AA; } else { @@ -881,16 +881,16 @@ u32 daNpc_Ji1_c::getMsg2ndType() { } else { msgNo = 0x986; - dComIfGs_onEventBit(0x2); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0002); } - dComIfGs_setEventReg(0xCF03, 0); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_CF03, 0); return msgNo; } /* 00002A08-00002A60 .text getMsg__11daNpc_Ji1_cFv */ u32 daNpc_Ji1_c::getMsg() { - if(dComIfGs_isEventBit(0x520)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { return getMsg2ndType(); } @@ -943,7 +943,7 @@ u16 daNpc_Ji1_c::next_msgStatus(u32* pMsgNo) { mMsgNo = 0x9C0; break; case 0x9A2: - if(dComIfGs_isEventBit(0xF10)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F10)) { mMsgNo = 0x9A3; } else { @@ -972,10 +972,10 @@ u16 daNpc_Ji1_c::next_msgStatus(u32* pMsgNo) { mMsgNo = 0x998; break; case 0x99A: - if(dComIfGs_getEventReg(0xD003) == 1) { + if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003) == 1) { mMsgNo = 0x99B; } - else if(dComIfGs_getEventReg(0xD003) == 2) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003) == 2) { mMsgNo = 0x99D; } else { @@ -1035,7 +1035,7 @@ u16 daNpc_Ji1_c::next_msgStatus(u32* pMsgNo) { BOOL daNpc_Ji1_c::talkAction(void*) { if(field_0xC78 == 0) { if(dComIfGp_event_chkTalkXY() && !dComIfGp_evmng_ChkPresentEnd()) { - if(dComIfGs_isEventBit(0xD80) == 0) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0D80) == 0) { daPy_py_c* player = daPy_getPlayerActorClass(); cXyz delta = player->current.pos - current.pos; f32 dummy = delta.absXZ(); @@ -1416,18 +1416,18 @@ void daNpc_Ji1_c::createItem() { else if(field_0xD7B == 1) { itemNo = dItem_HURRICANE_SPIN_e; } - else if(dComIfGs_getEventReg(0xD003) == 1) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003) == 1) { itemNo = dItem_PURPLE_RUPEE_e; } - else if(dComIfGs_getEventReg(0xD003) == 2) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003) == 2) { itemNo = dItem_ORANGE_RUPEE_e; } - else if(field_0xD70 >= l_HIO.field_0x60[3] && dComIfGs_isEventBit(0xF10)) { + else if(field_0xD70 >= l_HIO.field_0x60[3] && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F10)) { itemNo = dItem_SILVER_RUPEE_e; } else { itemNo = dItem_HEART_PIECE_e; - dComIfGs_onEventBit(0xF10); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0F10); } fpc_ProcID itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); @@ -2114,12 +2114,12 @@ BOOL daNpc_Ji1_c::startspeakAction(void*) { dComIfGp_evmng_cutEnd(dComIfGp_evmng_getMyStaffId("Ji1")); - if(dComIfGs_isEventBit(0x520)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { if(field_0xD7B) { mMsgNo = 0x9B5; } - else if(!dComIfGs_isEventBit(0xF20)) { - switch(dComIfGs_getEventReg(0xD003)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F20)) { + switch(dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003)) { case 0: mMsgNo = 0x98B; @@ -2217,13 +2217,13 @@ BOOL daNpc_Ji1_c::endspeakAction(void*) { dComIfGp_evmng_cutEnd(staffIdx); } - if(dComIfGs_isEventBit(0x520)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { mMsgNo = 0x996; } - else if(dComIfGs_isEventBit(0x1)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { mMsgNo = 0x96D; } - else if(!dComIfGs_isEventBit(0x2F40)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F40)) { mMsgNo = 0x950; } else { @@ -2293,7 +2293,7 @@ BOOL daNpc_Ji1_c::reiAction(void*) { mDoAud_bgmStart(JA_BGM_HOUSE_G); - if(dComIfGs_isEventBit(0x520)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { if(field_0xD70 == 0) { mMsgNo = 0x997; } @@ -2302,11 +2302,11 @@ BOOL daNpc_Ji1_c::reiAction(void*) { mMsgNo = 0x999; } } - else if(dComIfGs_isEventBit(0x1)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { mMsgNo = 0x96E; } - else if(!dComIfGs_isEventBit(0x2F40)) { - dComIfGs_onEventBit(0x2F40); + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F40)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2F40); mMsgNo = 0x951; } else { @@ -2419,7 +2419,7 @@ BOOL daNpc_Ji1_c::plmoveAction(void*) { initPos(0); - if(dComIfGs_isEventBit(0x520) && field_0xD7B == 0) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520) && field_0xD7B == 0) { dComIfGp_startMiniGame(6); game_life_point = 3; } @@ -2728,7 +2728,7 @@ BOOL daNpc_Ji1_c::teachAction(void*) { field_0xC78++; } else if(field_0xC78 != -1) { - if(!dComIfGs_isEventBit(0x2F10) && daNpc_Ji1_plRoomOutCheck()) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F10) && daNpc_Ji1_plRoomOutCheck()) { field_0xC84 = 9; setAction(&daNpc_Ji1_c::eventAction, 0); field_0x2C8 = &daNpc_Ji1_c::teachAction; @@ -2826,8 +2826,8 @@ BOOL daNpc_Ji1_c::teachAction(void*) { } } else if(field_0xC8C != 9 && field_0xD34 == 0) { - if(field_0xD70 >= 5 || (field_0xD70 >= 2 && !dComIfGs_isEventBit(1))) { - if(dComIfGs_isEventBit(1) && dComIfGs_isEventBit(0x2F10) == 0) { + if(field_0xD70 >= 5 || (field_0xD70 >= 2 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001))) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F10) == 0) { field_0xC84 = 0xF; fopAcM_orderOtherEventId(this, mEventIdx[field_0xC84]); } @@ -2897,9 +2897,9 @@ BOOL daNpc_Ji1_c::teachAction(void*) { field_0xD38 = current.pos; - if((field_0xD70 >= 5 || (field_0xD70 >= 2 && !dComIfGs_isEventBit(1))) && field_0xC90 == 3) { - if(dComIfGs_isEventBit(1) && dComIfGs_isEventBit(0x2F10) == 0) { - dComIfGs_onEventBit(0x2F10); + if((field_0xD70 >= 5 || (field_0xD70 >= 2 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001))) && field_0xC90 == 3) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F10) == 0) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2F10); field_0xD7C = 1; field_0xC84 = 0xF; setAction(&daNpc_Ji1_c::eventAction, NULL); @@ -3009,7 +3009,7 @@ BOOL daNpc_Ji1_c::teachSPRollCutAction(void*) { field_0xC90 = 0; field_0xD34 = 0; field_0xC30 = 0; - dComIfGs_onTmpBit(0x402); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0402); field_0xD70 = 6; field_0xC78++; } @@ -3037,8 +3037,8 @@ BOOL daNpc_Ji1_c::teachSPRollCutAction(void*) { if(cutType == 9 && y_diff < 20.0f) #endif { - dComIfGs_onEventBit(0xB20); - dComIfGs_offTmpBit(0x402); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0B20); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0402); #if VERSION > VERSION_DEMO dComIfGp_setItemBeastNumCount(3, -10); #endif @@ -3925,10 +3925,10 @@ BOOL daNpc_Ji1_c::battleGuardCheck() { if(field_0xD70 >= l_HIO.field_0x60[3]) { field_0xC84 = 8; - if(dComIfGs_isEventBit(0xF20)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F20)) { field_0xC38 = 2; } - else if(dComIfGs_isEventBit(0xF10)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F10)) { field_0xC38 = 0; } else { @@ -4668,7 +4668,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { mEventIdx[0x10] = dComIfGp_evmng_getEventIdx("Ji1_KmonTalk"); mEventIdx[0x11] = dComIfGp_evmng_getEventIdx("Ji1_EquipTalk"); - if(dComIfGs_isEventBit(0x1) && !dComIfGs_isEventBit(0x108)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0108)) { eventInfo.setEventId(mEventIdx[0x11]); } @@ -4729,8 +4729,8 @@ BOOL daNpc_Ji1_c::CreateInit() { field_0xC9C = 0.0f; field_0xD38 = current.pos; - if(dComIfGs_isEventBit(0x520)) { - if(!dComIfGs_isEventBit(0x2)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0002)) { field_0xD84 = 0; field_0xD50.x = -13.0f; field_0xD50.y = -4.0f; @@ -4760,7 +4760,7 @@ BOOL daNpc_Ji1_c::CreateInit() { field_0xD28 = home.pos; } else { - if(dComIfGs_isEventBit(0x501) || dComIfGs_isEventBit(0x1)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0501) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { field_0xD84 = 1; field_0xD50.x = -13.0f; field_0xD50.y = -4.0f; @@ -4774,7 +4774,7 @@ BOOL daNpc_Ji1_c::CreateInit() { } else { field_0xD84 = 0; - if(!dComIfGs_isEventBit(0x640) || l_HIO.field_0x30) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0640) || l_HIO.field_0x30) { field_0xD68 = 0; setAction(&daNpc_Ji1_c::kaitenExpAction, 0); @@ -5169,7 +5169,7 @@ BOOL daNpc_Ji1_c::lookBack() { else { if( (field_0xD7A != 0 || isGuardAnim()) || - (checkAction(&daNpc_Ji1_c::kaitenwaitAction) && !dComIfGs_isEventBit(0x501)) || + (checkAction(&daNpc_Ji1_c::kaitenwaitAction) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0501)) || (!checkAction(&daNpc_Ji1_c::normalAction) && dist < 600.0f) ) { if(mAnimation == 0xD) { diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 5d9c7ea83..7a173d79b 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -331,17 +331,17 @@ s16 daNpc_Md_c::XyCheckCB(int i_itemBtn) { return TRUE; } if (selectItemNo == dItem_GOLDEN_FEATHER_e) { - if (!dComIfGs_isEventBit(0x2E40) || (dComIfGs_isEventBit(0x2E40) && m_seaTalk)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E40) || (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E40) && m_seaTalk)) { return TRUE; } } } else if (isTypeM_Dai() || isTypeEdaichi()) { - if (selectItemNo == dItem_GOLDEN_FEATHER_e && !dComIfGs_isEventBit(0x3B80)) { + if (selectItemNo == dItem_GOLDEN_FEATHER_e && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B80)) { return TRUE; } } if (selectItemNo == dItem_GOLDEN_FEATHER_e) { - dComIfGs_onEventBit(0x2C08); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2C08); } return FALSE; } @@ -380,7 +380,7 @@ cPhs_State daNpc_Md_c::create() { mType = fopAcM_GetParam(this) >> 0x08; if ((int)mType == -2) { // Bug: Comparing unsigned value with -2 is always false. - dComIfGs_onEventBit(0x1620); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1620); } else { if (dComIfGs_isCollect(0, 2)) { if (strcmp(dComIfGp_getStartStageName(), "M_DaiB") != 0) { @@ -389,30 +389,30 @@ cPhs_State daNpc_Md_c::create() { setTypeM_DaiB(); } } else if (strcmp(dComIfGp_getStartStageName(), "sea") == 0) { - if (dComIfGs_isEventBit(0x2E04) || !dComIfGs_isEventBit(0x1820) || + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) || !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) || !dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_DRC)) { return cPhs_ERROR_e; } } else if (strcmp(dComIfGp_getStartStageName(), "Atorizk") == 0) { - if (dComIfGs_isEventBit(0x2E04) || dNpc_chkLetterPassed()) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) || dNpc_chkLetterPassed()) { return cPhs_ERROR_e; } } else if (strcmp(dComIfGp_getStartStageName(), "Adanmae") == 0) { - if (dComIfGs_isEventBit(0x2E04) || !dNpc_chkLetterPassed()) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) || !dNpc_chkLetterPassed()) { return cPhs_ERROR_e; } } else if (strcmp(dComIfGp_getStartStageName(), "M_Dra09") == 0) { - if (dComIfGs_isEventBit(0x2E04) || dComIfGs_isEventBit(0x1101)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101)) { return cPhs_ERROR_e; } } else if (strcmp(dComIfGp_getStartStageName(), "Edaichi") == 0) { - if (!dComIfGs_isEventBit(0x2E04) || dComIfGs_isEventBit(0x2920)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2920)) { return cPhs_ERROR_e; } setTypeEdaichi(); } else if (strcmp(dComIfGp_getStartStageName(), "M_Dai") == 0) { - if (!dComIfGs_isEventBit(0x2E04) || !dComIfGs_isEventBit(0x2920)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) || !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2920)) { return cPhs_ERROR_e; } setTypeM_Dai(); @@ -421,7 +421,7 @@ cPhs_State daNpc_Md_c::create() { } } - if (!dComIfGs_isEventBit(0x2E04) && dComIfGs_isEventBit(0x1608)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1608)) { setTypeShipRide(); strcpy(mModelArcName, l_arc_name_ship); heapSizeIdx = 1; @@ -1192,7 +1192,7 @@ int daNpc_Md_c::wallHitCheck() { /* 00003D68-00003E74 .text NpcCall__10daNpc_Md_cFPi */ void daNpc_Md_c::NpcCall(int* r31) { - if (!dComIfGs_isEventBit(0x1620)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1620)) { return; } f32 dist_sq = fopAcM_searchPlayerDistance2(this); @@ -1308,7 +1308,7 @@ BOOL daNpc_Md_c::waitNpcAction(void*) { } else { setAnm(0x12); } - } else if (isTypeM_Dra09() && !dComIfGs_isEventBit(0x1140)) { + } else if (isTypeM_Dra09() && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1140)) { setAnm(0x22); } else if (isTypeM_Dai() || isTypeEdaichi()) { if (!checkStatus(0x80UL)) { @@ -1347,14 +1347,14 @@ BOOL daNpc_Md_c::waitNpcAction(void*) { } } - if (isTypeAdanmae() && dComIfGs_isEventBit(0x1102)) { + if (isTypeAdanmae() && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1102)) { fopAcM_delete(this); return TRUE; } int sp08 = 0; - if (isTypeSea() && !dComIfGs_isEventBit(0x1402)) { + if (isTypeSea() && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1402)) { daPy_lk_c* link = daPy_getPlayerLinkActorClass(); f32 playerDistXZ2 = fopAcM_searchPlayerDistanceXZ2(this); f32 playerDistY = link->current.pos.y - current.pos.y; @@ -1375,13 +1375,13 @@ BOOL daNpc_Md_c::waitNpcAction(void*) { if (isTypeAtorizk() || isTypeAdanmae()) { mCurEventMode = 2; } else if (isTypeM_Dra09()) { - if (dComIfGs_isEventBit(0x1140)) { - if (dComIfGs_isEventBit(0x1101)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1140)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101)) { cLib_onBit(attention_info.flags, fopAc_Attn_ACTION_SPEAK_e); if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK800000_e)) { - dComIfGs_onEventBit(0x1280); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1280); } - if (dComIfGs_isEventBit(0x1280)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1280)) { mCurEventMode = 2; } else { mCurEventMode = 1; @@ -1394,7 +1394,7 @@ BOOL daNpc_Md_c::waitNpcAction(void*) { setAnm(0x22); } } else if (isTypeSea()) { - if (mCurEventMode == 0 && dComIfGs_isEventBit(0x1402)) { + if (mCurEventMode == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1402)) { mCurEventMode = 3; } } else { @@ -1404,7 +1404,7 @@ BOOL daNpc_Md_c::waitNpcAction(void*) { NpcCall(&sp08); } - if (isTypeM_Dra09() && dComIfGs_isEventBit(0x1101) && dComIfGs_isSwitch(m3100, fopAcM_GetRoomNo(this))) { + if (isTypeM_Dra09() && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101) && dComIfGs_isSwitch(m3100, fopAcM_GetRoomNo(this))) { setNpcAction(&daNpc_Md_c::demoFlyNpcAction); } @@ -1426,7 +1426,7 @@ BOOL daNpc_Md_c::waitNpcAction(void*) { lookBack(0, 0, 0); } } else if (isTypeM_Dra09()) { - if (dComIfGs_isEventBit(0x1140)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1140)) { lookBack(1, 0, 0); setAnm(0); } else { @@ -2837,7 +2837,7 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { *pCurrMsgNo = 0x17DB; break; case 0x17DB: - dComIfGs_onEventBit(dSv_evtBit_c::MEDLI_GAVE_FATHERS_LETTER); + dComIfGs_onEventBit(dSv_event_flag_c::MEDLI_GAVE_FATHERS_LETTER); msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x17DD: @@ -2860,11 +2860,11 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { *pCurrMsgNo = 0x17E3; break; case 0x17E4: - dComIfGs_onEventBit(0x1101); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1101); msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x17E5: - dComIfGs_onEventBit(0x1280); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1280); msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x17E6: @@ -2912,7 +2912,7 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { *pCurrMsgNo = 0x17F4; break; case 0x17F4: - dComIfGs_onEventBit(0x1104); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1104); // Fall-through case 0x17F8: setBitStatus(daMdStts_UNK40); @@ -2940,7 +2940,7 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { *pCurrMsgNo = 0x1801; break; case 0x1801: - dComIfGs_onEventBit(0x1102); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1102); msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x19C9: @@ -2968,7 +2968,7 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { *pCurrMsgNo = 0x19D1; break; case 0x19D1: - dComIfGs_onEventBit(0x1402); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1402); onSeaTalk(); msgStatus = fopMsgStts_MSG_ENDS_e; break; @@ -2988,7 +2988,7 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { *pCurrMsgNo = 0x19D8; break; case 0x19D8: - dComIfGs_onEventBit(0x1504); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1504); case 0x19D9: msgStatus = fopMsgStts_MSG_ENDS_e; break; @@ -3033,11 +3033,11 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { break; case 0x19FB: case 0x19FF: - dComIfGs_onEventBit(0x2E40); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2E40); onSeaTalk(); // Fall-through case 0x1A01: - dComIfGs_onEventBit(0x2C08); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2C08); msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x19FC: @@ -3053,7 +3053,7 @@ u16 daNpc_Md_c::next_msgStatus(u32* pCurrMsgNo) { *pCurrMsgNo = 0x1A01; break; case 0x1A02: - dComIfGs_onEventBit(0x3B80); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3B80); msgStatus = fopMsgStts_MSG_ENDS_e; break; default: @@ -3069,7 +3069,7 @@ u32 daNpc_Md_c::getMsg() { if (isShipRide()) { msgNo = 0x19EF; } else if (isTypeAtorizk()) { - if (dComIfGs_isEventBit(dSv_evtBit_c::MEDLI_GAVE_FATHERS_LETTER)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::MEDLI_GAVE_FATHERS_LETTER)) { msgNo = 0x17DC; } else if (dComIfGs_getClearCount() != 0) { msgNo = 0x1805; @@ -3089,13 +3089,13 @@ u32 daNpc_Md_c::getMsg() { } else { msgNo = 0x17F6; } - } else if (dComIfGs_isEventBit(0x1104)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1104)) { msgNo = 0x17F7; } else { msgNo = 0x17E6; } } else if (isTypeM_Dra09()) { - if (dComIfGs_isEventBit(0x1101)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101)) { msgNo = 0x17E5; } else { msgNo = 0x17DD; @@ -3103,22 +3103,22 @@ u32 daNpc_Md_c::getMsg() { } else if (isTypeSea()) { if (isXYTalk()) { if (isDefaultTalkXY()) { - if (dComIfGs_isEventBit(0x2E40)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E40)) { msgNo = 0x1A00; - } else if (dComIfGs_isEventBit(0x2C08)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2C08)) { msgNo = 0x19F8; } else { msgNo = 0x19FC; } } else { - if (dComIfGs_isEventBit(0x1504)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1504)) { msgNo = 0x19D9; } else { msgNo = 0x19D6; } } } else { - if (dComIfGs_isEventBit(0x1402)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1402)) { if (isSeaTalk()) { msgNo = 0x19D2; } else { diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index 9647262cb..e677f529e 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -12,23 +12,23 @@ #define TOTAL_FIGURE_COUNT 0x86 static u16 l_figure_comp[] = { - 0x95FF, - 0x94FF, - 0x93FF, - 0x92FF, - 0x91FF, - 0x90FF, - 0x8FFF, - 0x8EFF, - 0x8DFF, - 0x8CFF, - 0xB1FF, - 0x9CFF, - 0x84FF, - 0x83FF, - 0x82FF, - 0x81FF, - 0x80FF, + dSv_event_flag_c::UNK_95FF, + dSv_event_flag_c::UNK_94FF, + dSv_event_flag_c::UNK_93FF, + dSv_event_flag_c::UNK_92FF, + dSv_event_flag_c::UNK_91FF, + dSv_event_flag_c::UNK_90FF, + dSv_event_flag_c::UNK_8FFF, + dSv_event_flag_c::UNK_8EFF, + dSv_event_flag_c::UNK_8DFF, + dSv_event_flag_c::UNK_8CFF, + dSv_event_flag_c::UNK_B1FF, + dSv_event_flag_c::UNK_9CFF, + dSv_event_flag_c::UNK_84FF, + dSv_event_flag_c::UNK_83FF, + dSv_event_flag_c::UNK_82FF, + dSv_event_flag_c::UNK_81FF, + dSv_event_flag_c::UNK_80FF, }; /* 00000078-00000228 .text __ct__9daNpcMt_cFv */ @@ -257,7 +257,7 @@ void daNpcMt_c::setFigure(u8 figure) { u8 reg = dComIfGs_getEventReg(l_figure_comp[figure / 8]); reg |= 1 << (figure % 8); dComIfGs_setEventReg(l_figure_comp[figure / 8], reg); - dComIfGs_onEventBit(0x3A01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3A01); } } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 0a04df278..ed2f11a7a 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -382,17 +382,17 @@ BOOL daNpc_Os_c::jointCheck(s8 param_1) { /* 00000D10-00000DBC .text wakeupCheck__10daNpc_Os_cFv */ BOOL daNpc_Os_c::wakeupCheck() { if(argument == 0) { - if(dComIfGs_isEventBit(0x1780)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1780)) { return true; } } else if(argument == 1) { - if(dComIfGs_isEventBit(0x1740)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1740)) { return true; } } else if(argument == 2) { - if(dComIfGs_isEventBit(0x1720)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1720)) { return true; } } @@ -403,30 +403,30 @@ BOOL daNpc_Os_c::wakeupCheck() { /* 00000DBC-00000E3C .text setWakeup__10daNpc_Os_cFv */ void daNpc_Os_c::setWakeup() { if(argument == 0) { - dComIfGs_onEventBit(0x1780); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1780); } else if(argument == 1) { - dComIfGs_onEventBit(0x1740); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1740); } else if(argument == 2) { - dComIfGs_onEventBit(0x1720); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1720); } } /* 00000E3C-00000EE8 .text finishCheck__10daNpc_Os_cFv */ BOOL daNpc_Os_c::finishCheck() { if(argument == 0) { - if(dComIfGs_isEventBit(0x1710)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1710)) { return true; } } else if(argument == 1) { - if(dComIfGs_isEventBit(0x1704)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1704)) { return true; } } else if(argument == 2) { - if(dComIfGs_isEventBit(0x1B01)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B01)) { return true; } } @@ -437,13 +437,13 @@ BOOL daNpc_Os_c::finishCheck() { /* 00000EE8-00000F68 .text setFinish__10daNpc_Os_cFv */ void daNpc_Os_c::setFinish() { if(argument == 0) { - dComIfGs_onEventBit(0x1710); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1710); } else if(argument == 1) { - dComIfGs_onEventBit(0x1704); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1704); } else if(argument == 2) { - dComIfGs_onEventBit(0x1B01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1B01); } } @@ -542,17 +542,17 @@ void daNpc_Os_c::eventOrderCheck() { if(field_0x7A5 == -1) { s8 roomNo = fopAcM_GetRoomNo(this); if(argument == 0) { - if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(0x2510)) { + if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2510)) { field_0x7A5 = 7; } } else if(argument == 1) { - if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(0x2608)) { + if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2608)) { field_0x7A5 = 8; } } else if(argument == 2) { - if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(0x2604)) { + if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2604)) { field_0x7A5 = 9; } } @@ -831,7 +831,7 @@ BOOL daNpc_Os_c::finish01NpcAction(void* param_1) { BOOL daNpc_Os_c::finish02NpcAction(void* param_1) { if(field_0x7A9 == 0) { if(param_1 == NULL) { - if(dComIfGs_isEventBit(0x1B01)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B01)) { setAnm_brkAnm(7); } else { @@ -1334,10 +1334,10 @@ BOOL daNpc_Os_c::eventProc() { setFinish(); } else if(field_0x7A5 == 8) { - dComIfGs_onEventBit(0x2608); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2608); } else if(field_0x7A5 == 9) { - dComIfGs_onEventBit(0x2604); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2604); } } @@ -1907,7 +1907,7 @@ u16 daNpc_Os_c::next_msgStatus(u32* pMsgNo) { status = fopMsgStts_MSG_ENDS_e; } else if(*pMsgNo == 0xEF4) { - dComIfGs_onEventBit(0x2510); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2510); status = fopMsgStts_MSG_ENDS_e; } diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index ee73db840..1d740266d 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -3428,10 +3428,10 @@ static u32* l_msg_sa3_fdai[] = { }; static u16 l_item_chk_sa3[] = { - 0x2410, - 0x2408, - 0x2404, - 0x2402, + dSv_event_flag_c::UNK_2410, + dSv_event_flag_c::UNK_2408, + dSv_event_flag_c::UNK_2404, + dSv_event_flag_c::UNK_2402, }; static int l_item_id_sa3[] = { @@ -4250,7 +4250,7 @@ static cPhs_State phase_1(daNpcPeople_c* i_this) { break; case 0x8: case 0xA: - if(arg0 != 0xFF && (u32)((arg0 << 1) & 0xFE) != (dComIfGs_getEventReg(0xB907) & 6)) { + if(arg0 != 0xFF && (u32)((arg0 << 1) & 0xFE) != (dComIfGs_getEventReg(dSv_event_flag_c::UNK_B907) & 6)) { return cPhs_STOP_e; } @@ -4480,7 +4480,7 @@ cPhs_State daNpcPeople_c::createInit() { m766[0] = dComIfGp_evmng_getEventIdx("SA5_TALK_XY"); m766[1] = dComIfGp_evmng_getEventIdx("SA5_GET_ITEM"); - u8 reg = dComIfGs_getTmpReg(0xFD07); + u8 reg = dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FD07); for(int i = 0; i < 3; i++) { if(reg & (1 << i)) { kb_class* pig = (kb_class*)fopAcM_searchFromName("Pig", 0xF00, l_pig_para[i]); @@ -4878,7 +4878,7 @@ bool daNpcPeople_c::executeCommon() { diff.y = 0; f32 mag = diff.abs(); - if(mag < 200.0f && dComIfGs_isEventBit(0x2880) && dComIfGs_isEventBit(0x2B08) && !dComIfGs_isEventBit(0x2B04) && !dComIfGs_isTmpBit(0x208)) { + if(mag < 200.0f && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2880) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2B08) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2B04) && !dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0208)) { eventInfo.setEventId(m766[0]); fopAcM_OffStatus(this, fopAcStts_NOCULLEXEC_e); m79C = 0; @@ -4958,7 +4958,7 @@ void daNpcPeople_c::executeWait() { m7A6 = 5; break; case 0xB: - if(mbIsNight && (!dComIfGs_isEventBit(0xA02) || dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e))) { + if(mbIsNight && (!dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) || dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e))) { if(dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e)) { m748 = (s16)(mpNpcDat->field_0x28 * 2.0f); } @@ -4968,13 +4968,13 @@ void daNpcPeople_c::executeWait() { } if(m789) { - if(!dComIfGs_isEventBit(0x2320)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2320)) { m78D = 2; } else if(dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e)) { dComIfGp_setScopeType(1); if(dKy_moon_look_chk() && !(mEtcFlag & 0x100)) { - dComIfGs_onEventBit(0x2308); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2308); mEtcFlag |= 0x100; m7A7 = 0; m78D = 0xB; @@ -5912,11 +5912,11 @@ void daNpcPeople_c::eventMesSetInit(int staffIdx) { case 0x3594: mEtcFlag |= 0x800; - dComIfGs_onTmpBit(0x208); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0208); if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { setMessage(0x3594); } - else if(!dComIfGs_isEventBit(0xB80)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) { setMessage(0x3595); } else if(!dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) { @@ -5925,12 +5925,12 @@ void daNpcPeople_c::eventMesSetInit(int staffIdx) { else if(!dComIfGs_checkGetItem(CAMERA2)) { setMessage(0x3597); } - else if(!dComIfGs_isEventBit(0x1C08)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1C08)) { setMessage(0x3598); } else { mEtcFlag &= ~0x800; - dComIfGs_onEventBit(0x2B04); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2B04); setMessage(0x3599); } @@ -6005,9 +6005,9 @@ bool daNpcPeople_c::eventTurnToPlayer() { /* 00004BC4-00004CEC .text eventUb1TalkInit__13daNpcPeople_cFi */ void daNpcPeople_c::eventUb1TalkInit(int) { - if(!dComIfGs_isEventBit(0xA40)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A40)) { m73C = l_msg_ub1_1st_talk; - dComIfGs_onEventBit(0xA40); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A40); } else if(!dComIfGs_checkGetItem(CAMERA) && !dComIfGs_checkGetItem(CAMERA2)) { m73C = l_msg_ub1_no_camera; @@ -6015,7 +6015,7 @@ void daNpcPeople_c::eventUb1TalkInit(int) { else { if(!is1GetMap20()) { m73C = l_msg_ub1_no_collect_map20; - dComIfGs_onEventBit(0x2102); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2102); } else if(!is1DayGetMap20()) { @@ -6080,7 +6080,7 @@ void daNpcPeople_c::eventUb1TalkXyInit(int staffIdx) { } else { m73C = l_msg_xy_ub1_get_map20_1; - dComIfGs_setEventReg(0xC103, 1); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C103, 1); } } @@ -6403,7 +6403,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { break; } case 0x3024: - dComIfGs_onEventBit(0x2220); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2220); status = fopMsgStts_MSG_ENDS_e; break; @@ -6501,13 +6501,13 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { break; case 0xB: if(mpCurrMsg->mSelectNum == 0) { - if(dComIfGs_isEventBit(0x1808)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1808)) { m734 = l_msg_uw1_done_gp1_arasoi; } else if(dComIfGs_isSymbol(0)) { m734 = l_msg_uw1_get_pearl1; } - else if(dComIfGs_isEventBit(0x1E10)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E10)) { m734 = l_msg_uw1_talked_night; } else { @@ -6524,7 +6524,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { case 0xC: if(mpCurrMsg->mSelectNum == 0) { m734 = l_msg_uw2_request_yes; - dComIfGs_onEventBit(0x2240); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2240); } else { m734 = l_msg_uw2_request_no; @@ -6539,7 +6539,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { case 0xE: if(mpCurrMsg->mSelectNum == 0) { m734 = l_msg_um3_nazo_talk; - dComIfGs_onEventBit(0x2310); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2310); } else { m734 = l_msg_um3_no_nazo_talk2; @@ -6562,9 +6562,9 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { case 0x10: if(mpCurrMsg->mSelectNum == 0) { m734 = l_msg_sa5_yes; - dComIfGs_setTmpReg(0xFF03, getRand(3)); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FF03, getRand(3)); - if(dComIfGs_isEventBit(0x2A04)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2A04)) { dComIfGp_resetItemTimer(0x708); } else { @@ -6600,7 +6600,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { break; case 0x12: - m734 = l_msg_sa5_explain[dComIfGs_getTmpReg(0xFF03)]; + m734 = l_msg_sa5_explain[dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FF03)]; *pMsgNo = *m734; break; @@ -6612,12 +6612,12 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { case 0x14: if(mpCurrMsg->mSelectNum == 0) { m734 = l_msg_sa5_ok; - dComIfGs_onTmpBit(0x280); - dComIfGs_onEventBit(0x2680); - dComIfGs_onEventBit(0x2640); - dComIfGs_offTmpBit(0x240); - dComIfGs_setTmpReg(0xFE03, 0); - dComIfGs_setTmpReg(0xFD07, 7); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0280); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2680); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2640); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0240); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FE03, 0); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FD07, 7); } else { m734 = l_msg_sa5_wait; @@ -6629,12 +6629,12 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { case 0x15: if(mpCurrMsg->mSelectNum == 0) { m734 = l_msg_xy_sa5_ok; - dComIfGs_onTmpBit(0x280); - dComIfGs_onEventBit(0x2680); - dComIfGs_onEventBit(0x2620); - dComIfGs_setTmpReg(0xFE03, 3); - dComIfGs_setTmpReg(0xFF03, 3); - dComIfGs_setTmpReg(0xFD07, 7); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0280); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2680); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2620); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FE03, 3); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FF03, 3); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FD07, 7); } else { m734 = l_msg_xy_sa5_wait; @@ -6644,7 +6644,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { break; case 0x17: - dComIfGs_offTmpBit(0x280); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0280); status = fopMsgStts_MSG_ENDS_e; break; @@ -6688,7 +6688,7 @@ u32 daNpcPeople_c::getMsg() { else if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_16_e)) { m734 = l_msg_xy_ub4_get_item; #if VERSION > VERSION_DEMO - dComIfGs_onEventBit(0x2504); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2504); #endif } else { @@ -6706,7 +6706,7 @@ u32 daNpcPeople_c::getMsg() { else if(!isColor()) { m734 = l_msg_xy_um2_talk3; } - else if(!dComIfGs_isEventBit(0x2220)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2220)) { m734 = l_msg_xy_um2_talk4; } else { @@ -6758,7 +6758,7 @@ u32 daNpcPeople_c::getMsg() { if(itemNo != dItem_SKULL_NECKLACE_e) { m734 = l_msg_xy_sa5_no_skull_necklace; } - else if(!dComIfGs_isEventBit(0x2620)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2620)) { m734 = l_msg_xy_sa5_1st; } else { @@ -6773,22 +6773,22 @@ u32 daNpcPeople_c::getMsg() { switch(mNpcType) { case 0: if(!dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) { - if(!dComIfGs_isEventBit(0x2501)) { - dComIfGs_onEventBit(0x2501); + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2501)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2501); m734 = l_msg_uo1_1st_haitatu; } else { m734 = l_msg_uo1_haitatu; } } - else if(!dComIfGs_isEventBit(0x1B40)) { - dComIfGs_onEventBit(0x1B40); + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B40)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1B40); m734 = l_msg_uo1_1st_talk; } else if(isUo1FdaiAll()) { - if(!dComIfGs_isEventBit(0x1B10)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B10)) { m734 = l_msg_uo1_1st_talk_fdai; - dComIfGs_onEventBit(0x1B10); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1B10); } else { m734 = l_msg_uo1_2nd_talk_fdai; @@ -6807,11 +6807,11 @@ u32 daNpcPeople_c::getMsg() { m79A &= ~0x1; m734 = l_msg_uo2_surprise; } - else if(dComIfGs_isEventBit(0x2D01)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { m734 = l_msg_uo2_help; } - else if(!dComIfGs_isEventBit(0x1B04)) { - dComIfGs_onEventBit(0x1B04); + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B04)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1B04); m734 = l_msg_uo2_1st_talk; } else { @@ -6826,8 +6826,8 @@ u32 daNpcPeople_c::getMsg() { else if(m793 == 4) { m734 = l_msg_uo3_letter; } - else if(!dComIfGs_isEventBit(0x1E08)) { - dComIfGs_onEventBit(0x1E08); + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E08)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E08); m734 = l_msg_uo3_1st_talk; } else if(!(mEtcFlag & 0x2)) { @@ -6842,9 +6842,9 @@ u32 daNpcPeople_c::getMsg() { break; case 5: - if(!dComIfGs_isEventBit(0x1D20)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1D20)) { m734 = l_msg_ub3_1st_talk; - dComIfGs_onEventBit(0x1D20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1D20); } else { daShip_c* pShip = dComIfGp_getShipActor(); @@ -6869,11 +6869,11 @@ u32 daNpcPeople_c::getMsg() { if(mEtcFlag & 0x40) { m734 = l_msg_ub4_photo_house; } - else if(!dComIfGs_isEventBit(0x1D10)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1D10)) { m734 = l_msg_ub4_1st_talk; - dComIfGs_onEventBit(0x1D10); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1D10); } - else if(dComIfGs_isEventBit(0x2504)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2504)) { m734 = l_msg_ub4_color_photo; } else if(!dComIfGs_checkGetItem(CAMERA) && !dComIfGs_checkGetItem(CAMERA2)) { @@ -6885,21 +6885,21 @@ u32 daNpcPeople_c::getMsg() { break; case 7: - if(dComIfGs_isEventBit(0xA02) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { msgNo = 0x2DC9; } else if(!mbIsNight) { - if(!dComIfGs_isEventBit(0x1E20)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E20)) { m734 = l_msg_uw1_1st_talk_day; - dComIfGs_onEventBit(0x1E20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E20); } else { m734 = l_msg_uw1_talk_day; } } - else if(!dComIfGs_isEventBit(0x1E10)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E10)) { m734 = l_msg_uw1_1st_talk_night; - dComIfGs_onEventBit(0x1E10); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E10); } else if(dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) { if(dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) { @@ -6915,33 +6915,33 @@ u32 daNpcPeople_c::getMsg() { break; case 8: - if(dComIfGs_getEventReg(0xB907) < 2) { - if(!dComIfGs_isEventBit(0x2101)) { + if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_B907) < 2) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2101)) { m734 = l_msg_uw2_1st_talk1; - dComIfGs_onEventBit(0x2101); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2101); } - else if(dComIfGs_getEventReg(0xC407) < 6) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_C407) < 6) { m734 = l_msg_uw2_no_photo3; } - else if(dComIfGs_getEventReg(0xC407) < 7) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_C407) < 7) { m734 = l_msg_uw2_no_1day_photo3; } - else if(!dComIfGs_isEventBit(0x2240)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2240)) { m734 = l_msg_uw2_request; } - else if(!dComIfGs_isEventBit(0x2220)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2220)) { m734 = l_msg_uw2_cafe_off; } else { m734 = l_msg_uw2_cafe_on; - dComIfGs_setEventReg(0xB907, 1); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_B907, 1); } } - else if(dComIfGs_getEventReg(0xB907) < 4) { - if(!dComIfGs_isEventBit(0x2280)) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_B907) < 4) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2280)) { m734 = l_msg_uw2_1st_talk2; - dComIfGs_onEventBit(0x2280); - dComIfGs_setEventReg(0xB907, 3); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2280); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_B907, 3); } else { m734 = l_msg_uw2_talk2; @@ -6953,22 +6953,22 @@ u32 daNpcPeople_c::getMsg() { break; case 9: - if(dComIfGs_isEventBit(0xA02) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { msgNo = 0x2FBD; } - else if(!dComIfGs_isEventBit(0x2104)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2104)) { m734 = l_msg_um1_frrs_stop; } - else if(!dComIfGs_isEventBit(0x2210)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2210)) { m734 = l_msg_um1_1st_talk; - dComIfGs_onEventBit(0x2210); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2210); } - else if(!dComIfGs_isEventBit(0x1C02)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1C02)) { m734 = l_msg_um1_light_off; } - else if(!dComIfGs_isEventBit(0x1B20)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B20)) { m734 = l_msg_um1_get_item; - dComIfGs_onEventBit(0x1B20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1B20); } else { m734 = l_msg_um1_last; @@ -6976,31 +6976,31 @@ u32 daNpcPeople_c::getMsg() { break; case 0xA: - if(dComIfGs_getEventReg(0xB907) < 2) { - if(!dComIfGs_isEventBit(0x2208)) { + if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_B907) < 2) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2208)) { m734 = l_msg_um2_1st_talk1; - dComIfGs_onEventBit(0x2208); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2208); } - else if(dComIfGs_getEventReg(0xC407) < 7) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_C407) < 7) { m734 = l_msg_um2_no_1day_photo3; } #if VERSION == VERSION_DEMO - else if(!dComIfGs_isEventBit(0x2240)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2240)) { m734 = l_msg_um2_no_request; } - else if(!dComIfGs_isEventBit(0x2220)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2220)) { m734 = l_msg_um2_cafe_off; } else { m734 = l_msg_um2_cafe_on; - dComIfGs_setEventReg(0xB907, 1); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_B907, 1); } #else - else if(dComIfGs_isEventBit(0x2220)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2220)) { m734 = l_msg_um2_cafe_on; - dComIfGs_setEventReg(0xB907, 1); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_B907, 1); } - else if(!dComIfGs_isEventBit(0x2240)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2240)) { m734 = l_msg_um2_no_request; } else { @@ -7008,10 +7008,10 @@ u32 daNpcPeople_c::getMsg() { } #endif } - else if(dComIfGs_getEventReg(0xB907) < 4) { - if(!dComIfGs_isEventBit(0x2204)) { + else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_B907) < 4) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2204)) { m734 = l_msg_um2_1st_talk2; - dComIfGs_onEventBit(0x2204); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2204); } else { m734 = l_msg_um2_talk2; @@ -7023,18 +7023,18 @@ u32 daNpcPeople_c::getMsg() { break; case 0xB: - if(dComIfGs_isEventBit(0xA02) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { msgNo = 0x347B; } else if(!mbIsNight) { if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { m734 = l_msg_um3_not_sail; } - else if(!dComIfGs_isEventBit(0x2340)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2340)) { m734 = l_msg_um3_1st_talk; - dComIfGs_onEventBit(0x2340); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2340); } - else if(!dComIfGs_isEventBit(0x2310)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310)) { m734 = l_msg_um3_no_nazo_talk; } else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { @@ -7044,14 +7044,14 @@ u32 daNpcPeople_c::getMsg() { m734 = l_msg_um3_no_map15; } } - else if(!dComIfGs_isEventBit(0x2320)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2320)) { m734 = l_msg_um3_1st_night; - dComIfGs_onEventBit(0x2320); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2320); } - else if(!dComIfGs_isEventBit(0x2308)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2308)) { m734 = l_msg_um3_no_look_moon; } - else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && dComIfGs_isEventBit(0x2280)) { + else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2280)) { m734 = l_msg_um3_map15_n; } else { @@ -7060,12 +7060,12 @@ u32 daNpcPeople_c::getMsg() { break; case 0xC: - if(dComIfGs_isEventBit(0xA02) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { msgNo = 0x2E82; } - else if(!dComIfGs_isEventBit(0x2304)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2304)) { m734 = l_msg_sa1_1st_talk; - dComIfGs_onEventBit(0x2304); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2304); } else { m734 = l_msg_sa1_talk; @@ -7074,9 +7074,9 @@ u32 daNpcPeople_c::getMsg() { break; case 0xD: if(!mbIsNight) { - if(!dComIfGs_isEventBit(0x2302)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2302)) { m734 = l_msg_sa2_1st_talk; - dComIfGs_onEventBit(0x2302); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2302); } else if(getWindDir() == 6) { m734 = l_msg_sa2_wind_west; @@ -7094,16 +7094,16 @@ u32 daNpcPeople_c::getMsg() { break; case 0xE: - if(dComIfGs_isEventBit(0xA02) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { msgNo = 0x30E4; } else if(!mbIsNight) { if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { m734 = l_msg_sa3_not_sail; } - else if(!dComIfGs_isEventBit(0x2301)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2301)) { m734 = l_msg_sa3_1st_talk; - dComIfGs_onEventBit(0x2301); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2301); } else { m734 = l_msg_sa3_fdai[chkDaiza()]; @@ -7115,16 +7115,16 @@ u32 daNpcPeople_c::getMsg() { break; case 0xF: - if(dComIfGs_isEventBit(0xA02) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { msgNo = 0x321E; } else if(!mbIsNight) { if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { m734 = l_msg_sa4_not_sail; } - else if(!dComIfGs_isEventBit(0x2480)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2480)) { m734 = l_msg_sa4_1st_talk; - dComIfGs_onEventBit(0x2480); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2480); } else { m734 = l_msg_sa4_wind[getWindDir()]; @@ -7136,33 +7136,33 @@ u32 daNpcPeople_c::getMsg() { break; case 0x10: - if(dComIfGs_isEventBit(0xA02) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { msgNo = 0x3299; } else if(!mbIsNight) { if(mEtcFlag & 0x80) { mEtcFlag &= ~0x80; - if(!dComIfGs_isEventBit(0x2680)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2680)) { m734 = l_msg_sa5__next_day; } else if(getPigTimer() == 0) { m734 = l_msg_sa5_timer_zero; } - else if(dComIfGs_getTmpReg(0xFE03) == 0) { + else if(dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FE03) == 0) { if(isPigOk()) { m734 = l_msg_sa5_mini_game_clr; - dComIfGs_onEventBit(0x2A04); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2A04); } - else if(!dComIfGs_isTmpBit(0x240)) { - m734 = l_msg_sa5_false_1st[dComIfGs_getTmpReg(0xFF03)]; - dComIfGs_onTmpBit(0x240); + else if(!dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0240)) { + m734 = l_msg_sa5_false_1st[dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FF03)]; + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0240); } else { m734 = l_msg_sa5_false_2nd; } } else { - u8 reg = dComIfGs_getTmpReg(0xFE03); + u8 reg = dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FE03); switch(reg) { case 3: m734 = l_msg_xy_pig1; @@ -7172,36 +7172,36 @@ u32 daNpcPeople_c::getMsg() { break; case 1: m734 = l_msg_xy_sa5_mini_game2_clr; - dComIfGs_offEventBit(0x2680); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2680); break; } reg -= 1; - dComIfGs_setTmpReg(0xFE03, reg); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FE03, reg); } } - else if(!dComIfGs_isEventBit(0x2440)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2440)) { m734 = l_msg_sa5_1st_talk; - dComIfGs_onEventBit(0x2440); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2440); } - else if(dComIfGs_isTmpBit(0x280)) { - if(!dComIfGs_isEventBit(0x2680)) { + else if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0280)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2680)) { m734 = l_msg_sa5__next_day; } else if(getPigTimer() == 0) { m734 = l_msg_sa5_timer_zero; } else { - m734 = l_msg_sa5_play[dComIfGs_getTmpReg(0xFF03)]; + m734 = l_msg_sa5_play[dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FF03)]; } } - else if(dComIfGs_isEventBit(0x2680)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2680)) { m734 = l_msg_sa5_day; } else if((u32)dComIfGs_getRupee() > 80) { m734 = l_msg_sa5_50rupee; } - else if(!dComIfGs_isEventBit(0x2640)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2640)) { m734 = l_msg_sa5_1st; } else { @@ -7219,11 +7219,11 @@ u32 daNpcPeople_c::getMsg() { if(diff.abs() >= 200.0f) { m734 = l_msg_ug1_out_area; } - else if(!dComIfGs_isEventBit(0x2880)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2880)) { m734 = l_msg_ug1_1st_talk; - dComIfGs_onEventBit(0x2880); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2880); } - else if(dComIfGs_isEventBit(0x2B04)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2B04)) { m734 = l_msg_ug1_hint_talk; } else { @@ -7237,11 +7237,11 @@ u32 daNpcPeople_c::getMsg() { if(diff.abs() >= 200.0f) { m734 = l_msg_ug2_out_area; } - else if(!dComIfGs_isEventBit(0x2B08)) { + else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2B08)) { m734 = l_msg_ug2_1st_talk; - dComIfGs_onEventBit(0x2B08); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2B08); } - else if(dComIfGs_isEventBit(0x2B04)) { + else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2B04)) { m734 = l_msg_ug2_hint_talk; } else { @@ -7886,7 +7886,7 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) { break; case 0x3: case 0x4: - if(dComIfGs_isEventBit(0x2102) && isPhoto(itemNo)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2102) && isPhoto(itemNo)) { return true; } @@ -7912,7 +7912,7 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) { break; case 0xB: - if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(0x2310) && !dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { + if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310) && !dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { return true; } @@ -7922,7 +7922,7 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) { return false; } - if(!mbIsNight && dComIfGs_isEventBit(0x2440) && !dComIfGs_isTmpBit(0x280)) { + if(!mbIsNight && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2440) && !dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0280)) { return true; } @@ -8154,7 +8154,7 @@ BOOL daNpcPeople_c::is1GetMap20() { /* 00009100-00009144 .text is1DayGetMap20__13daNpcPeople_cFv */ BOOL daNpcPeople_c::is1DayGetMap20() { - return dComIfGs_getEventReg(0xC103) == 2 ? TRUE : FALSE; + return dComIfGs_getEventReg(dSv_event_flag_c::UNK_C103) == 2 ? TRUE : FALSE; } /* 00009144-0000917C .text getWindDir__13daNpcPeople_cFv */ @@ -8176,12 +8176,12 @@ BOOL daNpcPeople_c::isUo1FdaiOne() { } static u16 l_daiza_no_tbl[] = { - 0xF8FF, - 0xF7FF, - 0xF6FF, - 0xF5FF, - 0xF4FF, - 0xF3FF, + dSv_event_flag_c::UNK_F8FF, + dSv_event_flag_c::UNK_F7FF, + dSv_event_flag_c::UNK_F6FF, + dSv_event_flag_c::UNK_F5FF, + dSv_event_flag_c::UNK_F4FF, + dSv_event_flag_c::UNK_F3FF, }; /* 000091E0-00009420 .text chkDaiza__13daNpcPeople_cFv */ @@ -8252,7 +8252,7 @@ s32 daNpcPeople_c::chkDaiza() { /* 00009420-000095D8 .text checkPig__13daNpcPeople_cFv */ BOOL daNpcPeople_c::checkPig() { - if(dComIfGs_isTmpBit(0x280) && (m789 != 0 || m78A != 0)) { + if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0280) && (m789 != 0 || m78A != 0)) { for(int i = 0; i < 3; i++) { kb_class* pPig = (kb_class*)fopAcM_searchFromName("Pig", 0xF00, l_pig_para[i]); if(pPig && pPig->m408 == 0) { @@ -8262,10 +8262,10 @@ BOOL daNpcPeople_c::checkPig() { pPig->taura_pos_set(current.pos); m78D = 2; mEtcFlag |= 0x80; - dComIfGs_setTmpReg(0xFC03, i); - u8 reg = dComIfGs_getTmpReg(0xFD07); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FC03, i); + u8 reg = dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FD07); reg |= 1 << i; - dComIfGs_setTmpReg(0xFD07, reg); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FD07, reg); return true; } @@ -8278,7 +8278,7 @@ BOOL daNpcPeople_c::checkPig() { /* 000095D8-00009648 .text isPigOk__13daNpcPeople_cFv */ BOOL daNpcPeople_c::isPigOk() { - return dComIfGs_getTmpReg(0xFC03) == dComIfGs_getTmpReg(0xFF03) ? TRUE : FALSE; + return dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FC03) == dComIfGs_getTmpReg(dSv_event_tmp_flag_c::UNK_FF03) ? TRUE : FALSE; } /* 00009648-00009658 .text getPigTimer__13daNpcPeople_cFv */ @@ -8296,7 +8296,7 @@ void daNpcPeople_c::resetPig() { } } - dComIfGs_setTmpReg(0xFD07, 0); + dComIfGs_setTmpReg(dSv_event_tmp_flag_c::UNK_FD07, 0); } /* 00009700-000097C8 .text initUgSearchArea__13daNpcPeople_cFv */ diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index b654fbfce..04b143330 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -529,10 +529,10 @@ struct SaveDatStruct { }; // Size: 0x08 static const SaveDatStruct l_save_dat = { - 0x1208, - 0x1701, - 0x1601, - 0xC407, + dSv_event_flag_c::UNK_1208, + dSv_event_flag_c::UNK_1701, + dSv_event_flag_c::UNK_1601, + dSv_event_flag_c::UNK_C407, }; @@ -1667,7 +1667,7 @@ u16 daNpcPhoto_c::next_msgStatus(u32* pMsgNo) { } *pMsgNo = *field_0x980; dComIfGp_setItemRupeeCount(-dComIfGp_getMessageRupee()); - dComIfGs_onTmpBit(0x301); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0301); } } else { field_0x980 = NULL; @@ -1752,7 +1752,7 @@ u32 daNpcPhoto_c::getMsg() { } else if(dComIfGp_event_chkTalkXY()) { u32 itemNo = dComIfGp_event_getPreItemNo(); - if(itemNo == CAMERA2 && dComIfGs_isTmpBit(0x302)) { + if(itemNo == CAMERA2 && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)) { if (dComIfGs_getPictureNum() < 3) { field_0x980 = l_msg_xy_buy_photo; mItemNo = SALVAGE_ITEM1; @@ -1782,19 +1782,19 @@ u32 daNpcPhoto_c::getMsg() { msgNo = mMsgNno; } else { if(dComIfGs_checkGetItem(CAMERA2)) { - if(dComIfGs_isTmpBit(0x301)) { + if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0301)) { field_0x980 = (u32*)l_msg_buy_photo; field_0x9D0 = 0; } else { - if(dComIfGs_isTmpBit(0x302)) { + if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)) { field_0x980 = l_msg_get_photo; field_0x9D0 = 0; } else { if(isPhotoDxOk()) { - dComIfGs_onTmpBit(0x302); - if(dComIfGs_isEventBit(0x3808) == 0) { - dComIfGs_onEventBit(0x3808); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0302); + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3808) == 0) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3808); field_0x980 = (u32*)l_msg_week_1st; field_0x9D0 = 0; } else { @@ -2140,7 +2140,7 @@ bool daNpcPhoto_c::setAnmTbl(sPhotoAnmDat* i_anmDat) { /* 000048D0-00004950 .text XyCheckCB__12daNpcPhoto_cFi */ s16 daNpcPhoto_c::XyCheckCB(int i_itemBtn) { - if(dComIfGs_isTmpBit(0x302) && !dComIfGs_isTmpBit(0x301)){ + if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302) && !dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0301)){ attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e; } else { attention_info.flags = fopAc_Attn_UNK1000000_e | fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e; @@ -2152,7 +2152,7 @@ s16 daNpcPhoto_c::XyCheckCB(int i_itemBtn) { s16 daNpcPhoto_c::XyEventCB(int i_itemBtn) { s16 eventIdx; u8 itemNo = dComIfGp_getSelectItem(i_itemBtn); - if(itemNo == CAMERA2 && dComIfGs_isTmpBit(0x302)){ + if(itemNo == CAMERA2 && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)){ if(dComIfGs_getPictureNum() < 3){ eventIdx = mPhotoGetPhotoEventIdx; field_0x9C7 = false; @@ -2193,43 +2193,43 @@ BOOL daNpcPhoto_c::isPhotoOk() { BOOL daNpcPhoto_c::isPhotoDxOk() { switch(dKy_get_dayofweek()){ case 0: - if(dComIfGs_isEventBit(0x2D02)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) { return TRUE; } break; case 1: - if(dComIfGs_isEventBit(0x3910)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910)) { return TRUE; } break; case 2: - if (dComIfGs_isEventBit(0x3002) || - dComIfGs_isEventBit(0x3001) || - dComIfGs_isEventBit(0x3008) || - dComIfGs_isEventBit(0x3004) || - dComIfGs_isEventBit(0x3020) || - dComIfGs_isEventBit(0x3010) || - dComIfGs_isEventBit(0x3180)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3002) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_3001) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_3008) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_3004) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_3020) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_3010) || + dComIfGs_isEventBit(dSv_event_flag_c::UNK_3180)) { return TRUE; } break; case 3: - if(dComIfGs_isEventBit(0x3920)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3920)) { return TRUE; } break; case 4: - if(dComIfGs_isEventBit(0x1001)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1001)) { return TRUE; } break; case 5: - if(dComIfGs_isEventBit(0x2D20)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D20)) { return TRUE; } break; case 6: - if(dComIfGs_isEventBit(0x2D40)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D40)) { return TRUE; } break; diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 7f781ff1a..8485c27fe 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -1495,22 +1495,22 @@ struct SaveDatStruct { static const SaveDatStruct l_save_dat[] = { { - 0x1320, - 0xCB03, - 0xC803, - 0x1304, + dSv_event_flag_c::UNK_1320, + dSv_event_flag_c::UNK_CB03, + dSv_event_flag_c::UNK_C803, + dSv_event_flag_c::UNK_1304, }, { - 0x1310, - 0xCA03, - 0xC703, - 0x1302, + dSv_event_flag_c::UNK_1310, + dSv_event_flag_c::UNK_CA03, + dSv_event_flag_c::UNK_C703, + dSv_event_flag_c::UNK_1302, }, { - 0x1308, - 0xC903, - 0xC603, - 0x1301, + dSv_event_flag_c::UNK_1308, + dSv_event_flag_c::UNK_C903, + dSv_event_flag_c::UNK_C603, + dSv_event_flag_c::UNK_1301, }, }; @@ -1617,7 +1617,7 @@ static cPhs_State phase_1(daNpcRoten_c* i_this) { i_this->setNpcNo(i_this->getPrmNpcNo()); - if(!dComIfGs_isEventBit(0x1108)) { + if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1108)) { return cPhs_STOP_e; } @@ -2475,7 +2475,7 @@ u32 daNpcRoten_c::getMsg() { if(isGetMap(itemNo)) { field_0x98C = l_msg_try_force; dComIfGs_setReserveItemEmpty(); - dComIfGs_onEventBit(0x3E04); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E04); } else if(dComIfGs_getEventReg(l_save_dat[mNpcNo].field_0x02) >= 3) { field_0x98C = l_msg_xy_exchange3[mNpcNo]; @@ -2500,7 +2500,7 @@ u32 daNpcRoten_c::getMsg() { else if(dComIfGs_getEventReg(l_save_dat[mNpcNo].field_0x02) >= 3) { field_0x98C = l_msg_exchange3[mNpcNo]; } - else if(mNpcNo == 1 && dComIfGs_isEventBit(0x3E04)) { + else if(mNpcNo == 1 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E04)) { field_0x98C = l_msg_collect_map; } else if(dComIfGs_isEventBit(l_save_dat[mNpcNo].field_0x06)) { @@ -2800,7 +2800,7 @@ BOOL daNpcRoten_c::isKoukanItem(u8 itemNo) { /* 00003AC8-00003B30 .text isGetMap__12daNpcRoten_cFUc */ BOOL daNpcRoten_c::isGetMap(u8 itemNo) { - if(mNpcNo == 1 && !dComIfGs_isEventBit(0x3E04) && itemNo == PRESIDENT_STATUE) { + if(mNpcNo == 1 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E04) && itemNo == PRESIDENT_STATUE) { return true; } diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index 30be2afc4..114ac4f88 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -88,7 +88,7 @@ cPhs_State daObjYboil_c::_create() { fopAcM_SetupActor(this, daObjYboil_c); cPhs_State ret; - if (dComIfGs_isEventBit(0x1902)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1902)) { ret = cPhs_STOP_e; } else { ret = dComIfG_resLoad(&mPhs, "Yboil"); diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 796ce853f..a9e00d657 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -116,7 +116,7 @@ bool daObjYgush00_c::_delete() { /* 00000524-0000066C .text _execute__14daObjYgush00_cFv */ bool daObjYgush00_c::_execute() { - if (mType != 3 || dComIfGs_isEventBit(dSv_evtBit_c::COLORS_IN_HYRULE) == 1) { + if (mType != 3 || dComIfGs_isEventBit(dSv_event_flag_c::COLORS_IN_HYRULE) == 1) { mBtkAnm.play(); mBckAnm.play(); } diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index f8f0f30c0..5b6400c5b 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -105,10 +105,22 @@ bool daObjAdnno_c::_execute() { } static const u16 daObjAdnno_event_bit_table[16] = { - 0x3508, 0x3504, 0x3502, 0x3501, - 0x3680, 0x3640, 0x3620, 0x3610, - 0x3608, 0x3604, 0x3602, 0x3601, - 0x3780, 0x3740, 0x3720, 0x3710, + dSv_event_flag_c::LITHOGRAPH_1, + dSv_event_flag_c::LITHOGRAPH_2, + dSv_event_flag_c::LITHOGRAPH_3, + dSv_event_flag_c::LITHOGRAPH_4, + dSv_event_flag_c::LITHOGRAPH_5, + dSv_event_flag_c::LITHOGRAPH_6, + dSv_event_flag_c::LITHOGRAPH_7, + dSv_event_flag_c::LITHOGRAPH_8, + dSv_event_flag_c::LITHOGRAPH_9, + dSv_event_flag_c::LITHOGRAPH_10, + dSv_event_flag_c::UNK_3602, + dSv_event_flag_c::UNK_3601, + dSv_event_flag_c::UNK_3780, + dSv_event_flag_c::UNK_3740, + dSv_event_flag_c::UNK_3720, + dSv_event_flag_c::UNK_3710, }; bool daObjAdnno_c::_draw() { diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 6ccbf4929..1fefabfbc 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -200,7 +200,7 @@ void daObjBarrel::Act_c::mode_carry_init() { cLib_offBit(attention_info.flags, fopAc_Attn_ACTION_CARRY_e); mMode = MODE_CARRY; if (strcmp(dComIfGp_getStartStageName(), "majroom") == 0 || strcmp(dComIfGp_getStartStageName(), "MajyuE") == 0) { - dComIfGs_onEventBit(0x401); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0401); } mTimer = 15; } diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 8339041a0..f5794462c 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -229,7 +229,7 @@ void daObjBarrier_c::brkAnmPlay() { /* 00000884-000009F0 .text break_start_wait_proc__14daObjBarrier_cFv */ void daObjBarrier_c::break_start_wait_proc() { // 0x3980: Saw Hyrule 3 Electric Barrier Demo - if (dComIfGs_isEventBit(0x3980) == true) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3980) == true) { daPy_py_c* player_p = (daPy_py_c*)daPy_getPlayerActorClass(); if ((player_p->current.pos - current.pos).absXZ() >= 8800.0f && @@ -246,7 +246,7 @@ void daObjBarrier_c::break_start_wait_proc() { case 8: case 9: case 10: - dComIfGs_onEventBit(dSv_evtBit_c::BARRIER_BREAK); + dComIfGs_onEventBit(dSv_event_flag_c::BARRIER_BREAK); mEventID = dComIfGp_evmng_getEventIdx("seal"); mBarrierProc = PROC_BREAK_ORDER; break; @@ -280,11 +280,11 @@ bool daObjBarrier_c::break_check() { #if VERSION <= VERSION_JPN if (mMoya == 0) { - if (dComIfGs_isEventBit(0x3980) == true) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3980) == true) { daPy_py_c* player_p = (daPy_py_c*)daPy_getPlayerActorClass(); if ((player_p->current.pos - current.pos).absXZ() >= 8800.0f) { - dComIfGs_onEventBit(dSv_evtBit_c::BARRIER_BREAK); + dComIfGs_onEventBit(dSv_event_flag_c::BARRIER_BREAK); dComIfGp_setNextStage("Hyrule", 0xE9, 0, 9); chk = true; } @@ -503,7 +503,7 @@ cPhs_State daObjBarrier_c::_create() { mMoya = param_get_moya(); if (mMoya != 0) { mBarrierActive = true; - } else if (dComIfGs_isEventBit(dSv_evtBit_c::BARRIER_BREAK) == true) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::BARRIER_BREAK) == true) { mBarrierActive = false; } else { mBarrierActive = true; diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 2365a9156..9f50606c3 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -41,7 +41,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 00000224-00000334 .text CreateHeap__17daObj_Bscurtain_cFv */ BOOL daObj_Bscurtain_c::CreateHeap() { J3DModelData* modelData; - if ((fpcM_GetParam(this) & 0xFF) != 1 || dComIfGs_isEventBit(0x1F08) != 0) { + if ((fpcM_GetParam(this) & 0xFF) != 1 || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F08) != 0) { modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCO); } else { modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCU); diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 0284d04e0..ecf6f39d0 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -222,7 +222,11 @@ void daObjDoguu_c::CreateInit() { field_0x8A1 = false; field_0x8A2 = true; field_0x8AC = 14; - } else if (dComIfGs_isEventBit(0x1480) && dComIfGs_isEventBit(0x1440) && dComIfGs_isEventBit(0x1410)) { + } else if ( + dComIfGs_isEventBit(dSv_event_flag_c::PLACED_DINS_PEARL) && + dComIfGs_isEventBit(dSv_event_flag_c::PLACED_FARORES_PEARL) && + dComIfGs_isEventBit(dSv_event_flag_c::PLACED_NAYRUS_PEARL) + ) { mBckHead.setFrame(mBckHead.getEndFrame()); mBckBody.setFrame(mBckBody.getEndFrame()); mBckCrystal.setFrame(mBckCrystal.getEndFrame()); @@ -233,9 +237,9 @@ void daObjDoguu_c::CreateInit() { } else { field_0x8A1 = false; if ( - (field_0x894 == 0 && dComIfGs_isEventBit(0x1480)) || - (field_0x894 == 1 && dComIfGs_isEventBit(0x1440)) || - (field_0x894 == 2 && dComIfGs_isEventBit(0x1410)) + (field_0x894 == 0 && dComIfGs_isEventBit(dSv_event_flag_c::PLACED_DINS_PEARL)) || + (field_0x894 == 1 && dComIfGs_isEventBit(dSv_event_flag_c::PLACED_FARORES_PEARL)) || + (field_0x894 == 2 && dComIfGs_isEventBit(dSv_event_flag_c::PLACED_NAYRUS_PEARL)) ) { field_0x8A2 = true; field_0x8A0 = true; @@ -493,13 +497,13 @@ void daObjDoguu_c::privateCut() { /* 000015A8-00001630 .text getFinishEventCount__12daObjDoguu_cFv */ int daObjDoguu_c::getFinishEventCount() { int count = 0; - if (dComIfGs_isEventBit(0x1480)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::PLACED_DINS_PEARL)) { count += 1; } - if (dComIfGs_isEventBit(0x1440)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::PLACED_FARORES_PEARL)) { count += 1; } - if (dComIfGs_isEventBit(0x1410)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::PLACED_NAYRUS_PEARL)) { count += 1; } return count; @@ -509,11 +513,11 @@ int daObjDoguu_c::getFinishEventCount() { /* 00001630-000016A4 .text setFinishMyEvent__12daObjDoguu_cFv */ void daObjDoguu_c::setFinishMyEvent() { if (field_0x894 == 0) { - dComIfGs_onEventBit(0x1480); + dComIfGs_onEventBit(dSv_event_flag_c::PLACED_DINS_PEARL); } else if (field_0x894 == 1) { - dComIfGs_onEventBit(0x1440); + dComIfGs_onEventBit(dSv_event_flag_c::PLACED_FARORES_PEARL); } else { - dComIfGs_onEventBit(0x1410); + dComIfGs_onEventBit(dSv_event_flag_c::PLACED_NAYRUS_PEARL); } } @@ -734,7 +738,7 @@ bool daObjDoguu_c::_execute() { setFinishMyEvent(); if (getFinishEventCount() >= 3) { - dComIfGs_onEventBit(0x1e40); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E40); fopAcM_orderChangeEventId(this, mMegamiDemoEventIdx, 0, 0xFFFF); field_0x8AC = 11; } else { diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index a7265faba..bcccd2249 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -383,7 +383,7 @@ void daObjFerris::Act_c::rot_mng() { } break; case 1: - dComIfGs_onEventBit(0x2104); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2104); if (!(mFrameTimer & 3)) mRotSpeed++; diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 3e25b690f..69f983be2 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -39,23 +39,23 @@ static const char* l_arcname_tbl[] = { }; static u16 l_figure_comp[] = { - 0x95FF, - 0x94FF, - 0x93FF, - 0x92FF, - 0x91FF, - 0x90FF, - 0x8FFF, - 0x8EFF, - 0x8DFF, - 0x8CFF, - 0xB1FF, - 0x9CFF, - 0x84FF, - 0x83FF, - 0x82FF, - 0x81FF, - 0x80FF, + dSv_event_flag_c::UNK_95FF, + dSv_event_flag_c::UNK_94FF, + dSv_event_flag_c::UNK_93FF, + dSv_event_flag_c::UNK_92FF, + dSv_event_flag_c::UNK_91FF, + dSv_event_flag_c::UNK_90FF, + dSv_event_flag_c::UNK_8FFF, + dSv_event_flag_c::UNK_8EFF, + dSv_event_flag_c::UNK_8DFF, + dSv_event_flag_c::UNK_8CFF, + dSv_event_flag_c::UNK_B1FF, + dSv_event_flag_c::UNK_9CFF, + dSv_event_flag_c::UNK_84FF, + dSv_event_flag_c::UNK_83FF, + dSv_event_flag_c::UNK_82FF, + dSv_event_flag_c::UNK_81FF, + dSv_event_flag_c::UNK_80FF, }; static dCcD_SrcCyl l_cyl_src = { @@ -881,14 +881,14 @@ void daObjFigure_c::eventOnPlrInit() { ((daPy_lk_c*)dComIfGp_getLinkPlayer())->offPlayerNoDraw(); dCam_getBody()->Reset(); dCam_getBody()->Start(); - dComIfGs_offTmpBit(0x408); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0408); } /* 00001658-000016A8 .text eventOffPlrInit__13daObjFigure_cFv */ void daObjFigure_c::eventOffPlrInit() { ((daPy_lk_c*)dComIfGp_getLinkPlayer())->onPlayerNoDraw(); dCam_getBody()->Stop(); - dComIfGs_onTmpBit(0x408); + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0408); } /* 000016A8-00001788 .text talk__13daObjFigure_cFi */ @@ -1003,13 +1003,13 @@ int daObjFigure_c::getFigureBmd(u8 figureNo) { u32 bmd = l_figure_dat_tbl[figureNo].mBmdId; switch(figureNo) { case 0x10: - if(dComIfGs_isEventBit(0x2D01)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { bmd = 3; } break; case 0x12: - if(dComIfGs_isEventBit(0x2D01)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { bmd = 6; } diff --git a/src/d/actor/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp index ee9cc945e..0ab2b4382 100644 --- a/src/d/actor/d_a_obj_hbrf1.cpp +++ b/src/d/actor/d_a_obj_hbrf1.cpp @@ -95,13 +95,13 @@ void daObjHbrf1::Act_c::init_mtx() { /* 000004C0-0000066C .text daObjHbrf1_down_stop__Q210daObjHbrf15Act_cFv */ void daObjHbrf1::Act_c::daObjHbrf1_down_stop() { if ((prm_get_Type() == 0 && !fopAcM_isSwitch(this, prm_get_swSave())) || (prm_get_Type() != 0 && fopAcM_isSwitch(this, prm_get_swSave()))) { - if (prm_get_Event() == 0 && !dComIfGs_isEventBit(0x1540)) { - dComIfGs_onEventBit(0x1540); + if (prm_get_Event() == 0 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1540)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1540); fopAcM_orderOtherEventId(this, mEventIdx); m2E4 = 1; mMode = Mode_UP_DEMO_WAIT_e; - } else if (prm_get_Event() == 1 && !dComIfGs_isEventBit(0x1510)) { - dComIfGs_onEventBit(0x1510); + } else if (prm_get_Event() == 1 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1510)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1510); fopAcM_orderOtherEventId(this, mEventIdx); m2E4 = 1; mMode = Mode_UP_DEMO_WAIT_e; @@ -152,13 +152,13 @@ void daObjHbrf1::Act_c::daObjHbrf1_up_demo() { /* 000007FC-000009B0 .text daObjHbrf1_up_stop__Q210daObjHbrf15Act_cFv */ void daObjHbrf1::Act_c::daObjHbrf1_up_stop() { if ((prm_get_Type() == 0 && fopAcM_isSwitch(this, prm_get_swSave())) || (prm_get_Type() != 0 && !fopAcM_isSwitch(this, prm_get_swSave()))) { - if (prm_get_Event() == 0 && !dComIfGs_isEventBit(0x1520)) { - dComIfGs_onEventBit(0x1520); + if (prm_get_Event() == 0 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1520)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1520); fopAcM_orderOtherEventId(this, mEventIdx); m2E4 = 1; mMode = Mode_DOWN_DEMO_WAIT_e; - } else if (prm_get_Event() == 1 && !dComIfGs_isEventBit(0x1508)) { - dComIfGs_onEventBit(0x1508); + } else if (prm_get_Event() == 1 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1508)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1508); fopAcM_orderOtherEventId(this, mEventIdx); m2E4 = 1; mMode = Mode_DOWN_DEMO_WAIT_e; diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp index 324a45a5d..479583356 100644 --- a/src/d/actor/d_a_obj_homen.cpp +++ b/src/d/actor/d_a_obj_homen.cpp @@ -564,7 +564,7 @@ BOOL Act_c::process_wait_falldown_init() { } if (mType == 0) { - dComIfGs_onEventBit(0x3410); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3410); } return TRUE; @@ -744,7 +744,7 @@ void Act_c::set_co_collision() { fopAc_ac_c* hookshot = mSph.GetTgHitAc(); mHookshotID = fopAcM_GetID(hookshot); if (mType == 0) { - dComIfGs_onEventBit(0x3880); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3880); } } mSph.ClrTgHit(); diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 8c4c21b4d..155d604f6 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -261,7 +261,7 @@ BOOL daObjMknjD::Act_c::Create() { mMelodyNum = 4; mGiveItemNo = TACT_SONG5; eventInfo.setEventName("MKNJD_K_TALK"); - m0430 = 0x2910; + m0430 = dSv_event_flag_c::UNK_2910; } else { mCheckEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[2]); @@ -272,7 +272,7 @@ BOOL daObjMknjD::Act_c::Create() { mMelodyNum = 3; mGiveItemNo = TACT_SONG4; eventInfo.setEventName("MKNJD_D_TALK"); - m0430 = 0x2920; + m0430 = dSv_event_flag_c::UNK_2920; } attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0x3D; diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index 8c75ac749..399a20a1b 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -36,14 +36,14 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 000001AC-00000348 .text CreateHeap__12daObj_Pbco_cFv */ BOOL daObj_Pbco_c::CreateHeap() { J3DModelData* modelData; - if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBCO)); } else { modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBC2)); } JUT_ASSERT(0xa9, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); - if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { mpBgW = NULL; } else { mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, PBCO_INDEX_DZB_PBCO), cBgW::MOVE_BG_e, diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index 728e84c7d..78026146c 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -243,7 +243,7 @@ void daObjPirateship::Act_c::partsCreate() { s32 uVar3 = (fopAcM_GetParam(this) >> 8) & 0xff; s16 sVar6 = 0; - if (dComIfGs_isEventBit(0x520)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { sVar6 = 0x1B18; } sp10.z = sVar6; @@ -430,9 +430,9 @@ bool daObjPirateship::Act_c::_execute() { } if (m2CC == 0) { - if (dComIfGs_isEventBit(0x310)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0310)) { #if VERSION > VERSION_JPN - if (!dComIfGs_isEventBit(1)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { CreateWave(); } #endif @@ -440,7 +440,7 @@ bool daObjPirateship::Act_c::_execute() { } else { return false; } - } else if (m2CD == 0 && dComIfGs_isEventBit(1)) { + } else if (m2CD == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { m2CD = 1; pirateCreate(create_idx_tbl_1stIsland_demo); #if VERSION > VERSION_JPN @@ -484,12 +484,12 @@ cPhs_State daObjPirateship::Act_c::_create() { switch (uVar3) { case 0: - if (dComIfGs_isEventBit(0x310) == 0) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0310) == 0) { m2CC = 0; m2CD = 0; } else { m2CC = 0; - if (dComIfGs_isEventBit(1)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { pirateCreate(create_idx_tbl_1stIsland); m2CD = 1; } else { diff --git a/src/d/actor/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp index dd4fb2f5e..5a6dd90c2 100644 --- a/src/d/actor/d_a_obj_rcloud.cpp +++ b/src/d/actor/d_a_obj_rcloud.cpp @@ -97,7 +97,7 @@ cPhs_State daObjRcloud_c::_create() { switch (mDemoNameIndex) { case 0: - if (dComIfGs_isEventBit(0x3908) == 0) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3908) == 0) { phase = dComIfG_resLoad(&mPhase, l_arcname); mResourceLoadedFlag = 1; } @@ -175,7 +175,7 @@ void daObjRcloud_c::clouds_lift_act_proc() { mCloudAnimProgress += HIO(m08); if (mCloudAnimProgress < endCloudAnimProgress) { mCloudAnimProgress = -1.0f; - dComIfGs_onEventBit(0x3908); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3908); fopAcM_delete(this); } } diff --git a/src/d/actor/d_a_obj_shelf.cpp b/src/d/actor/d_a_obj_shelf.cpp index 070e87222..9a66a37c6 100644 --- a/src/d/actor/d_a_obj_shelf.cpp +++ b/src/d/actor/d_a_obj_shelf.cpp @@ -114,7 +114,7 @@ void daObjShelf::Act_c::mode_wait_init() { void daObjShelf::Act_c::mode_wait() { bool quake = dComIfGp_getDetect().chk_quake(¤t.pos); bool event = false; - if (quake && prm_get_groundma() && !dComIfGs_isEventBit(0x1)) { + if (quake && prm_get_groundma() && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { hold_event(); quake = false; event = true; diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index d5d181e3f..e195aa1c8 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -156,11 +156,11 @@ cPhs_State Act_c::Mthd_Create() { if (M_type == 3) { #if VERSION == VERSION_DEMO - if (dComIfGs_isTmpBit(0x401)) { + if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0401)) { m309 = false; } #else - dComIfGs_offTmpBit(0x401); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0401); #endif } @@ -399,7 +399,7 @@ void Act_c::mode_gmtw() { se_set_gmtw(); #if VERSION > VERSION_DEMO - if (dComIfGs_isTmpBit(0x401)) { + if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0401)) { if (m30C > 0) { m30C--; } else { diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index b99fd2466..6dd11f5be 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -41,19 +41,19 @@ extern dScnPly_reg_HIO_c g_regHIO; const char daObjTpost_c::m_arc_name[] = "Toripost"; const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = { - {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM}, - {false, 0x0CF9, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_KOMALIS_FATHER}, - {false, 0x0CFA, dItem_COLLECT_MAP_60_e, dSv_evtBit_c::LETTER_BOMBS_AD}, - {false, 0x0CFC, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ORCA}, - {false, 0x0805, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_GRANDMA}, - {false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD}, - {true, 0x0DB6, dItem_COLLECT_MAP_52_e, dSv_evtBit_c::LETTER_TINGLE}, - {false, 0x1148, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ARYLL}, - {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM}, - {true, 0x0F76, KAISEN_PRESENT1, dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP}, - {false, 0x19A6, KAKERA_HEART2, dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND}, - {true, 0x0CFB, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_BAITO}, - {true, 0x0F77, KAISEN_PRESENT2, dSv_evtBit_c::LETTER_GOLD_MEMBERSHIP}, + {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_event_flag_c::LETTER_BAITOS_MOM}, + {false, 0x0CF9, dItem_HEART_PIECE_e, dSv_event_flag_c::LETTER_KOMALIS_FATHER}, + {false, 0x0CFA, dItem_COLLECT_MAP_60_e, dSv_event_flag_c::LETTER_BOMBS_AD}, + {false, 0x0CFC, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_ORCA}, + {false, 0x0805, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_GRANDMA}, + {false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_event_flag_c::LETTER_ROCK_SPIRE_SHOP_AD}, + {true, 0x0DB6, dItem_COLLECT_MAP_52_e, dSv_event_flag_c::LETTER_TINGLE}, + {false, 0x1148, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_ARYLL}, + {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_event_flag_c::LETTER_BAITOS_MOM}, + {true, 0x0F76, KAISEN_PRESENT1, dSv_event_flag_c::LETTER_SILVER_MEMBERSHIP}, + {false, 0x19A6, KAKERA_HEART2, dSv_event_flag_c::LETTER_HOSKITS_GIRLFRIEND}, + {true, 0x0CFB, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_BAITO}, + {true, 0x0F77, KAISEN_PRESENT2, dSv_event_flag_c::LETTER_GOLD_MEMBERSHIP}, }; const dCcD_SrcCyl daObjTpost_c::m_cyl_src = { @@ -239,10 +239,10 @@ void daObjTpost_c::cutDispLetterProc(int staffIdx) { void daObjTpost_c::deliverLetter() { switch(mPreItemNo) { case MAGYS_LETTER: - dComIfGs_onEventBit(0x1220); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1220); break; case dItem_NOTE_TO_MOM_e: - dLetter_send(dSv_evtBit_c::LETTER_BAITOS_MOM); + dLetter_send(dSv_event_flag_c::LETTER_BAITOS_MOM); break; } } @@ -919,23 +919,23 @@ bool daObjTpost_c::_draw() { /* 00001980-00001BA4 .text createInit__12daObjTpost_cFv */ void daObjTpost_c::createInit() { if(dComIfGs_isSymbol(2)) { - dLetter_autoStock(0xB503); + dLetter_autoStock(dSv_event_flag_c::LETTER_KOMALIS_FATHER); } if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { - dLetter_autoStock(0x7D03); + dLetter_autoStock(dSv_event_flag_c::LETTER_BOMBS_AD); } - if(dLetter_isDelivery(dSv_evtBit_c::LETTER_BAITOS_MOM) && dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_ET)) { - dLetter_autoStock(0x7C03); + if(dLetter_isDelivery(dSv_event_flag_c::LETTER_BAITOS_MOM) && dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_ET)) { + dLetter_autoStock(dSv_event_flag_c::LETTER_BAITO); } - if(dComIfGs_isEventBit(0x1E80)) { - dLetter_autoStock(0x7B03); + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E80)) { + dLetter_autoStock(dSv_event_flag_c::LETTER_ORCA); } if(dComIfGs_getWalletSize() == 1 || dComIfGs_getWalletSize() == 2) { - dLetter_autoStock(0x7A03); + dLetter_autoStock(dSv_event_flag_c::LETTER_ROCK_SPIRE_SHOP_AD); } field_0x8F0 = 1; diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp index 228d509c1..d1ca2422d 100644 --- a/src/d/actor/d_a_obj_tower.cpp +++ b/src/d/actor/d_a_obj_tower.cpp @@ -65,7 +65,7 @@ cPhs_State daObjTower_c::_create() { field_0x2d0 = 0; cPhs_State phase_state; - if (!dComIfGs_isEventBit(0x1e40)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E40)) { phase_state = cPhs_STOP_e; } else { phase_state = dComIfG_resLoad(&mPhs, "X_tower"); diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 26cd627e5..8d09e17a4 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -191,7 +191,7 @@ BOOL daObjVfan::Act_c::Execute(Mtx** mtx) { if (dComIfGp_evmng_endCheck(m_evid)) { fopAcM_onSwitch(this, prm_get_swSave()); - dComIfGs_onEventBit(0x3a08); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3A08); dComIfGp_event_reset(); fopAcM_delete(this); } diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index ed9d67234..d0c3d010d 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -30,10 +30,16 @@ const s32 daObjVgnfd_c::M_door_bdl_table[] = { VGNFD_BDL_YGCBD00, }; const u16 daObjVgnfd_c::M_door_ev_table[] = { - 0x3904, 0x3902, 0x3901, 0x3A80, + dSv_event_flag_c::UNK_3904, + dSv_event_flag_c::UNK_3902, + dSv_event_flag_c::UNK_3901, + dSv_event_flag_c::UNK_3A80, }; const u16 daObjVgnfd_c::M_boss_ev_table[] = { - 0x3240, 0x3220, 0x3210, 0x3208, + dSv_event_flag_c::UNK_3240, + dSv_event_flag_c::UNK_3220, + dSv_event_flag_c::UNK_3210, + dSv_event_flag_c::UNK_3208, }; const char daObjVgnfd_c::M_arcname[6] = "VgnFD"; @@ -256,7 +262,7 @@ BOOL daObjVgnfd_c::check_fin() { /* 00000A28-00000A58 .text on_fin__12daObjVgnfd_cFv */ void daObjVgnfd_c::on_fin() { - dComIfGs_onEventBit(0x3204); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3204); } /* 00000A58-00000B3C .text init_mtx__12daObjVgnfd_cFv */ diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 9944b7163..271582765 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -287,7 +287,7 @@ void daObjVmc::Act_c::daObjVmc_tree_main() { if (hitObj != NULL) { fopAc_ac_c* at = hitObj->GetAc(); if (at != NULL && fopAcM_GetName(at) == PROC_HOOKSHOT) - dComIfGs_onEventBit(0x3420); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3420); } } } diff --git a/src/d/actor/d_a_obj_vmsms.cpp b/src/d/actor/d_a_obj_vmsms.cpp index 81d13fff9..e0c8a817e 100644 --- a/src/d/actor/d_a_obj_vmsms.cpp +++ b/src/d/actor/d_a_obj_vmsms.cpp @@ -69,7 +69,7 @@ void daObjVmsms_c::init_mtx() { /* 0000026C-000002A8 .text check_demo__12daObjVmsms_cCFv */ bool daObjVmsms_c::check_demo() const { - return dComIfGs_isEventBit(0x2d04); + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D04); } /* 000002A8-0000030C .text _execute__12daObjVmsms_cFv */ diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index 3e857b828..b5b912c76 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -36,7 +36,14 @@ public: static daObj_Warpt_HIO_c l_HIO; const char daObj_Warpt_c::m_arc_name[] = "ltubw"; -const u16 daObj_Warpt_c::m_event_reg[] = {0xA207, 0xA107, 0xA007, 0x9F07, 0xA307, 0xA407}; +const u16 daObj_Warpt_c::m_event_reg[] = { + dSv_event_flag_c::UNK_A207, + dSv_event_flag_c::UNK_A107, + dSv_event_flag_c::UNK_A007, + dSv_event_flag_c::UNK_9F07, + dSv_event_flag_c::UNK_A307, + dSv_event_flag_c::UNK_A407, +}; const GXColor daObj_Warpt_c::m_def_smoke_prm_color[] = { {0x9F, 0x7F, 0x9C, 0x80}, {0x9F, 0x7F, 0x9C, 0x80}, diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index b1c2d7eb2..35e288e2f 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -128,15 +128,15 @@ int daPds_c::getMyStaffId() { /* 0000052C-000005D8 .text wakeupCheck__Q210daPedestal7daPds_cFv */ BOOL daPds_c::wakeupCheck() { if (argument == 0) { - if (dComIfGs_isEventBit(0x1780)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1780)) { return TRUE; } } else if (argument == 1) { - if (dComIfGs_isEventBit(0x1740)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1740)) { return TRUE; } } else if (argument == 2) { - if (dComIfGs_isEventBit(0x1720)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1720)) { return TRUE; } } @@ -147,15 +147,15 @@ BOOL daPds_c::wakeupCheck() { /* 000005D8-00000684 .text finishCheck__Q210daPedestal7daPds_cFv */ BOOL daPds_c::finishCheck() { if (argument == 0) { - if (dComIfGs_isEventBit(0x1710)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1710)) { return TRUE; } } else if (argument == 1) { - if (dComIfGs_isEventBit(0x1704)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1704)) { return TRUE; } } else if (argument == 2) { - if (dComIfGs_isEventBit(0x1B01)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B01)) { return TRUE; } } diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index 64608c35b..be5ef92f5 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -479,7 +479,7 @@ BOOL daPy_lk_c::procGrabMiss_init() { ); mProcVar0.m3570 = 0; m34D0 = daPy_HIO_grab_c0::m.field_0x6; - dComIfGs_onEventBit(0x4020); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_4020); return true; } diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index f5b86ab50..f58170a6f 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -7225,7 +7225,7 @@ BOOL daPy_lk_c::procAutoJump() { } } else if (speed.y < -gravity && mProcVar0.m3570 != 2) { if (mActorKeepGrab.getActor() != NULL && fopAcM_GetName(mActorKeepGrab.getActor()) == PROC_NPC_MD && - dComIfGs_isEventBit(0x1620)) + dComIfGs_isEventBit(dSv_event_flag_c::UNK_1620)) { speed.y = 5.0f; gravity = 0.0f; @@ -10873,8 +10873,8 @@ void daPy_lk_c::checkFallCode() { } if (dStage_changeSceneExitId(mAcch.m_gnd, dVar5, uVar3, bVar2)) { onNoResetFlg1(daPyFlg1_UNK100000); - if (dComIfGs_isEventBit(0x3e10)) { - dComIfGs_onEventBit(0x3e01); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E10)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E01); } daPy_py_c::changePlayer((daPy_py_c*)this); if ((!strcmp(dComIfGp_getStartStageName(), "GanonM")) && current.roomNo == 1) { @@ -10924,7 +10924,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_ setDamagePoint(param_3); mTinkleShieldTimer = 0; - if (stageType == dStageType_SEA_e && !dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL) && + if (stageType == dStageType_SEA_e && !dComIfGs_isEventBit(dSv_event_flag_c::RODE_KORL) && (current.roomNo == dIsleRoom_WindfallIsland_e || current.roomNo == dIsleRoom_OutsetIsland_e) && dStage_chkPlayerId(0x80, current.roomNo)) { @@ -11253,7 +11253,7 @@ BOOL daPy_lk_c::execute() { fopMsgM_demoMsgFlagOn(); if (checkEndMessage(0x14A3)) { offNoResetFlg1(daPyFlg1_UNK200); - dComIfGs_setEventReg(0x9EFF, 0); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_9EFF, 0); dComIfGp_event_reset(); mDemo.setDemoType(0); } @@ -12424,7 +12424,7 @@ void daPy_lk_c::playerInit() { // Modify the linktexS3TC texture in Link's model to be the casual clothes texture. texture->setResTIMG(i, *linktex_casual); - if (!dComIfGs_isEventBit(0x2A80) || dComIfGs_getClearCount() != 0) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2A80) || dComIfGs_getClearCount() != 0) { onNoResetFlg1(daPyFlg1_CASUAL_CLOTHES); } if (checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES)) { @@ -12543,7 +12543,7 @@ cPhs_State daPy_lk_c::makeBgWait() { (!strcmp(dComIfGp_getStartStageName(), "Siren") && fopAcM_GetRoomNo(this) == 0 && current.pos.z > 1400.0f && current.pos.x < 400.0f && current.pos.x > -400.0f)))) { - if (!dComIfGs_isEventBit(0xf80)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::MET_KORL)) { if (changeSwimProc()) { procSwimWait_init(0); m34C2 = 0; @@ -12556,9 +12556,9 @@ cPhs_State daPy_lk_c::makeBgWait() { return cPhs_INIT_e; } #if VERSION > VERSION_JPN - if (dComIfGs_isEventBit(0x3e10)) { - dComIfGs_onEventBit(0x3e01); - dComIfGs_onEventBit(0x3f80); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E10)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3F80); } #endif s16 sVar6; diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 4b76653c1..692e22629 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -237,7 +237,7 @@ void daPy_lk_c::setLightSaver() { #if VERSION == VERSION_DEMO BOOL daPy_lk_c::checkLastDemoSwordNoDraw(BOOL param_0) { if ((mEquipItem == daPyItem_SWORD_e || param_0) && - dComIfGs_isEventBit(0x3f40)) + dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F40)) { return TRUE; } else { @@ -247,7 +247,7 @@ BOOL daPy_lk_c::checkLastDemoSwordNoDraw(BOOL param_0) { #else /* 80155490-801554C8 .text checkDemoShieldNoDraw__9daPy_lk_cFv */ BOOL daPy_lk_c::checkDemoShieldNoDraw() { - if (dComIfGs_isEventBit(0x3f40)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F40)) { return TRUE; } else { return FALSE; @@ -257,7 +257,7 @@ BOOL daPy_lk_c::checkDemoShieldNoDraw() { /* 801554C8-80155544 .text checkDemoSwordNoDraw__9daPy_lk_cFi */ BOOL daPy_lk_c::checkDemoSwordNoDraw(BOOL param_0) { if ((mEquipItem == daPyItem_SWORD_e || param_0) && - (dComIfGs_isEventBit(0x3f40) || (mCurProc == daPyProc_DEMO_TOOL_e && m34D6 == 1))) + (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F40) || (mCurProc == daPyProc_DEMO_TOOL_e && m34D6 == 1))) { return true; } else { @@ -1675,9 +1675,9 @@ BOOL daPy_lk_c::procCutTurnMove_init() { m3598 = 1.0f; mDirection = DIR_FORWARD; - if (dComIfGs_isEventBit(0xb20)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B20)) { bVar1 = true; - } else if (dComIfGs_isTmpBit(0x402)) { + } else if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0402)) { bVar1 = true; } else { bVar1 = false; diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index 9c1d03045..cdd92b106 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -510,7 +510,7 @@ bool daSalvage_c::end_salvage() { switch (uVar2) { case 0: dComIfGs_onCompleteCollectMap(uVar1); - dComIfGs_onEventBit(0x3e02); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E02); break; case 2: diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 1db576452..90dbe6de0 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -335,31 +335,31 @@ static BOOL daShip_Draw(daShip_c* i_this) { /* 00000B34-00000DAC .text checkForceMessage__8daShip_cFv */ BOOL daShip_c::checkForceMessage() { - if (dComIfGs_isGetItem(1, 0) && !dComIfGs_isEventBit(0x908)) { + if (dComIfGs_isGetItem(1, 0) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) { mNextMessageNo = 0x5E0; } - else if (dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(0xA80)) { + else if (dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A80)) { mNextMessageNo = 0x5EC; } - else if (dComIfGs_isSymbol(2) && !dComIfGs_isEventBit(0xA08)) { + else if (dComIfGs_isSymbol(2) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A08)) { mNextMessageNo = 0x5F6; } - else if (dComIfGs_isEventBit(dSv_evtBit_c::ENDLESS_NIGHT) && !dComIfGs_isEventBit(0xA01)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A01)) { mNextMessageNo = 0x607; } - else if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(0x1F02)) { + else if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F02)) { mNextMessageNo = 0x624; } - else if (dComIfGs_isSymbol(0) && !dComIfGs_isEventBit(0x2F20)) { + else if (dComIfGs_isSymbol(0) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F20)) { mNextMessageNo = 0xD5A; } - else if (dComIfGs_isEventBit(0x2D10) && !daPy_getPlayerActorClass()->checkMasterSwordEquip()) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D10) && !daPy_getPlayerActorClass()->checkMasterSwordEquip()) { mNextMessageNo = 0xD65; } - else if (dComIfGs_isEventBit(0x3E01) && !dComIfGs_isEventBit(0x3F80)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E01) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F80)) { mNextMessageNo = 0x1688; } - else if (dComIfGs_isEventBit(0x2D02) && !dComIfGs_isEventBit(0x3201)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3201)) { mNextMessageNo = 0x1645; } else { @@ -380,14 +380,14 @@ void daShip_c::setInitMessage() { return; } #if VERSION > VERSION_DEMO - else if (dComIfGs_isEventBit(0x2110) && !dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2110) && !dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { mNextMessageNo = 0x623; } #endif else if (checkStateFlg(daSFLG_UNK800000_e)) { mNextMessageNo = 0x636; } - else if (dComIfGs_isEventBit(0x3D02)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D02)) { if (!strcmp(dComIfGp_getStartStageName(), "GanonA") || !strcmp(dComIfGp_getStartStageName(), "GanonB") || !strcmp(dComIfGp_getStartStageName(), "GanonC") || @@ -412,13 +412,13 @@ void daShip_c::setInitMessage() { mNextMessageNo = 0xd78; } } - else if (dComIfGs_isEventBit(0x2C02)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::BARRIER_BREAK)) { mNextMessageNo = 0xd76; } - else if (dComIfGs_isEventBit(0x2C01)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2C01)) { mNextMessageNo = 0xd75; } - else if (dComIfGs_isEventBit(0x2D08)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D08)) { if (!strcmp(dComIfGp_getStartStageName(), "Hyrule")) { mNextMessageNo = 0xd74; } @@ -426,7 +426,7 @@ void daShip_c::setInitMessage() { mNextMessageNo = 0xd73; } } - else if (dComIfGs_isEventBit(0x4004)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_4004)) { if (dComIfGs_getTriforceNum() == 8) { mNextMessageNo = 0xd72; } @@ -434,13 +434,13 @@ void daShip_c::setInitMessage() { mNextMessageNo = 0xd71; } } - else if (dComIfGs_isEventBit(0x2E02)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E02)) { mNextMessageNo = 0xd70; } - else if (dComIfGs_isEventBit(0x1610)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610)) { mNextMessageNo = 0xd6f; } - else if (dComIfGs_isEventBit(0x3A02)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3A02)) { if (dComIfGs_isTact(4)) { mNextMessageNo = 0xd6e; } @@ -448,36 +448,36 @@ void daShip_c::setInitMessage() { mNextMessageNo = 0xd6d; } } - else if (dComIfGs_isEventBit(0x2E04)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04)) { mNextMessageNo = 0xd6c; } - else if (dComIfGs_isEventBit(0x1620)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1620)) { mNextMessageNo = 0xd6b; } else if (dComIfGs_isTact(3) || dComIfGs_isTact(4)) { mNextMessageNo = 0xd6a; } - else if (dComIfGs_isEventBit(0x3910)) { - if (!dComIfGs_isEventBit(0x3380)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3380)) { mNextMessageNo = 0xd7b; } else { mNextMessageNo = 0xd69; } } - else if (dComIfGs_isEventBit(0x3040)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3040)) { mNextMessageNo = 0xd68; } - else if (dComIfGs_isEventBit(0x3810)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3810)) { mNextMessageNo = 0xd67; } else if (daPy_getPlayerActorClass()->checkMasterSwordEquip()) { mNextMessageNo = 0xd66; } - else if (dComIfGs_isEventBit(0x2D10)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D10)) { mNextMessageNo = 0xd65; } - else if (dComIfGs_isEventBit(0x1E40)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E40)) { if (dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_DUNGEON_e) { mNextMessageNo = 0xd63; } @@ -485,21 +485,21 @@ void daShip_c::setInitMessage() { mNextMessageNo = 0xd64; } } - else if (dComIfGs_isEventBit(0x2F20)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F20)) { mNextMessageNo = 0xd62; } else if (dComIfGs_isSymbol(0)) { mNextMessageNo = 0xd5a; } - else if (dComIfGs_isEventBit(0x1940)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1940)) { mNextMessageNo = 0xd61; } - else if (dComIfGs_isEventBit(0x3E10)) { - if (!dComIfGs_isEventBit(0x3E01)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E10)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E01)) { mNextMessageNo = 0x1687; } else { - if (dComIfGs_isEventBit(0x3F80)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F80)) { mNextMessageNo = 0x1689; } else { @@ -507,11 +507,11 @@ void daShip_c::setInitMessage() { } } } - else if (dComIfGs_isEventBit(0x1F02)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F02)) { mNextMessageNo = 0xd60; } - else if (dComIfGs_isEventBit(0x1F04)) { - if (!dComIfGs_isEventBit(0x2110)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F04)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2110)) { mNextMessageNo = 0x621; } else { @@ -523,12 +523,12 @@ void daShip_c::setInitMessage() { } } } - else if (dComIfGs_isEventBit(0xA02)) { - if (dComIfGs_isEventBit(0x2A01)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2A01)) { mNextMessageNo = 0xd5f; } else { - if (dComIfGs_isEventBit(0xA01)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A01)) { mNextMessageNo = 0x608; } else { @@ -536,12 +536,12 @@ void daShip_c::setInitMessage() { } } } - else if (dComIfGs_isEventBit(0xA08)) { - if (dComIfGs_isEventBit(0x2A02)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A08)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2A02)) { mNextMessageNo = 0xd5e; } else { - if (dComIfGs_isEventBit(0xA04)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A04)) { mNextMessageNo = 0x5f9; } else { @@ -549,12 +549,12 @@ void daShip_c::setInitMessage() { } } } - else if (dComIfGs_isEventBit(0xA20)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A20)) { if (dComIfGs_isSymbol(2)) { mNextMessageNo = 0x5f6; } else { - if (dComIfGs_isEventBit(0x2B80)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2B80)) { mNextMessageNo = 0x5f5; } else { @@ -562,8 +562,8 @@ void daShip_c::setInitMessage() { } } } - else if (dComIfGs_isEventBit(0xA80)) { - if (dComIfGs_isEventBit(0x1980)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A80)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1980)) { mNextMessageNo = 0xd5d; } else { @@ -576,12 +576,12 @@ void daShip_c::setInitMessage() { } } } - else if (dComIfGs_isEventBit(0x902)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0902)) { if (dComIfGs_isSymbol(1)) { mNextMessageNo = 0x5ec; } else { - if (dComIfGs_isEventBit(0xA10)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A10)) { mNextMessageNo = 0x5eb; } else { @@ -590,11 +590,11 @@ void daShip_c::setInitMessage() { } } else { - if (dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::RODE_KORL)) { mNextMessageNo = 0xd5c; } else { - if (dComIfGs_isEventBit(0x908)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) { mNextMessageNo = 0x5df; } else { @@ -621,47 +621,47 @@ BOOL daShip_c::setNextMessage(msg_class* msg) { currMessageNo != 0x1687 && currMessageNo != 0x1689) { if (currMessageNo == 0x5e4) { - dComIfGs_onEventBit(0x908); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0908); } else if (currMessageNo == 0x5ea) { - dComIfGs_onEventBit(0xa10); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A10); } else if (currMessageNo == 0x5ed) { - dComIfGs_onEventBit(0xa80); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A80); } else if (currMessageNo == 0x5f4) { - dComIfGs_onEventBit(0x2b80); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2B80); } else if (currMessageNo == 0x5f7) { - dComIfGs_onEventBit(0xa08); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A08); } else if (currMessageNo == 0x5f8) { - dComIfGs_onEventBit(0xa04); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A04); } else if (currMessageNo == 0x607) { - dComIfGs_onEventBit(0xa01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A01); } else if (currMessageNo == 0x622) { - dComIfGs_onEventBit(0x1f01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F01); } else if (currMessageNo == 0x624) { - dComIfGs_onEventBit(0x1f02); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F02); } else if (currMessageNo == 0xd5b) { - dComIfGs_onEventBit(0x2f20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2F20); } else if (currMessageNo == 0x1682) { - dComIfGs_onEventBit(0x3d04); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3D04); #if VERSION > VERSION_DEMO mNextMessageNo = 0; #endif } else if (currMessageNo == 0x1688) { - dComIfGs_onEventBit(0x3f80); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3F80); } else { if (currMessageNo == 0x168c) { - dComIfGs_onEventBit(0x3840); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3840); } else { if (currMessageNo == 0x5e0) { @@ -709,7 +709,7 @@ BOOL daShip_c::setNextMessage(msg_class* msg) { mNextMessageNo = 0x164b; } else if (currMessageNo == 0x164b) { - dComIfGs_onEventBit(0x3201); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3201); mNextMessageNo = 0x164c; } else if (currMessageNo == 0x164d) { @@ -719,7 +719,7 @@ BOOL daShip_c::setNextMessage(msg_class* msg) { mNextMessageNo = 0x164f; } else if (currMessageNo == 0x164f) { - dComIfGs_onEventBit(0x3380); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3380); if (dComIfGs_getTriforceNum() > 0) { mNextMessageNo = 0x1650; } @@ -728,7 +728,7 @@ BOOL daShip_c::setNextMessage(msg_class* msg) { } } else if (currMessageNo == 0x1683) { - dComIfGs_onEventBit(0x3e20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E20); if (dComIfGs_getItem(12) != dItem_NONE_e) { mNextMessageNo = 0x1685; } @@ -1011,7 +1011,7 @@ BOOL daShip_c::checkOutRange() { } if (bVar5) { if ( - (pathIndex == 0 && dComIfGs_isEventBit(0x902)) || + (pathIndex == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0902)) || (pathIndex == 1 && dComIfGs_isSymbol(2)) || (pathIndex == 2 && daPy_getPlayerActorClass()->checkMasterSwordEquip()) ) { @@ -1562,18 +1562,18 @@ BOOL daShip_c::procPaddleMove_init() { current.pos.y -= 50.0f; } - dComIfGs_onEventBit(dSv_evtBit_c::RODE_KORL); + dComIfGs_onEventBit(dSv_event_flag_c::RODE_KORL); - if (dComIfGs_isEventBit(0xA80)) { - dComIfGs_onEventBit(0x1980); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A80)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1980); } - if (dComIfGs_isEventBit(0xA08)) { - dComIfGs_onEventBit(0x2A02); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A08)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2A02); } - if (dComIfGs_isEventBit(0xA02)) { - dComIfGs_onEventBit(0x2A01); + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2A01); } return TRUE; @@ -2628,7 +2628,7 @@ BOOL daShip_c::procTornadoUp_init() { camera->mCamera.Set(current.pos, tornadoPos); m03A6 = 0; fopAcM_seStartCurrent(mTornadoActor, 0x186C, 0); - dComIfGs_onEventBit(0x3E40); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E40); return TRUE; } @@ -2885,7 +2885,7 @@ BOOL daShip_c::procWhirlDown() { } current.pos.y += speed.y; if (m037A == 0 && current.pos.y < m03F4 - 1000.0f) { - dComIfGs_onEventBit(0x1940); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1940); dComIfGp_setNextStage(dComIfGp_getStartStageName(), m03B2, fopAcM_GetRoomNo(this)); m037A = 1; } @@ -3491,7 +3491,7 @@ void daShip_c::setHeadAnm() { } else if ( #if VERSION > VERSION_DEMO - (!dComIfGs_isEventBit(0x3910) || dComIfGs_isEventBit(0x2D02)) && + (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) && #endif (mSph.ChkTgHit() || mCyl[0].ChkTgHit() || mCyl[1].ChkTgHit() || mCyl[2].ChkTgHit())) { @@ -3505,7 +3505,7 @@ void daShip_c::setHeadAnm() { else { if ( #if VERSION > VERSION_DEMO - (!dComIfGs_isEventBit(0x3910) || dComIfGs_isEventBit(0x2D02)) && + (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) && #endif (mSph.ChkTgHit() || mCyl[0].ChkTgHit() || mCyl[1].ChkTgHit() || mCyl[2].ChkTgHit())) { @@ -3521,7 +3521,7 @@ void daShip_c::setHeadAnm() { std::fabsf(mpHeadAnm->getPlaySpeed()) < 0.01f && cM_rnd() < 0.4f && (g_Counter.mTimer & 0x1FF) == 0x1FF && #if VERSION > VERSION_DEMO - (!dComIfGs_isEventBit(0x3910) || dComIfGs_isEventBit(0x2D02)) && + (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) && #endif !checkStateFlg(daSFLG_UNK40000000_e)) { newFileIndex = SHIP_BCK_AKIBI1; @@ -4151,7 +4151,7 @@ BOOL daShip_c::execute() { else if (mCurMode == 8 || distXz > 125.0f) { if ( (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && - (!dComIfGs_isEventBit(0x3910) || dComIfGs_isEventBit(0x2D02))) && + (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02))) && dComIfGp_getMiniGameType() != 1 ) { #if VERSION == VERSION_DEMO @@ -4168,12 +4168,12 @@ BOOL daShip_c::execute() { } else { attention_info.position = current.pos; - if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && dComIfGs_isEventBit(0x908) && !checkStateFlg(daSFLG_UNK800000_e)) { - if (dComIfGs_isEventBit(0x1980) || !dComIfGs_isEventBit(0x902)) { + if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908) && !checkStateFlg(daSFLG_UNK800000_e)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1980) || !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0902)) { attention_info.flags = fopAc_Attn_ACTION_SHIP_e; } else { - if (dComIfGs_isEventBit(0xA80)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A80)) { cXyz* windVec = dKyw_get_wind_vec(); if (abs(cM_atan2s(windVec->x, windVec->z)) < 0x1000) { attention_info.flags = fopAc_Attn_ACTION_SHIP_e; @@ -4241,28 +4241,28 @@ BOOL daShip_c::execute() { } } if ( - (dComIfGs_isEventBit(0x2D10) && !daPy_getPlayerLinkActorClass()->checkMasterSwordEquip()) || - (dComIfGs_isEventBit(0x3804) && !dComIfGs_isEventBit(0x2D02)) || - (dComIfGs_isEventBit(0x3E10) && !dComIfGs_isEventBit(0x3F80)) + (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D10) && !daPy_getPlayerLinkActorClass()->checkMasterSwordEquip()) || + (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3804) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) || + (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E10) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F80)) ) { attention_info.flags &= ~fopAc_Attn_ACTION_SHIP_e; } if (mCurMode != 8 && dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { BOOL r24_2; r24_2 = TRUE; - if (dComIfGs_isEventBit(0x1E40) && !dComIfGs_isEventBit(0x3840)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E40) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3840)) { mNextMessageNo = 0x168c; } - else if (dComIfGs_isEventBit(0x2D02) && !dComIfGs_isEventBit(0x3201)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3201)) { mNextMessageNo = 0x1645; } - else if (dComIfGs_isEventBit(0x1820) && !dComIfGs_isEventBit(0x3380)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3380)) { mNextMessageNo = 0x164d; } - else if(dComIfGs_getTriforceNum() == 8 && !dComIfGs_isEventBit(0x3D04)) { + else if(dComIfGs_getTriforceNum() == 8 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D04)) { mNextMessageNo = 0x1682; } - else if (dComIfGs_isEventBit(0x3E40) && !dComIfGs_isEventBit(0x3E20)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E40) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E20)) { mNextMessageNo = 0x1683; } else { @@ -4565,7 +4565,7 @@ cPhs_State daShip_c::create() { fopAcM_SetupActor(this, daShip_c); - if (!dComIfGs_isEventBit(dSv_evtBit_c::MET_KORL)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::MET_KORL)) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index 3b387cc9e..eda1358b4 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -79,7 +79,7 @@ cPhs_State daSpcItem01_c::_create() { fopAcM_SetupActor(this, daSpcItem01_c); m_itemNo = daSpcItem01_prm::getItemNo(this); - if (m_itemNo == dItem_SHIELD_e && dComIfGs_isEventBit(0xE20)) { + if (m_itemNo == dItem_SHIELD_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E20)) { setLoadError(); return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index 8f5ae4399..92bab0829 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -86,7 +86,7 @@ void daTag_Event_c::demoInitProc() { bk = daTag_getBk(5); dComIfGp_event_setItemPartner(bk); dComIfGp_event_setTalkPartner(bk); - dComIfGs_onEventBit(0x0004); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0004); mDoAud_bgmStart(JA_BGM_BK_FLY_DOWN); break; case 0x2: @@ -94,10 +94,10 @@ void daTag_Event_c::demoInitProc() { if (bk) { bk->m121C = 1; } - dComIfGs_onEventBit(0x0101); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0101); break; case 0x3: - dComIfGs_onEventBit(0x0E20); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0E20); break; case 0x5: mDoAud_bgmAllMute(0x1E); @@ -110,12 +110,12 @@ void daTag_Event_c::demoInitProc() { } case 0x9: u8 r30; - if (!dComIfGs_isEventBit(0x3B20)) { - dComIfGs_onEventBit(0x3B20); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B20)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3B20); r30 = (u8)(s32)cM_rndF(6.0f); - dComIfGs_setEventReg(0xBA0F, r30); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_BA0F, r30); } else { - r30 = dComIfGs_getEventReg(0xBA0F); + r30 = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BA0F); } char password[0x18]; fopMsgM_passwordGet(password, 0x1B37 + r30); @@ -139,16 +139,16 @@ void daTag_Event_c::demoEndProc() { mDoAud_subBgmStart(JA_BGM_MBOSS); break; case 0x8: - dComIfGs_onEventBit(0x2502); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2502); break; case 0xB: - dComIfGs_onEventBit(0x3040); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3040); break; case 0x9: - dComIfGs_onEventBit(0x2110); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2110); break; case 0xA: - dComIfGs_onEventBit(0x3202); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3202); break; } } @@ -269,7 +269,7 @@ BOOL daTag_Event_c::actionArrival() { if (arrivalTerms()) { switch (getType()) { case 0x2: - if (dComIfGs_isEventBit(0x0004)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0004)) { m297 = 7; } else { m297 = 5; @@ -278,9 +278,9 @@ BOOL daTag_Event_c::actionArrival() { actionHunt2(); break; case 0x3: - if (dComIfGs_isEventBit(0x0E20)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E20)) { setActio(ACTION_WAIT); - } else if (!dComIfGs_isEventBit(0x0101)) { + } else if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0101)) { setActio(ACTION_WAIT); } else { setActio(ACTION_HUNT); @@ -288,7 +288,7 @@ BOOL daTag_Event_c::actionArrival() { } break; case 0x5: - if (dComIfGs_isEventBit(0x1101)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101)) { setActio(ACTION_WAIT); } else { setActio(ACTION_HUNT); @@ -296,7 +296,7 @@ BOOL daTag_Event_c::actionArrival() { } break; case 0x9: - if (dComIfGs_isEventBit(0x0A02)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT)) { setActio(ACTION_HUNT); actionHunt(); } else { @@ -304,7 +304,7 @@ BOOL daTag_Event_c::actionArrival() { } break; case 0xA: - if (dComIfGs_isEventBit(0x0E20)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E20)) { setActio(ACTION_HUNT); actionHunt(); } else { @@ -335,7 +335,7 @@ BOOL daTag_Event_c::actionSpeReady() { demoInitProc(); setActio(ACTION_SPE_EVENT); actionSpeEvent(); - dComIfGs_onEventBit(0x2740); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2740); } else { fopAcM_orderOtherEventId(this, mEventIdx); } @@ -358,17 +358,17 @@ BOOL daTag_Event_c::actionSpeHunt() { /* 00000DF0-00000F20 .text actionSpeArrival__13daTag_Event_cFv */ BOOL daTag_Event_c::actionSpeArrival() { - if (dComIfGs_isEventBit(0x1001)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1001)) { setActio(ACTION_WAIT); return TRUE; } - if (!dComIfGs_isEventBit(0x1820)) { - if (dComIfGs_isEventBit(0x2740)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2740)) { setActio(ACTION_WAIT); return TRUE; } mEventIdx = dComIfGp_evmng_getEventIdx("SUPERELF"); - } else if (dComIfGs_isEventBit(0x2740)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2740)) { mEventIdx = dComIfGp_evmng_getEventIdx("fairy_flag_on_Jmp"); } else { mEventIdx = dComIfGp_evmng_getEventIdx("fairy_Jmp"); diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index 58fb60f58..f692e5f5f 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -31,8 +31,8 @@ void daTag_Gship_c::modeClearWait() { /* 000001C0-00000214 .text modeClearEventInit__13daTag_Gship_cFv */ void daTag_Gship_c::modeClearEventInit() { - dComIfGs_getEventReg(0x8803); - dComIfGs_setEventReg(0x8803, 3); + dComIfGs_getEventReg(dSv_event_flag_c::UNK_8803); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_8803, 3); } /* 00000214-00000418 .text modeClearEvent__13daTag_Gship_cFv */ @@ -40,7 +40,7 @@ void daTag_Gship_c::modeClearEvent() { if(eventInfo.checkCommandDemoAccrpt()) { int staffIdx = dComIfGp_evmng_getMyStaffId("PScnChg"); if(strcmp(dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx), "WARAIGOE") == 0) { - if(dComIfGs_getEventReg(0x8803) == 3) { + if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_8803) == 3) { mDoAud_seStart(JA_SE_CV_G_SHIP_SCREAM); } else { mDoAud_seStart(JA_SE_CV_G_SHIP_LAUGH); @@ -51,8 +51,8 @@ void daTag_Gship_c::modeClearEvent() { if(dComIfGp_evmng_endCheck("PSHIP_CLEAR")) { mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP); - u8 room = dComIfGs_getEventReg(0xC3FF); - s8 spawn = dComIfGs_getEventReg(0x85FF); + u8 room = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C3FF); + s8 spawn = dComIfGs_getEventReg(dSv_event_flag_c::UNK_85FF); dKy_set_nexttime(120.0f); dComIfGp_setNextStage("sea", spawn, room, 0xFF, 0.0f, 5); } diff --git a/src/d/actor/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp index cb3619c8b..57003f1fa 100644 --- a/src/d/actor/d_a_tag_hint.cpp +++ b/src/d/actor/d_a_tag_hint.cpp @@ -82,7 +82,7 @@ s32 daTag_Hint_c::arrivalTerms() { } break; case 0x11: - if (!dComIfGs_isEventBit(0x4020)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_4020)) { return 0; } } @@ -98,7 +98,7 @@ s32 daTag_Hint_c::arrivalTerms() { m2A0 = 0xe10; break; case 9: - if (!dComIfGs_isTmpBit(0x308)) { + if (!dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0308)) { return 0; } m2A0 = 600; @@ -153,12 +153,12 @@ s32 daTag_Hint_c::waitTerms() { if (uVar1 != 0xff) { dComIfGs_onSwitch(uVar1, fopAcM_GetRoomNo(this)); } - dComIfGs_onEventBit(0x404); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0404); return 1; } break; case 6: - if (dComIfGs_isEventBit(0x2a10)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2A10)) { #if VERSION == VERSION_DEMO if (uVar1 != 0xFF) { dComIfGs_onSwitch(uVar1, fopAcM_GetRoomNo(this)); @@ -173,11 +173,11 @@ s32 daTag_Hint_c::waitTerms() { } break; case 9: - if (dComIfGs_isTmpBit(0x304)) { + if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0304)) { return 1; } - if (dComIfGs_isEventBit(0x1801)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1801)) { return 1; } break; @@ -201,12 +201,12 @@ s32 daTag_Hint_c::waitTerms() { } break; case 0xe: - if (dComIfGs_isEventBit(0x3c01)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3C01)) { return 1; } break; case 0xf: - if (dComIfGs_isEventBit(0x3f20)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F20)) { return 1; } break; @@ -268,14 +268,14 @@ s32 daTag_Hint_c::otherCheck() { break; case 1: - dComIfGs_onEventBit(0x404); - if (dComIfGs_isEventBit(0x401) == 0) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0404); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0401) == 0) { return 0; } break; case 6: - if (dComIfGs_getEventReg(0xa507) < 3) { + if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_A507) < 3) { return 0; } break; @@ -448,7 +448,7 @@ void daTag_Hint_c::startProc() { u8 type = getType(); switch (type) { case 0: - dComIfGs_onEventBit(0x401); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0401); break; #if VERSION > VERSION_DEMO case 6: @@ -728,11 +728,11 @@ static BOOL daTag_Hint_Delete(daTag_Hint_c* i_this) { switch (i_this->getType()) { case 9: - dComIfGs_offTmpBit(0x308); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0308); break; case 17: - dComIfGs_offEventBit(0x4020); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_4020); break; } return TRUE; @@ -747,7 +747,7 @@ cPhs_State daTag_Hint_c::create() { s32 uVar2 = getSwbit(); switch (getType()) { case 1: - if (dComIfGs_isEventBit(0x404) && uVar2 != 0xff) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0404) && uVar2 != 0xff) { dComIfGs_onSwitch(uVar2, fopAcM_GetRoomNo(this)); } break; diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index f006223da..d8374a33d 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -83,13 +83,13 @@ void daTag_Island_c::makeEvId() { /* 00000354-000003D4 .text getArrivalFlag__14daTag_Island_cFv */ u16 daTag_Island_c::getArrivalFlag() { switch (getType()) { - case 1: return 0x0902; - case 2: return 0x0A20; - case 3: return 0x0A02; - case 4: return 0x1F04; - case 5: return 0x2E04; - case 6: return 0x2E02; - case 7: return 0x3E10; + case 1: return dSv_event_flag_c::UNK_0902; + case 2: return dSv_event_flag_c::UNK_0A20; + case 3: return dSv_event_flag_c::ENDLESS_NIGHT; + case 4: return dSv_event_flag_c::UNK_1F04; + case 5: return dSv_event_flag_c::UNK_2E04; + case 6: return dSv_event_flag_c::UNK_2E02; + case 7: return dSv_event_flag_c::UNK_3E10; default: return 0; } } @@ -98,11 +98,11 @@ u16 daTag_Island_c::getArrivalFlag() { BOOL daTag_Island_c::otherCheck() { switch (getType()) { case 5: - if (!dComIfGs_isEventBit(0x1608)) + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1608)) return FALSE; break; case 6: - if (!dComIfGs_isEventBit(0x1604)) + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1604)) return FALSE; break; } diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index d195b92fd..534d039cb 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -240,7 +240,7 @@ cPhs_State daTag_Msg_c::create() { int swBit; fopAcM_SetupActor(this, daTag_Msg_c); swBit = (int)(getSwbit() & 0xFF); - if ((getMessage() == 0x9c5) && dComIfGs_isEventBit(0x502)) { + if ((getMessage() == 0x9c5) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0502)) { setActio(0); } else if ((s32)swBit != 0xff && dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(this)) != 0) { setActio(0); diff --git a/src/d/actor/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp index 69fc5d63d..392f70088 100644 --- a/src/d/actor/d_a_tag_photo.cpp +++ b/src/d/actor/d_a_tag_photo.cpp @@ -222,7 +222,7 @@ void daTagPhoto_c::eventOrder() { void daTagPhoto_c::eventMove() { if(dComIfGp_evmng_endCheck(mPhotoTalkEventIdx) || dComIfGp_evmng_endCheck(mPhotoTalk2EventIdx)) { dComIfGp_event_reset(); - dComIfGs_onEventBit(0x1601); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1601); } else { bool attn = mEventCut.getAttnFlag(); diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp index ff51c185c..20f010bec 100644 --- a/src/d/actor/d_a_tag_volcano.cpp +++ b/src/d/actor/d_a_tag_volcano.cpp @@ -34,7 +34,7 @@ cPhs_State daTagvolcano::Act_c::_create() { if (mType == 0) { if (current.roomNo == dIsleRoom_FireMountain_e) { - if (dComIfGs_isEventBit(0x1902)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1902)) { fopAcM_onSwitch(this, prm_get_swSave()); } else if (dComIfGs_getStartPoint() == 2 && current.roomNo == dComIfGs_getRestartRoomNo()) { field_0x2a0 = 10; @@ -43,7 +43,7 @@ cPhs_State daTagvolcano::Act_c::_create() { fopAcM_offSwitch(this, prm_get_swSave()); } } else { - if (dComIfGs_isEventBit(0x1901)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1901)) { fopAcM_onSwitch(this, prm_get_swSave()); } else if (dComIfGs_getStartPoint() == 2 && current.roomNo == dComIfGs_getRestartRoomNo()) { field_0x2a0 = 10; @@ -134,9 +134,9 @@ bool daTagvolcano::Act_c::_execute() { if (dComIfG_getTimerPtr() != NULL && dComIfG_getTimerMode() == 3) dComIfG_TimerDeleteRequest(); if (mType == 1) - dComIfGs_onEventBit(0x1902); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1902); else - dComIfGs_onEventBit(0x1901); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1901); field_0x2a4 = 0; } else if (dComIfG_getTimerPtr() != NULL) { if (dComIfGp_event_runCheck()) { diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index efe398fbf..57a2e6d2d 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -69,7 +69,7 @@ BOOL daTornado_c::draw() { mBtk.entry(mpModel->getModelData(), mBtkFrame); mBrk.entry(mpModel->getModelData(), mBrkFrame); - if (dComIfGs_isTmpBit(0x404)) { + if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0404)) { dComIfGd_setListMaskOff(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); @@ -180,7 +180,7 @@ BOOL daTornado_c::execute() { fopAcM_seStartCurrent(this, JA_SE_OBJ_TORNADE_SUS, 100); - if (dComIfGs_isEventBit(0x2710)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2710)) { mPtclCb.remove(); daShip_c* ship = dComIfGp_getShipActor(); if (ship != NULL) { @@ -315,7 +315,7 @@ cPhs_State daTornado_c::create() { } } else { fopAcM_SetParam(this, 0); - if (dComIfGs_isEventBit(0x2710)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2710)) { return cPhs_ERROR_e; } dKyw_tornado_Notice(¤t.pos); diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index 68a935d42..2be33e667 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -117,15 +117,15 @@ void daWarpdm20_c::CreateInit() { m2E0 = current.pos; m2EC.set(1.0f, 1.0f, 1.0f); m2C8 = 0; - if (dComIfGs_isEventBit(0x2d08)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D08)) { m2CC = 1; setEndAnm(); } mEventIdx = dComIfGp_evmng_getEventIdx("TO_HYRULE_WARP", 0xff); - if (dComIfGs_isEventBit(0x2d02)) { - dComIfGs_onEventBit(0x1820); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) { + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1820); } } @@ -187,7 +187,7 @@ void daWarpdm20_c::normal_execute() { f32 abs = (player->current.pos - current.pos).absXZ(); f32 max = 2000.0f; - if (dComIfGs_isEventBit(0x2d08)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D08)) { m2CC = 1; animPlay(); if (emitter != NULL) { diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index b89e9e95f..9576dcf8c 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -131,7 +131,7 @@ void daWarphr_c::CreateInit() { fopAcM_setCullSizeBox(this, -300.0f, 0.0f, -300.0f, 300.0f, 5000.0f, 300.0f); fopAcM_setCullSizeFar(this, 1.0f); set_mtx(); - if (dComIfGs_isEventBit(0x2d08)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D08)) { m2F8 = dComIfGp_evmng_getEventIdx("TO_SEA_WARP_2"); } else { m2F8 = dComIfGp_evmng_getEventIdx("TO_SEA_WARP_1"); @@ -206,7 +206,7 @@ bool daWarphr_c::_execute() { BOOL daWarphr_c::normal_execute() { if (check_warp() != 0) { if (get_return_count() == 0) { - dComIfGs_onEventBit(0x3810); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3810); } m2F0 = 2; } @@ -398,7 +398,7 @@ s32 daWarphr_c::get_return_count() { return 0; } - return dComIfGs_isEventBit(0x1001) ? 2 : 1; + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1001) ? 2 : 1; } /* 0000134C-000014F0 .text check_warp__10daWarphr_cFv */ diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index 641c945bb..bffc6afef 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -112,12 +112,12 @@ bool daYgcwp_c::_delete() { /* 000004A0-000004D0 .text check_ev__9daYgcwp_cCFv */ BOOL daYgcwp_c::check_ev() const { - return dComIfGs_isTmpBit(0x0480); + return dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0480); } /* 000004D0-00000500 .text off_ev__9daYgcwp_cCFv */ void daYgcwp_c::off_ev() const { - dComIfGs_offTmpBit(0x0480); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0480); } /* 00000500-00000588 .text init_mtx__9daYgcwp_cFv */ diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 8009479c4..244026961 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -192,68 +192,68 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) { if (strcmp(dComIfGp_getStartStageName(), "sea") == 0) { if (i_roomNo == dIsleRoom_OutsetIsland_e) { - if (dComIfGs_isEventBit(0x520)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { return layer | 4; - } else if (dComIfGs_isEventBit(0xE20)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E20)) { return layer | 2; - } else if (dComIfGs_isEventBit(0x101)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0101)) { return 9; } } else if (i_roomNo == dIsleRoom_WindfallIsland_e) { - if (dComIfGs_isEventBit(0x2D01)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { return layer | 4; } else if (dKy_checkEventNightStop()) { return layer | 2; } } else if (i_roomNo == dIsleRoom_ForsakenFortress_e) { - return dComIfGs_isEventBit(0x1820) ? 3 : 1; + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) ? 3 : 1; } } else if (strcmp(dComIfGp_getStartStageName(), "A_mori") == 0) { - if (dComIfGs_isEventBit(0xF80)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::MET_KORL)) { return layer | 2; } } else if (strcmp(dComIfGp_getStartStageName(), "Asoko") == 0) { - if (dComIfGs_isEventBit(0x520)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { return layer | 2; } } else if (strcmp(dComIfGp_getStartStageName(), "Hyrule") == 0) { if (dComIfGs_getTriforceNum() == 8) { return layer | 4; - } else if (dComIfGs_isEventBit(0x3280)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3280)) { return layer | 2; } } else if (strcmp(dComIfGp_getStartStageName(), "Hyroom") == 0) { - if (dComIfGs_getTriforceNum() == 8 && !dComIfGs_isEventBit(0x2C01)) { + if (dComIfGs_getTriforceNum() == 8 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2C01)) { return layer | 4; - } else if (dComIfGs_isEventBit(0x3280)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3280)) { return layer | 2; - } else if (dComIfGs_isEventBit(0x3B40)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B40)) { return layer | 6; } } else if (strcmp(dComIfGp_getStartStageName(), "kenroom") == 0) { #if VERSION <= VERSION_JPN - if (dComIfGs_isEventBit(0x2C01)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2C01)) { #else - if (dComIfGs_isEventBit(0x2C01) || - (dComIfGs_isEventBit(dSv_evtBit_c::COLORS_IN_HYRULE) && !dComIfGs_isEventBit(0x3280))) + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2C01) || + (dComIfGs_isEventBit(dSv_event_flag_c::COLORS_IN_HYRULE) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3280))) { #endif return layer | 6; } else if (dComIfGs_getTriforceNum() == 8) { return layer | 4; - } else if (dComIfGs_isEventBit(VERSION_SELECT(0x3280, 0x3280, dSv_evtBit_c::COLORS_IN_HYRULE, dSv_evtBit_c::COLORS_IN_HYRULE))) { + } else if (dComIfGs_isEventBit(VERSION_SELECT(dSv_event_flag_c::UNK_3280, dSv_event_flag_c::UNK_3280, dSv_event_flag_c::COLORS_IN_HYRULE, dSv_event_flag_c::COLORS_IN_HYRULE))) { return layer | 2; } } else if (strcmp(dComIfGp_getStartStageName(), "M2tower") == 0) { - if (dComIfGs_isEventBit(0x2D01)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { return layer | 2; } } else if (strcmp(dComIfGp_getStartStageName(), "GanonK") == 0) { - if (!dComIfGs_isEventBit(0x3B02)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B02)) { return 8; } } else if (strcmp(dComIfGp_getStartStageName(), "GTower") == 0) { - if (!dComIfGs_isEventBit(0x4002)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_4002)) { return 8; } } @@ -1101,12 +1101,12 @@ BOOL dComIfGs_checkSeaLandingEvent(s8 i_roomNo) { }; static landing_event l_landingEvent[] = { - {1, 0x3040}, - {4, 0x2E02}, - {13, 0x902}, - {23, dSv_evtBit_c::ENDLESS_NIGHT}, - {41, 0xA20}, - {45, 0x2E04}, + {dIsleRoom_ForsakenFortress_e, dSv_event_flag_c::UNK_3040}, + {dIsleRoom_GaleIsle_e, dSv_event_flag_c::UNK_2E02}, + {dIsleRoom_DragonRoostIsland_e, dSv_event_flag_c::UNK_0902}, + {dIsleRoom_GreatfishIsle_e, dSv_event_flag_c::ENDLESS_NIGHT}, + {dIsleRoom_ForestHaven_e, dSv_event_flag_c::UNK_0A20}, + {dIsleRoom_HeadstoneIsland_e, dSv_event_flag_c::UNK_2E04}, }; landing_event* event_check = l_landingEvent; @@ -1133,12 +1133,12 @@ void dComIfGs_setGameStartStage() { }; static check_data l_checkData[] = { - {true, dSv_evtBit_c::RODE_KORL, "", 0, 0}, - {true, dSv_evtBit_c::MET_KORL, "sea", 11, 128}, - {true, 0x801, "MajyuE", 0, 0}, - {true, 0x808, "MajyuE", 0, 18}, - {true, 0x2401, "A_umikz", 0, 204}, - {false, 0, "sea", 44, 128}, + {true, dSv_event_flag_c::RODE_KORL, "", 0, 0}, + {true, dSv_event_flag_c::MET_KORL, "sea", dIsleRoom_WindfallIsland_e, 128}, + {true, dSv_event_flag_c::UNK_0801, "MajyuE", 0, 0}, + {true, dSv_event_flag_c::UNK_0808, "MajyuE", 0, 18}, + {true, dSv_event_flag_c::UNK_2401, "A_umikz", 0, 204}, + {false, 0, "sea", dIsleRoom_OutsetIsland_e, 128}, }; check_data* data_p = l_checkData; @@ -1165,8 +1165,8 @@ void dComIfGs_setGameStartStage() { if (!isNot_PShip) { strcpy(stage_name, "sea"); - room_no = dComIfGs_getEventReg(0xC3FF); - point = dComIfGs_getEventReg(0x85FF); + room_no = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C3FF); + point = dComIfGs_getEventReg(dSv_event_flag_c::UNK_85FF); dKy_set_nexttime(120.0f); } else if (stage_type == dStageType_SEA_e) { daPy_lk_c* player_p = daPy_getPlayerLinkActorClass(); @@ -1272,16 +1272,16 @@ void dComIfGs_setPlayerRecollectionData() { #endif u32 tbl; - if (strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0 && dComIfGs_isEventBit(0x3d80) != 0) { + if (strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D80) != 0) { tbl = 0; dComIfGp_setPlayerInfoBufferStageNo(1); - } else if (strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0 && dComIfGs_isEventBit(0x3d40) != 0) { + } else if (strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D40) != 0) { tbl = 1; dComIfGp_setPlayerInfoBufferStageNo(2); - } else if (strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0 && dComIfGs_isEventBit(0x3d20) != 0) { + } else if (strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D20) != 0) { tbl = 2; dComIfGp_setPlayerInfoBufferStageNo(3); - } else if (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0 && dComIfGs_isEventBit(0x3d10) != 0) { + } else if (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D10) != 0) { tbl = 3; dComIfGp_setPlayerInfoBufferStageNo(4); } else { diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 0b1893073..ed7624293 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -113,15 +113,24 @@ const f32 daWindTag::daWindTag_c::mData[] = { }; const u16 daSalvage_c::m_savelabel[] = { - 0x2080, 0x2004, - 0x2002, 0x2804, - 0x2802, 0x2801, - 0x2980, 0x2940, - 0x3B01, 0x3C80, - 0x3C40, 0x3C20, - 0x3C10, 0x3C08, - 0x3C04, 0x3C02, + dSv_event_flag_c::UNK_2080, + dSv_event_flag_c::UNK_2004, + dSv_event_flag_c::UNK_2002, + dSv_event_flag_c::UNK_2804, + dSv_event_flag_c::UNK_2802, + dSv_event_flag_c::UNK_2801, + dSv_event_flag_c::UNK_2980, + dSv_event_flag_c::UNK_2940, + dSv_event_flag_c::UNK_3B01, + dSv_event_flag_c::UNK_3C80, + dSv_event_flag_c::UNK_3C40, + dSv_event_flag_c::UNK_3C20, + dSv_event_flag_c::UNK_3C10, + dSv_event_flag_c::UNK_3C08, + dSv_event_flag_c::UNK_3C04, + dSv_event_flag_c::UNK_3C02, }; + dSalvage_control_c* daSalvage_c::mTagData_p; s8 daSalvage_c::mNowRoomNo; int daSalvage_c::mSalvageId; @@ -142,7 +151,7 @@ u8 daObjLight::Act_c::M_S_lod_access; bool daObjLight::Act_c::renew_light_angle() { M_S_lod_access = 1; if (dKy_daynight_check() == dKy_TIME_NIGHT_e) { - if (dComIfGs_isEventBit(0x1C02) == 1) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1C02) == 1) { set_light_dif_angle_LOD(get_light_dif_angle() + 0x80); return true; } @@ -187,26 +196,46 @@ BOOL daObjLight::Act_c::set_light_dif_angle_FRRS(s16 r3) { s8 daDai_c::mNowDaizaNum; s8 daDai_c::mNowItemNum; const u16 daDai_c::m_savelabel[] = { - 0xF8FF, 0xF7FF, - 0xF6FF, 0xF5FF, - 0xF4FF, 0xF3FF, - 0xF2FF, 0xF1FF, - 0xF0FF, 0xEFFF, - 0xEEFF, 0xEDFF, - 0xECFF, 0xEBFF, - 0xEAFF, 0xE9FF, - 0xE8FF, 0xE7FF, - 0xE6FF, 0xE5FF, - 0xE4FF, 0xE3FF, - 0xE2FF, 0xE1FF, - 0xE0FF, 0xDFFF, - 0xDEFF, 0xDDFF, - 0xDCFF, 0xDBFF, - 0xDAFF, 0xD9FF, - 0xD8FF, 0xD7FF, - 0xD6FF, 0xD5FF, - 0xD4FF, 0xD3FF, - 0xD2FF, 0xD1FF, + dSv_event_flag_c::UNK_F8FF, + dSv_event_flag_c::UNK_F7FF, + dSv_event_flag_c::UNK_F6FF, + dSv_event_flag_c::UNK_F5FF, + dSv_event_flag_c::UNK_F4FF, + dSv_event_flag_c::UNK_F3FF, + dSv_event_flag_c::UNK_F2FF, + dSv_event_flag_c::UNK_F1FF, + dSv_event_flag_c::UNK_F0FF, + dSv_event_flag_c::UNK_EFFF, + dSv_event_flag_c::UNK_EEFF, + dSv_event_flag_c::UNK_EDFF, + dSv_event_flag_c::UNK_ECFF, + dSv_event_flag_c::UNK_EBFF, + dSv_event_flag_c::UNK_EAFF, + dSv_event_flag_c::UNK_E9FF, + dSv_event_flag_c::UNK_E8FF, + dSv_event_flag_c::UNK_E7FF, + dSv_event_flag_c::UNK_E6FF, + dSv_event_flag_c::UNK_E5FF, + dSv_event_flag_c::UNK_E4FF, + dSv_event_flag_c::UNK_E3FF, + dSv_event_flag_c::UNK_E2FF, + dSv_event_flag_c::UNK_E1FF, + dSv_event_flag_c::UNK_E0FF, + dSv_event_flag_c::UNK_DFFF, + dSv_event_flag_c::UNK_DEFF, + dSv_event_flag_c::UNK_DDFF, + dSv_event_flag_c::UNK_DCFF, + dSv_event_flag_c::UNK_DBFF, + dSv_event_flag_c::UNK_DAFF, + dSv_event_flag_c::UNK_D9FF, + dSv_event_flag_c::UNK_D8FF, + dSv_event_flag_c::UNK_D7FF, + dSv_event_flag_c::UNK_D6FF, + dSv_event_flag_c::UNK_D5FF, + dSv_event_flag_c::UNK_D4FF, + dSv_event_flag_c::UNK_D3FF, + dSv_event_flag_c::UNK_D2FF, + dSv_event_flag_c::UNK_D1FF, }; /* 800568A8-800568B0 .text getMaxDaiza__7daDai_cFv */ diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp index 4ef90e4b5..38100a037 100644 --- a/src/d/d_door.cpp +++ b/src/d/d_door.cpp @@ -780,27 +780,27 @@ void dDoor_hkyo_c::proc(dDoor_info_c* door) { switch (m11) { case 1: - if (dComIfGs_isTmpBit(0x108)) + if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0108)) setAnm(1); - else if (dComIfGs_isTmpBit(0x110)) + else if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0110)) setAnm(2); else setAnm(0); break; case 4: - if (dComIfGs_isEventBit(0x1710)) + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1710)) setAnm(0); else setAnm(3); break; case 3: - if (!dComIfGs_isTact(2) || dComIfGs_isEventBit(0x1704)) + if (!dComIfGs_isTact(2) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1704)) setAnm(0); else setAnm(3); break; case 2: - if (!dComIfGs_isEventBit(0x1704) || dComIfGs_isEventBit(0x1b01)) + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1704) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1B01)) setAnm(0); else setAnm(3); @@ -823,7 +823,7 @@ BOOL dDoor_hkyo_c::chkFirst() { switch (mAnmIdx) { case 1: - if (!dComIfGs_isEventBit(0x2602)) + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2602)) return TRUE; break; } @@ -834,8 +834,8 @@ BOOL dDoor_hkyo_c::chkFirst() { /* 8006D784-8006D7E8 .text onFirst__12dDoor_hkyo_cFv */ void dDoor_hkyo_c::onFirst() { switch (mAnmIdx) { - case 1: dComIfGs_onEventBit(0x2602); break; - case 2: dComIfGs_onEventBit(0x2601); break; + case 1: dComIfGs_onEventBit(dSv_event_flag_c::UNK_2602); break; + case 2: dComIfGs_onEventBit(dSv_event_flag_c::UNK_2601); break; } } diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 36c180842..e5c4f33aa 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -597,9 +597,9 @@ void dEvent_manager_c::exceptionProc() { if (startCheck(eventIdx)) { mException.mState = 2; if (strcmp(eventName, "MEETSHISHIOH") == 0) - dComIfGs_onEventBit(0x0F80); + dComIfGs_onEventBit(dSv_event_flag_c::MET_KORL); if (strcmp(eventName, "look_tetra") == 0) - dComIfGs_onEventBit(0x0280); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_0280); } else { fopAcM_orderOtherEvent(NULL, (char*)eventName); } diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 81048c41e..d784bc100 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -1425,47 +1425,47 @@ void item_func_tincle_rupee6() { /* 800C4DB4-800C4DE4 .text item_func_lithograph1__Fv */ void item_func_lithograph1() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_1); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_1); } /* 800C4DE4-800C4E14 .text item_func_lithograph2__Fv */ void item_func_lithograph2() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_2); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_2); } /* 800C4E14-800C4E44 .text item_func_lithograph3__Fv */ void item_func_lithograph3() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_3); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_3); } /* 800C4E44-800C4E74 .text item_func_lithograph4__Fv */ void item_func_lithograph4() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_4); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_4); } /* 800C4E74-800C4EA4 .text item_func_lithograph5__Fv */ void item_func_lithograph5() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_5); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_5); } /* 800C4EA4-800C4ED4 .text item_func_lithograph6__Fv */ void item_func_lithograph6() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_6); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_6); } /* 800C4ED4-800C4F04 .text item_func_collectmap64__Fv */ void item_func_collectmap64() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_7); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_7); } /* 800C4F04-800C4F34 .text item_func_collectmap63__Fv */ void item_func_collectmap63() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_8); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_8); } /* 800C4F34-800C4F64 .text item_func_collectmap62__Fv */ void item_func_collectmap62() { - dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_9); + dComIfGs_onEventBit(dSv_event_flag_c::LITHOGRAPH_9); } /* 800C4F64-800C4FB8 .text item_func_collectmap61__Fv */ @@ -2532,52 +2532,52 @@ int item_getcheck_func_xxx_039() { /* 800C77E4-800C7814 .text item_getcheck_func_lithograph1__Fv */ int item_getcheck_func_lithograph1() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_1); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_1); } /* 800C7814-800C7844 .text item_getcheck_func_lithograph2__Fv */ int item_getcheck_func_lithograph2() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_2); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_2); } /* 800C7844-800C7874 .text item_getcheck_func_lithograph3__Fv */ int item_getcheck_func_lithograph3() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_3); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_3); } /* 800C7874-800C78A4 .text item_getcheck_func_lithograph4__Fv */ int item_getcheck_func_lithograph4() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_4); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_4); } /* 800C78A4-800C78D4 .text item_getcheck_func_lithograph5__Fv */ int item_getcheck_func_lithograph5() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_5); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_5); } /* 800C78D4-800C7904 .text item_getcheck_func_lithograph6__Fv */ int item_getcheck_func_lithograph6() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_6); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_6); } /* 800C7904-800C7934 .text item_getcheck_func_lithograph7__Fv */ int item_getcheck_func_lithograph7() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_7); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_7); } /* 800C7934-800C7964 .text item_getcheck_func_lithograph8__Fv */ int item_getcheck_func_lithograph8() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_8); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_8); } /* 800C7964-800C7994 .text item_getcheck_func_lithograph9__Fv */ int item_getcheck_func_lithograph9() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_9); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_9); } /* 800C7994-800C79C4 .text item_getcheck_func_lithograph10__Fv */ int item_getcheck_func_lithograph10() { - return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_10); + return dComIfGs_isEventBit(dSv_event_flag_c::LITHOGRAPH_10); } /* 800C79C4-800C79F4 .text item_getcheck_func_lithograph11__Fv */ diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index e5ad727b5..15c9fe4fa 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -3164,7 +3164,7 @@ void dKy_arrowcol_chg_move() { /* 80196764-801967C4 .text dKy_checkEventNightStop__Fv */ BOOL dKy_checkEventNightStop() { - if (dComIfGs_isEventBit(dSv_evtBit_c::ENDLESS_NIGHT) && !dComIfGs_isSymbol(0)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_isSymbol(0)) { return true; } diff --git a/src/d/d_kankyo_dayproc.inc b/src/d/d_kankyo_dayproc.inc index 7e9ee335a..b2e2e7ea2 100644 --- a/src/d/d_kankyo_dayproc.inc +++ b/src/d/d_kankyo_dayproc.inc @@ -6,103 +6,103 @@ /* 80197AB8-80197FE4 .text dKankyo_DayProc__Fv */ static void dKankyo_DayProc() { - if (dComIfGs_isEventBit(0x1820)) - dLetter_autoStock(0x8b03); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) + dLetter_autoStock(dSv_event_flag_c::LETTER_ARYLL); - if (dComIfGs_isEventBit(0x1820) && dComIfGs_isEventBit(0x0b80)) - dLetter_autoStock(0xb203); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) + dLetter_autoStock(dSv_event_flag_c::LETTER_TINGLE); - dLetter_delivery(0xac03); - dLetter_delivery(0xae03); - dLetter_delivery(0xb003); - dLetter_delivery(0xaf03); - dLetter_delivery(0x9d03); + dLetter_delivery(dSv_event_flag_c::LETTER_BAITOS_MOM); + dLetter_delivery(dSv_event_flag_c::LETTER_HOSKITS_GIRLFRIEND); + dLetter_delivery(dSv_event_flag_c::LETTER_SILVER_MEMBERSHIP); + dLetter_delivery(dSv_event_flag_c::LETTER_GOLD_MEMBERSHIP); + dLetter_delivery(dSv_event_flag_c::LETTER_GRANDMA); - u8 clamped = cLib_maxLimit(dComIfGs_getEventReg(0xcf03) + 1, 3); - dComIfGs_setEventReg(0xcf03, clamped); - clamped = cLib_maxLimit(dComIfGs_getEventReg(0xab03) + 1, 3); - dComIfGs_setEventReg(0xab03, clamped); + u8 clamped = cLib_maxLimit(dComIfGs_getEventReg(dSv_event_flag_c::UNK_CF03) + 1, 3); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_CF03, clamped); + clamped = cLib_maxLimit(dComIfGs_getEventReg(dSv_event_flag_c::UNK_AB03) + 1, 3); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_AB03, clamped); if (dComIfGs_isGetItemReserve(0x0F) && dComIfGs_checkReserveItem(MO_LETTER) == 0) { - clamped = cLib_maxLimit(dComIfGs_getEventReg(0xccff) + 1, 2); - dComIfGs_setEventReg(0xccff, clamped); + clamped = cLib_maxLimit(dComIfGs_getEventReg(dSv_event_flag_c::UNK_CCFF) + 1, 2); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_CCFF, clamped); } - dComIfGs_setEventReg(0xbcff, 0); - dComIfGs_setEventReg(0xcb03, 0); - dComIfGs_setEventReg(0xca03, 0); - dComIfGs_setEventReg(0xc903, 0); - dComIfGs_offEventBit(0x1304); - dComIfGs_offEventBit(0x1302); - dComIfGs_offEventBit(0x1301); - dComIfGs_offTmpBit(0x0120); - dComIfGs_offTmpBit(0x0040); - dComIfGs_offTmpBit(0x0020); - dComIfGs_offTmpBit(0x0010); - dComIfGs_offTmpBit(0x0008); - dComIfGs_offTmpBit(0x0004); - dComIfGs_offTmpBit(0x0002); - dComIfGs_offTmpBit(0x0001); - dComIfGs_offTmpBit(0x0180); - dComIfGs_offTmpBit(0x0140); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_BCFF, 0); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_CB03, 0); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_CA03, 0); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C903, 0); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_1304); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_1302); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_1301); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0120); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0040); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0020); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0010); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0008); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0004); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0002); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0001); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0180); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0140); #if VERSION > VERSION_DEMO - dComIfGs_offTmpBit(0x0580); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0580); #endif - dComIfGs_offTmpBit(0x0104); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0104); - if (dComIfGs_getEventReg(0xc103) == 1) - dComIfGs_setEventReg(0xc103, 2); + if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C103) == 1) + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C103, 2); - if (dComIfGs_isEventBit(0x1f10)) { - u8 reg = dComIfGs_getEventReg(0xbb07); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F10)) { + u8 reg = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BB07); if (reg == 7) { - dComIfGs_onEventBit(0x1f08); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F08); } else { clamped = cLib_maxLimit(reg + 1, 7); - dComIfGs_setEventReg(0xbb07, clamped); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_BB07, clamped); } } - if (dComIfGs_getEventReg(0xc407) == 6) - dComIfGs_setEventReg(0xc407, 7); + if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C407) == 6) + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C407, 7); - u8 reg = dComIfGs_getEventReg(0xb907); + u8 reg = dComIfGs_getEventReg(dSv_event_flag_c::UNK_B907); if (reg & 1) - dComIfGs_setEventReg(0xb907, reg + 1); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_B907, reg + 1); - dComIfGs_offEventBit(0x2680); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2680); #if VERSION > VERSION_JPN - if (dComIfGs_isEventBit(0x2a20)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2A20)) { #endif - clamped = cLib_maxLimit(dComIfGs_getEventReg(0xa60f) + 1, 3); - dComIfGs_setEventReg(0xa60f, clamped); + clamped = cLib_maxLimit(dComIfGs_getEventReg(dSv_event_flag_c::UNK_A60F) + 1, 3); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_A60F, clamped); #if VERSION > VERSION_JPN } #endif if (dKy_get_dayofweek() == 5) { - dComIfGs_offEventBit(0x2080); - dComIfGs_offEventBit(0x2004); - dComIfGs_offEventBit(0x2002); - dComIfGs_offEventBit(0x2804); - dComIfGs_offEventBit(0x2802); - dComIfGs_offEventBit(0x2801); - dComIfGs_offEventBit(0x2980); - dComIfGs_offEventBit(0x2940); - dComIfGs_offEventBit(0x3b01); - dComIfGs_offEventBit(0x3c80); - dComIfGs_offEventBit(0x3c40); - dComIfGs_offEventBit(0x3c20); - dComIfGs_offEventBit(0x3c10); - dComIfGs_offEventBit(0x3c08); - dComIfGs_offEventBit(0x3c04); - dComIfGs_offEventBit(0x3c02); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2080); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2004); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2002); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2804); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2802); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2801); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2980); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2940); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3B01); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3C80); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3C40); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3C20); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3C10); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3C08); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3C04); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_3C02); } - dComIfGs_offTmpBit(0x0208); - if (dComIfGs_isEventBit(0x2f01)) - dComIfGs_onEventBit(0x3080); - dComIfGs_offTmpBit(0x0302); - dComIfGs_offTmpBit(0x0301); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0208); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F01)) + dComIfGs_onEventBit(dSv_event_flag_c::UNK_3080); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0302); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0301); } diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index f920598b8..d543c4ef5 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -215,17 +215,17 @@ void dMenu_Collect_c::screenSet() { fopMsgM_setPaneData(&m3F8[i], m004, l_sik[i]); } - if (dComIfGs_isEventBit(0x1480)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::PLACED_DINS_PEARL)) { m1000[1].mInitAlpha *= 0.5f; m10A8[1].mInitAlpha *= 0.5f; } - if (dComIfGs_isEventBit(0x1440)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::PLACED_FARORES_PEARL)) { m1000[2].mInitAlpha *= 0.5f; m10A8[2].mInitAlpha *= 0.5f; } - if (dComIfGs_isEventBit(0x1410)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::PLACED_NAYRUS_PEARL)) { m1000[0].mInitAlpha *= 0.5f; m10A8[0].mInitAlpha *= 0.5f; } diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp index 777c39c1a..ad3a30fc0 100644 --- a/src/d/d_mesg.cpp +++ b/src/d/d_mesg.cpp @@ -579,7 +579,7 @@ bool dMesg_tSequenceProcessor::do_tag(u32 param_1, const void* param_2, u32 para r29 = true; int r30 = 0; char sp28[17]; - fopMsgM_passwordGet(sp28, dComIfGs_getEventReg(0xBA0F) + 0x1B37); + fopMsgM_passwordGet(sp28, dComIfGs_getEventReg(dSv_event_flag_c::UNK_BA0F) + 0x1B37); char sp10[3]; while (sp28[r30]) { int char_code; @@ -1003,7 +1003,7 @@ bool dMesg_tMeasureProcessor::do_tag(u32 param_1, const void* param_2, u32 param r26 = true; int r25 = 0; char sp18[17]; - u32 tmp = dComIfGs_getEventReg(0xBA0F); + u32 tmp = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BA0F); fopMsgM_passwordGet(sp18, tmp + 0x1B37); #if VERSION > VERSION_DEMO if (retFlag && r27 >= 0 && r27 < linemax) { diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 1f1bcd411..ff2b2737b 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -639,7 +639,7 @@ void dNpc_calc_DisXZ_AngY(cXyz param_1, cXyz param_2, float* param_3, s16* param /* 8021BEC4-8021BF30 .text dNpc_chkArasoi__Fv */ bool dNpc_chkArasoi() { - return dComIfGs_isEventBit(0x1220) && !dComIfGs_isEventBit(0x1808); + return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1220) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1808); } /* 8021BF30-8021BF98 .text dNpc_chkLetterPassed__Fv */ diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 1c9983296..0e0230d2a 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -705,7 +705,7 @@ int dRes_control_c::syncAllRes(dRes_info_c* pInfo, int infoNum) { /* 8006F430-8006F500 .text setStageRes__14dRes_control_cFPCcP7JKRHeap */ BOOL dRes_control_c::setStageRes(char const* pArcName, JKRHeap* pHeap) { char path[20]; - snprintf(path, sizeof(path), "/res/Stage/%s/", strcmp(dComIfGp_getStartStageName(), "ma2room") == 0 && dComIfGs_isEventBit(0x1820) ? "ma3room" : dComIfGp_getStartStageName()); + snprintf(path, sizeof(path), "/res/Stage/%s/", strcmp(dComIfGp_getStartStageName(), "ma2room") == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) ? "ma3room" : dComIfGp_getStartStageName()); return setRes(pArcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo), path, 1, pHeap); } diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 6c5e2f6c1..b65c03b26 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -119,7 +119,7 @@ static BOOL dScnMenu_Draw(menu_of_scene_class* i_this) { static const char* language[] = {"ENGLISH", "GERMAN", "FRENCH", "SPANISH", "ITALIAN"}; JUTReport(40, 440, "%s", language[dComIfGs_getPalLanguage()]); #endif - if (dComIfGs_isEventBit(0x2d01)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { JUTReport(400, 420, "３コン（Ａ）:デモ２３　ＯＮ"); } else { JUTReport(400, 420, "３コン（Ａ）:デモ２３　ＯＦＦ"); @@ -230,9 +230,9 @@ static BOOL dScnMenu_Execute(menu_of_scene_class* i_this) { if (CPad_CHECK_TRIG_A(2)) { l_demo23 ^= 1; if (l_demo23) - dComIfGs_onEventBit(0x2d01); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2D01); else - dComIfGs_offEventBit(0x2d01); + dComIfGs_offEventBit(dSv_event_flag_c::UNK_2D01); } g_env_light.mTimeAdv = 0.0f; diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index ff0f9a316..8ea232a3b 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -664,7 +664,7 @@ void dScnName_c::FileSelectMainNormal() { mMainProc = 5; } else { dComIfGs_setCardToMemory(saveMemory, dFs_c->saveSlot); - if (dFs_c->saveStatus[dFs_c->saveSlot] != 0 && !dComIfGs_isEventBit(0x3510)) { + if (dFs_c->saveStatus[dFs_c->saveSlot] != 0 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3510)) { field_0x1bb9 = 1; } @@ -676,7 +676,7 @@ void dScnName_c::FileSelectMainNormal() { card_pictdata* workBuf = &savePicDatabuf[dFs_c->saveSlot * 3]; for (s32 i = 0; i < 3; i++) { u32 mask = 1 << i; - if ((dComIfGs_getEventReg(0x89ff) & mask)) { + if ((dComIfGs_getEventReg(dSv_event_flag_c::UNK_89FF) & mask)) { workBuf++; continue; } @@ -697,7 +697,7 @@ void dScnName_c::FileSelectMainNormal() { dComIfGs_setPictureNum(pictureNum - failed); } - dComIfGs_setEventReg(0x89ff, 0); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_89FF, 0); mDoMemCd_setPictDataPtr(NULL); dComIfGp_itemDataInit(); if (field_0x1bb9 != 0) { diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 7dc157ba8..97cb76d05 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -1238,7 +1238,7 @@ cPhs_State phase_0(dScnPly_ply_c* i_this) { } else { l_lkDemoAnmCommand = NULL; - s32 darcIdx = dComIfGs_isEventBit(0x2D01) ? 1 : 0; + s32 darcIdx = dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01) ? 1 : 0; if (darcIdx != dComIfGp_getLkDemoAnmNo()) { if (dComIfGp_getLkDemoAnmNo() >= 0) { dComIfGp_getLkDemoAnmArchive()->unmount(); @@ -1364,7 +1364,7 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) { mDoGph_gInf_c::offFade(); stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); - if (stag_info != NULL && dStage_stagInfo_GetSTType(stag_info) == dStageType_FF1_e && dComIfGs_isEventBit(0x0801)) { + if (stag_info != NULL && dStage_stagInfo_GetSTType(stag_info) == dStageType_FF1_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0801)) { dComIfGs_setSelectEquip(0, dItem_NONE_e); dComIfGp_setSelectEquip(0, dItem_NONE_e); dComIfGs_offCollect(0, 0); @@ -1408,7 +1408,17 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) { dScnPly_ply_c::pauseTimer = 0; dScnPly_ply_c::nextPauseTimer = 0; - if (((strcmp(dComIfGp_getStartStageName(), "Hyrule") == 0 || strcmp(dComIfGp_getStartStageName(), "Hyroom") == 0 || strcmp(dComIfGp_getStartStageName(), "kenroom") == 0) && !dComIfGs_isEventBit(0x3802)) || dComIfGp_getStartStageName()[0] == 'X') { + if ( + ( + ( + strcmp(dComIfGp_getStartStageName(), "Hyrule") == 0 || + strcmp(dComIfGp_getStartStageName(), "Hyroom") == 0 || + strcmp(dComIfGp_getStartStageName(), "kenroom") == 0 + ) && + !dComIfGs_isEventBit(dSv_event_flag_c::COLORS_IN_HYRULE) + ) || + dComIfGp_getStartStageName()[0] == 'X' + ) { mDoGph_gInf_c::onMonotone(); bool hy8 = strcmp(dComIfGp_getStartStageName(), "Hyrule") == 0 && dComIfGp_getStartStageLayer() == 8; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 74b3d523f..6b15f0c07 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -124,15 +124,15 @@ static BOOL dScnRoom_Delete(room_of_scene_class* i_this) { if (!dComIfGp_isEnableNextStage()) { if (i_this->field_0x1dc == 1) { - dComIfGs_onEventBit(0x1a80); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A80); } if (strcmp(dComIfGp_getStartStageName(), "sea") == 0) - dComIfGs_offTmpBit(0x0320); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0320); } if (i_this->field_0x1dc == 2) - dComIfGs_onEventBit(0x1c40); + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1C40); if (strcmp(dComIfGp_getStartStageName(), "sea") == 0) daNpc_Md_c::offSeaTalk(); @@ -266,9 +266,9 @@ cPhs_State phase_4(room_of_scene_class* i_this) { // Bug? The game seems to set these flags for DRI even when you're not on the sea stage. // TODO: Look into this more. if (roomNo == dIsleRoom_DragonRoostIsland_e) { - dComIfGs_setEventReg(0xb8ff, 0); - if (dComIfGs_isEventBit(0x3f02)) - dComIfGs_onEventBit(0x1580); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_B8FF, 0); + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F02)) + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1580); } return cPhs_COMPLEATE_e; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 8ca7fb311..677258950 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -1368,11 +1368,33 @@ void dSv_info_c::init() { /* 8005D660-8005D860 .text reinit__10dSv_info_cFv */ void dSv_info_c::reinit() { - static u16 l_holdEventReg[] = {0x95FF, 0x94FF, 0x93FF, 0x92FF, 0x91FF, 0x90FF, - 0x8FFF, 0x8EFF, 0x8DFF, 0x8CFF, 0xB1FF, 0x9CFF, - 0x84FF, 0x83FF, 0x82FF, 0x81FF, 0x80FF}; + static u16 l_holdEventReg[] = { + dSv_event_flag_c::UNK_95FF, + dSv_event_flag_c::UNK_94FF, + dSv_event_flag_c::UNK_93FF, + dSv_event_flag_c::UNK_92FF, + dSv_event_flag_c::UNK_91FF, + dSv_event_flag_c::UNK_90FF, + dSv_event_flag_c::UNK_8FFF, + dSv_event_flag_c::UNK_8EFF, + dSv_event_flag_c::UNK_8DFF, + dSv_event_flag_c::UNK_8CFF, + dSv_event_flag_c::UNK_B1FF, + dSv_event_flag_c::UNK_9CFF, + dSv_event_flag_c::UNK_84FF, + dSv_event_flag_c::UNK_83FF, + dSv_event_flag_c::UNK_82FF, + dSv_event_flag_c::UNK_81FF, + dSv_event_flag_c::UNK_80FF + }; - static u16 l_onEventBit[] = {0x2F08, 0x2F04, 0x2F02, 0x3A01, 0x3401}; + static u16 l_onEventBit[] = { + dSv_event_flag_c::UNK_2F08, + dSv_event_flag_c::UNK_2F04, + dSv_event_flag_c::UNK_2F02, + dSv_event_flag_c::UNK_3A01, + dSv_event_flag_c::UNK_3401, + }; u8* r29 = new u8[ARRAY_SIZE(l_holdEventReg)]; for (int i = 0; i < ARRAY_SIZE(l_holdEventReg); i++) { @@ -1392,7 +1414,7 @@ void dSv_info_c::reinit() { #if VERSION > VERSION_DEMO u8 pictureNum = dComIfGs_getPictureNum(); - u8 r27 = dComIfGs_getEventReg(0x89FF); + u8 r27 = dComIfGs_getEventReg(dSv_event_flag_c::UNK_89FF); #endif init(); @@ -1406,7 +1428,7 @@ void dSv_info_c::reinit() { } #if VERSION > VERSION_DEMO - dComIfGs_setEventReg(0xC407, 7); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_C407, 7); #endif dComIfGs_setClearCount(clearCount); @@ -1433,7 +1455,7 @@ void dSv_info_c::reinit() { dComIfGs_setPictureNum(pictureNum); - dComIfGs_setEventReg(0x89FF, r27); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_89FF, r27); #endif } diff --git a/src/d/d_save_init.cpp b/src/d/d_save_init.cpp index 679c7fd5f..11b60fd43 100644 --- a/src/d/d_save_init.cpp +++ b/src/d/d_save_init.cpp @@ -10,6 +10,6 @@ /* 8005EF88-8005EFDC .text setInitEventBit__Fv */ void setInitEventBit() { - dComIfGs_setEventReg(0xBEFF, daNpc_Kg1_c::m_highscore); - dComIfGs_setEventReg(0x7EFF, 0xE); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_BEFF, daNpc_Kg1_c::m_highscore); + dComIfGs_setEventReg(dSv_event_flag_c::UNK_7EFF, 0xE); } diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index 600e04c15..d688a7a85 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -1029,8 +1029,8 @@ void ShopItems_c::createItem(int numItems, int roomNo) { Item_set_pos_data_tbl[mItemSetListGlobalIdx][0].z ); - dComIfGs_isEventBit(0x0D04); - dComIfGs_isEventBit(0x0D02); + dComIfGs_isEventBit(dSv_event_flag_c::UNK_0D04); + dComIfGs_isEventBit(dSv_event_flag_c::UNK_0D02); mItemActorProcessIds[0] = fopAcM_createShopItem( &pos, Item_set_data_tbl[mItemSetListGlobalIdx][0]->mpItemData->mItemNo, @@ -1038,7 +1038,7 @@ void ShopItems_c::createItem(int numItems, int roomNo) { ); pos.x += 75.0f; - if (dComIfGs_isEventBit(0x0D04)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0D04)) { mItemActorProcessIds[1] = fopAcM_createShopItem( &pos, Item_set_data_tbl[mItemSetListGlobalIdx][1]->mpItemData->mItemNo, &angle, roomNo @@ -1046,7 +1046,7 @@ void ShopItems_c::createItem(int numItems, int roomNo) { pos.x += 75.0f; } - if (dComIfGs_isEventBit(0x0D02)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0D02)) { mItemActorProcessIds[2] = fopAcM_createShopItem( &pos, Item_set_data_tbl[mItemSetListGlobalIdx][2]->mpItemData->mItemNo, &angle, roomNo diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 842e0d9d2..63a12c191 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1885,7 +1885,7 @@ bool dStage_setShipPos(int param_0, int i_roomNo) { #else /* 800429C0-80042B10 .text dStage_setShipPos__Fii */ bool dStage_setShipPos(int param_0, int i_roomNo) { - if (strcmp(dComIfGp_getStartStageName(), "GanonM") == 0 && !dComIfGs_isEventBit(0x3D02)) { + if (strcmp(dComIfGp_getStartStageName(), "GanonM") == 0 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D02)) { param_0 = 0xFF; i_roomNo = 0xFF; dComIfGp_setShipId(0xFF); @@ -1939,7 +1939,7 @@ int dStage_shipInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) { int shipId = dComIfGp_getShipId(); int roomId = dComIfGp_getShipRoomId(); - if (dStage_chkTaura(roomId) && !dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL)) { + if (dStage_chkTaura(roomId) && !dComIfGs_isEventBit(dSv_event_flag_c::RODE_KORL)) { if (dStage_setShipPos(0x80, roomId)) { shipId = 0xFF; roomId = 0xFF; @@ -1948,7 +1948,7 @@ int dStage_shipInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) { } } #if VERSION == VERSION_DEMO - else if (strcmp(dComIfGp_getStartStageName(), "GanonM") == 0 && !dComIfGs_isEventBit(0x3D02)) { + else if (strcmp(dComIfGp_getStartStageName(), "GanonM") == 0 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D02)) { shipId = 0xFF; roomId = 0xFF; dComIfGp_setShipId(0xFF); @@ -2330,8 +2330,8 @@ int dStage_changeSceneExitId(cBgS_PolyInfo& i_poly, f32 i_speed, u32 i_mode, s8 return 1; } else if (exit_id == 0x3C) { if (strcmp(dComIfGp_getStartStageName(), "Asoko") == 0) { - if (dComIfGs_isEventBit(0x808)) { - if (dComIfGs_isEventBit(0x520)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0808)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0520)) { dComIfGp_setNextStage("sea", 5, 11, -1, i_speed, i_mode); } else { dComIfGp_setNextStage("MajyuE", 18, 0, -1, i_speed, i_mode); diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index bb65b3a8d..0d809306b 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -93,7 +93,7 @@ static BOOL daThrowstoneExecute(void* ptr) { } bool daThrowstone_c::_draw() { - if (!dComIfGs_isEventBit(0x0310)) + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0310)) return TRUE; g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 97632c0f2..a754c9046 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -2593,7 +2593,7 @@ void fopMsgM_msgDataProc_c::getRubyString(char* param_1, char* param_2, char* pa /* 80035D28-80035E40 .text tag_len_kaisen_game__21fopMsgM_msgDataProc_cFPiPfPiPiPi */ void fopMsgM_msgDataProc_c::tag_len_kaisen_game(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) { char buf[12]; - fopMsgM_int_to_char(buf, dComIfGs_getEventReg(0xBEFF), false); + fopMsgM_int_to_char(buf, dComIfGs_getEventReg(dSv_event_flag_c::UNK_BEFF), false); strcat(buf, ""); char* p1; @@ -2751,7 +2751,7 @@ void fopMsgM_msgDataProc_c::tag_len_letter_game_max(int* param_1, f32* param_2, /* Nonmatching */ char buf[24]; - fopMsgM_int_to_char(buf, dComIfGs_getEventReg(0x8AFF), false); + fopMsgM_int_to_char(buf, dComIfGs_getEventReg(dSv_event_flag_c::UNK_8AFF), false); char* p1; u8 *p2; @@ -2981,7 +2981,7 @@ void fopMsgM_msgDataProc_c::tag_len_point(int* param_1, f32* param_2, int* param char buf[24]; - int num = dComIfGs_getEventReg(0x86FF); + int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); fopMsgM_int_to_char(buf, num, false); if(num != 1) { strcat(buf, " points"); @@ -3053,8 +3053,8 @@ void fopMsgM_msgDataProc_c::tag_len_rev_pendant(int* param_1, f32* param_2, int* char buf[28]; - int num = dComIfGs_getEventReg(0xC0FF); - fopMsgM_int_to_char(buf, dComIfGs_getEventReg(0xC0FF), false); + int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF); + fopMsgM_int_to_char(buf, dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF), false); if(num != 1) { strcat(buf, ""); } @@ -3636,7 +3636,7 @@ void fopMsgM_msgDataProc_c::tag_kaisen_game() { /* Nonmatching */ char buf[12]; - int num = dComIfGs_getEventReg(0xBEFF); + int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_BEFF); fopMsgM_int_to_char(buf, num, false); char* p1 = buf; @@ -3668,7 +3668,7 @@ void fopMsgM_msgDataProc_c::tag_kaisen_game() { field_0x20 = field_0x108[field_0x130] + field_0x14 + 0.5f; } - dComIfGs_getEventReg(0xBEFF); + dComIfGs_getEventReg(dSv_event_flag_c::UNK_BEFF); char buf2[12]; strcpy(buf2, ""); @@ -3860,7 +3860,7 @@ void fopMsgM_msgDataProc_c::tag_letter_game_max() { /* Nonmatching */ char buf[24]; - int num = dComIfGs_getEventReg(0x8AFF); + int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_8AFF); fopMsgM_int_to_char(buf, num, false); char* p1 = buf; @@ -4199,7 +4199,7 @@ void fopMsgM_msgDataProc_c::tag_point() { /* Nonmatching */ char buf[24]; - int num = dComIfGs_getEventReg(0x86FF); + int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_86FF); fopMsgM_int_to_char(buf, num, false); if(num != 1) { strcat(buf, " points"); @@ -4293,7 +4293,7 @@ void fopMsgM_msgDataProc_c::tag_rev_pendant() { /* Nonmatching */ char buf[16]; - int num = dComIfGs_getEventReg(0xC0FF); + int num = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF); fopMsgM_int_to_char(buf, num, false); char* p1 = buf;