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

move some of d_com_inf_game (#128)

Browse Source 
* move most d_com_inf_game

* remove temp
This commit is contained in:
TakaRikka
2021-05-02 20:04:42 -04:00
committed by GitHub
parent 8fd9f2ab5d
commit a83a461e54
42 changed files with 1045 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/SSystem/SComponent/c_angle/Norm__7cSGlobeCFv.s
-20
View File
@@ -1,20 +0,0 @@
lbl_80271B30:
/* 80271B30 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80271B34 7C 08 02 A6 */ mflr r0
/* 80271B38 90 01 00 24 */ stw r0, 0x24(r1)
/* 80271B3C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80271B40 7C 7F 1B 78 */ mr r31, r3
/* 80271B44 7C 85 23 78 */ mr r5, r4
/* 80271B48 38 61 00 08 */ addi r3, r1, 8
/* 80271B4C C0 22 B8 3C */ lfs f1, lit_2744(r2)
/* 80271B50 38 85 00 04 */ addi r4, r5, 4
/* 80271B54 38 A5 00 06 */ addi r5, r5, 6
/* 80271B58 4B FF FC F9 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle
/* 80271B5C 7F E3 FB 78 */ mr r3, r31
/* 80271B60 38 81 00 08 */ addi r4, r1, 8
/* 80271B64 4B FF FF 51 */ bl Xyz__7cSGlobeCFv
/* 80271B68 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80271B6C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80271B70 7C 08 03 A6 */ mtlr r0
/* 80271B74 38 21 00 20 */ addi r1, r1, 0x20
/* 80271B78 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/clearItemBombNumCount__14dComIfG_play_cFUc.s
-6
View File
@@ -1,6 +0,0 @@
lbl_8002B394:
/* 8002B394 38 A0 00 00 */ li r5, 0
/* 8002B398 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e
/* 8002B39C 7C 63 02 14 */ add r3, r3, r0
/* 8002B3A0 B0 A3 4E C2 */ sth r5, 0x4ec2(r3)
/* 8002B3A4 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/ct__14dComIfG_play_cFv.s
-21
View File
@@ -1,21 +0,0 @@
lbl_8002B1DC:
/* 8002B1DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002B1E0 7C 08 02 A6 */ mflr r0
/* 8002B1E4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002B1E8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8002B1EC 7C 7F 1B 78 */ mr r31, r3
/* 8002B1F0 38 00 00 00 */ li r0, 0
/* 8002B1F4 98 03 4E 0C */ stb r0, 0x4e0c(r3)
/* 8002B1F8 90 03 4E 04 */ stw r0, 0x4e04(r3)
/* 8002B1FC 98 03 4E 0D */ stb r0, 0x4e0d(r3)
/* 8002B200 38 7F 50 24 */ addi r3, r31, 0x5024
/* 8002B204 38 80 00 00 */ li r4, 0
/* 8002B208 38 A0 00 08 */ li r5, 8
/* 8002B20C 4B FD 82 4D */ bl memset
/* 8002B210 7F E3 FB 78 */ mr r3, r31
/* 8002B214 48 00 00 19 */ bl init__14dComIfG_play_cFv
/* 8002B218 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8002B21C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002B220 7C 08 03 A6 */ mtlr r0
/* 8002B224 38 21 00 10 */ addi r1, r1, 0x10
/* 8002B228 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/dComIfG_get_timelayer__FPi.s
-18
View File
@@ -1,18 +0,0 @@
lbl_8002B3F4:
/* 8002B3F4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002B3F8 7C 08 02 A6 */ mflr r0
/* 8002B3FC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002B400 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8002B404 7C 7F 1B 78 */ mr r31, r3
/* 8002B408 48 17 46 B1 */ bl dKy_daynight_check__Fv
/* 8002B40C 2C 03 00 00 */ cmpwi r3, 0
/* 8002B410 41 82 00 10 */ beq lbl_8002B420
/* 8002B414 80 7F 00 00 */ lwz r3, 0(r31)
/* 8002B418 38 03 00 01 */ addi r0, r3, 1
/* 8002B41C 90 1F 00 00 */ stw r0, 0(r31)
lbl_8002B420:
/* 8002B420 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8002B424 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002B428 7C 08 03 A6 */ mtlr r0
/* 8002B42C 38 21 00 10 */ addi r1, r1, 0x10
/* 8002B430 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/dComIfGp_checkItemGet__FUci.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8002B2A8:
/* 8002B2A8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002B2AC 7C 08 02 A6 */ mflr r0
/* 8002B2B0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002B2B4 48 06 CC 2D */ bl checkItemGet__FUci
/* 8002B2B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002B2BC 7C 08 03 A6 */ mtlr r0
/* 8002B2C0 38 21 00 10 */ addi r1, r1, 0x10
/* 8002B2C4 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getItemBombNumCount__14dComIfG_play_cFUc.s
-5
View File
@@ -1,5 +0,0 @@
lbl_8002B384:
/* 8002B384 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e
/* 8002B388 7C 63 02 14 */ add r3, r3, r0
/* 8002B38C A8 63 4E C2 */ lha r3, 0x4ec2(r3)
/* 8002B390 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getLayerNo_common__14dComIfG_play_cFPCcii.s
-13
View File
@@ -1,13 +0,0 @@
lbl_8002C950:
/* 8002C950 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002C954 7C 08 02 A6 */ mflr r0
/* 8002C958 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002C95C 4B FF EA D9 */ bl getLayerNo_common_common__14dComIfG_play_cFPCcii
/* 8002C960 2C 03 00 00 */ cmpwi r3, 0
/* 8002C964 40 80 00 08 */ bge lbl_8002C96C
/* 8002C968 38 60 00 00 */ li r3, 0
lbl_8002C96C:
/* 8002C96C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002C970 7C 08 03 A6 */ mtlr r0
/* 8002C974 38 21 00 10 */ addi r1, r1, 0x10
/* 8002C978 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getNowVibration__14dComIfG_play_cFv.s
-3
View File
@@ -1,3 +0,0 @@
lbl_8002B3B0:
/* 8002B3B0 88 63 4F 5A */ lbz r3, 0x4f5a(r3)
/* 8002B3B4 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getTimerLimitTimeMs__14dComIfG_play_cFv.s
-3
View File
@@ -1,3 +0,0 @@
lbl_8002CBAC:
/* 8002CBAC 80 63 50 00 */ lwz r3, 0x5000(r3)
/* 8002CBB0 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getTimerMode__14dComIfG_play_cFv.s
-3
View File
@@ -1,3 +0,0 @@
lbl_8002CBBC:
/* 8002CBBC 80 63 50 04 */ lwz r3, 0x5004(r3)
/* 8002CBC0 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getTimerNowTimeMs__14dComIfG_play_cFv.s
-3
View File
@@ -1,3 +0,0 @@
lbl_8002CB9C:
/* 8002CB9C 80 63 4F FC */ lwz r3, 0x4ffc(r3)
/* 8002CBA0 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getTimerPtr__14dComIfG_play_cFv.s
-3
View File
@@ -1,3 +0,0 @@
lbl_8002CBDC:
/* 8002CBDC 80 63 4F F8 */ lwz r3, 0x4ff8(r3)
/* 8002CBE0 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/getTimerType__14dComIfG_play_cFv.s
-3
View File
@@ -1,3 +0,0 @@
lbl_8002CBCC:
/* 8002CBCC 88 63 50 08 */ lbz r3, 0x5008(r3)
/* 8002CBD0 4E 80 00 20 */ blr
asm/d/com/d_com_inf_game/setItemBombNumCount__14dComIfG_play_cFUcs.s
-7
View File
@@ -1,7 +0,0 @@
lbl_8002B36C:
/* 8002B36C 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e
/* 8002B370 7C 63 02 14 */ add r3, r3, r0
/* 8002B374 A8 03 4E C2 */ lha r0, 0x4ec2(r3)
/* 8002B378 7C 00 2A 14 */ add r0, r0, r5
/* 8002B37C B0 03 4E C2 */ sth r0, 0x4ec2(r3)
/* 8002B380 4E 80 00 20 */ blr
include/SSystem/SComponent/c_angle.h
+1 -1
View File
@@ -93,7 +93,7 @@ public:
cSGlobe(float, short, short);
cSGlobe(float, const cSAngle&, const cSAngle&);
cSGlobe(const cXyz&);
~cSGlobe();
~cSGlobe() {}
cSGlobe& Formal(void);
void Val(const cSGlobe&);
void Val(float, short, short);
include/SSystem/SComponent/c_cc_d.h
+14 -12
View File
@@ -11,6 +11,9 @@
#include "f_op/f_op_actor.h"
class cCcD_ShapeAttr {
private:
/* 0x00 */ cM3dGAab mAab;
public:
struct Shape {};
@@ -22,9 +25,6 @@ public:
/* 80263A64 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
static f32 m_virtual_center[3];
private:
/* 0x00 */ cM3dGAab mAab;
};
class cCcD_SphAttr;
@@ -132,26 +132,28 @@ class cCcD_TriAttr {
};
class cCcD_DivideInfo {
public:
/* 80263358 */ void Set(u32, u32, u32);
/* 80263368 */ void Chk(cCcD_DivideInfo const&) const;
private:
/* 0x00 */ u32 field_0x0;
/* 0x04 */ u32 field_0x4;
/* 0x08 */ u32 field_0x8;
/* 0x0C */ void* vtable;
public:
virtual void test(); // temp to build OK, remove later
virtual ~cCcD_DivideInfo();
/* 80263358 */ void Set(u32, u32, u32);
/* 80263368 */ void Chk(cCcD_DivideInfo const&) const;
};
class cCcD_DivideArea {
private:
cM3dGAab mAab;
public:
virtual void test(); // temp to build OK, remove later
virtual ~cCcD_DivideArea();
/* 802633A8 */ void SetArea(cM3dGAab const&);
/* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
/* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&);
private:
cM3dGAab mAab;
void* vtable;
};
struct cCcD_SrcObjTg {};
include/SSystem/SComponent/c_m3d_g_aab.h
+1
View File
@@ -11,6 +11,7 @@ public:
cXyz mMin;
cXyz mMax;
virtual void test(); // temp to build OK, remove later
virtual ~cM3dGAab();
void Set(const cXyz*, const cXyz*);
bool CrossY(const cXyz*) const;
include/SSystem/SComponent/c_m3d_g_cyl.h
+1
View File
@@ -15,6 +15,7 @@ class cM3dGSph;
class cM3dGCyl : public cM3dGCylS {
public:
cM3dGCyl(const cXyz*, f32, f32);
virtual void test(); // temp to build OK, remove later
virtual ~cM3dGCyl();
void Set(const cM3dGCylS&);
void Set(const cXyz&, f32, f32);
include/SSystem/SComponent/c_m3d_g_tri.h
+1
View File
@@ -9,6 +9,7 @@
class cM3dGTri {
// private:
public:
~cM3dGTri();
cM3dGPla mPlane;
cXyz mA;
cXyz mB;
include/d/a/d_a_player.h
+1 -5
View File
@@ -2,15 +2,11 @@
#define D_A_D_A_PLAYER_H
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "d/d_resorce.h"
#include "d/save/d_save.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
// todo: remove after moving JKernel
struct JKRHeap {
/* 802CE5CC */ void freeAll();
};
class daPy_anmHeap_c {
public:
enum daAlinkHEAP_TYPE {};

Some files were not shown because too many files have changed in this diff Show More