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

add missing class and clang-format

Browse Source
This commit is contained in:
unknown
2020-12-25 21:16:13 -05:00
parent e066711553 e8315cdb81
commit 64a6a97b7b
244 changed files with 16175 additions and 15556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_a/d_a_alink.cpp
+150 -1
View File
@@ -1 +1,150 @@
// ok
#include "d/d_a/d_a_alink/d_a_alink.h"
#include "f/f_pc/f_pc_searcher.h"
u32 daAlink_c::getE3Zhint(void){
return 0;
}
asm const char* daAlink_c::getAlinkArcName(void){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009D884.s"
}
asm void daAlink_tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*,fopAc_ac_c*, dCcD_GObjInf*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009D88C.s"
}
asm void daAlink_coHitCallback(fopAc_ac_c*, dCcD_GObjInf*,fopAc_ac_c*, dCcD_GObjInf*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009D8B8.s"
}
void daAlink_matAnm_c::init(void){
float init = lbl_80452CC0;
unk244 = init;
unk248 = init;
unk252 = init;
unk256 = init;
lbl_80450FC8 = 0;
lbl_80450FC9 = 0;
unk260 = 0;
}
asm void daAlink_matAnm_c::calc(J3DMaterial*) const{
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009D90C.s"
}
// 1 missing mr instruction
#ifdef NONMATCHING
u32 daAlink_c::checkStageName(const char* stage){
return (u32)__cntlzw(strcmp(g_dComIfG_gameInfo.stage,(char*)stage)) >> 5; // no idea if current stage vars are a struct or part of some class
}
#else
asm u32 daAlink_c::checkStageName(char const* stage){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009DA60.s"
}
#endif
asm void daAlink_c::tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009DA98.s"
}
asm void daAlink_c::coHitCallback(fopAc_ac_c*, dCcD_GObjInf*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009DB64.s"
}
asm void daAlink_c::setMatrixWorldAxisRot(float(*)[4],short,short,short,int,const cXyz*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009DC6C.s"
}
asm bool daAlink_c::jointControll(int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009DD90.s"
}
asm void daAlink_c::setUpperFront(void){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009E7B8.s"
}
asm void daAlink_c::changeBlendRate(int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009E91C.s"
}
asm void daAlink_c::resetRootMtx(void){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009EB18.s"
}
asm bool daAlink_c::modelCallBack(int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009EB58.s"
}
asm bool daAlink_modelCallBack(J3DJoint*, int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009EC28.s"
}
asm bool daAlink_c::headModelCallBack(int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009ECA0.s"
}
asm bool daAlink_headModelCallBack(J3DJoint*, int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009EF38.s"
}
asm bool daAlink_c::wolfModelCallBack(int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009EF7C.s"
}
asm bool daAlink_wolfModelCallBack(J3DJoint*, int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009EFF0.s"
}
asm void daAlink_c::setHatAngle(void){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009F034.s"
}
asm void daAlink_c::calcHairAngle(short*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_8009FFF8.s"
}
asm void daAlink_c::setHairAngle(cXyz*,float,float){
nofralloc
#include "d/d_a/d_a_alink/asm/func_800A002C.s"
}
asm void daAlink_c::setLookPosFromOut(cXyz*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_800A0744.s"
}
asm int daAlink_c::checkAttentionPosAngle(cXyz*){
nofralloc
#include "d/d_a/d_a_alink/asm/func_800A07D8.s"
}
asm bool daAlink_c::checkActorPosAngle(fopAc_ac_c*, cXyz**){
nofralloc
#include "d/d_a/d_a_alink/asm/func_800A0868.s"
}
asm cXyz* daAlink_c::getNeckAimPos(cXyz*, int*, int){
nofralloc
#include "d/d_a/d_a_alink/asm/func_800A093C.s"
}
src/d/d_a/d_a_horse_static.cpp
+3 -11
View File
@@ -1,20 +1,12 @@
#include "d/d_a/d_a_horse_static/d_a_horse_static.h"
#include "global.h"
// 1 instruction off
#ifdef NONMATCHING
u32 e_wb_class::checkWait(void){
u32 temp;
temp = (0x2a - (this->unk1460)); // missing a cntlzw
return temp >> 5 & 0xff;
temp = __cntlzw(0x2a - this->unk1460);
return (u8)(temp >> 5);
}
#else
asm u32 e_wb_class::checkWait(void) {
nofralloc
#include "d/d_a/d_a_horse_static/asm/func_80037C7C.s"
}
#endif
void e_wb_class::setPlayerRideNow(void){
this->unk1680 = 0x67;
@@ -29,7 +21,7 @@ void e_wb_class::setPlayerRide(void){
this->unk1460 = 0;
this->unk1726 |= 3;
setLinkRiding(true); // needs something else here
setLinkRiding(true); // needs to call Z2CreatureRide
}
#else
asm void e_wb_class::setPlayerRide(void) {
src/d/d_bomb.cpp
+17 -1
View File
@@ -1 +1,17 @@
// ok
#include "d/d_bomb/d_bomb.h"
bool dBomb_c::checkStateCarry(){
return ((unk_3 & 0x2000) != 0 || (unk_3 & 0x100000) != 0 || unk_2 == 2 || unk_2 == 1);
}
bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1){
return (unk_1 == 0x221 && unk_2 == 4);
}
bool dBomb_c::checkWaterBomb(fopAc_ac_c* param_1){
return (unk_1 == 0x221 && (unk_4 & 0x10)!=0);
}
bool dBomb_c::checkInsectBombMove(fopAc_ac_c* param_1){
return (unk_1 == 0x221 && unk_2 == 7);
}
src/d/d_item/d_item.cpp
+326 -362
View File
File diff suppressed because it is too large Load Diff
src/d/d_save/d_save.cpp
+4 -4
View File
@@ -93,7 +93,7 @@ u16 dSv_player_status_a_c::getRupeeMax(void) const {
BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const {
if (i_magic == 0) {
return g_dComIfG_gameInfo.save_file.getEventFlags().isEventBit(0x2304);
return g_dComIfG_gameInfo.info.getSaveFile().getEventFlags().isEventBit(0x2304);
}
return (this->mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE;
}
@@ -252,7 +252,7 @@ void dSv_player_item_c::setItem(int current_items_index, u8 new_items_index) {
int select_item_index = DEFAULT_SELECT_ITEM_INDEX;
do {
if (current_items_index == g_dComIfG_gameInfo.save_file.getPlayerStatusA().getSelectItemIndex(select_item_index)) {
if (current_items_index == g_dComIfG_gameInfo.info.getSaveFile().getPlayerStatusA().getSelectItemIndex(select_item_index)) {
dComIfGp_setSelectItem(select_item_index);
}
select_item_index++;
@@ -632,7 +632,7 @@ void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) {
u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 param_2) {
int iVar3 = this->mBottles[i_bottleIdx] + param_2;
g_dComIfG_gameInfo.save_file.getPlayerItem().getItem((u8)(i_bottleIdx + 0xB), true);
g_dComIfG_gameInfo.info.getSaveFile().getPlayerItem().getItem((u8)(i_bottleIdx + 0xB), true);
if (iVar3 < 0) {
this->mBottles[i_bottleIdx] = 0;
@@ -676,7 +676,7 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const {
u8 iVar3;
iVar3 = 0x1;
if (g_dComIfG_gameInfo.save_file.getPlayerGetItem().isFirstBit(BOMB_BAG_LV2)) {
if (g_dComIfG_gameInfo.info.getSaveFile().getPlayerGetItem().isFirstBit(BOMB_BAG_LV2)) {
iVar3 = 0x2;
}