diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-12-10 08:46:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-10 18:46:19 +0200 |
| commit | 8d73439554beb2b4870b86159aa2e676357792b7 (patch) | |
| tree | f146d56805cdbbf0ee01412b66d328396d2b0305 /src/d/d_menu_window_HIO.cpp | |
| parent | 3fa6b50e6ab76f8d6fed3c92a70084db2f0e221e (diff) | |
tbox/camera/d_bg_w_kcol work and cleanup (#2262)
* some camera/tbox cleanup
* d_bg_w_kcol work
* make item name enum better
Diffstat (limited to 'src/d/d_menu_window_HIO.cpp')
| -rw-r--r-- | src/d/d_menu_window_HIO.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d/d_menu_window_HIO.cpp b/src/d/d_menu_window_HIO.cpp index 617a87fcd5..6490dc9a7d 100644 --- a/src/d/d_menu_window_HIO.cpp +++ b/src/d/d_menu_window_HIO.cpp @@ -13,9 +13,9 @@ dMw_HIO_c::dMw_HIO_c() { /* 801F9B38-801F9E14 1F4478 02DC+00 1/1 0/0 0/0 .text init__9dMw_HIO_cFv */ void dMw_HIO_c::init() { - static u8 m_cloth_item[3] = {WEAR_KOKIRI, ARMOR, WEAR_ZORA}; - static u8 m_sword_item[4] = {SWORD, MASTER_SWORD, LIGHT_SWORD, WOOD_STICK}; - static u8 m_shield_item[3] = {SHIELD, HYLIA_SHIELD, WOOD_SHIELD}; + static u8 m_cloth_item[3] = {fpcNm_ITEM_WEAR_KOKIRI, fpcNm_ITEM_ARMOR, fpcNm_ITEM_WEAR_ZORA}; + static u8 m_sword_item[4] = {fpcNm_ITEM_SWORD, fpcNm_ITEM_MASTER_SWORD, fpcNm_ITEM_LIGHT_SWORD, fpcNm_ITEM_WOOD_STICK}; + static u8 m_shield_item[3] = {fpcNm_ITEM_SHIELD, fpcNm_ITEM_HYLIA_SHIELD, fpcNm_ITEM_WOOD_SHIELD}; mArrowFlag = 0; mBombFlag = 0; @@ -57,8 +57,8 @@ void dMw_HIO_c::init() { mDonationAmount = 0; for (int i = 0; i < 24; i++) { - mItemsCopy[i] = NO_ITEM; - mItems[i] = NO_ITEM; + mItemsCopy[i] = fpcNm_ITEM_NONE; + mItems[i] = fpcNm_ITEM_NONE; field_0x7a[i] = 0; } @@ -72,8 +72,8 @@ void dMw_HIO_c::init() { mBombNum[i] = 0; } - mScentCopy = NO_ITEM; - mScent = NO_ITEM; + mScentCopy = fpcNm_ITEM_NONE; + mScent = fpcNm_ITEM_NONE; field_0xa8 = 0; field_0xf4 = 0; field_0xea = 0; @@ -171,4 +171,4 @@ dMw_DHIO_c::dMw_DHIO_c() { dMw_HIO_c g_mwHIO; /* 8042E9A8-8042EBB0 05B6C8 0208+00 0/1 1/1 0/0 .bss g_mwDHIO */ -dMw_DHIO_c g_mwDHIO;
\ No newline at end of file +dMw_DHIO_c g_mwDHIO; |