mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-30 16:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

various matches / cleanup (#2271)

Browse Source 
* cleanup various TUs

* checkpoint

* d_attention doc
This commit is contained in:
TakaRikka
2024-12-29 07:53:54 -08:00
committed by GitHub
parent c429ce21eb
commit 0e281cb975
62 changed files with 1865 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_balloon_2D.cpp
+2 -13
View File
@@ -550,8 +550,7 @@ COMPILER_STRIP_GATE(0x806555E4, &lit_4175);
#pragma pop
/* 80654730-80654E8C 001350 075C+00 1/1 0/0 0/0 .text drawAddScore__13daBalloon2D_cFv */
// field_0x0.x, regalloc
#ifdef NONMATCHING
// NONMATCHING - field_0x0.x, regalloc
void daBalloon2D_c::drawAddScore() {
for (int i = 19; i >= 0; i--) {
if (field_0x5f8[i].field_0xe != 0) {
@@ -633,11 +632,6 @@ void daBalloon2D_c::drawAddScore() {
}
}
}
#else
void daBalloon2D_c::drawAddScore() {
// NONMATCHING
}
#endif
/* 80654E8C-80655250 001AAC 03C4+00 2/2 0/0 0/0 .text setHIO__13daBalloon2D_cFb */
void daBalloon2D_c::setHIO(bool param_1) {
@@ -724,16 +718,11 @@ SECTION_DATA extern void* __vt__Q213daBalloon2D_c6c_list[4] = {
};
/* 80655250-80655304 001E70 00B4+00 1/0 0/0 0/0 .text daBalloon2D_create__FP13daBalloon2D_c */
#ifdef NONMATCHING
// NONMATCHING - vtable
static int daBalloon2D_create(daBalloon2D_c* i_this) {
fopAcM_SetupActor(i_this, daBalloon2D_c);
return i_this->create();
}
#else
static int daBalloon2D_create(daBalloon2D_c* param_0) {
// NONMATCHING
}
#endif
/* 80655304-80655340 001F24 003C+00 2/2 0/0 0/0 .text __dt__Q213daBalloon2D_c10CHeadScoreFv */
daBalloon2D_c::CHeadScore::~CHeadScore() {
src/d/actor/d_a_bg.cpp
+12 -25
View File
@@ -10,6 +10,11 @@
#include "dol2asm.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "string.h"
#include "d/d_bg_w.h"
#include "m_Do/m_Do_lib.h"
#include "d/d_demo.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
//
// Forward References:
@@ -389,8 +394,7 @@ SECTION_DEAD static char const* const stringBase_804593C6 = "room.plc";
#pragma pop
/* 804582B8-80458750 000738 0498+00 2/2 0/0 1/1 .text createHeap__6daBg_cFv */
// regalloc, but equivalent
#ifdef NONMATCHING
// NONMATCHING - regalloc, but equivalent
int daBg_c::createHeap() {
const char* arcName = setArcName();
s32 prm = fopAcM_GetParam(this);
@@ -505,11 +509,6 @@ int daBg_c::createHeap() {
return 1;
}
#else
int daBg_c::createHeap() {
// NONMATCHING
}
#endif
/* 80458750-80458788 000BD0 0038+00 1/1 0/0 0/0 .text __ct__11J3DLightObjFv */
// J3DLightObj::J3DLightObj() {
@@ -590,8 +589,7 @@ SECTION_DEAD static char const* const stringBase_80459418 = "MA00_Kusa";
#pragma pop
/* 804588C4-80458F38 000D44 0674+00 1/1 0/0 0/0 .text draw__6daBg_cFv */
// just regalloc + some reorder issues
#ifdef NONMATCHING
// NONMATCHING - just regalloc + some reorder issues
int daBg_c::draw() {
int roomNo = fopAcM_GetParam(this);
daBg_unkData* bgData = mBgData;
@@ -742,11 +740,6 @@ int daBg_c::draw() {
return 1;
}
#else
int daBg_c::draw() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 804593A4-804593A8 000030 0004+00 1/1 0/0 0/0 .rodata @4524 */
@@ -801,14 +794,13 @@ static int daBg_Create(fopAc_ac_c* i_this) {
}
/* 8045906C-8045933C 0014EC 02D0+00 1/1 0/0 0/0 .text create__6daBg_cFv */
// regalloc
#ifdef NONMATCHING
// NONMATCHING - regalloc
int daBg_c::create() {
int roomNo = fopAcM_GetParam(this);
field_0x5f0 = 0;
field_0x5f1 = 0;
if (mHeap == NULL) {
if (this->heap == NULL) {
fopAcM_SetupActor(this, daBg_c);
home.roomNo = roomNo;
@@ -816,13 +808,13 @@ int daBg_c::create() {
JKRExpHeap* heap = dStage_roomControl_c::getMemoryBlock(roomNo);
if (heap != NULL) {
mHeap = JKRSolidHeap::create(-1, heap, false);
this->heap = JKRSolidHeap::create(-1, heap, false);
JKRHeap* old = mDoExt_setCurrentHeap(mHeap);
JKRHeap* old = mDoExt_setCurrentHeap(this->heap);
createHeap();
mDoExt_setCurrentHeap(old);
mHeap->adjustSize();
this->heap->adjustSize();
} else if (!fopAcM_entrySolidHeap(this, checkCreateHeap, 0x80020040)) {
return cPhs_ERROR_e;
}
@@ -888,11 +880,6 @@ int daBg_c::create() {
dComIfGp_roomControl_onStatusFlag(roomNo, 0x10);
return cPhs_COMPLEATE_e;
}
#else
int daBg_c::create() {
// NONMATCHING
}
#endif
/* 8045933C-8045936C 0017BC 0030+00 1/0 0/0 0/0 .text calc__11J3DTexNoAnmCFPUs */
// void J3DTexNoAnm::calc(u16* param_0) const {
src/d/actor/d_a_bg_obj.cpp
+10 -25
View File
@@ -318,16 +318,14 @@ SECTION_DEAD static char const* const stringBase_8045CA86 = "データブロッ
/* 80459904-80459B64 000324 0260+00 1/1 0/0 1/1 .text Set__Q29daBgObj_c11spec_data_cFPv
*/
// close-ish
#ifdef NONMATCHING
int daBgObj_c::spec_data_c::Set(void* i_ptr) {
// NONMATCHING - close-ish
bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
spec_dat* data = (spec_dat*)i_ptr;
mSpecType = data->field_0x0;
switch (mSpecType) {
case 0:
case 0: {
u8 block_type = data->field_0x4;
u8* block_p = (u8*)data + 4;
@@ -350,7 +348,8 @@ int daBgObj_c::spec_data_c::Set(void* i_ptr) {
block_type = *block_p;
} while (1);
break;
case 1:
}
case 1: {
u16 temp_r3 = data->field_0x2;
field_0x02 = temp_r3 & 0xF;
field_0x03 = (temp_r3 >> 0xE) & 3;
@@ -386,7 +385,8 @@ int daBgObj_c::spec_data_c::Set(void* i_ptr) {
block_type = *block_p;
} while (1);
break;
case 2:
}
case 2: {
u16 temp_r3_2 = data->field_0x2;
field_0x02 = temp_r3_2 & 0xF;
field_0x03 = (temp_r3_2 >> 0xE) & 3;
@@ -426,17 +426,13 @@ int daBgObj_c::spec_data_c::Set(void* i_ptr) {
block_type = *block_p;
} while (1);
break;
}
default:
return 0;
}
return 1;
}
#else
bool daBgObj_c::spec_data_c::Set(void* param_0) {
// NONMATCHING
}
#endif
/* 80459B64-80459BB4 000584 0050+00 4/4 0/0 0/0 .text release__9daBgObj_cFP4dBgW */
void daBgObj_c::release(dBgW* param_0) {
@@ -968,7 +964,7 @@ BOOL daBgObj_c::checkDestroy() {
/* 8045B534-8045B5E0 001F54 00AC+00 2/2 0/0 0/0 .text checkHitAt__9daBgObj_cFP8cCcD_Obj
*/
#ifdef NONMATCHING
// NONMATCHING
BOOL daBgObj_c::checkHitAt(cCcD_Obj* i_hitObj) {
u32 hit_flags = 0;
u32 var_r8 = 0;
@@ -995,11 +991,6 @@ BOOL daBgObj_c::checkHitAt(cCcD_Obj* i_hitObj) {
return hit_flags != 0;
}
#else
BOOL daBgObj_c::checkHitAt(cCcD_Obj* param_0) {
// NONMATCHING
}
#endif
/* 8045B5E0-8045B7FC 002000 021C+00 1/1 0/0 0/0 .text orderWait_tri__9daBgObj_cFv */
void daBgObj_c::orderWait_tri() {
@@ -1047,8 +1038,7 @@ void daBgObj_c::orderWait_tri() {
/* 8045B7FC-8045B9C4 00221C 01C8+00 1/1 0/0 0/0 .text orderWait_cyl__9daBgObj_cFv */
// r30/r31 swap
#ifdef NONMATCHING
// NONMATCHING - r30/r31 swap
void daBgObj_c::orderWait_cyl() {
if (mCyl.ChkTgHit()) {
if (checkHitAt(mCyl.GetTgHitObj())) {
@@ -1086,11 +1076,6 @@ void daBgObj_c::orderWait_cyl() {
dComIfG_Ccsp()->Set(&mCyl);
}
#else
void daBgObj_c::orderWait_cyl() {
// NONMATCHING
}
#endif
/* 8045B9C4-8045BB38 0023E4 0174+00 1/1 0/0 0/0 .text orderWait_spec__9daBgObj_cFv */
void daBgObj_c::orderWait_spec() {
src/d/actor/d_a_e_ym.cpp
+3 -75
View File
@@ -669,8 +669,7 @@ COMPILER_STRIP_GATE(0x808159E8, &lit_4102);
#pragma pop
/* 808083CC-80808678 00038C 02AC+00 1/1 0/0 0/0 .text draw__8daE_YM_cFv */
// one instruction order mismatch (probably causes regalloc issue)
#ifdef NONMATCHING
// NONMATCHING - one instruction order mismatch (probably causes regalloc issue)
int daE_YM_c::draw() {
if (field_0x71d) {
return 1;
@@ -738,11 +737,6 @@ int daE_YM_c::draw() {
return 1;
}
#else
int daE_YM_c::draw() {
// NONMATCHING
}
#endif
/* 80808678-80808698 000638 0020+00 1/0 0/0 0/0 .text daE_YM_Draw__FP8daE_YM_c */
static int daE_YM_Draw(daE_YM_c* i_this) {
@@ -753,11 +747,8 @@ static int daE_YM_Draw(daE_YM_c* i_this) {
/* 80815D28-80815D2C 000008 0004+00 2/2 0/0 0/0 .bss None */
static u8 data_80815D28[4];
/* 80815D2C-80815D38 00000C 000C+00 1/1 0/0 0/0 .bss @3941 */
static u8 lit_3941[12];
/* 80815D38-80815D5C 000018 0024+00 18/18 0/0 0/0 .bss l_HIO */
static u8 l_HIO[36];
static daE_YM_HIO_c l_HIO;
/* 80815D5C-80815D60 00003C 0004+00 3/3 0/0 0/0 .bss m_near_obj */
static fopAc_ac_c* m_near_obj;
@@ -1850,8 +1841,7 @@ SECTION_DEAD static char const* const stringBase_80815AFE = "E_ym";
#pragma pop
/* 80814BA4-80815224 00CB64 0680+00 2/1 0/0 0/0 .text create__8daE_YM_cFv */
// literals / small issue
#ifdef NONMATCHING
// NONMATCHING - literals / small issue
int daE_YM_c::create() {
fopAcM_SetupActor(this, daE_YM_c);
@@ -2023,11 +2013,6 @@ int daE_YM_c::create() {
return phase;
}
#else
int daE_YM_c::create() {
// NONMATCHING
}
#endif
/* 80815224-8081526C 00D1E4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
// cM3dGSph::~cM3dGSph() {
@@ -2063,60 +2048,3 @@ extern "C" void __dt__12dBgS_AcchCirFv() {
static int daE_YM_Create(daE_YM_c* i_this) {
return i_this->create();
}
/* 80815410-80815458 00D3D0 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80815458-808154A0 00D418 0048+00 2/1 0/0 0/0 .text __dt__12daE_YM_HIO_cFv */
daE_YM_HIO_c::~daE_YM_HIO_c() {
// NONMATCHING
}
/* 808154A0-808154DC 00D460 003C+00 0/0 1/0 0/0 .text __sinit_d_a_e_ym_cpp */
void __sinit_d_a_e_ym_cpp(){// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x808154A0, __sinit_d_a_e_ym_cpp);
#pragma pop
/* 808154DC-808154E4 00D49C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
static void func_808154DC() {
// NONMATCHING
}
/* 808154E4-808154EC 00D4A4 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
static void func_808154E4() {
// NONMATCHING
}
/* 808154EC-80815900 00D4AC 0414+00 1/1 0/0 0/0 .text
* setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz */
static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, cXyz* param_2,
cXyz* param_3) {
// NONMATCHING
}
/* 80815900-8081593C 00D8C0 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
// cXyz::~cXyz() {
extern "C" void __dt__4cXyzFv() {
// NONMATCHING
}
/* 8081593C-80815958 00D8FC 001C+00 2/2 0/0 0/0 .text getLeftHandPos__9daPy_py_cCFv */
// void daPy_py_c::getLeftHandPos() const {
extern "C" void getLeftHandPos__9daPy_py_cCFv() {
// NONMATCHING
}
/* 80815958-80815980 00D918 0028+00 1/1 0/0 0/0 .text getPos__13daTag_FWall_cFUc */
// void daTag_FWall_c::getPos(u8 param_0) {
extern "C" void getPos__13daTag_FWall_cFUc() {
// NONMATCHING
}
/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_grass.cpp
+1 -7
View File
@@ -2248,8 +2248,7 @@ SECTION_DEAD static char const* const stringBase_805231CE = "D_MN07A";
#pragma pop
/* 8051C304-8051D6CC 0006A4 13C8+00 1/1 0/0 0/0 .text create__9daGrass_cFv */
// matches except for static data
#ifdef NONMATCHING
// NONMATCHING - matches except for static data
int daGrass_c::create() {
static csXyz l_setType0[] = {
csXyz(0, 0, 0), csXyz(3, 0, -50), csXyz(-2, 0, 50), csXyz(50, 0, 27),
@@ -2414,11 +2413,6 @@ int daGrass_c::create() {
fopAcM_setStageLayer(this);
return cPhs_COMPLEATE_e;
}
#else
int daGrass_c::create() {
// NONMATCHING
}
#endif
int daGrass_c::Delete() {
if (m_myObj == this) {
src/d/actor/d_a_kytag13.cpp
+2 -23
View File
@@ -446,8 +446,7 @@ SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12] = {
/* 8085F2B0-80860148 000130 0E98+00 1/1 0/0 0/0 .text
* daKytag13_Execute_standard__FP13kytag13_class */
// some regalloc
#ifdef NONMATCHING
// NONMATCHING - some regalloc
static int daKytag13_Execute_standard(kytag13_class* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
dKankyo_snow_Packet* snow_packet = g_env_light.mpSnowPacket;
@@ -536,7 +535,7 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) {
switch (snow_packet->mSnowEff[i].mStatus) {
case 0:
snow_packet->mSnowEff[i].mWindSpeed = (4.0f * i_this->field_0x574) + cM_rndF(6.0f);
snow_packet->mSnowEff[i].mWindSpeed = (4.0f * i_this->mSpeed) + cM_rndF(6.0f);
snow_packet->mSnowEff[i].mGravity = temp_f28;
snow_packet->mSnowEff[i].mTimer = 0;
snow_packet->mSnowEff[i].mPosition.x = sp40.x + cM_rndFX(500.0f * a_this->scale.x);
@@ -754,11 +753,6 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) {
return 1;
}
#else
static void daKytag13_Execute_standard(kytag13_class* i_this) {
// NONMATCHING
}
#endif
/* 80860148-808601C0 000FC8 0078+00 4/3 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */
// dBgS_ObjGndChk::~dBgS_ObjGndChk() {
@@ -852,18 +846,3 @@ static int daKytag13_Create(fopAc_ac_c* i_this) {
return cPhs_COMPLEATE_e;
}
/* 80860450-80860458 0012D0 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */
static void func_80860450() {
// NONMATCHING
}
/* 80860458-80860460 0012D8 0008+00 1/0 0/0 0/0 .text @76@__dt__14dBgS_ObjGndChkFv */
static void func_80860458() {
// NONMATCHING
}
/* 80860460-80860468 0012E0 0008+00 1/0 0/0 0/0 .text @60@__dt__14dBgS_ObjGndChkFv */
static void func_80860460() {
// NONMATCHING
}
src/d/actor/d_a_obj_bosswarp.cpp
+1 -7
View File
@@ -678,8 +678,7 @@ SECTION_DEAD static char const* const stringBase_8057B64F = "Timer";
#pragma pop
/* 8057AA94-8057B0D8 0014D4 0644+00 11/8 0/0 0/0 .text demoProc__15daObjBossWarp_cFv */
#ifdef NONMATCHING
// regalloc
// NONMATCHING - regalloc
int daObjBossWarp_c::demoProc() {
static char* action_table[15] = {
"WAIT",
@@ -878,11 +877,6 @@ int daObjBossWarp_c::demoProc() {
return 1;
}
#else
int daObjBossWarp_c::demoProc() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 8057B4BC-8057B4C0 00015C 0004+00 0/0 0/0 0/0 .rodata @4491 */
src/d/actor/d_a_obj_carry.cpp
+4 -28
View File
@@ -2134,8 +2134,7 @@ COMPILER_STRIP_GATE(0x8047A394, &lit_3962);
/* 8046F3E4-8046F4AC 000464 00C8+00 1/0 0/0 0/0 .text
* CoHitCallBackBokkuri__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
#ifdef NONMATCHING
// literals
// NONMATCHING - literals
static void CoHitCallBackBokkuri(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
daObjCarry_c* _param_0 = static_cast<daObjCarry_c*>(param_0);
@@ -2155,12 +2154,6 @@ static void CoHitCallBackBokkuri(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
}
}
}
#else
static void CoHitCallBackBokkuri(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
// NONMATCHING
}
#endif
/* 8046F4AC-8046F52C 00052C 0080+00 1/1 0/0 0/0 .text s_swA_sub__FPvPv */
static void* s_swA_sub(void* param_0, void* param_1) {
@@ -2728,8 +2721,7 @@ s32 daObjCarry_c::CreateInit_Lv8Ball() {
}
/* 80470B5C-80470BF4 001BDC 0098+00 1/1 0/0 0/0 .text CreateHeap__12daObjCarry_cFv */
#ifdef NONMATCHING
// 1 instruction in wrong place
// NONMATCHING - 1 instruction in wrong place
s32 daObjCarry_c::CreateHeap() {
s32 l_modelFlag;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getArcName(),getBmdName());
@@ -2748,14 +2740,9 @@ s32 daObjCarry_c::CreateHeap() {
return 1;
}
#else
s32 daObjCarry_c::CreateHeap() {
// NONMATCHING
}
#endif
/* 80470BF4-80470CF0 001C74 00FC+00 1/1 0/0 0/0 .text create__12daObjCarry_cFv */
#ifdef NONMATCHING
// NONMATCHING
cPhs__Step daObjCarry_c::create() {
cPhs__Step step;
preInit();
@@ -2770,16 +2757,11 @@ cPhs__Step daObjCarry_c::create() {
}
if (step == cPhs_NEXT_e) {
return;
return step;
}
return step;
}
#else
cPhs__Step daObjCarry_c::create() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 8047A3D4-8047A3E0 000AC8 000C+00 1/1 0/0 0/0 .rodata l_event_bitA$4815 */
@@ -2973,15 +2955,9 @@ COMPILER_STRIP_GATE(0x8047A424, &lit_5876);
#pragma pop
/* 80472B54-80472D8C 003BD4 0238+00 1/1 0/0 0/0 .text crr_pos__12daObjCarry_cFv */
#ifdef NONMATCHING
void daObjCarry_c::crr_pos() {
}
#else
void daObjCarry_c::crr_pos() {
// NONMATCHING
}
#endif
/* 80472D8C-80472E5C 003E0C 00D0+00 1/1 0/0 0/0 .text check_sink__12daObjCarry_cFPf */
void daObjCarry_c::check_sink(f32* param_0) {
src/d/actor/d_a_obj_crope.cpp
+2 -13
View File
@@ -401,15 +401,10 @@ static int daObjCrope_Create(fopAc_ac_c* i_this) {
}
/* 80BCD524-80BCD69C 0008C4 0178+00 1/1 0/0 0/0 .text __dt__12daObjCrope_cFv */
#ifdef NONMATCHING
// NONMATCHING
daObjCrope_c::~daObjCrope_c() {
dComIfG_resDelete(&mPhase, l_arcName);
}
#else
daObjCrope_c::~daObjCrope_c() {
// NONMATCHING
}
#endif
/* 80BCD69C-80BCD6C4 000A3C 0028+00 1/0 0/0 0/0 .text daObjCrope_Delete__FP12daObjCrope_c
*/
@@ -457,8 +452,7 @@ COMPILER_STRIP_GATE(0x80BCEB24, &lit_4119);
/* 80BCD6C4-80BCD9EC 000A64 0328+00 3/3 0/0 0/0 .text setNormalRopePos__12daObjCrope_cFv
*/
// Horrible regalloc
#ifdef NONMATCHING
// NONMATCHING - Horrible regalloc
void daObjCrope_c::setNormalRopePos() {
cXyz* pdVar4;
cXyz* pVVar5;
@@ -522,11 +516,6 @@ void daObjCrope_c::setNormalRopePos() {
this_01++;
}
}
#else
void daObjCrope_c::setNormalRopePos() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80BCEB28-80BCEB2C 00005C 0004+00 1/2 0/0 0/0 .rodata @4407 */
src/d/actor/d_a_obj_dmelevator.cpp
-7
View File
@@ -846,17 +846,10 @@ SECTION_DEAD static char const* const stringBase_80BDF93C = "Timer";
#pragma pop
/* 80BDFAB0-80BDFAB8 -00001 0008+00 1/1 0/0 0/0 .data action_table$4279 */
#ifdef NONMATCHING
static char* action_table[2] = {
"WAIT",
"MOVE",
};
#else
SECTION_DATA static void* action_table[2] = {
(void*)(((char*)&d_a_obj_dmelevator__stringBase0) + 0x46),
(void*)(((char*)&d_a_obj_dmelevator__stringBase0) + 0x4B),
};
#endif
/* 80BDF16C-80BDF320 0018EC 01B4+00 3/3 0/0 0/0 .text demoProc__17daObjDmElevator_cFv */
int daObjDmElevator_c::demoProc() {
src/d/actor/d_a_obj_fmobj.cpp
+3 -8
View File
@@ -7,6 +7,7 @@
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "SSystem/SComponent/c_math.h"
#include "dol2asm.h"
//
@@ -138,8 +139,7 @@ COMPILER_STRIP_GATE(0x8057CF70, &lit_3745);
/* 8057CDE0-8057CF60 000280 0180+00 1/0 0/0 0/0 .text daObj_Fmobj_Create__FP10fopAc_ac_c
*/
// reg alloc
#ifdef NONMATCHING
// NONMATCHING - reg alloc
static int daObj_Fmobj_Create(fopAc_ac_c* i_this) {
obj_fmobj_class* a_this = (obj_fmobj_class*)i_this;
fopAcM_SetupActor(a_this, obj_fmobj_class);
@@ -168,18 +168,13 @@ static int daObj_Fmobj_Create(fopAc_ac_c* i_this) {
a_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_stack_c::transM(0.0f, -30.0f, 0.0f);
MTXCopy(mDoMtx_stack_c::get(), a_this->mDzbMtx);
MTXCopy(mDoMtx_stack_c::get(), a_this->mBgMtx);
a_this->mpBgW->Move();
}
return phase;
}
#else
static int daObj_Fmobj_Create(fopAc_ac_c* param_0) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 8057CF80-8057CFA0 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Fmobj_Method */
src/d/actor/d_a_obj_hbombkoya.cpp
+1 -7
View File
@@ -359,18 +359,12 @@ int daObjHBombkoya_c::Delete() {
/* 80C1C1A8-80C1C2BC 0009A8 0114+00 1/0 0/0 0/0 .text
* daObjHBombkoya_create1st__FP16daObjHBombkoya_c */
// vtable issues, read more below
#ifdef NONMATCHING
// NONMATCHING - vtable issues, read more below
static int daObjHBombkoya_create1st(daObjHBombkoya_c* i_this) {
fopAcM_SetupActor(i_this, daObjHBombkoya_c);
return i_this->create1st();
}
#else
static void daObjHBombkoya_create1st(daObjHBombkoya_c* param_0) {
// NONMATCHING
}
#endif
/* 80C1C2BC-80C1C304 000ABC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
// cM3dGCyl::~cM3dGCyl() {
src/d/actor/d_a_obj_ice_l.cpp
+2 -13
View File
@@ -182,8 +182,7 @@ COMPILER_STRIP_GATE(0x80C207C8, &lit_3741);
/* 80C1FA60-80C1FCCC 0000E0 026C+00 1/1 0/0 0/0 .text Check_RideOn__12daObjIce_l_cF4cXyz
*/
// float match issues
#ifdef NONMATCHING
// NONMATCHING - float match issues
int daObjIce_l_c::Check_RideOn(cXyz param_0) {
fopAc_ac_c* player_p = (fopAc_ac_c*)daPy_getPlayerActorClass();
s16 var_r29 = 0;
@@ -212,11 +211,6 @@ int daObjIce_l_c::Check_RideOn(cXyz param_0) {
cLib_addCalc(&field_0x5a0, var_r29, 0.015f, 100.0f, 0.0f);
return 0;
}
#else
int daObjIce_l_c::Check_RideOn(cXyz param_0) {
// NONMATCHING
}
#endif
/* 80C1FCCC-80C1FCF8 00034C 002C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjIce_l_cFv */
void daObjIce_l_c::initBaseMtx() {
@@ -562,7 +556,7 @@ COMPILER_STRIP_GATE(0x80C20818, &lit_4003);
/* 80C203C4-80C206AC 000A44 02E8+00 1/0 0/0 0/0 .text Execute__12daObjIce_l_cFPPA3_A4_f
*/
#ifdef NONMATCHING
// NONMATCHING
int daObjIce_l_c::Execute(Mtx** param_0) {
daPy_py_c* player_p = daPy_getPlayerActorClass();
fopAcM_GetPosition(player_p);
@@ -597,11 +591,6 @@ int daObjIce_l_c::Execute(Mtx** param_0) {
setBaseMtx();
return 1;
}
#else
int daObjIce_l_c::Execute(Mtx** param_0) {
// NONMATCHING
}
#endif
/* 80C206AC-80C20750 000D2C 00A4+00 1/0 0/0 0/0 .text Draw__12daObjIce_l_cFv */
int daObjIce_l_c::Draw() {
src/d/actor/d_a_obj_item.cpp
+1 -8
View File
@@ -106,9 +106,8 @@ void daItem_c::setBaseMtx_1() {
/* 8015B254-8015B320 155B94 00CC+00 2/2 0/0 0/0 .text
* itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
// matches, but pushes up weak daPy_py_c functions incorrectly
// NONMATCHING - matches, but pushes up weak daPy_py_c functions incorrectly
// might need other TUs that use daPy_py_c weaks to be finished first
#ifdef NONMATCHING
static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
daItem_c* a_coActorA = (daItem_c*)i_coActorA;
@@ -127,12 +126,6 @@ static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
}
}
}
#else
static void itemGetCoCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2,
dCcD_GObjInf* param_3) {
// NONMATCHING
}
#endif
/* 8015B320-8015B3D8 155C60 00B8+00 2/2 0/0 0/0 .text
* itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
+1 -7
View File
@@ -205,8 +205,7 @@ void dalv4CandleDemoTag_c::setBaseMtx() {
}
/* 80C5CA90-80C5CBA4 000190 0114+00 1/1 0/0 0/0 .text create__20dalv4CandleDemoTag_cFv */
// vtables need work
#ifdef NONMATCHING
// NONMATCHING - vtables need work
int dalv4CandleDemoTag_c::create() {
fopAcM_SetupActor(this, dalv4CandleDemoTag_c);
@@ -230,11 +229,6 @@ int dalv4CandleDemoTag_c::create() {
return cPhs_COMPLEATE_e;
}
#else
int dalv4CandleDemoTag_c::create() {
// NONMATCHING
}
#endif
/* 80C5CBA4-80C5CBE8 0002A4 0044+00 1/1 0/0 0/0 .text Execute__20dalv4CandleDemoTag_cFv
*/
src/d/actor/d_a_obj_master_sword.cpp
+2 -14
View File
@@ -437,8 +437,7 @@ void daObjMasterSword_c::setAction(daObjMasterSword_c::Mode_e i_mode) {
/* 80C90F6C-80C9120C 0004EC 02A0+00 1/1 0/0 0/0 .text create_init__18daObjMasterSword_cFv
*/
// matches, but weak function emission is hella weird. cant be linked til its fixed
#ifdef NONMATCHING
// NONMATCHING - matches, but weak function emission is hella weird. cant be linked til its fixed
void daObjMasterSword_c::create_init() {
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
initCollision();
@@ -464,11 +463,6 @@ void daObjMasterSword_c::create_init() {
setAction(MODE_0_e);
}
#else
void daObjMasterSword_c::create_init() {
// NONMATCHING
}
#endif
/* 80C9120C-80C9127C 00078C 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
// dBgS_ObjAcch::~dBgS_ObjAcch() {
@@ -514,16 +508,10 @@ static int daObjMasterSword_Delete(daObjMasterSword_c* i_this) {
}
/* 80C91448-80C915E8 0009C8 01A0+00 1/1 0/0 0/0 .text __dt__18daObjMasterSword_cFv */
// vtables issues
#ifdef NONMATCHING
// NONMATCHING - vtables issues
daObjMasterSword_c::~daObjMasterSword_c() {
dComIfG_resDelete(&mPhase, l_arcName);
}
#else
daObjMasterSword_c::~daObjMasterSword_c() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80C91960-80C91968 000020 0008+00 1/1 0/0 0/0 .rodata @4030 */
src/d/actor/d_a_obj_swBallA.cpp
+5 -10
View File
@@ -412,19 +412,19 @@ extern "C" void __dt__12J3DFrameCtrlFv() {
}
/* 80CF3970-80CF3A90 0006F0 0120+00 1/1 0/0 0/0 .text create__14daObjSwBallA_cFv */
#ifdef NONMATCHING
// NONMATCHING
int daObjSwBallA_c::create() {
fopAcM_SetupActor(this, daObjSwBallA_c);
if (field_0x5c4 == 0) {
field_0x5c4 = 1;
field_0x5c6 = orig.angle.x;
field_0x5c8 = orig.angle.z;
field_0x5c6 = home.angle.x;
field_0x5c8 = home.angle.z;
shape_angle.x = 0;
current.angle.x = 0;
orig.angle.x = 0;
home.angle.x = 0;
shape_angle.z = 0;
current.angle.z = 0;
orig.angle.z = 0;
home.angle.z = 0;
}
int res = dComIfG_resLoad(&field_0x57c, l_arcName);
if (res == cPhs_COMPLEATE_e) {
@@ -436,11 +436,6 @@ int daObjSwBallA_c::create() {
}
return res;
}
#else
int daObjSwBallA_c::create() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80CF452C-80CF4530 000024 0004+00 1/1 0/0 0/0 .bss None */
src/d/actor/d_a_obj_swBallB.cpp
+1 -6
View File
@@ -640,7 +640,7 @@ void daObjSwBallB_c::PutCrrPos() {
/* 80CF56A4-80CF582C 001164 0188+00 1/1 0/0 0/0 .text draw__14daObjSwBallB_cFv */
#ifdef NONMATCHING
// NONMATCHING
int daObjSwBallB_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -662,11 +662,6 @@ int daObjSwBallB_c::draw() {
dComIfGd_setList();
return 1;
}
#else
int daObjSwBallB_c::draw() {
// NONMATCHING
}
#endif
/* 80CF582C-80CF5860 0012EC 0034+00 1/1 0/0 0/0 .text _delete__14daObjSwBallB_cFv */
int daObjSwBallB_c::_delete() {
src/d/actor/d_a_obj_zrTurara.cpp
+2 -7
View File
@@ -7,6 +7,7 @@
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "SSystem/SComponent/c_math.h"
#include "dol2asm.h"
//
@@ -500,8 +501,7 @@ COMPILER_STRIP_GATE(0x80D415F8, &lit_4060);
#pragma pop
/* 80D410E0-80D412A0 000C60 01C0+00 1/0 0/0 0/0 .text modeBreak__12daZrTurara_cFv */
#ifdef NONMATCHING
// regalloc
// NONMATCHING - regalloc
void daZrTurara_c::modeBreak() {
cXyz scale(mScaleF, mScaleF, mScaleF);
mParticleKey = dComIfGp_particle_set(mParticleKey, 0x8a98, &current.pos, NULL, &scale);
@@ -525,11 +525,6 @@ void daZrTurara_c::modeBreak() {
}
}
}
#else
void daZrTurara_c::modeBreak() {
// NONMATCHING
}
#endif
/* 80D412A0-80D412AC 000E20 000C+00 2/2 0/0 0/0 .text init_modeEnd__12daZrTurara_cFv */
void daZrTurara_c::init_modeEnd() {
src/d/actor/d_a_scene_exit.cpp
+2 -8
View File
@@ -6,6 +6,7 @@
#include "d/actor/d_a_scene_exit.h"
#include "dol2asm.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "m_Do/m_Do_mtx.h"
//
@@ -120,9 +121,7 @@ COMPILER_STRIP_GATE(0x80485CA8, &lit_3842);
#pragma pop
/* 80485A50-80485C90 000290 0240+00 1/1 0/0 0/0 .text execute__8daScex_cFv */
// regalloc
// this matches debug but not retail :/
#ifdef NONMATCHING
// NONMATCHING - regalloc, this matches debug but not retail :/
int daScex_c::execute() {
daPy_py_c* player = daPy_getPlayerActorClass();
cXyz spC;
@@ -164,11 +163,6 @@ int daScex_c::execute() {
return 1;
}
#else
int daScex_c::execute() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80485CAC-80485CCC -00001 0020+00 1/0 0/0 0/0 .data l_daScex_Method */
src/d/actor/d_a_swc00.cpp
+2 -8
View File
@@ -64,10 +64,9 @@ inline int daSwc00_getShape(daSwc00_c* i_this) {
}
/* 805A13F8-805A15DC 000078 01E4+00 1/1 0/0 0/0 .text hitCheck__FP9daSwc00_c */
// r30 / r31 swap
#ifdef NONMATCHING
// NONMATCHING - r30 / r31 swap
static bool hitCheck(daSwc00_c* i_swc) {
fopAc_ac_c* playerAc = daPy_getPlayerActorClass();
fopAc_ac_c* playerAc = (fopAc_ac_c*)daPy_getPlayerActorClass();
fopAc_ac_c* player;
if (daSwc00_getCondition(i_swc) == 2) {
@@ -105,11 +104,6 @@ static bool hitCheck(daSwc00_c* i_swc) {
return false;
}
#else
static bool hitCheck(daSwc00_c* param_0) {
// NONMATCHING
}
#endif
/* 805A15DC-805A15FC 00025C 0020+00 1/0 0/0 0/0 .text daSwc00_Execute__FP9daSwc00_c */
static int daSwc00_Execute(daSwc00_c* i_this) {
src/d/actor/d_a_tag_wljump.cpp
+6 -108
View File
@@ -7,6 +7,8 @@
#include "dol2asm.h"
#include "d/d_path.h"
#include "d/d_procname.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_midna.h"
#include "JSystem/JKernel/JKRHeap.h"
//
@@ -104,8 +106,7 @@ static int daTagWljump_Delete(daTagWljump_c* param_0) {
/* ############################################################################################## */
/* 80D65090-80D6587C 000250 07EC+00 1/1 0/0 0/0 .text execute__13daTagWljump_cFv */
// reg swap
#ifdef NONMATCHING
// NONMATCHING - reg swap
int daTagWljump_c::execute() {
attention_info.flags = 0;
if (field_0x56c[1]) {
@@ -203,8 +204,8 @@ int daTagWljump_c::execute() {
if (uVar6 == field_0x5c4->m_num) {
field_0x568 = -1;
}
} else if (field_0x56b) {
field_0x56b = 0;
} else if (mNextCheckFlg) {
mNextCheckFlg = 0;
if (field_0x56a < field_0x568) {
field_0x568++;
if (field_0x5c4->m_num == field_0x568) {
@@ -220,7 +221,7 @@ int daTagWljump_c::execute() {
eyePos.set(pPoint->m_position.x, pPoint->m_position.y, pPoint->m_position.z);
attention_info.position = eyePos;
attention_info.position.y += 220.0f;
field_0x5c8 = pPoint->field_0x3 * 10.0f;
mLandArea = pPoint->mArg0 * 10.0f;
if (pPoint->field_0x1 == 1) {
shape_angle.z = 1;
} else {
@@ -260,109 +261,6 @@ int daTagWljump_c::execute() {
return 1;
}
#else
/* 80D658CC-80D658D0 000000 0004+00 1/1 0/0 0/0 .rodata @4044 */
SECTION_RODATA static f32 const lit_4044 = 1.0f;
COMPILER_STRIP_GATE(0x80D658CC, &lit_4044);
/* 80D658D0-80D658D4 000004 0004+00 0/1 0/0 0/0 .rodata @4045 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4045 = -1.0f;
COMPILER_STRIP_GATE(0x80D658D0, &lit_4045);
#pragma pop
/* 80D658D4-80D658DC 000008 0004+04 0/1 0/0 0/0 .rodata @4046 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4046[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
/* padding */
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80D658D4, &lit_4046);
#pragma pop
/* 80D658DC-80D658E4 000010 0008+00 0/1 0/0 0/0 .rodata @4047 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4047[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D658DC, &lit_4047);
#pragma pop
/* 80D658E4-80D658EC 000018 0008+00 0/1 0/0 0/0 .rodata @4048 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4048[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D658E4, &lit_4048);
#pragma pop
/* 80D658EC-80D658F4 000020 0008+00 0/1 0/0 0/0 .rodata @4049 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4049[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D658EC, &lit_4049);
#pragma pop
/* 80D658F4-80D658F8 000028 0004+00 0/1 0/0 0/0 .rodata @4050 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4050 = 5.0f;
COMPILER_STRIP_GATE(0x80D658F4, &lit_4050);
#pragma pop
/* 80D658F8-80D658FC 00002C 0004+00 0/1 0/0 0/0 .rodata @4051 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4051 = 10.0f;
COMPILER_STRIP_GATE(0x80D658F8, &lit_4051);
#pragma pop
/* 80D658FC-80D65904 000030 0004+04 0/1 0/0 0/0 .rodata @4052 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4052[1 + 1 /* padding */] = {
220.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80D658FC, &lit_4052);
#pragma pop
/* 80D65904-80D6590C 000038 0008+00 0/1 0/0 0/0 .rodata @4054 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4054[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D65904, &lit_4054);
#pragma pop
/* 80D6590C-80D65914 000040 0008+00 0/1 0/0 0/0 .rodata @4055 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4055[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D6590C, &lit_4055);
#pragma pop
int daTagWljump_c::execute() {
// NONMATCHING
}
#endif
/* 80D6587C-80D6589C 000A3C 0020+00 1/0 0/0 0/0 .text daTagWljump_Execute__FP13daTagWljump_c */
static int daTagWljump_Execute(daTagWljump_c* param_0) {
src/d/actor/d_a_vrbox2.cpp
+2 -14
View File
@@ -186,8 +186,7 @@ SECTION_DEAD static char const* const stringBase_80499ACC = "F_SP127";
static s16 mangZ;
/* 80498ACC-804990DC 0000CC 0610+00 1/0 0/0 0/0 .text daVrbox2_Draw__FP12vrbox2_class */
// reg alloc
#ifdef NONMATCHING
// NONMATCHING - reg alloc
static int daVrbox2_Draw(vrbox2_class* i_this) {
cXyz sp14;
cXyz sp8;
@@ -345,11 +344,6 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
return 1;
}
#else
static int daVrbox2_Draw(vrbox2_class* param_0) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80499AA4-80499AA8 000038 0004+00 0/1 0/0 0/0 .rodata @4069 */
@@ -415,8 +409,7 @@ SECTION_DEAD static char const* const stringBase_80499AD4 = "R_SP30";
#pragma pop
/* 804990DC-804997E8 0006DC 070C+00 1/1 0/0 0/0 .text daVrbox2_color_set__FP12vrbox2_class */
// some regalloc at the end
#ifdef NONMATCHING
// NONMATCHING - some regalloc at the end
static int daVrbox2_color_set(vrbox2_class* i_this) {
dKankyo_sun_Packet* sun_p = g_env_light.mpSunPacket;
@@ -590,11 +583,6 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
return 1;
}
#else
static int daVrbox2_color_set(vrbox2_class* param_0) {
// NONMATCHING
}
#endif
/* 804997E8-8049982C 000DE8 0044+00 1/0 0/0 0/0 .text daVrbox2_Execute__FP12vrbox2_class
*/
src/d/actor/d_grass.inc
+13 -23
View File
@@ -1,3 +1,6 @@
#include "d/actor/d_a_grass.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
#include "SSystem/SComponent/c_lib.h"
#include "f_op/f_op_overlap_mng.h"
@@ -23,8 +26,7 @@ void dGrass_data_c::Direction_Set(fopAc_ac_c* param_0, u32 param_1, int param_2,
/* 8051E1C8-8051EB4C 002568 0984+00 1/1 0/0 0/0 .text
* WorkAt__13dGrass_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfUs */
// literals / regswap, equivalent?
#ifdef NONMATCHING
// NONMATCHING - literals / regswap, equivalent?
void dGrass_data_c::WorkAt(fopAc_ac_c* param_0, u32 param_1, int i_roomNo, dCcMassS_HitInf* param_3,
u16 i_particleID) {
cCcD_Obj* hit_obj = param_3->GetAtHitObj();
@@ -47,8 +49,8 @@ void dGrass_data_c::WorkAt(fopAc_ac_c* param_0, u32 param_1, int i_roomNo, dCcMa
WorkAt_NoCutAnim(param_0, param_1, i_roomNo, param_3, hit_obj);
return;
}
} else if (daPy_getPlayerActorClass()->getCutType() >= CUT_TYPE_NM_RIGHT &&
daPy_getPlayerActorClass()->getCutType() <= CUT_TYPE_FINISH_VERTICAL)
} else if (daPy_getPlayerActorClass()->getCutType() >= daPy_py_c::CUT_TYPE_NM_RIGHT &&
daPy_getPlayerActorClass()->getCutType() <= daPy_py_c::CUT_TYPE_FINISH_VERTICAL)
{
if (m_pos.abs(player_p->current.pos) > 158.0f) {
if (m_pos.abs(player_p->current.pos) < 200.0f) {
@@ -56,22 +58,22 @@ void dGrass_data_c::WorkAt(fopAc_ac_c* param_0, u32 param_1, int i_roomNo, dCcMa
}
return;
}
} else if (daPy_getPlayerActorClass()->getCutType() == CUT_TYPE_TURN_RIGHT ||
daPy_getPlayerActorClass()->getCutType() == CUT_TYPE_TURN_LEFT)
} else if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_TURN_RIGHT ||
daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_TURN_LEFT)
{
if (m_pos.abs(player_p->current.pos) > 200.0f) {
WorkAt_NoCutAnim(param_0, param_1, i_roomNo, param_3, hit_obj);
return;
}
} else if (daPy_getPlayerActorClass()->getCutType() == CUT_TYPE_LARGE_TURN_RIGHT ||
daPy_getPlayerActorClass()->getCutType() == CUT_TYPE_LARGE_TURN_LEFT)
} else if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT ||
daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT)
{
if (m_pos.abs(player_p->current.pos) > 500.0f) {
WorkAt_NoCutAnim(param_0, param_1, i_roomNo, param_3, hit_obj);
return;
}
} else if (daPy_getPlayerActorClass()->getCutType() == CUT_TYPE_NM_VERTICAL ||
daPy_getPlayerActorClass()->getCutType() == CUT_TYPE_NM_STAB)
} else if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_NM_VERTICAL ||
daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_NM_STAB)
{
if (m_pos.abs(player_p->current.pos) > 158.0f) {
return;
@@ -117,12 +119,6 @@ void dGrass_data_c::WorkAt(fopAc_ac_c* param_0, u32 param_1, int i_roomNo, dCcMa
mDoAud_seStart(JA_SE_LK_CUT_GRASS, &m_pos, 0, dComIfGp_getReverb(i_roomNo));
}
}
#else
void dGrass_data_c::WorkAt(fopAc_ac_c* param_0, u32 param_1, int param_2,
dCcMassS_HitInf* param_3, u16 param_4) {
// NONMATCHING
}
#endif
/* 8051EB4C-8051EB88 002EEC 003C+00 3/3 0/0 0/0 .text __dt__5csXyzFv */
// csXyz::~csXyz() {
@@ -227,8 +223,7 @@ static f32 checkGroundY(cXyz& param_0) {
}
/* 80520030-8052067C 0043D0 064C+00 1/1 0/0 0/0 .text update__15dGrass_packet_cFv */
// mostly matches except literals, some regalloc, and one out of order block
#ifdef NONMATCHING
// NONMATCHING - mostly matches except literals, some regalloc, and one out of order block
void dGrass_packet_c::update() {
static s16 mAngleZ[1500];
@@ -347,11 +342,6 @@ void dGrass_packet_c::update() {
mDoLib_clipper::resetFar();
dComIfGd_getListPacket()->entryImm(this, 0);
}
#else
void dGrass_packet_c::update() {
// NONMATCHING
}
#endif
/* 8052067C-80520770 004A1C 00F4+00 1/1 0/0 0/0 .text
* setData__15dGrass_packet_cFP13dGrass_data_ciR4cXyziUcUcsUc */
src/d/d_attention.cpp
+427 -390
View File
File diff suppressed because it is too large Load Diff
src/d/d_msg_class.cpp
+411 -599
View File
File diff suppressed because it is too large Load Diff
src/d/d_msg_scrn_talk.cpp
+1 -7
View File
@@ -417,8 +417,7 @@ SECTION_SDATA2 static f32 lit_4278 = 4.0f / 5.0f;
SECTION_SDATA2 static f32 lit_4279 = -1.0f;
/* 80247E4C-802480F0 24278C 02A4+00 1/0 0/0 0/0 .text drawSelf__14dMsgScrnTalk_cFv */
// regalloc
#ifdef NONMATCHING
// NONMATCHING - regalloc
void dMsgScrnTalk_c::drawSelf() {
CharInfo_c* pCharInfo;
J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
@@ -474,11 +473,6 @@ void dMsgScrnTalk_c::drawSelf() {
}
mpArrow_c->draw();
}
#else
void dMsgScrnTalk_c::drawSelf() {
// NONMATCHING
}
#endif
/* 802480F0-80248114 242A30 0024+00 1/0 0/0 0/0 .text arwAnimeInit__14dMsgScrnTalk_cFv */
void dMsgScrnTalk_c::arwAnimeInit() {
src/d/d_msg_unit.cpp
+2 -8
View File
@@ -71,8 +71,7 @@ SECTION_SDATA2 static f32 lit_3704[1 + 1 /* padding */] = {
SECTION_SDATA2 static f64 lit_3707 = 4503601774854144.0 /* cast s32 to float */;
/* 80238CEC-8023907C 23362C 0390+00 0/0 5/5 0/0 .text setTag__10dMsgUnit_cFiiPcb */
// regalloc + mulli issue
#ifdef NONMATCHING
// NONMATCHING - regalloc + mulli issue
void dMsgUnit_c::setTag(int param_1, int param_2, char* param_3, bool param_4) {
*param_3 = 0;
if (param_1 == 0x10000) {
@@ -149,11 +148,6 @@ void dMsgUnit_c::setTag(int param_1, int param_2, char* param_3, bool param_4) {
}
}
}
#else
void dMsgUnit_c::setTag(int param_0, int param_1, char* param_2, bool param_3) {
// NONMATCHING
}
#endif
/* 804510D0-804510D8 0005D0 0004+04 1/1 5/5 0/0 .sbss g_msg_unit */
dMsgUnit_c g_msg_unit;
dMsgUnit_c g_msg_unit;
src/d/d_npc_lib.cpp
+3 -9
View File
@@ -5,6 +5,7 @@
#include "d/d_npc_lib.h"
#include "dol2asm.h"
#include "SSystem/SComponent/c_math.h"
//
// Forward References:
@@ -114,8 +115,7 @@ SECTION_SDATA2 static f64 lit_3873 = 4503601774854144.0 /* cast s32 to float */;
/* 80251534-80251B60 24BE74 062C+00 0/0 0/0 2/2 .text
* action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi */
// regswap, equivalent
#ifdef NONMATCHING
// NONMATCHING - regswap, equivalent
void dNpcLib_lookat_c::action(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, Mtx param_3,
int param_4) {
cXyz spA0;
@@ -190,12 +190,6 @@ void dNpcLib_lookat_c::action(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, M
field_0x64[i].z = 0;
}
}
#else
void dNpcLib_lookat_c::action(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, Mtx param_3,
int param_4) {
// NONMATCHING
}
#endif
/* 80251B60-80251B64 24C4A0 0004+00 0/0 0/0 2/2 .text dbView__16dNpcLib_lookat_cFv */
void dNpcLib_lookat_c::dbView() {}
@@ -259,4 +253,4 @@ int dNpcLib_lookat_c::limitter(s16* o_value, s16 param_1, s16 param_2, s16 param
}
/* 80252094-8025217C 24C9D4 00E8+00 1/0 0/0 0/0 .text __dt__16dNpcLib_lookat_cFv */
dNpcLib_lookat_c::~dNpcLib_lookat_c() {}
dNpcLib_lookat_c::~dNpcLib_lookat_c() {}