mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-18 13:43:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+165 -147
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 = {
src/d/menu/d_menu_window.cpp
-11
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];
src/d/meter/d_meter2.cpp
+1 -199
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 */];
src/d/meter/d_meter2_draw.cpp
-183
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*);
};
src/d/meter/d_meter_map.cpp
+1 -37
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"
}
src/f_op/f_op_msg_mng.cpp
+1 -1
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"
}