format / asm

This commit is contained in:
TakaRikka
2022-03-15 02:35:30 -07:00
parent 985d47a5c8
commit 9b81bd3fc3
126 changed files with 316 additions and 3820 deletions
+1 -1
View File
@@ -2338,7 +2338,7 @@ public:
field_0x2844.clearData();
}
s32 checkPlayerDemoMode() const { return mDemo.getDemoType(); }
u16 getMidnaMsgNum() const { return mMidnaMsgNum; }
u16 getMidnaMsgNum() const { return mMidnaMsgNum; }
BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef D_A_D_A_NPC_H
#define D_A_D_A_NPC_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
#include "dolphin/types.h"
#include "global.h"
class daNpcT_MotionSeqMngr_c {
@@ -253,7 +253,7 @@ public:
/* 8014BEE4 */ void getEvtAreaTagP(int, int);
/* 8014BFB0 */ void getShopItemTagP();
/* 8014C030 */ void setHitodamaPrtcl();
/* 8014CD20 */ virtual ~daNpcT_c();
/* 801490D4 */ virtual void ctrlBtk();
/* 8014CC14 */ virtual void ctrlSubFaceMotion(int);
@@ -301,7 +301,7 @@ public:
/* 8014CCA8 */ virtual void changeBtp(int*, int*);
/* 8014CCE8 */ virtual void changeBtk(int*, int*);
/* 8014A628 */ virtual void setMotionAnm(int, f32, int);
static u8 const mCcDObjData[48];
static u8 mCcDCyl[68];
static u8 mCcDSph[64];
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef D_A_D_A_SHOP_ITEM_STATIC_H
#define D_A_D_A_SHOP_ITEM_STATIC_H
#include "dolphin/types.h"
#include "d/a/d_a_itembase.h"
#include "dolphin/types.h"
struct ResourceData {
char* get_arcName() const { return mArcName; }