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

d_a_no_chg_room / d_a_e_st_line done (#2056)

Browse Source 
* no_chg_room done

* d_a_e_st_line done

* remove asm

* d_a_e_bi_leaf done

* d_a_e_hb_leaf done
This commit is contained in:
TakaRikka
2024-01-31 20:05:04 +02:00
committed by GitHub
parent 255cc868e4
commit 4a081109bd
35 changed files with 610 additions and 1890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_no_chg_room.h
+16 -1
View File
@@ -1,6 +1,21 @@
#ifndef D_A_D_A_NO_CHG_ROOM_H
#define D_A_D_A_NO_CHG_ROOM_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daNocrm_c : public fopAc_ac_c {
public:
/* 801452DC */ int execute();
/* 80145508 */ int getRoomNo(int);
inline int create();
s8 getReadRoomId() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getScaleType() { return fopAcM_GetParamBit(this, 8, 4); }
/* 0x568 */ Mtx mMtx;
/* 0x598 */ Mtx mInvMtx;
/* 0x5C8 */ s8 mRoomNo[2];
/* 0x5CA */ bool mRoomLoading;
};
#endif /* D_A_D_A_NO_CHG_ROOM_H */
include/d/d_stage.h
+1
View File
@@ -830,6 +830,7 @@ public:
static void setRoomReadId(s8 id) { data_804505F0 = id; }
static s8 getRoomReadId() { return data_804505F0; }
static void offNoChangeRoom() { mNoChangeRoom = false; }
static void onNoChangeRoom() { mNoChangeRoom = true; }
static void setProcID(u32 id) { mProcID = id; }
static u32 getProcID() { return mProcID; }
static void setStatusProcID(int i_roomNo, unsigned int i_id) { mStatus[i_roomNo].mProcID = i_id; }
include/d/s/d_s_play.h
+52 -52
View File
@@ -207,108 +207,108 @@ extern dScnPly_reg_HIO_c g_regHIO;
#define tREG_S(i) g_regHIO.mChildReg[25].mShortReg[i]
#else
// Morita
#define TREG_F(i)
#define TREG_S(i)
#define TREG_F(i) (0)
#define TREG_S(i) (0)
// Matsutani
#define DREG_F(i)
#define DREG_S(i)
#define DREG_F(i) (0)
#define DREG_S(i) (0)
// Iwawaki
#define IREG_F(i)
#define IREG_S(i)
#define IREG_F(i) (0)
#define IREG_S(i) (0)
// Sasa
#define SREG_F(i)
#define SREG_S(i)
#define SREG_F(i) (0)
#define SREG_S(i) (0)
// Umemiya
#define UREG_F(i)
#define UREG_S(i)
#define UREG_F(i) (0)
#define UREG_S(i) (0)
// Ogawa
#define OREG_F(i)
#define OREG_S(i)
#define OREG_F(i) (0)
#define OREG_S(i) (0)
// Sakaguchi
#define YREG_F(i)
#define YREG_S(i)
#define YREG_F(i) (0)
#define YREG_S(i) (0)
// Sakai
#define KREG_F(i)
#define KREG_S(i)
#define KREG_F(i) (0)
#define KREG_S(i) (0)
// Hara
#define BREG_F(i)
#define BREG_S(i)
#define BREG_F(i) (0)
#define BREG_S(i) (0)
// Sumiyoshi
#define MREG_F(i)
#define MREG_S(i)
#define MREG_F(i) (0)
#define MREG_S(i) (0)
// Takeshita
#define AREG_F(i)
#define AREG_S(i)
#define AREG_F(i) (0)
#define AREG_S(i) (0)
// Yoshida
#define PREG_F(i)
#define PREG_S(i)
#define PREG_F(i) (0)
#define PREG_S(i) (0)
// Noma
#define NREG_F(i)
#define NREG_S(i)
#define NREG_F(i) (0)
#define NREG_S(i) (0)
// Nishiwaki
#define WREG_F(i)
#define WREG_S(i)
#define WREG_F(i) (0)
#define WREG_S(i) (0)
// Masaro
#define JREG_F(i)
#define JREG_S(i)
#define JREG_F(i) (0)
#define JREG_S(i) (0)
// Hayakawa
#define HREG_F(i)
#define HREG_S(i)
#define HREG_F(i) (0)
#define HREG_S(i) (0)
// Sadamoto
#define VREG_F(i)
#define VREG_S(i)
#define VREG_F(i) (0)
#define VREG_S(i) (0)
// Nishikawa
#define XREG_F(i)
#define XREG_S(i)
#define XREG_F(i) (0)
#define XREG_S(i) (0)
// Suzuki
#define ZREG_F(i)
#define ZREG_S(i)
#define ZREG_F(i) (0)
#define ZREG_S(i) (0)
// Nakanishi
#define nREG_F(i)
#define nREG_S(i)
#define nREG_F(i) (0)
#define nREG_S(i) (0)
// Kuwajima
#define kREG_F(i)
#define kREG_S(i)
#define kREG_F(i) (0)
#define kREG_S(i) (0)
// Okajima
#define oREG_F(i)
#define oREG_S(i)
#define oREG_F(i) (0)
#define oREG_S(i) (0)
// Yamazaki
#define yREG_F(i)
#define yREG_S(i)
#define yREG_F(i) (0)
#define yREG_S(i) (0)
// Ashida
#define aREG_F(i)
#define aREG_S(i)
#define aREG_F(i) (0)
#define aREG_S(i) (0)
// Okada
#define hREG_F(i)
#define hREG_S(i)
#define hREG_F(i) (0)
#define hREG_S(i) (0)
// Takahashi
#define tREG_F(i)
#define tREG_S(i)
#define tREG_F(i) (0)
#define tREG_S(i) (0)
#endif
#endif /* D_S_D_S_PLAY_H */