encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07: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/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;