falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
TakaRikka 2021-12-04 16:27:19 -08:00
parent 942c375fe5
commit 751a4112a0
14 changed files with 751 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/d/bg/d_bg_s_acch.h
View File

@ -137,8 +137,8 @@ public:
void SetGroundHit() { m_flags |= GROUND_HIT; }
void SetGroundLanding() { m_flags |= GROUND_LANDING; }
void SetGroundAway() { m_flags |= GROUND_AWAY; }
u32 MaskWaterHit() { return m_flags & WATER_HIT; }
bool ChkWaterHit() { return MaskWaterHit(); }
const u32 MaskWaterHit() { return m_flags & WATER_HIT; }
const bool ChkWaterHit() { return MaskWaterHit(); }
// inline dupe
void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; }

5
include/d/com/d_com_inf_game.h
View File

@ -11,6 +11,7 @@
#include "d/d_vibration.h"
#include "d/event/d_event.h"
#include "d/event/d_event_manager.h"
#include "d/particle/d_particle.h"
#include "d/save/d_save.h"
#include "dolphin/types.h"
@ -68,6 +69,10 @@ STATIC_ASSERT(sizeof(dComIfG_camera_info_class) == 0x38);
enum PlayerPtr { LINK_PTR, HORSE_PTR };
class daHorse_c;
class dPa_control_c;
class daAlink_c;
class dComIfG_play_c {
public:
dComIfG_play_c() { this->ct(); }

4
include/d/d_stage.h
View File

@ -45,6 +45,10 @@ struct stage_stag_info_class {
/* 0x2A */ u16 mStageTitleNo;
}; // Size: Unknown
inline u16 dStage_stagInfo_GetUpButton(stage_stag_info_class* p_info) {
return p_info->field_0x10 & 7;
}
struct stage_scls_info_class {
/* 0x0 */ char mStage[8];
/* 0x8 */ u8 mStart;

152
include/d/meter/d_meter2.h
View File

@ -1,6 +1,158 @@
#ifndef D_METER_D_METER2_H
#define D_METER_D_METER2_H
#include "JSystem/JKernel/JKRExpHeap.h"
#include "d/com/d_com_inf_game.h"
#include "d/meter/d_meter2_draw.h"
#include "d/meter/d_meter_map.h"
#include "dolphin/types.h"
class msg_class {
public:
/* 0x0 */ u8 field_0x0[0x100];
};
class dMeterMap_c;
class dMeter2_c {
public:
/* 8021EA14 */ void _create();
/* 8021F128 */ void _execute();
/* 8021F370 */ void _draw();
/* 8021F49C */ void _delete();
/* 8021F6EC */ void emphasisButtonDelete();
/* 8021F780 */ void setLifeZero();
/* 8021F7B0 */ void checkStatus();
/* 8021FD60 */ void moveLife();
/* 80220180 */ void moveKantera();
/* 8022051C */ void moveOxygen();
/* 80220888 */ void moveLightDrop();
/* 80220C30 */ void moveRupee();
/* 802210AC */ void moveKey();
/* 80221244 */ void moveButtonA();
/* 802217F4 */ void moveButtonB();
/* 80221EC8 */ void moveButtonR();
/* 80222000 */ void moveButtonZ();
/* 802222A0 */ void moveButton3D();
/* 80222364 */ void moveButtonC();
/* 80222494 */ void moveButtonS();
/* 80222518 */ void moveButtonXY();
/* 80222E88 */ void moveButtonCross();
/* 802230F8 */ void moveTouchSubMenu();
/* 802230FC */ void moveSubContents();
/* 802231C8 */ void move2DContents();
/* 802237D4 */ void checkSubContents();
/* 80223BC4 */ void check2DContents();
/* 80223E00 */ void moveBombNum();
/* 80224258 */ void moveBottleNum();
/* 80224354 */ void moveArrowNum();
/* 80224680 */ void movePachinkoNum();
/* 802248E4 */ void alphaAnimeLife();
/* 80224A04 */ void alphaAnimeKantera();
/* 80224BAC */ void alphaAnimeOxygen();
/* 80224D6C */ void alphaAnimeLightDrop();
/* 80224DC0 */ void alphaAnimeRupee();
/* 80224F70 */ void alphaAnimeKey();
/* 802250F4 */ void alphaAnimeButton();
/* 802254C0 */ void alphaAnimeButtonCross();
/* 802256DC */ void isShowLightDrop();
/* 802258A0 */ void killSubContents(u8);
/* 80225960 */ void isKeyVisible();
/* 802259F8 */ void isArrowEquip();
/* 80225A64 */ void isPachinkoEquip();
private:
/* 0x100 */ JKRExpHeap* mpHeap;
/* 0x104 */ JKRExpHeap* mpSubHeap;
/* 0x108 */ void* field_0x108;
/* 0x10C */ dMeter2Draw_c* mpMeterDraw;
/* 0x110 */ dDlst_base_c* field_0x110;
/* 0x114 */ dDlst_base_c* field_0x114;
/* 0x118 */ dDlst_base_c* field_0x118;
/* 0x11C */ void* field_0x11c;
/* 0x120 */ dMeterMap_c* mpMap;
/* 0x124 */ u32 field_0x124;
/* 0x128 */ int field_0x128;
/* 0x12C */ int field_0x12c;
/* 0x130 */ f32 field_0x130;
/* 0x134 */ f32 field_0x134[2];
/* 0x13C */ f32 field_0x13c[2];
/* 0x144 */ f32 field_0x144;
/* 0x148 */ f32 field_0x148[2];
/* 0x150 */ f32 field_0x150[2];
/* 0x158 */ f32 field_0x158;
/* 0x15C */ f32 field_0x15c;
/* 0x160 */ f32 field_0x160[4];
/* 0x170 */ u8 field_0x170[4];
/* 0x174 */ f32 field_0x174[4];
/* 0x184 */ u8 field_0x184[4];
/* 0x188 */ f32 field_0x188;
/* 0x18C */ f32 field_0x18c;
/* 0x190 */ s16 field_0x190;
/* 0x192 */ s16 mNowLifeGauge;
/* 0x194 */ s16 field_0x194;
/* 0x196 */ s16 field_0x196;
/* 0x198 */ s16 field_0x198;
/* 0x19A */ s16 field_0x19a;
/* 0x19C */ int field_0x19c;
/* 0x1A0 */ int field_0x1a0;
/* 0x1A4 */ int field_0x1a4;
/* 0x1A8 */ int field_0x1a8;
/* 0x1AC */ int field_0x1ac;
/* 0x1B0 */ u16 field_0x1b0;
/* 0x1B2 */ u16 field_0x1b2;
/* 0x1B4 */ u16 field_0x1b4;
/* 0x1B6 */ u16 mSubContentsStringType;
/* 0x1B8 */ u16 field_0x1b8[5];
/* 0x1C2 */ u8 field_0x1c2;
/* 0x1C3 */ u8 field_0x1c3;
/* 0x1C4 */ u8 field_0x1c4;
/* 0x1C5 */ u8 field_0x1c5;
/* 0x1C6 */ u8 field_0x1c6;
/* 0x1C7 */ u8 field_0x1c7;
/* 0x1C8 */ u8 field_0x1c8;
/* 0x1C9 */ u8 field_0x1c9;
/* 0x1CA */ u8 field_0x1ca;
/* 0x1CB */ u8 field_0x1cb;
/* 0x1CC */ u8 field_0x1cc;
/* 0x1CD */ u8 field_0x1cd;
/* 0x1CE */ u8 field_0x1ce;
/* 0x1CF */ u8 field_0x1cf;
/* 0x1D0 */ u8 field_0x1d0;
/* 0x1D1 */ u8 field_0x1d1;
/* 0x1D2 */ u8 field_0x1d2[4];
/* 0x1D6 */ u8 field_0x1d6[2];
/* 0x1D8 */ u8 field_0x1d8[2];
/* 0x1DA */ u8 field_0x1da;
/* 0x1DB */ u8 field_0x1db;
/* 0x1DC */ u8 field_0x1dc;
/* 0x1DD */ u8 field_0x1dd;
/* 0x1DE */ u8 field_0x1de;
/* 0x1DF */ u8 field_0x1df;
/* 0x1E0 */ u8 field_0x1e0;
/* 0x1E1 */ u8 field_0x1e1;
/* 0x1E2 */ u8 field_0x1e2;
/* 0x1E3 */ u8 field_0x1e3;
/* 0x1E4 */ u8 field_0x1e4;
/* 0x1E5 */ u8 mSubContents;
/* 0x1E6 */ u8 field_0x1e6;
/* 0x1E7 */ u8 field_0x1e7;
/* 0x1E8 */ u8 field_0x1e8;
/* 0x1E9 */ u8 field_0x1e9;
/* 0x1EA */ u8 field_0x1ea;
/* 0x1EB */ u8 field_0x1eb;
/* 0x1EC */ u8 field_0x1ec;
/* 0x1ED */ u8 field_0x1ed;
/* 0x1EE */ u8 field_0x1ee;
/* 0x1EF */ u8 field_0x1ef[4];
/* 0x1F3 */ u8 field_0x1f3[3];
/* 0x1F6 */ u8 field_0x1f6[3];
/* 0x1F9 */ u8 field_0x1f9[4];
/* 0x1FD */ u8 field_0x1fd;
/* 0x1FE */ u8 field_0x1fe;
/* 0x1FF */ u8 field_0x1ff;
/* 0x200 */ u8 field_0x200;
/* 0x201 */ u8 field_0x201;
};
#endif /* D_METER_D_METER2_H */

358
include/d/meter/d_meter2_draw.h
View File

@ -1,6 +1,364 @@
#ifndef D_METER_D_METER2_DRAW_H
#define D_METER_D_METER2_DRAW_H
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JUtility/TColor.h"
#include "d/d_drawlist.h"
#include "d/pane/d_pane_class.h"
#include "dolphin/types.h"
class dKantera_icon_c;
class dMeter2Draw_c : public dDlst_base_c {
public:
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 80210FB0 */ void init();
/* 8021135C */ void exec(u32);
/* 8021151C */ void draw();
/* 80211BEC */ void initLife();
/* 80211E64 */ void initMagic();
/* 80212190 */ void initLightDrop();
/* 80212404 */ void initRupeeKey();
/* 802126E4 */ void initButton();
/* 8021350C */ void initButtonCross();
/* 80213CEC */ void playPikariBckAnimation(f32);
/* 80213D6C */ void setPikariBpkAnimation(J2DAnmColor*);
/* 80213E3C */ void playPikariBpkAnimation(f32);
/* 80213E94 */ void playOxygenBpkAnimation(J2DAnmColor*);
/* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
/* 80213FF0 */ void drawPikari(CPaneMgr*, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
/* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
/* 802147CC */ void changeTextureLife(int, bool, u8);
/* 802149F4 */ void drawLife(s16, s16, f32, f32);
/* 80214C20 */ void setAlphaLifeChange(bool);
/* 80214DF4 */ void setAlphaLifeAnimeMin();
/* 80214E54 */ void setAlphaLifeAnimeMax();
/* 80214EB4 */ void drawKanteraScreen(u8);
/* 80215290 */ void drawMagic(s16, s16, f32, f32);
/* 80215380 */ void setAlphaMagicChange(bool);
/* 802154A8 */ void drawKantera(s32, s32, f32, f32);
/* 802155B8 */ void setAlphaKanteraChange(bool);
/* 802156E0 */ void setAlphaKanteraAnimeMin();
/* 8021575C */ void setAlphaKanteraAnimeMax();
/* 802157E0 */ void drawOxygen(s32, s32, f32, f32);
/* 802158F0 */ void setAlphaOxygenChange(bool);
/* 80215A18 */ void setAlphaOxygenAnimeMin();
/* 80215A94 */ void setAlphaOxygenAnimeMax();
/* 80215B18 */ void drawLightDrop(u8, u8, f32, f32, f32, f32, u8);
/* 80215DA4 */ void setAlphaLightDropChange(bool);
/* 80215DA8 */ void getNowLightDropRateCalc();
/* 80215E40 */ void setAlphaLightDropAnimeMin();
/* 80215F88 */ void setAlphaLightDropAnimeMax();
/* 8021632C */ void drawRupee(s16);
/* 80216684 */ void setAlphaRupeeChange(bool);
/* 802168D0 */ void setAlphaRupeeAnimeMin();
/* 80216990 */ void setAlphaRupeeAnimeMax();
/* 80216A40 */ void drawKey(s16);
/* 80216B28 */ void setAlphaKeyChange(bool);
/* 80216CA8 */ void setAlphaKeyAnimeMin();
/* 80216D2C */ void setAlphaKeyAnimeMax();
/* 80216DAC */ void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool);
/* 802170E4 */ void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool);
/* 8021764C */ void drawButtonR(u8, u8, bool, bool);
/* 802176EC */ void drawButtonZ(u8);
/* 80217904 */ void drawButton3D(u8);
/* 80217954 */ void drawButtonC(u8, bool);
/* 802179C0 */ void drawButtonS(u8);
/* 80217A10 */ void drawButtonBin(u8);
/* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool);
/* 80218238 */ void getButtonCrossParentInitTransY();
/* 80218254 */ void drawButtonCross(f32, f32);
/* 80218338 */ void setAlphaButtonCrossAnimeMin();
/* 802183A8 */ void setAlphaButtonCrossAnimeMax();
/* 80218448 */ void setAlphaButtonCrossItemAnimeMin();
/* 80218524 */ void setAlphaButtonCrossItemAnimeMax();
/* 802185E8 */ void setAlphaButtonCrossMapAnimeMin();
/* 802186C4 */ void setAlphaButtonCrossMapAnimeMax();
/* 80218788 */ void setAlphaButtonChange(bool);
/* 8021901C */ void setAlphaButtonAnimeMin();
/* 802190A8 */ void setAlphaButtonAnimeMax();
/* 80219174 */ void setAlphaButtonAAnimeMin();
/* 80219258 */ void setAlphaButtonAAnimeMax();
/* 80219324 */ void setAlphaButtonBAnimeMin();
/* 80219474 */ void setAlphaButtonBAnimeMax();
/* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool);
/* 80219788 */ void setButtonIconBAlpha(u8, u32, bool);
/* 80219A84 */ void setButtonIconMidonaAlpha(u32);
/* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool);
/* 8021A29C */ void getNumberTexture(int);
/* 8021A2F4 */ void getActionString(u8, u8, u8*);
/* 8021A468 */ void changeTextureItemB(u8);
/* 8021A71C */ void changeTextureItemXY(int, u8);
/* 8021A9C8 */ void setAlphaAnimeMin(CPaneMgrAlpha*, s16);
/* 8021AAA4 */ void setAlphaAnimeMax(CPaneMgrAlpha*, s16);
/* 8021AB84 */ void setItemNum(u8, u8, u8);
/* 8021AEC8 */ void drawItemNum(u8, f32);
/* 8021AF78 */ void drawKanteraMeter(u8, f32);
/* 8021B0C8 */ void isButtonVisible();
/* 8021B104 */ void setItemParamX(u8);
/* 8021B364 */ void setItemParamY(u8);
/* 8021B5B0 */ void setItemParamZ(u8);
/* 8021B810 */ void setItemParamB(u8);
/* 8021BB6C */ void getFishingType();
/* 8021BBB4 */ void getCanoeFishing();
/* 8021BC24 */ void getCameraSubject();
/* 8021BC54 */ void getItemSubject();
/* 8021BCAC */ void getPlayerSubject();
/* 8021BCC0 */ void isBButtonShow(bool);
/* 8021BDD0 */ void getButtonTimer();
/* 802102F8 */ virtual ~dMeter2Draw_c();
private:
/* 0x004 */ f32 field_0x4;
/* 0x008 */ f32 field_0x8;
/* 0x00C */ f32 field_0xc;
/* 0x010 */ f32 field_0x10;
/* 0x014 */ f32 field_0x14;
/* 0x028 */ f32 field_0x18;
/* 0x01C */ f32 field_0x1c;
/* 0x020 */ f32 field_0x20;
/* 0x024 */ f32 field_0x24;
/* 0x028 */ f32 field_0x28;
/* 0x02C */ f32 field_0x2c;
/* 0x030 */ f32 field_0x30;
/* 0x034 */ f32 field_0x34;
/* 0x038 */ f32 field_0x38;
/* 0x03C */ f32 field_0x3c;
/* 0x040 */ f32 field_0x40;
/* 0x044 */ f32 field_0x44;
/* 0x048 */ f32 field_0x48;
/* 0x04C */ f32 field_0x4c;
/* 0x050 */ f32 field_0x50;
/* 0x054 */ f32 field_0x54;
/* 0x058 */ f32 field_0x58;
/* 0x05C */ f32 field_0x5c;
/* 0x060 */ f32 field_0x60;
/* 0x064 */ f32 field_0x64;
/* 0x068 */ f32 field_0x68;
/* 0x06C */ f32 field_0x6c;
/* 0x070 */ f32 field_0x70;
/* 0x074 */ JKRExpHeap* mp_heap;
/* 0x078 */ J2DScreen* mpScreen;
/* 0x07C */ J2DScreen* mpKanteraScreen;
/* 0x080 */ J2DScreen* mpPikariScreen;
/* 0x084 */ J2DScreen* mpItemNumTex[2][3];
/* 0x09C */ int field_0x9c[3];
/* 0x0A8 */ int field_0xa8;
/* 0x0AC */ dKantera_icon_c* mpKanteraMeter[2];
/* 0x0B4 */ u8 field_0xb4[8];
/* 0x0BC */ void* mpParent;
/* 0x0C0 */ CPaneMgr* mpAText[5];
/* 0x0D4 */ CPaneMgr* mpBText[5];
/* 0x0E8 */ CPaneMgr* mpXYText[5][3];
/* 0x124 */ CPaneMgr* mpLifeParent;
/* 0x128 */ CPaneMgr* mpLifeParts[20];
/* 0x178 */ CPaneMgr* mpHeartMask[20];
/* 0x1C8 */ CPaneMgr* mpBigHeart;
/* 0x1CC */ CPaneMgr* mpMagicParent;
/* 0x1D0 */ CPaneMgr* mpMagicBase;
/* 0x1D4 */ CPaneMgr* mpMagicFrameL;
/* 0x1D8 */ CPaneMgr* mpMagicMeter;
/* 0x1DC */ CPaneMgr* mpMagicFrameR;
/* 0x1E0 */ CPaneMgr* mpLightDropParent;
/* 0x1E4 */ int field_0x1e4;
/* 0x1E8 */ CPaneMgr* mpSIParent[2];
/* 0x1F0 */ CPaneMgr* mpSIParts[16][3];
/* 0x2B0 */ CPaneMgr* mpRupeeKeyParent;
/* 0x2B4 */ CPaneMgr* mpRupeeParent[3];
/* 0x2C0 */ CPaneMgr* mpRupeeTexture[4][2];
/* 0x2E0 */ CPaneMgr* mpKeyParent;
/* 0x2E4 */ CPaneMgr* mpKeyTexture[5];
/* 0x2F8 */ CPaneMgr* mpButtonParent;
/* 0x2FC */ int field_0x2fc;
/* 0x300 */ CPaneMgr* mpButtonA;
/* 0x304 */ CPaneMgr* mpButtonB;
/* 0x308 */ CPaneMgr* mpButtonMidona;
/* 0x30C */ CPaneMgr* mpButtonXY[3];
/* 0x318 */ CPaneMgr* mpLightB;
/* 0x31C */ CPaneMgr* mpLightXY[3];
/* 0x328 */ CPaneMgr* mpItemB;
/* 0x32C */ CPaneMgr* mpItemXY[2];
/* 0x334 */ CPaneMgr* mpItemR;
/* 0x338 */ CPaneMgr* mpBTextA;
/* 0x33C */ CPaneMgr* mpBTextB;
/* 0x340 */ CPaneMgr* mpBTextXY[2];
/* 0x348 */ int field_0x348;
/* 0x34C */ CPaneMgr* mpTextA;
/* 0x350 */ CPaneMgr* mpTextB;
/* 0x354 */ CPaneMgr* mpTextXY[3];
/* 0x360 */ CPaneMgr* mpTextI;
/* 0x364 */ CPaneMgr* mpTextM;
/* 0x368 */ CPaneMgr* mpButtonCrossParent;
/* 0x36C */ int field_0x36c;
/* 0x370 */ u8 field_0x370[0x2C];
/* 0x39C */ CPaneMgr* mpPikariParent;
/* 0x3A0 */ CPaneMgr* mpLifeTexture[20][2];
/* 0x440 */ CPaneMgr* mpHeartBase[20];
/* 0x490 */ CPaneMgr* mpJujiI[5];
/* 0x4A4 */ CPaneMgr* mpJujiM[5];
/* 0x4B8 */ CPaneMgr* mpUzu;
/* 0x4BC */ u8 field_0x4bc[0x28];
/* 0x4E4 */ JKRHeap* mpItemBTex[2][2];
/* 0x4F4 */ JKRHeap* mpItemXYTex[2][2][2];
/* 0x514 */ J2DPicture* mpItemBPane;
/* 0x518 */ J2DPicture* mpItemXYPane[3];
/* 0x524 */ int field_0x524[2][2];
/* 0x534 */ u8 field_0x534[8];
/* 0x53C */ void* field_0x53c;
/* 0x540 */ J2DAnmBase* field_0x540; // bpk
/* 0x544 */ J2DAnmBase* field_0x544; // bpk
/* 0x548 */ u8 field_0x548[8];
/* 0x550 */ f32 field_0x550;
/* 0x554 */ f32 field_0x554;
/* 0x558 */ f32 field_0x558;
/* 0x55C */ f32 field_0x55c;
/* 0x560 */ f32 field_0x560;
/* 0x564 */ f32 field_0x564;
/* 0x568 */ f32 field_0x568;
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ f32 field_0x570;
/* 0x574 */ f32 field_0x574;
/* 0x578 */ f32 field_0x578;
/* 0x57C */ f32 field_0x57c;
/* 0x580 */ f32 field_0x580;
/* 0x584 */ u8 field_0x584[0x78];
/* 0x5FC */ f32 field_0x5fc[3];
/* 0x608 */ f32 field_0x608;
/* 0x60C */ f32 field_0x60c;
/* 0x610 */ f32 field_0x610[3];
/* 0x61C */ f32 field_0x61c;
/* 0x620 */ f32 field_0x620[3];
/* 0x62C */ f32 field_0x62c[16];
/* 0x66C */ f32 field_0x66c[16];
/* 0x6AC */ f32 field_0x6ac[3];
/* 0x6B8 */ f32 field_0x6b8[3];
/* 0x6C4 */ f32 field_0x6c4[3];
/* 0x6D0 */ f32 field_0x6d0[3];
/* 0x6DC */ f32 field_0x6dc;
/* 0x6E0 */ f32 field_0x6e0;
/* 0x6E4 */ f32 field_0x6e4;
/* 0x6E8 */ f32 field_0x6e8;
/* 0x6EC */ f32 field_0x6ec;
/* 0x6F0 */ f32 field_0x6f0;
/* 0x6F4 */ f32 field_0x6f4;
/* 0x6F8 */ f32 field_0x6f8;
/* 0x6FC */ f32 field_0x6fc;
/* 0x700 */ u8 field_0x700[0x18];
/* 0x718 */ f32 field_0x718;
/* 0x71C */ u8 field_0x71c[4];
/* 0x720 */ f32 mZButtonAlpha;
/* 0x724 */ f32 field_0x724;
/* 0x728 */ f32 field_0x728;
/* 0x72C */ f32 field_0x72c;
/* 0x730 */ f32 field_0x730;
/* 0x734 */ f32 field_0x734;
/* 0x738 */ f32 field_0x738;
/* 0x73C */ u8 field_0x73c[4];
/* 0x740 */ u16 field_0x740;
/* 0x742 */ u16 field_0x742[3];
/* 0x748 */ u8 field_0x748[0xE];
/* 0x756 */ u16 field_0x754;
/* 0x756 */ u16 field_0x756;
/* 0x758 */ u8 field_0x758;
/* 0x759 */ u8 field_0x759;
/* 0x75A */ u8 field_0x75a;
/* 0x75B */ u8 field_0x75b;
/* 0x75C */ u8 field_0x75c[3];
/* 0x75F */ u8 field_0x75f;
/* 0x760 */ u8 field_0x760;
/* 0x761 */ u8 field_0x761;
/* 0x762 */ u8 field_0x762;
/* 0x763 */ u8 field_0x763;
/* 0x764 */ u8 field_0x764;
/* 0x765 */ u8 field_0x765;
/* 0x766 */ u8 field_0x766;
/* 0x767 */ u8 field_0x767;
/* 0x768 */ u8 field_0x768[3];
/* 0x76B */ u8 field_0x76b;
/* 0x76C */ u8 field_0x76c[2];
/* 0x76E */ u8 field_0x76e;
/* 0x76F */ u8 field_0x76f;
/* 0x770 */ u8 field_0x770;
/* 0x771 */ u8 field_0x771;
/* 0x772 */ u8 field_0x772;
/* 0x773 */ u8 field_0x773[2];
/* 0x778 */ f32 field_0x778;
/* 0x77C */ f32 field_0x77c;
/* 0x780 */ f32 field_0x780;
/* 0x784 */ f32 field_0x784;
/* 0x788 */ f32 field_0x788;
/* 0x78C */ f32 field_0x78c;
/* 0x790 */ f32 field_0x790;
/* 0x794 */ f32 field_0x794;
/* 0x798 */ f32 field_0x798;
/* 0x79C */ f32 field_0x79c;
/* 0x7A0 */ f32 field_0x7a0;
/* 0x7A4 */ f32 field_0x7a4;
/* 0x7A8 */ f32 field_0x7a8;
/* 0x7AC */ f32 field_0x7ac;
/* 0x7B0 */ f32 field_0x7b0;
/* 0x7B4 */ f32 field_0x7b4;
/* 0x7B8 */ f32 field_0x7b8;
/* 0x7BC */ f32 field_0x7bc;
/* 0x7C0 */ f32 field_0x7c0;
/* 0x7C4 */ f32 field_0x7c4;
/* 0x7C8 */ f32 field_0x7c8;
/* 0x7CC */ f32 field_0x7cc;
/* 0x7D0 */ f32 field_0x7d0;
/* 0x7D4 */ f32 field_0x7d4;
/* 0x7D8 */ f32 field_0x7d8;
/* 0x7DC */ f32 field_0x7dc;
/* 0x7E0 */ f32 field_0x7e0;
/* 0x7E4 */ f32 field_0x7e4;
/* 0x7E8 */ f32 field_0x7e8;
/* 0x7EC */ f32 field_0x7ec;
/* 0x7F0 */ f32 field_0x7f0;
/* 0x7F4 */ f32 field_0x7f4;
/* 0x7F8 */ f32 field_0x7f8;
/* 0x7FC */ f32 field_0x7fc;
/* 0x800 */ f32 field_0x800;
/* 0x804 */ f32 field_0x804;
/* 0x808 */ f32 field_0x808;
/* 0x80C */ f32 field_0x80c;
/* 0x810 */ f32 field_0x810;
/* 0x814 */ f32 field_0x814[2];
/* 0x81C */ f32 field_0x81c[2];
/* 0x824 */ f32 field_0x824[2];
/* 0x82C */ f32 field_0x82c[2];
/* 0x834 */ f32 field_0x834;
/* 0x838 */ f32 field_0x838;
/* 0x83C */ f32 field_0x83c;
/* 0x840 */ f32 field_0x840;
/* 0x844 */ f32 field_0x844;
/* 0x848 */ f32 field_0x848;
/* 0x84C */ u8 field_0x84c;
/* 0x84D */ u8 field_0x84d;
/* 0x84E */ u8 field_0x84e;
/* 0x84F */ u8 field_0x84f;
/* 0x850 */ u8 field_0x850;
/* 0x851 */ u8 field_0x851;
/* 0x852 */ u8 field_0x852;
/* 0x853 */ u8 field_0x853;
/* 0x854 */ u8 field_0x854;
/* 0x855 */ u8 field_0x855;
/* 0x856 */ u8 field_0x856;
/* 0x857 */ u8 field_0x857;
/* 0x858 */ u8 field_0x858;
/* 0x859 */ u8 field_0x859;
/* 0x85A */ u8 field_0x85a;
/* 0x85B */ u8 field_0x85b;
/* 0x85C */ u8 field_0x85c;
/* 0x85D */ u8 field_0x85d;
/* 0x85E */ u8 field_0x85e;
/* 0x85F */ u8 field_0x85f;
/* 0x860 */ u8 field_0x860;
/* 0x861 */ u8 field_0x861;
};
#endif /* D_METER_D_METER2_DRAW_H */

56
include/d/meter/d_meter2_info.h
View File

@ -4,6 +4,7 @@
#include "JSystem/JUtility/JUTTexture.h"
#include "d/d_resorce.h"
#include "d/menu/d_menu_window.h"
#include "d/meter/d_meter2.h"
#include "d/msg/d_msg_flow.h"
#include "d/pane/d_pane_class.h"
#include "dolphin/types.h"
@ -13,18 +14,9 @@ struct dMsgObject_c {
/* 802384C4 */ static void setLetterNameID(u16);
/* 802379AC */ void setKillMessageFlag();
/* 8023822C */ void getStatus();
/* 802371E4 */ void isPlaceMessage();
};
class dMeterMap_c {
public:
/* 8020D900 */ static bool isMapOpenCheck();
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
/* 8020D874 */ void setDispPosInsideFlg_SE_On();
/* 8020D8BC */ void setDispPosOutsideFlg_SE_On();
};
struct J2DPicture {};
struct JMSMesgEntry_c {
/* 0x00 */ u32 mStringOffset;
/* 0x04 */ u16 mStringId;
@ -64,11 +56,9 @@ struct dItem_data {
};
class dMw_c;
class dMeter2_c {
public:
/* 8021F6EC */ void emphasisButtonDelete();
};
class dMeter2_c;
class J2DPicture;
class dMeterMap_c;
class dMeter2Info_c {
public:
@ -95,7 +85,7 @@ public:
void getStringKana(u32, char*, JMSMesgEntry_c*);
void getStringKanji(u32, char*, JMSMesgEntry_c*);
double getStringLength(J2DTextBox*, char*); // define J2DTextBox
dMeter2Info_c* getStringLength(JUTFont*, float, float, char*);
dMeter2Info_c* getStringLength(JUTFont*, f32, f32, char*);
void onDirectUseItem(int);
bool isDirectUseItem(int);
int setMeterString(s32);
@ -137,6 +127,8 @@ public:
u8 getWarpPlayerNo() { return mWarpInfo.mWarpPlayerNo; }
cXyz& getWarpPos() { return mWarpInfo.mPosition; }
const char* getWarpStageName() { return mWarpInfo.mStageName; }
void setNowCount(u8 count) { mNowCount = count; }
void setMaxCount(u8 count) { mMaxCount = count; }
private:
/* 0x04 */ u8 unk4[4];
@ -149,18 +141,18 @@ private:
/* 0x24 */ dMw_c* mMenuWindowClass;
/* 0x28 */ CPaneMgr* mMeterItemPanePtr[4];
/* 0x38 */ WarpInfo_c mWarpInfo;
/* 0x54 */ float unk84;
/* 0x58 */ float unk88;
/* 0x5C */ float unk92;
/* 0x60 */ float unk96;
/* 0x64 */ float unk100;
/* 0x68 */ float unk104;
/* 0x6C */ float unk108;
/* 0x70 */ float m2DWidth;
/* 0x74 */ float m2DHeight;
/* 0x78 */ float m2DPosH;
/* 0x7C */ float m2DPosV;
/* 0x80 */ float unk128;
/* 0x54 */ f32 unk84;
/* 0x58 */ f32 unk88;
/* 0x5C */ f32 unk92;
/* 0x60 */ f32 unk96;
/* 0x64 */ f32 unk100;
/* 0x68 */ f32 unk104;
/* 0x6C */ f32 unk108;
/* 0x70 */ f32 m2DWidth;
/* 0x74 */ f32 m2DHeight;
/* 0x78 */ f32 m2DPosH;
/* 0x7C */ f32 m2DPosV;
/* 0x80 */ f32 unk128;
/* 0x84 */ u32 mTimeMs;
/* 0x88 */ u32 mMsgTimeMs;
/* 0x8C */ u32 mMeterString;
@ -277,4 +269,12 @@ inline const char* dMeter2Info_getWarpStageName() {
return g_meter2_info.getWarpStageName();
}
inline void dMeter2Info_setNowCount(u8 count) {
g_meter2_info.setNowCount(count);
}
inline void dMeter2Info_setMaxCount(u8 count) {
g_meter2_info.setMaxCount(count);
}
#endif /* D_METER_D_METER2_INFO_H */

32
include/d/meter/d_meter_map.h
View File

@ -1,6 +1,38 @@
#ifndef D_METER_D_METER_MAP_H
#define D_METER_D_METER_MAP_H
#include "JSystem/J2DGraph/J2DScreen.h"
#include "dolphin/types.h"
class dMeterMap_c {
public:
/* 8020D49C */ void isEnableDispMap();
/* 8020D528 */ void getMapDispSizeTypeNo();
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
/* 8020D690 */ void getMapDispEdgeBottomY_Layout();
/* 8020D698 */ void isEventRunCheck();
/* 8020D72C */ void getMapDispEdgeLeftX_Layout();
/* 8020D75C */ void getMapDispEdgeTop();
/* 8020D7E4 */ bool getDispPosInside_OffsetX();
/* 8020D7EC */ void getDispPosOutSide_OffsetX();
/* 8020D874 */ void setDispPosInsideFlg_SE_On();
/* 8020D8BC */ void setDispPosOutsideFlg_SE_On();
/* 8020D8F8 */ void setMapAlpha(u8);
/* 8020D900 */ static bool isMapOpenCheck();
/* 8020D948 */ dMeterMap_c(J2DScreen*);
/* 8020D990 */ ~dMeterMap_c();
/* 8020D9EC */ void _create(J2DScreen*);
/* 8020DC50 */ void _delete();
/* 8020DCE4 */ void _move(u32);
/* 8020DF1C */ void _draw();
/* 8020DF68 */ void draw();
/* 8020E070 */ void ctrlShowMap();
/* 8020E45C */ void checkMoveStatus();
/* 8020E4C8 */ void isShow(u32);
/* 8020E620 */ void isFmapScreen();
/* 8020E70C */ void isDmapScreen();
/* 8020E754 */ void meter_map_move(u32);
/* 8020E9CC */ void keyCheck();
};
#endif /* D_METER_D_METER_MAP_H */

2
include/f_op/f_op_msg_mng.h
View File

@ -6,4 +6,6 @@
typedef int (*fopMsgCreateFunc)(void*);
JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*);
#endif

312
src/d/a/d_a_alink.cpp
View File

@ -4911,24 +4911,26 @@ SECTION_RODATA u8 const daAlinkHIO_noActAtnMove_c0::m[84] = {
COMPILER_STRIP_GATE(0x8038D768, &daAlinkHIO_noActAtnMove_c0::m);
/* 8038D7BC-8038D82C 019E1C 0070+00 5/7 0/0 0/0 .rodata m__23daAlinkHIO_frontRoll_c0 */
daAlinkHIO_frontRoll_c1 const daAlinkHIO_frontRoll_c0::m = {{29, 1.1f, 0.0f, 3.0f, 22.0f},
{29, 0.8f, 3.0f, 2.0f, 25.0f},
{33, 1.2f, 0.0f, 1.0f, 25.0f},
10000,
5,
1000,
100,
3.0f,
1.3f,
25.0f,
10.0f,
3.0f,
15.0f,
10.0f,
12.0f,
9.0f,
19.0f,
60.0f};
daAlinkHIO_frontRoll_c1 const daAlinkHIO_frontRoll_c0::m = {
{29, 1.1f, 0.0f, 3.0f, 22.0f},
{29, 0.8f, 3.0f, 2.0f, 25.0f},
{33, 1.2f, 0.0f, 1.0f, 25.0f},
10000,
5,
1000,
100,
3.0f,
1.3f,
25.0f,
10.0f,
3.0f,
15.0f,
10.0f,
12.0f,
9.0f,
19.0f,
60.0f,
};
/* 8038D82C-8038D864 019E8C 0038+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_backJump_c0 */
daAlinkHIO_backJump_c1 const daAlinkHIO_backJump_c0::m = {
@ -4936,32 +4938,36 @@ daAlinkHIO_backJump_c1 const daAlinkHIO_backJump_c0::m = {
};
/* 8038D864-8038D8CC 019EC4 0068+00 3/3 0/0 0/0 .rodata m__22daAlinkHIO_sideStep_c0 */
daAlinkHIO_sideStep_c1 const daAlinkHIO_sideStep_c0::m = {{5, 1.1f, 1.0f, 3.0f, 6.0f},
{9, 1.0f, 0.0f, 3.0f, 2.0f},
{6, 1.0f, 0.0f, 3.0f, 7.0f},
{9, 1.1f, 0.0f, 3.0f, 4.0f},
28.0f,
22.0f,
25.0f,
20.0f,
100.0f,
10.0f};
daAlinkHIO_sideStep_c1 const daAlinkHIO_sideStep_c0::m = {
{5, 1.1f, 1.0f, 3.0f, 6.0f},
{9, 1.0f, 0.0f, 3.0f, 2.0f},
{6, 1.0f, 0.0f, 3.0f, 7.0f},
{9, 1.1f, 0.0f, 3.0f, 4.0f},
28.0f,
22.0f,
25.0f,
20.0f,
100.0f,
10.0f,
};
/* 8038D8CC-8038D944 019F2C 0078+00 5/10 0/0 0/0 .rodata m__19daAlinkHIO_slide_c0 */
daAlinkHIO_slide_c1 const daAlinkHIO_slide_c0::m = {{14, 0.75f, 0.0f, 5.0f, 15.0f},
{6, 0.9f, 0.0f, 3.0f, 7.0f},
{15, 1.0f, 0.0f, 3.0f, 9.0f},
{20, 1.0f, 0.0f, 3.0f, 16.0f},
40.0f,
3.0f,
50.0f,
27.0f,
0.2f,
12.0f,
50.0f,
3.0f,
33.0f,
1.2f};
daAlinkHIO_slide_c1 const daAlinkHIO_slide_c0::m = {
{14, 0.75f, 0.0f, 5.0f, 15.0f},
{6, 0.9f, 0.0f, 3.0f, 7.0f},
{15, 1.0f, 0.0f, 3.0f, 9.0f},
{20, 1.0f, 0.0f, 3.0f, 16.0f},
40.0f,
3.0f,
50.0f,
27.0f,
0.2f,
12.0f,
50.0f,
3.0f,
33.0f,
1.2f,
};
/* 8038D944-8038D964 019FA4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmV_c0 */
#pragma push
@ -5091,15 +5097,17 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnJU_c0::m[84] = {
COMPILER_STRIP_GATE(0x8038DAEC, &daAlinkHIO_cutFnJU_c0::m);
/* 8038DB40-8038DB84 01A1A0 0044+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutJump_c0 */
daAlinkHIO_cutJump_c1 const daAlinkHIO_cutJump_c0::m = {{17, 1.1f, 0.0f, 2.0f, 18.0f},
{29, 1.0f, 2.0f, 0.0f, 9.0f},
25.0f,
27.0f,
15.0f,
13.0f,
13.0f,
1.0f,
3.0f};
daAlinkHIO_cutJump_c1 const daAlinkHIO_cutJump_c0::m = {
{17, 1.1f, 0.0f, 2.0f, 18.0f},
{29, 1.0f, 2.0f, 0.0f, 9.0f},
25.0f,
27.0f,
15.0f,
13.0f,
13.0f,
1.0f,
3.0f,
};
/* 8038DB84-8038DC1C 01A1E4 0098+00 5/6 0/0 0/0 .rodata m__21daAlinkHIO_cutTurn_c0 */
SECTION_RODATA u8 const daAlinkHIO_cutTurn_c0::m[152] = {
@ -5222,49 +5230,53 @@ SECTION_RODATA u8 const daAlinkHIO_cutHead_c0::m[96] = {
COMPILER_STRIP_GATE(0x8038DDB8, &daAlinkHIO_cutHead_c0::m);
/* 8038DE18-8038DE8C 01A478 0074+00 5/5 0/0 0/0 .rodata m__26daAlinkHIO_cutLargeJump_c0 */
daAlinkHIO_cutLargeJump_c1 const daAlinkHIO_cutLargeJump_c0::m = {{29, 1.3f, 0.0f, 3.0f, 30.0f},
{6, 1.0f, 0.0f, 3.0f, 7.0f},
{16, 1.0f, 0.0f, 2.0f, 17.0f},
{35, 1.25f, 0.0f, 0.0f, 22.0f},
20.0f,
33.0f,
2.0f,
6.0f,
13.0f,
0.0f,
10.0f,
250.0f,
5.0f};
daAlinkHIO_cutLargeJump_c1 const daAlinkHIO_cutLargeJump_c0::m = {
{29, 1.3f, 0.0f, 3.0f, 30.0f},
{6, 1.0f, 0.0f, 3.0f, 7.0f},
{16, 1.0f, 0.0f, 2.0f, 17.0f},
{35, 1.25f, 0.0f, 0.0f, 22.0f},
20.0f,
33.0f,
2.0f,
6.0f,
13.0f,
0.0f,
10.0f,
250.0f,
5.0f,
};
/* 8038DE8C-8038DF28 01A4EC 009C+00 21/30 0/0 0/0 .rodata m__17daAlinkHIO_cut_c0 */
daAlinkHIO_cut_c1 const daAlinkHIO_cut_c0::m = {{18, -1.100f, 0.0f, 3.0f, -1.0f},
{22, 0.9f, 0.0f, 3.0f, 23.0f},
{45, 1.0f, 0.0f, 3.0f, 15.0f},
{47, 1.0f, 0.0f, 5.0f, 27.0f},
0,
1,
15,
8,
10,
90,
75,
4000,
-4000,
30,
12.0f,
1.250f,
1.0f,
1.0f,
1.6f,
45.0f,
1.65f,
65.0f,
1.21f,
35.0f,
2.3f,
2.2f,
65.0f,
0.0f};
daAlinkHIO_cut_c1 const daAlinkHIO_cut_c0::m = {
{18, -1.100f, 0.0f, 3.0f, -1.0f},
{22, 0.9f, 0.0f, 3.0f, 23.0f},
{45, 1.0f, 0.0f, 3.0f, 15.0f},
{47, 1.0f, 0.0f, 5.0f, 27.0f},
0,
1,
15,
8,
10,
90,
75,
4000,
-4000,
30,
12.0f,
1.250f,
1.0f,
1.0f,
1.6f,
45.0f,
1.65f,
65.0f,
1.21f,
35.0f,
2.3f,
2.2f,
65.0f,
0.0f,
};
/* 8038DF28-8038DF4C 01A588 0024+00 1/1 0/0 0/0 .rodata m__21daAlinkHIO_gAtPush_c0 */
SECTION_RODATA u8 const daAlinkHIO_gAtPush_c0::m[36] = {
@ -5314,37 +5326,39 @@ SECTION_RODATA u8 const daAlinkHIO_crouch_c0::m[76] = {
COMPILER_STRIP_GATE(0x8038E01C, &daAlinkHIO_crouch_c0::m);
/* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata m__22daAlinkHIO_autoJump_c0 */
daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = {{6, 1.2f, 3.0f, 6.0f, 7.0f},
{7, 0.9f, 1.0f, 0.0f, 5.0f},
{4, 0.75f, 0.0f, 2.0f, 5.0f},
{10, 0.6f, 0.0f, 2.0f, 11.0f},
1,
9158,
12287,
8,
16384,
10.0f,
10.0f,
1.3f,
5.0f,
10.0f,
3.0f,
-3.4f,
-200.0f,
26.0f,
3.0f,
4.0f,
10.0f,
1.0f,
170.0f,
100.0f,
20.0f,
30.0f,
20.0f,
-3.4f,
14.0f,
-5.0f,
23.0f};
daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = {
{6, 1.2f, 3.0f, 6.0f, 7.0f},
{7, 0.9f, 1.0f, 0.0f, 5.0f},
{4, 0.75f, 0.0f, 2.0f, 5.0f},
{10, 0.6f, 0.0f, 2.0f, 11.0f},
1,
9158,
12287,
8,
16384,
10.0f,
10.0f,
1.3f,
5.0f,
10.0f,
3.0f,
-3.4f,
-200.0f,
26.0f,
3.0f,
4.0f,
10.0f,
1.0f,
170.0f,
100.0f,
20.0f,
30.0f,
20.0f,
-3.4f,
14.0f,
-5.0f,
23.0f,
};
/* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata m__23daAlinkHIO_smallJump_c0 */
SECTION_RODATA u8 const daAlinkHIO_smallJump_c0::m[72] = {
@ -5627,21 +5641,23 @@ SECTION_RODATA u8 const daAlinkHIO_fmChain_c0::m[40] = {
COMPILER_STRIP_GATE(0x8038E7CC, &daAlinkHIO_fmChain_c0::m);
/* 8038E7F4-8038E840 01AE54 004C+00 17/21 0/0 0/0 .rodata m__24daAlinkHIO_magneBoots_c0 */
daAlinkHIO_magneBoots_c1 const daAlinkHIO_magneBoots_c0::m = {{29, 1.1f, 0.0f, 3.0f, 23.0f},
0.4f,
1.0f,
1.8f,
0.7f,
0.75f,
0.45,
0.6f,
50.0f,
10.0f,
0.35f,
0.3f,
0.7f,
0.8f,
0.7f};
daAlinkHIO_magneBoots_c1 const daAlinkHIO_magneBoots_c0::m = {
{29, 1.1f, 0.0f, 3.0f, 23.0f},
0.4f,
1.0f,
1.8f,
0.7f,
0.75f,
0.45,
0.6f,
50.0f,
10.0f,
0.35f,
0.3f,
0.7f,
0.8f,
0.7f,
};
/* 8038E840-8038E870 01AEA0 0030+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_pickUp_c0 */
SECTION_RODATA u8 const daAlinkHIO_pickUp_c0::m[48] = {
@ -5752,15 +5768,17 @@ COMPILER_STRIP_GATE(0x8038EB34, &daAlinkHIO_zwLight_c0::m);
#pragma pop
/* 8038EB50-8038EB8C 01B1B0 003C+00 3/3 0/0 0/0 .rodata m__18daAlinkHIO_item_c0 */
daAlinkHIO_item_c1 const daAlinkHIO_item_c0::m = {{12, 1.0f, 0.0f, 3.0f, 13.0f},
{14, 1.0f, 0.0f, 3.0f, 15.0f},
15,
10000,
-13000,
6000,
-9000,
1.3f,
1.3f};
daAlinkHIO_item_c1 const daAlinkHIO_item_c0::m = {
{12, 1.0f, 0.0f, 3.0f, 13.0f},
{14, 1.0f, 0.0f, 3.0f, 15.0f},
15,
10000,
-13000,
6000,
-9000,
1.3f,
1.3f,
};
/* 8038EB8C-8038EBFC 01B1EC 0070+00 14/14 0/0 0/0 .rodata m__20daAlinkHIO_ladder_c0 */
daAlinkHIO_ladder_c1 const daAlinkHIO_ladder_c0::m = {

11
src/d/menu/d_menu_window.cpp
View File

@ -11,8 +11,6 @@
// Types:
//
struct msg_class {};
struct mDoGph_gInf_c {
static u8 mFader[4];
static u8 mFrameBufferTimg[4];
@ -122,19 +120,11 @@ struct dMenu_Collect2D_c {
/* 801B5FAC */ bool isOutCheck();
};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct dDlst_MENU_CAPTURE_c {
/* 801FDFCC */ void draw();
/* 801FE2E8 */ ~dDlst_MENU_CAPTURE_c();
};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@ -387,7 +377,6 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__10CSTControl[4];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_mwHIO[304];
extern "C" extern u8 g_mwDHIO[520];
extern "C" extern u8 g_fmapHIO[1188];

200
src/d/meter/d_meter2.cpp
View File

@ -6,49 +6,12 @@
#include "d/meter/d_meter2.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "f_op/f_op_msg_mng.h"
//
// Types:
//
struct msg_class {};
struct dSv_player_status_a_c {
/* 80032A5C */ void getSelectItemIndex(int) const;
/* 80032AA8 */ void getRupeeMax() const;
};
struct dSv_player_item_record_c {
/* 80033F6C */ void setBombNum(u8, u8);
/* 80033F7C */ void getBombNum(u8) const;
/* 80034030 */ void getBottleNum(u8) const;
};
struct dSv_player_item_max_c {
/* 800340F8 */ void getBombNum(u8) const;
};
struct dSv_player_item_c {
/* 80032FB8 */ void setItem(int, u8);
/* 80033030 */ void getItem(int, bool) const;
};
struct dSv_player_collect_c {
/* 8003422C */ void onCollectCrystal(u8);
/* 8003424C */ void isCollectCrystal(u8) const;
/* 80034270 */ void onCollectMirror(u8);
/* 80034290 */ void isCollectMirror(u8) const;
};
struct dSv_light_drop_c {
/* 80034340 */ void getLightDropNum(u8) const;
/* 8003439C */ void isLightDropGetFlag(u8) const;
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct dScope_c {
/* 80193690 */ dScope_c(u8);
};
@ -59,27 +22,11 @@ struct dMw_HIO_c {
/* 801F9E24 */ bool getPachinkoFlag();
};
struct dMsgObject_c {
/* 802371E4 */ void isPlaceMessage();
/* 8023822C */ void getStatus();
};
struct dMeterString_c {
/* 8020ED60 */ dMeterString_c(int);
/* 8020F5A4 */ void createString(int);
};
struct J2DScreen {};
struct dMeterMap_c {
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
/* 8020D75C */ void getMapDispEdgeTop();
/* 8020D948 */ dMeterMap_c(J2DScreen*);
/* 8020DCE4 */ void _move(u32);
/* 8020DF1C */ void _draw();
/* 8020E754 */ void meter_map_move(u32);
};
struct dMeterHakusha_c {
/* 8020C320 */ dMeterHakusha_c(void*);
};
@ -98,143 +45,10 @@ struct dMeterButton_c {
/* 80209CEC */ void hideAll();
};
struct dMeter2_c {
/* 8021EA14 */ void _create();
/* 8021F128 */ void _execute();
/* 8021F370 */ void _draw();
/* 8021F49C */ void _delete();
/* 8021F6EC */ void emphasisButtonDelete();
/* 8021F780 */ void setLifeZero();
/* 8021F7B0 */ void checkStatus();
/* 8021FD60 */ void moveLife();
/* 80220180 */ void moveKantera();
/* 8022051C */ void moveOxygen();
/* 80220888 */ void moveLightDrop();
/* 80220C30 */ void moveRupee();
/* 802210AC */ void moveKey();
/* 80221244 */ void moveButtonA();
/* 802217F4 */ void moveButtonB();
/* 80221EC8 */ void moveButtonR();
/* 80222000 */ void moveButtonZ();
/* 802222A0 */ void moveButton3D();
/* 80222364 */ void moveButtonC();
/* 80222494 */ void moveButtonS();
/* 80222518 */ void moveButtonXY();
/* 80222E88 */ void moveButtonCross();
/* 802230F8 */ void moveTouchSubMenu();
/* 802230FC */ void moveSubContents();
/* 802231C8 */ void move2DContents();
/* 802237D4 */ void checkSubContents();
/* 80223BC4 */ void check2DContents();
/* 80223E00 */ void moveBombNum();
/* 80224258 */ void moveBottleNum();
/* 80224354 */ void moveArrowNum();
/* 80224680 */ void movePachinkoNum();
/* 802248E4 */ void alphaAnimeLife();
/* 80224A04 */ void alphaAnimeKantera();
/* 80224BAC */ void alphaAnimeOxygen();
/* 80224D6C */ void alphaAnimeLightDrop();
/* 80224DC0 */ void alphaAnimeRupee();
/* 80224F70 */ void alphaAnimeKey();
/* 802250F4 */ void alphaAnimeButton();
/* 802254C0 */ void alphaAnimeButtonCross();
/* 802256DC */ void isShowLightDrop();
/* 802258A0 */ void killSubContents(u8);
/* 80225960 */ void isKeyVisible();
/* 802259F8 */ void isArrowEquip();
/* 80225A64 */ void isPachinkoEquip();
};
struct dMeter2Info_c {
/* 8021C1DC */ void isFloatingMessageVisible();
/* 8021C950 */ void isDirectUseItem(int);
/* 8021DCE0 */ void decHotSpringTimer();
};
struct JKRExpHeap {};
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 8021135C */ void exec(u32);
/* 802149F4 */ void drawLife(s16, s16, f32, f32);
/* 80214C20 */ void setAlphaLifeChange(bool);
/* 80214DF4 */ void setAlphaLifeAnimeMin();
/* 80214E54 */ void setAlphaLifeAnimeMax();
/* 802154A8 */ void drawKantera(s32, s32, f32, f32);
/* 802155B8 */ void setAlphaKanteraChange(bool);
/* 802156E0 */ void setAlphaKanteraAnimeMin();
/* 8021575C */ void setAlphaKanteraAnimeMax();
/* 802157E0 */ void drawOxygen(s32, s32, f32, f32);
/* 802158F0 */ void setAlphaOxygenChange(bool);
/* 80215A18 */ void setAlphaOxygenAnimeMin();
/* 80215A94 */ void setAlphaOxygenAnimeMax();
/* 80215B18 */ void drawLightDrop(u8, u8, f32, f32, f32, f32, u8);
/* 80215DA4 */ void setAlphaLightDropChange(bool);
/* 80215DA8 */ void getNowLightDropRateCalc();
/* 80215E40 */ void setAlphaLightDropAnimeMin();
/* 80215F88 */ void setAlphaLightDropAnimeMax();
/* 8021632C */ void drawRupee(s16);
/* 80216684 */ void setAlphaRupeeChange(bool);
/* 802168D0 */ void setAlphaRupeeAnimeMin();
/* 80216990 */ void setAlphaRupeeAnimeMax();
/* 80216A40 */ void drawKey(s16);
/* 80216B28 */ void setAlphaKeyChange(bool);
/* 80216CA8 */ void setAlphaKeyAnimeMin();
/* 80216D2C */ void setAlphaKeyAnimeMax();
/* 80216DAC */ void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool);
/* 802170E4 */ void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool);
/* 8021764C */ void drawButtonR(u8, u8, bool, bool);
/* 802176EC */ void drawButtonZ(u8);
/* 80217904 */ void drawButton3D(u8);
/* 80217954 */ void drawButtonC(u8, bool);
/* 802179C0 */ void drawButtonS(u8);
/* 80217A10 */ void drawButtonBin(u8);
/* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool);
/* 80218238 */ void getButtonCrossParentInitTransY();
/* 80218254 */ void drawButtonCross(f32, f32);
/* 80218338 */ void setAlphaButtonCrossAnimeMin();
/* 802183A8 */ void setAlphaButtonCrossAnimeMax();
/* 80218788 */ void setAlphaButtonChange(bool);
/* 8021901C */ void setAlphaButtonAnimeMin();
/* 802190A8 */ void setAlphaButtonAnimeMax();
/* 80219174 */ void setAlphaButtonAAnimeMin();
/* 80219258 */ void setAlphaButtonAAnimeMax();
/* 80219324 */ void setAlphaButtonBAnimeMin();
/* 80219474 */ void setAlphaButtonBAnimeMax();
/* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool);
/* 80219788 */ void setButtonIconBAlpha(u8, u32, bool);
/* 80219A84 */ void setButtonIconMidonaAlpha(u32);
/* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool);
/* 8021A2F4 */ void getActionString(u8, u8, u8*);
/* 8021AB84 */ void setItemNum(u8, u8, u8);
/* 8021AEC8 */ void drawItemNum(u8, f32);
/* 8021AF78 */ void drawKanteraMeter(u8, f32);
/* 8021B0C8 */ void isButtonVisible();
/* 8021BC24 */ void getCameraSubject();
/* 8021BC54 */ void getItemSubject();
/* 8021BCAC */ void getPlayerSubject();
/* 8021BCC0 */ void isBButtonShow(bool);
/* 8021BDD0 */ void getButtonTimer();
};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct dDemo_c {
static u8 m_mode[4];
};
struct dComIfG_play_c {
/* 8002B36C */ void setItemBombNumCount(u8, s16);
/* 8002B384 */ void getItemBombNumCount(u8);
/* 8002B394 */ void clearItemBombNumCount(u8);
/* 8002C97C */ void getLayerNo(int);
/* 8002CBBC */ void getTimerMode();
};
struct dCamera_c {
/* 80174EA4 */ bool CalcSubjectAngle(s16*, s16*);
};
@ -243,10 +57,6 @@ struct Z2StatusMgr {
/* 802B5F70 */ void heartGaugeOn();
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@ -256,11 +66,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
};
//
// Forward References:
//
@ -471,16 +276,13 @@ extern "C" void _restgpr_23();
extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_mwHIO[304];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */];
extern "C" extern u8 g_meter2_info[248];
extern "C" u8 m_mode__7dDemo_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];

183
src/d/meter/d_meter2_draw.cpp
View File

@ -29,22 +29,6 @@ struct dMsgObject_c {
/* 8023822C */ void getStatus();
};
struct ResTIMG {};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
/* TBox2<f32> */
struct TBox2__template0 {};
};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
@ -56,157 +40,6 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JUtility {
struct TColor {};
};
struct JKRExpHeap {};
struct J2DGrafContext {};
struct JKRArchive {
/* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
};
struct J2DBasePosition {};
struct J2DRotateAxis {};
struct J2DPane {
/* 802F666C */ void appendChild(J2DPane*);
/* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32);
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
/* 802F79A8 */ void getGlbVtx(u8) const;
/* 802F7FCC */ void animationTransform();
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
struct J2DAnmColor {};
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 802102F8 */ ~dMeter2Draw_c();
/* 80210FB0 */ void init();
/* 8021135C */ void exec(u32);
/* 8021151C */ void draw();
/* 80211BEC */ void initLife();
/* 80211E64 */ void initMagic();
/* 80212190 */ void initLightDrop();
/* 80212404 */ void initRupeeKey();
/* 802126E4 */ void initButton();
/* 8021350C */ void initButtonCross();
/* 80213CEC */ void playPikariBckAnimation(f32);
/* 80213D6C */ void setPikariBpkAnimation(J2DAnmColor*);
/* 80213E3C */ void playPikariBpkAnimation(f32);
/* 80213E94 */ void playOxygenBpkAnimation(J2DAnmColor*);
/* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
/* 80213FF0 */ void drawPikari(CPaneMgr*, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
/* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
/* 802147CC */ void changeTextureLife(int, bool, u8);
/* 802149F4 */ void drawLife(s16, s16, f32, f32);
/* 80214C20 */ void setAlphaLifeChange(bool);
/* 80214DF4 */ void setAlphaLifeAnimeMin();
/* 80214E54 */ void setAlphaLifeAnimeMax();
/* 80214EB4 */ void drawKanteraScreen(u8);
/* 80215290 */ void drawMagic(s16, s16, f32, f32);
/* 80215380 */ void setAlphaMagicChange(bool);
/* 802154A8 */ void drawKantera(s32, s32, f32, f32);
/* 802155B8 */ void setAlphaKanteraChange(bool);
/* 802156E0 */ void setAlphaKanteraAnimeMin();
/* 8021575C */ void setAlphaKanteraAnimeMax();
/* 802157E0 */ void drawOxygen(s32, s32, f32, f32);
/* 802158F0 */ void setAlphaOxygenChange(bool);
/* 80215A18 */ void setAlphaOxygenAnimeMin();
/* 80215A94 */ void setAlphaOxygenAnimeMax();
/* 80215B18 */ void drawLightDrop(u8, u8, f32, f32, f32, f32, u8);
/* 80215DA4 */ void setAlphaLightDropChange(bool);
/* 80215DA8 */ void getNowLightDropRateCalc();
/* 80215E40 */ void setAlphaLightDropAnimeMin();
/* 80215F88 */ void setAlphaLightDropAnimeMax();
/* 8021632C */ void drawRupee(s16);
/* 80216684 */ void setAlphaRupeeChange(bool);
/* 802168D0 */ void setAlphaRupeeAnimeMin();
/* 80216990 */ void setAlphaRupeeAnimeMax();
/* 80216A40 */ void drawKey(s16);
/* 80216B28 */ void setAlphaKeyChange(bool);
/* 80216CA8 */ void setAlphaKeyAnimeMin();
/* 80216D2C */ void setAlphaKeyAnimeMax();
/* 80216DAC */ void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool);
/* 802170E4 */ void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool);
/* 8021764C */ void drawButtonR(u8, u8, bool, bool);
/* 802176EC */ void drawButtonZ(u8);
/* 80217904 */ void drawButton3D(u8);
/* 80217954 */ void drawButtonC(u8, bool);
/* 802179C0 */ void drawButtonS(u8);
/* 80217A10 */ void drawButtonBin(u8);
/* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool);
/* 80218238 */ void getButtonCrossParentInitTransY();
/* 80218254 */ void drawButtonCross(f32, f32);
/* 80218338 */ void setAlphaButtonCrossAnimeMin();
/* 802183A8 */ void setAlphaButtonCrossAnimeMax();
/* 80218448 */ void setAlphaButtonCrossItemAnimeMin();
/* 80218524 */ void setAlphaButtonCrossItemAnimeMax();
/* 802185E8 */ void setAlphaButtonCrossMapAnimeMin();
/* 802186C4 */ void setAlphaButtonCrossMapAnimeMax();
/* 80218788 */ void setAlphaButtonChange(bool);
/* 8021901C */ void setAlphaButtonAnimeMin();
/* 802190A8 */ void setAlphaButtonAnimeMax();
/* 80219174 */ void setAlphaButtonAAnimeMin();
/* 80219258 */ void setAlphaButtonAAnimeMax();
/* 80219324 */ void setAlphaButtonBAnimeMin();
/* 80219474 */ void setAlphaButtonBAnimeMax();
/* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool);
/* 80219788 */ void setButtonIconBAlpha(u8, u32, bool);
/* 80219A84 */ void setButtonIconMidonaAlpha(u32);
/* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool);
/* 8021A29C */ void getNumberTexture(int);
/* 8021A2F4 */ void getActionString(u8, u8, u8*);
/* 8021A468 */ void changeTextureItemB(u8);
/* 8021A71C */ void changeTextureItemXY(int, u8);
/* 8021A9C8 */ void setAlphaAnimeMin(CPaneMgrAlpha*, s16);
/* 8021AAA4 */ void setAlphaAnimeMax(CPaneMgrAlpha*, s16);
/* 8021AB84 */ void setItemNum(u8, u8, u8);
/* 8021AEC8 */ void drawItemNum(u8, f32);
/* 8021AF78 */ void drawKanteraMeter(u8, f32);
/* 8021B0C8 */ void isButtonVisible();
/* 8021B104 */ void setItemParamX(u8);
/* 8021B364 */ void setItemParamY(u8);
/* 8021B5B0 */ void setItemParamZ(u8);
/* 8021B810 */ void setItemParamB(u8);
/* 8021BB6C */ void getFishingType();
/* 8021BBB4 */ void getCanoeFishing();
/* 8021BC24 */ void getCameraSubject();
/* 8021BC54 */ void getItemSubject();
/* 8021BCAC */ void getPlayerSubject();
/* 8021BCC0 */ void isBButtonShow(bool);
/* 8021BDD0 */ void getButtonTimer();
};
struct dKantera_icon_c {
/* 801AE938 */ dKantera_icon_c();
/* 801AEB7C */ void setAlphaRate(f32);
@ -221,8 +54,6 @@ struct dItem_data {
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@ -232,20 +63,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};

38
src/d/meter/d_meter_map.cpp
View File

@ -36,38 +36,6 @@ struct dMsgObject_c {
/* 8023822C */ void getStatus();
};
struct J2DScreen {};
struct dMeterMap_c {
/* 8020D49C */ void isEnableDispMap();
/* 8020D528 */ void getMapDispSizeTypeNo();
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
/* 8020D690 */ void getMapDispEdgeBottomY_Layout();
/* 8020D698 */ void isEventRunCheck();
/* 8020D72C */ void getMapDispEdgeLeftX_Layout();
/* 8020D75C */ void getMapDispEdgeTop();
/* 8020D7E4 */ bool getDispPosInside_OffsetX();
/* 8020D7EC */ void getDispPosOutSide_OffsetX();
/* 8020D874 */ void setDispPosInsideFlg_SE_On();
/* 8020D8BC */ void setDispPosOutsideFlg_SE_On();
/* 8020D8F8 */ void setMapAlpha(u8);
/* 8020D900 */ void isMapOpenCheck();
/* 8020D948 */ dMeterMap_c(J2DScreen*);
/* 8020D990 */ ~dMeterMap_c();
/* 8020D9EC */ void _create(J2DScreen*);
/* 8020DC50 */ void _delete();
/* 8020DCE4 */ void _move(u32);
/* 8020DF1C */ void _draw();
/* 8020DF68 */ void draw();
/* 8020E070 */ void ctrlShowMap();
/* 8020E45C */ void checkMoveStatus();
/* 8020E4C8 */ void isShow(u32);
/* 8020E620 */ void isFmapScreen();
/* 8020E70C */ void isDmapScreen();
/* 8020E754 */ void meter_map_move(u32);
/* 8020E9CC */ void keyCheck();
};
struct dMap_c {
/* 80029874 */ dMap_c(int, int, int, int);
/* 8002A32C */ void _move(f32, f32, int, f32);
@ -86,8 +54,6 @@ struct dDlst_list_c {
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@ -96,8 +62,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
@ -333,7 +297,7 @@ void dMeterMap_c::setMapAlpha(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeterMap_c::isMapOpenCheck() {
asm bool dMeterMap_c::isMapOpenCheck() {
nofralloc
#include "asm/d/meter/d_meter_map/isMapOpenCheck__11dMeterMap_cFv.s"
}

2
src/f_op/f_op_msg_mng.cpp
View File

@ -373,7 +373,7 @@ asm void J2DPicture::insert(char const* param_0, u8 param_1, f32 param_2) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void fopMsgM_createExpHeap(u32 param_0, JKRHeap* param_1) {
asm JKRExpHeap* fopMsgM_createExpHeap(u32 param_0, JKRHeap* param_1) {
nofralloc
#include "asm/f_op/f_op_msg_mng/fopMsgM_createExpHeap__FUlP7JKRHeap.s"
}