mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-20 06:06:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
TakaRikka
2021-12-27 06:17:37 -08:00
parent 38037ea1a0
commit 3c26cf452e
23 changed files with 228 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphLoader/J3DAnmLoader.h
+1 -3
View File
@@ -3,9 +3,7 @@
#include "dolphin/types.h"
enum J3DAnmLoaderDataBaseFlag {
UNK_FLAG0
};
enum J3DAnmLoaderDataBaseFlag { UNK_FLAG0 };
struct J3DAnmBase;
include/JSystem/JSupport/JSUInputStream.h
-1
View File
@@ -47,7 +47,6 @@ public:
/* 802DC298 */ s32 read(void*, s32);
}; // Size = 0x8
// move?
template <typename T>
T* JSUConvertOffsetToPtr(const void*, const void*);
include/d/a/d_a_alink.h
+1 -1
View File
@@ -203,7 +203,7 @@ public:
enum daAlink_WANM {
/* 0x5E */ ANM_WOLF_HOWL_SUCCESS = 94,
/* 0x70 */ ANM_TRANFORM_HUMAN = 0x70, // verify
/* 0x70 */ ANM_TRANFORM_HUMAN = 0x70, // verify
};
enum MODE_FLG {
include/d/a/d_a_horse_static.h
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef D_A_D_A_HORSE_STATIC_H
#define D_A_D_A_HORSE_STATIC_H
#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
#include "dolphin/types.h"
#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
class daTagHstop_c {
static daTagHstop_c* m_top;
include/d/a/d_a_player.h
+1 -1
View File
@@ -505,7 +505,7 @@ public:
}
return sumouCameraMode;
}
bool i_getSumouMode() const { return getSumouCameraMode(); }
bool checkStatusWindowDraw() { return i_checkNoResetFlg2(STATUS_WINDOW_DRAW); }
include/d/d_drawlist.h
+1 -3
View File
@@ -191,9 +191,7 @@ public:
/* 800568D8 */ void wipeIn(f32);
/* 80056900 */ void calcWipe();
void set2DOpa(dDlst_base_c* dlst) {
set(field_0x1b4, field_0x1b8, dlst);
}
void set2DOpa(dDlst_base_c* dlst) { set(field_0x1b4, field_0x1b8, dlst); }
static u8 mWipeDlst[72];
static u8 mWipeColor[4];
include/d/d_stage.h
+1 -1
View File
@@ -705,6 +705,6 @@ inline s8 dStage_sclsInfo_getTimeH(stage_scls_info_class* p_info) {
inline u32 dStage_FileList_dt_getMiniMap(dStage_FileList_dt_c* p_fList) {
return p_fList->field_0x0 >> 3 & 7;
}
}
#endif /* D_D_STAGE_H */
include/d/map/d_map_path.h
+1 -1
View File
@@ -18,7 +18,7 @@ public:
/* 8003CB00 */ void rendering(dDrawPath_c::group_class const*);
/* 8003CBBC */ void rendering(dDrawPath_c::floor_class const*);
/* 8002AD3C */ virtual ~dDrawPath_c();
/* 8002ABF0 */ virtual bool isDrawType(int);
virtual void getColor(int) = 0;
include/d/map/d_map_path_dmap.h
+6 -8
View File
@@ -1,8 +1,8 @@
#ifndef D_MAP_D_MAP_PATH_DMAP_H
#define D_MAP_D_MAP_PATH_DMAP_H
#include "d/map/d_map_path.h"
#include "d/d_stage.h"
#include "d/map/d_map_path.h"
#include "dolphin/types.h"
struct dTres_c {
@@ -68,7 +68,7 @@ public:
/* 8003FE6C */ void setSingleRoomSetting();
/* 8003FFF4 */ void getFirstDrawRoomNo();
/* 80040094 */ void getNextDrawRoomNo(int);
/* 8003FE18 */ virtual void draw();
/* 8002B150 */ virtual ~renderingDAmap_c();
/* 8003FD9C */ virtual void isSwitch(dDrawPath_c::group_class const*);
@@ -82,7 +82,7 @@ public:
/* 800402E0 */ virtual bool getFirstDrawLayerNo();
/* 800402E8 */ virtual void getNextDrawLayerNo(int);
/* 800409E0 */ virtual void isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool,
Vec const*) const;
Vec const*) const;
/* 80040AE4 */ virtual void getIconGroupNumber(u8) const;
virtual void hasMap() const = 0;
virtual void isRendAllRoom() const = 0;
@@ -93,9 +93,7 @@ public:
/* 8003FE70 */ virtual void isDrawRoom(int, int) const;
/* 800409B4 */ virtual void isDrawRoomIcon(int, int) const;
bool isDraw() const {
return mDraw;
}
bool isDraw() const { return mDraw; }
private:
/* 0x24 */ int field_0x24;
@@ -108,13 +106,13 @@ private:
class stage_tgsc_data_class;
class renderingPlusDoor_c : public renderingDAmap_c {
public:
public:
/* 80040574 */ void drawDoor1();
/* 800405B8 */ void drawDoor2();
/* 800405FC */ void drawDoorCommon(stage_tgsc_data_class const*, int, bool);
/* 80040710 */ void checkDispDoorS(int, int, f32);
/* 80040838 */ void drawNormalDoorS(stage_tgsc_data_class const*, int, int, bool);
/* 8002B0B4 */ virtual ~renderingPlusDoor_c();
/* 8004145C */ virtual void beforeDrawPath();
/* 80040518 */ virtual void afterDrawPath();
include/d/meter/d_meter2_draw.h
+3 -3
View File
@@ -114,7 +114,7 @@ public:
/* 802102F8 */ virtual ~dMeter2Draw_c();
J2DScreen* getMainScreenPtr() { return mpScreen; }
J2DScreen* getMainScreenPtr() { return mpScreen; }
private:
/* 0x004 */ f32 field_0x4;
@@ -213,8 +213,8 @@ private:
/* 0x524 */ int field_0x524[2][2];
/* 0x534 */ u8 field_0x534[8];
/* 0x53C */ J2DAnmColorKey* field_0x53c;
/* 0x540 */ J2DAnmColorKey* field_0x540; // bpk
/* 0x544 */ J2DAnmColorKey* field_0x544; // bpk
/* 0x540 */ J2DAnmColorKey* field_0x540;
/* 0x544 */ J2DAnmColorKey* field_0x544;
/* 0x548 */ u8 field_0x548[8];
/* 0x550 */ f32 field_0x550;
/* 0x554 */ f32 field_0x554;
include/d/meter/d_meter_map.h
+4 -10
View File
@@ -1,8 +1,8 @@
#ifndef D_METER_D_METER_MAP_H
#define D_METER_D_METER_MAP_H
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/map/d_map_path_dmap.h"
#include "dolphin/types.h"
@@ -66,7 +66,7 @@ public:
/* 8002A1BC */ void getDispType() const;
/* 8002A32C */ void _move(f32, f32, int, f32);
/* 8002AB54 */ void _draw();
/* 8002AF20 */ virtual ~dMap_c();
/* 800296EC */ virtual void isDrawType(int);
/* 80028DF4 */ virtual void getColor(int);
@@ -80,9 +80,7 @@ public:
/* 8002A148 */ virtual void setAmapPaletteColor(int, u8, u8, u8, u8);
/* 80029744 */ virtual bool isSpecialOutline();
bool isDraw() const {
return renderingDAmap_c::isDraw();
}
bool isDraw() const { return renderingDAmap_c::isDraw(); }
ResTIMG* getResTIMGPointer() { return mResTIMG; }
f32 getTopEdgePlus() { return mTopEdgePlus; }
@@ -154,11 +152,7 @@ public:
bool isDispPosInsideFlg() { return field_0x2d != 0; }
enum {
MAP_SIZE_TYPE_BIG = 2,
MAP_SIZE_TYPE_SMALL = 3,
MAP_SIZE_TYPE_STAGE = 7
};
enum { MAP_SIZE_TYPE_BIG = 2, MAP_SIZE_TYPE_SMALL = 3, MAP_SIZE_TYPE_STAGE = 7 };
private:
/* 0x04 */ J2DPicture* mMapJ2DPicture;
include/m_Do/m_Do_ext.h
+1 -3
View File
@@ -20,9 +20,7 @@ private:
class mDoExt_transAnmBas : public J3DAnmTransformKey {
public:
mDoExt_transAnmBas(void* bas) {
mBas = bas;
}
mDoExt_transAnmBas(void* bas) { mBas = bas; }
virtual ~mDoExt_transAnmBas();
private:
include/rel/d/a/d_a_horse/d_a_horse.h
+3 -3
View File
@@ -1,12 +1,12 @@
#ifndef D_A_HORSE_H
#define D_A_HORSE_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/bg/d_bg_s.h"
#include "d/cc/d_cc_d.h"
#include "d/msg/d_msg_flow.h"
#include "Z2AudioLib/Z2Creature.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class daHorseRein_c {
public:
include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h
+1 -1
View File
@@ -1,9 +1,9 @@
#ifndef D_A_E_WB_H
#define D_A_E_WB_H
#include "Z2AudioLib/Z2Creature.h"
#include "dolphin/types.h"
#include "rel/d/a/d_a_horse/d_a_horse.h"
#include "Z2AudioLib/Z2Creature.h"
class e_wb_class : public fopAc_ac_c {
public: