diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_npc_cdn3.h | 4 | ||||
| -rw-r--r-- | include/d/d_menu_fmap2D.h | 10 | ||||
| -rw-r--r-- | include/d/d_meter2_info.h | 2 | ||||
| -rw-r--r-- | include/d/d_pane_class.h | 6 | ||||
| -rw-r--r-- | include/d/d_save.h | 7 |
5 files changed, 18 insertions, 11 deletions
diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index c5ef9f9283..c1436a8e3d 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -223,7 +223,7 @@ public: break; } /* dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town */ - if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 9) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 9) { uVar3 = 0xb; } } else { @@ -257,7 +257,7 @@ public: break; } /* dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town */ - if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 10) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 10) { uVar3 = 12; } } diff --git a/include/d/d_menu_fmap2D.h b/include/d/d_menu_fmap2D.h index 75752c8ccc..cda275f36f 100644 --- a/include/d/d_menu_fmap2D.h +++ b/include/d/d_menu_fmap2D.h @@ -14,7 +14,9 @@ class dMsgScrnExplain_c; class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c { public: dMenu_Fmap2DBack_c(); + void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32); + void setRegionTexData(u8, f32, f32, f32, f32, f32, f32, f32, f32, f32); void calcAllMapPos(); f32 calcAllMapScaleRate(); void calcAllMapPos2DFirst(f32, f32, f32*, f32*); @@ -142,8 +144,8 @@ public: u8 getSpotCursor() { return mSpotCursor; } u8 getSelectRegion() { return mSelectRegion; } bool getAllPathShowFlag() { return mAllPathShowFlag; } - f32 getRegionOriginX(u8 i_region) { return mRegionOriginX[i_region]; } - f32 getRegionOriginZ(u8 i_region) { return mRegionOriginZ[i_region]; } + f32 getRegionOriginX(int i_region) { return mRegionOriginX[i_region]; } + f32 getRegionOriginZ(int i_region) { return mRegionOriginZ[i_region]; } void setArrowAlpha(f32 i_alpha) { mArrowAlpha = i_alpha; } void setSpotTextureFadeAlpha(f32 i_alpha) { mSpotTextureFadeAlpha = i_alpha; } @@ -155,8 +157,8 @@ public: void onArrowDrawFlag() { mArrowDrawFlag = true; } bool isArrowDrawFlag() { return mArrowDrawFlag; } - void onShowRegionFlag(int region_bit) { mRegionFlag |= ((1 << region_bit) & 0xFF); } - bool isShowRegionFlag(int region_bit) { return mRegionFlag & ((1 << region_bit) & 0xFF); } + void onShowRegionFlag(int region_bit) { mRegionFlag |= (u8)(1 << region_bit); } + BOOL isShowRegionFlag(int region_bit) { return mRegionFlag & (u8)(1 << region_bit) ? TRUE : FALSE; } void mapBlink() {} diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h index b538a2112d..c6bbcda163 100644 --- a/include/d/d_meter2_info.h +++ b/include/d/d_meter2_info.h @@ -302,7 +302,7 @@ void dMeter2Info_set2DVibrationM(); void dMeter2Info_offUseButton(int pButton); bool dMeter2Info_is2DActiveTouchArea(); u8 dMeter2Info_getRecieveLetterNum(); -bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX, +u8 dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX, f32 i_sizeY, struct ResTIMG const* i_resTimg); const char* dMeter2Info_getPlusTextureName(); const char* dMeter2Info_getNumberTextureName(int i_num); diff --git a/include/d/d_pane_class.h b/include/d/d_pane_class.h index 7b71458443..345cae1274 100644 --- a/include/d/d_pane_class.h +++ b/include/d/d_pane_class.h @@ -34,7 +34,7 @@ public: JGeometry::TBox2<f32>* getBounds(J2DPane*); Vec getGlobalVtx(Mtx* param_0, u8 param_1, bool param_2, s16 param_3) { - return getGlobalVtx(getPanePtr(), param_0, param_1, param_2, param_3); + return getGlobalVtx(mPane, param_0, param_1, param_2, param_3); } Vec getGlobalVtxCenter(bool param_0, s16 param_1) { @@ -60,8 +60,8 @@ public: f32 getPosX() { return getPanePtr()->getBounds().i.x; } f32 getPosY() { return getPanePtr()->getBounds().i.y; } - f32 getSizeX() { return getPanePtr()->getWidth(); } - f32 getSizeY() { return getPanePtr()->getHeight(); } + f32 getSizeX() { return mPane->getWidth(); } + f32 getSizeY() { return mPane->getHeight(); } f32 getRotateZ() { return getPanePtr()->getRotateZ(); } diff --git a/include/d/d_save.h b/include/d/d_save.h index a30d2d62c4..ba358fb04f 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -1027,7 +1027,12 @@ public: #if VERSION > VERSION_GCN_JPN const #endif - static u16 saveBitLabels[822]; +#if PLATFORM_SHIELD + s16 +#else + u16 +#endif + static saveBitLabels[822]; }; class dSv_event_tmp_flag_c { |