mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
TakaRikka
2022-01-04 05:37:27 -08:00
parent f8ce912342
commit 035a24092e
29 changed files with 138 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JFramework/JFWDisplay.h
+4 -4
View File
@@ -1,12 +1,12 @@
#ifndef JFWDISPLAY_H
#define JFWDISPLAY_H
#include "dolphin/types.h"
#include "dolphin/gx/GX.h"
#include "JSystem/JUtility/JUTXfb.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JUtility/TColor.h"
#include "JSystem/JUtility/JUTFader.h"
#include "JSystem/JUtility/JUTXfb.h"
#include "JSystem/JUtility/TColor.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
class JFWDisplay {
public:
include/JSystem/JGeometry.h
+1 -3
View File
@@ -40,9 +40,7 @@ struct TVec3<f32> {
z = z_;
}
void zero() {
x = y = z = 0.0f;
}
void zero() { x = y = z = 0.0f; }
void mul(const TVec3<f32>& a, const TVec3<f32>& b) {
x = a.x * b.x;
include/JSystem/JParticle/JPABaseShape.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef JPABASESHAPE_H
#define JPABASESHAPE_H
#include "dolphin/types.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
class JPAEmitterWorkData;
class JKRHeap;
include/JSystem/JParticle/JPAChildShape.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef JPACHILDSHAPE_H
#define JPACHILDSHAPE_H
#include "dolphin/types.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
struct JPAChildShapeData {
// Common header.
include/d/com/d_com_inf_game.h
+1 -1
View File
@@ -1126,7 +1126,7 @@ inline daPy_py_c* dComIfGp_getLinkPlayer() {
inline daPy_py_c* daPy_getLinkPlayerActorClass() {
return dComIfGp_getLinkPlayer();
}
}
inline daAlink_c* daAlink_getAlinkActorClass() {
return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR);
include/d/d_lib.h
+2 -4
View File
@@ -42,11 +42,9 @@ struct STControl {
}; // Size = 0x30
struct CSTControl : public STControl {
CSTControl(s16 param_0, s16 param_1, s16 param_2,
s16 param_3, f32 param_4, f32 param_5,
CSTControl(s16 param_0, s16 param_1, s16 param_2, s16 param_3, f32 param_4, f32 param_5,
s16 param_6, s16 param_7)
: STControl(param_0, param_1, param_2, param_3,
param_4, param_5, param_6, param_7) {}
: STControl(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7) {}
virtual f32 getValueStick();
virtual s16 getAngleStick();
include/d/d_select_cursor.h
+2 -2
View File
@@ -1,9 +1,9 @@
#ifndef D_D_SELECT_CURSOR_H
#define D_D_SELECT_CURSOR_H
#include "dolphin/types.h"
#include "d/d_select_icon.h"
#include "d/d_drawlist.h"
#include "d/d_select_icon.h"
#include "dolphin/types.h"
class dSelect_cursorHIO_c {
public:
include/d/menu/d_menu_collect.h
+2 -2
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_COLLECT_H
#define D_MENU_D_MENU_COLLECT_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "dolphin/types.h"
class dMsgString_c;
class dMenu_save_c;
include/d/menu/d_menu_dmap.h
+1 -1
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_DMAP_H
#define D_MENU_D_MENU_DMAP_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "dolphin/types.h"
class dMenu_DmapMapCtrl_c;
class dMenu_DmapBg_c;
include/d/menu/d_menu_fishing.h
+2 -2
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_FISHING_H
#define D_MENU_D_MENU_FISHING_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_select_cursor.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "dolphin/types.h"
class mDoDvdThd_mountArchive_c;
class dMsgString_c;
include/d/menu/d_menu_fmap.h
+3 -3
View File
@@ -1,11 +1,11 @@
#ifndef D_MENU_D_MENU_FMAP_H
#define D_MENU_D_MENU_FMAP_H
#include "dolphin/types.h"
#include "d/pane/d_pane_class.h"
#include "d/d_lib.h"
#include "d/d_drawlist.h"
#include "d/d_lib.h"
#include "d/msg/d_msg_flow.h"
#include "d/pane/d_pane_class.h"
#include "dolphin/types.h"
class dMenu_Fmap_stage_data_c;
class dMenu_Fmap_world_data_c;
include/d/menu/d_menu_insect.h
+2 -2
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_INSECT_H
#define D_MENU_D_MENU_INSECT_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_select_cursor.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "dolphin/types.h"
class dMsgScrn3Select_c;
class dMsgString_c;
include/d/menu/d_menu_letter.h
+2 -2
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_LETTER_H
#define D_MENU_D_MENU_LETTER_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_select_cursor.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "dolphin/types.h"
class mDoDvdThd_mountArchive_c;
class dMsgString_c;
include/d/menu/d_menu_option.h
+7 -7
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_OPTION_H
#define D_MENU_D_MENU_OPTION_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "dolphin/types.h"
class dFile_warning_c;
class dMenu_Calibration_c;
@@ -97,11 +97,11 @@ private:
/* 0x014 */ J2DScreen* mpTVScreen;
/* 0x018 */ J2DScreen* mpScreenIcon;
/* 0x01C */ J2DScreen* mpSelectScreen;
/* 0x020 */ void* field_0x20; // bck
/* 0x024 */ void* field_0x24; // bck
/* 0x028 */ void* field_0x28; // bck
/* 0x02C */ void* field_0x2c; // bpk
/* 0x030 */ void* field_0x30; // btk
/* 0x020 */ void* field_0x20;
/* 0x024 */ void* field_0x24;
/* 0x028 */ void* field_0x28;
/* 0x02C */ void* field_0x2c;
/* 0x030 */ void* field_0x30;
/* 0x034 */ dFile_warning_c* mpWarning;
/* 0x038 */ J2DPicture* mpBlackTex;
/* 0x03C */ dMenu_Calibration_c* field_0x3c;
include/d/menu/d_menu_ring.h
+2 -2
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_RING_H
#define D_MENU_D_MENU_RING_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_select_cursor.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "dolphin/types.h"
class dMsgString_c;
class dKantera_icon_c;
include/d/menu/d_menu_save.h
+12 -12
View File
@@ -3,8 +3,8 @@
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/d_lib.h"
#include "dolphin/types.h"
#include "d/d_select_cursor.h"
#include "dolphin/types.h"
class dMsgString_c;
class mDoDvdThd_command_c;
@@ -173,14 +173,14 @@ private:
/* 0x002C */ dSelect_cursor_c* mSelIcon;
/* 0x0030 */ dFile_warning_c* field_0x30;
/* 0x0034 */ dFile_info_c* field_0x34[3];
/* 0x0040 */ void* field_0x40; // bck
/* 0x0044 */ void* field_0x44; // bck
/* 0x0048 */ void* field_0x48; // bck
/* 0x004C */ void* field_0x4c; // bck
/* 0x0040 */ void* field_0x40;
/* 0x0044 */ void* field_0x44;
/* 0x0048 */ void* field_0x48;
/* 0x004C */ void* field_0x4c;
/* 0x0050 */ s32 field_0x50;
/* 0x0054 */ u8 field_0x54;
/* 0x0058 */ CPaneMgr* field_0x58;
/* 0x005C */ int field_0x5c;
/* 0x005C */ int field_0x5c;
/* 0x0060 */ int field_0x60;
/* 0x0064 */ u8 field_0x64;
/* 0x0064 */ u8 field_0x65;
@@ -215,15 +215,15 @@ private:
/* 0x0132 */ u8 field_0x132[2];
/* 0x0134 */ u8 field_0x134[2];
/* 0x0138 */ CPaneMgr* field_0x138[2];
/* 0x0140 */ void* field_0x140; // bpk
/* 0x0140 */ void* field_0x140;
/* 0x0144 */ int field_0x144;
/* 0x0148 */ void* field_0x148; // btk
/* 0x0148 */ void* field_0x148;
/* 0x014C */ int field_0x14c;
/* 0x0150 */ void* field_0x150;
/* 0x0154 */ int field_0x154;
/* 0x0158 */ void* field_0x158; // btk
/* 0x0158 */ void* field_0x158;
/* 0x015C */ int field_0x15c;
/* 0x0160 */ void* field_0x160; // brk
/* 0x0160 */ void* field_0x160;
/* 0x0164 */ int field_0x164;
/* 0x0168 */ CPaneMgr* field_0x168[2];
/* 0x0170 */ u8 field_0x170[8];
@@ -260,8 +260,8 @@ private:
/* 0x01C0 */ u8 field_0x1c0;
/* 0x01C4 */ int field_0x1c4;
/* 0x01C8 */ int field_0x1c8;
/* 0x01CC */ void* field_0x1cc; // func
/* 0x01D0 */ u8 field_0x1d0[0xA94 * 3]; // 3 savefiles buffer
/* 0x01CC */ void* field_0x1cc;
/* 0x01D0 */ u8 field_0x1d0[0xA94 * 3];
/* 0x218C */ dMsgScrnExplain_c* mpScrnExplain;
/* 0x2190 */ u8 field_0x2190;
/* 0x2192 */ u16 field_0x2192;
include/d/menu/d_menu_skill.h
+3 -3
View File
@@ -1,10 +1,10 @@
#ifndef D_MENU_D_MENU_SKILL_H
#define D_MENU_D_MENU_SKILL_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "dolphin/types.h"
class mDoDvdThd_mountArchive_c;
class dMsgString_c;
@@ -39,7 +39,7 @@ public:
/* 801F93C0 */ void setNameString(u16);
/* 801F9470 */ void getSkillNum();
/* 801F9500 */ void setHIO(bool);
/* 801F9A08 */ virtual void draw();
/* 801F7348 */ virtual ~dMenu_Skill_c();
include/d/menu/d_menu_window.h
+3 -17
View File
@@ -1,13 +1,13 @@
#ifndef D_MENU_D_MENU_WINDOW_H
#define D_MENU_D_MENU_WINDOW_H
#include "d/d_drawlist.h"
#include "d/menu/d_menu_collect.h"
#include "d/meter/d_meter2_info.h"
#include "d/msg/d_msg_class.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_drawlist.h"
#include "d/menu/d_menu_collect.h"
#include "d/msg/d_msg_class.h"
class dMenu_Ring_c;
class dMenu_Dmap_c;
@@ -238,18 +238,4 @@ static int dMw_Create(msg_class*);
typedef int (*dMw_Method)(dMw_c*);
typedef void (dMw_c::*dMw_init_func)(u8);
struct dMw_init_proc {
/* 0x0 */ u32 field_0x0;
/* 0x4 */ u32 field_0x4;
/* 0x8 */ dMw_init_func init_func;
};
typedef void (dMw_c::*dMw_proc_func)();
struct dMw_move_proc {
/* 0x0 */ u32 field_0x0;
/* 0x4 */ u32 field_0x4;
/* 0x8 */ dMw_proc_func proc_func;
};
#endif /* D_MENU_D_MENU_WINDOW_H */
include/d/meter/d_meter2_info.h
+1 -1
View File
@@ -135,7 +135,7 @@ public:
bool isGameStatus(int status) { return mGameStatus & status; }
void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; }
bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); }
void offMenuInForce(int flag) { unk152 &= ~(1 << flag); }
void offMenuInForce(int flag) { unk152 &= ~(1 << flag); }
bool isMenuInForce(int flag) { return unk152 & (1 << flag); }
u16 getMapKeyDirection() { return mMapKeyDirection; }
u8 getWindowStatus() { return mWindowStatus; }
include/dolphin/gx/GX.h
-1
View File
@@ -928,7 +928,6 @@ inline void GXTexCoord2f32(f32 s, f32 t) {
}
inline void GXEnd() {}
};
#endif
include/dolphin/os/OS.h
+1 -1
View File
@@ -306,7 +306,7 @@ inline void* OSPhysicalToCached(u32 offset) {
static inline u8 __OSf32tou8(register f32 src) {
f32 tmp;
register f32 *p = &tmp;
register f32* p = &tmp;
register u8 ret;
asm
include/m_Do/m_Do_graphic.h
+2 -2
View File
@@ -1,9 +1,9 @@
#ifndef M_DO_M_DO_GRAPHIC_H
#define M_DO_M_DO_GRAPHIC_H
#include "dolphin/gx/GX.h"
#include "JSystem/JUtility/JUTFader.h"
#include "JSystem/JFramework/JFWDisplay.h"
#include "JSystem/JUtility/JUTFader.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
void mDoGph_Create();