mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-04 10:48:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tag_firewall done (#2137)

Browse Source 
* mostly fix TVec3 ctors

* d_a_tag_firewall done

* remove asm
This commit is contained in:
TakaRikka
2024-04-21 05:27:47 -07:00
committed by GitHub
parent 151c5099ab
commit b24b477fc4
27 changed files with 369 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink_demo.inc
+5 -5
View File
@@ -1286,7 +1286,7 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) {
if (mProcID != PROC_DEAD && i_dmgAmount >= dComIfGs_getLife() && !checkMagicArmorNoDamage() &&
!dComIfGs_checkBottle(FAIRY))
{
onNoResetFlg2(FLG2_UNK_40000);
onNoResetFlg2(FLG2_FORCE_GAMEOVER);
procCoDeadInit(0);
return 1;
}
@@ -1311,7 +1311,7 @@ void daAlink_c::setDeadRideSyncPos() {
BOOL daAlink_c::checkDeadHP() {
return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) &&
!dComIfGs_checkBottle(FAIRY)) ||
checkNoResetFlg2(FLG2_UNK_40000) ||
checkNoResetFlg2(FLG2_FORCE_GAMEOVER) ||
(dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0);
}
@@ -2853,7 +2853,7 @@ int daAlink_c::procCoDeadInit(int param_0) {
setDeadRideSyncPos();
if (checkNoResetFlg2(FLG2_UNK_40000)) {
if (checkNoResetFlg2(FLG2_FORCE_GAMEOVER)) {
if (param_0) {
if (checkWolf()) {
setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMove_c0::m.field_0x70, 3.0f);
@@ -2960,7 +2960,7 @@ int daAlink_c::procCoDead() {
mDoAud_bgmStart(Z2BGM_GAME_OVER);
}
if (!checkNoResetFlg2(FLG2_UNK_40000)) {
if (!checkNoResetFlg2(FLG2_FORCE_GAMEOVER)) {
mProcVar3.field_0x300e++;
if (mProcVar3.field_0x300e.x == 2) {
dCam_getBody()->StartEventCamera(9, fopAcM_GetID(this), 0);
@@ -2989,7 +2989,7 @@ int daAlink_c::procCoDead() {
setDeadRideSyncPos();
if (checkAnmEnd(frameCtrl_p) || ((checkModeFlg(0x40000) && frameCtrl_p->getFrame() > 70.0f) ||
checkNoResetFlg2(FLG2_UNK_40000)))
checkNoResetFlg2(FLG2_FORCE_GAMEOVER)))
{
cLib_chaseF(&field_0x3478, 0.0f, 0.01f);
if (field_0x3478 < 0.38f) {
src/d/meter/d_meter2_draw.cpp
+4 -4
View File
@@ -589,8 +589,8 @@ void dMeter2Draw_c::draw() {
for (int j = 0; j < 3; j++) {
f32 temp_f30 = mItemParams[i].num_scale * 16.0f;
JGeometry::TVec3<f32> vtx0 = mpItemXY[i]->getPanePtr()->getGlbVtx(0);
JGeometry::TVec3<f32> vtx3 = mpItemXY[i]->getPanePtr()->getGlbVtx(3);
Vec vtx0 = mpItemXY[i]->getPanePtr()->getGlbVtx(0);
Vec vtx3 = mpItemXY[i]->getPanePtr()->getGlbVtx(3);
mpItemNumTex[i][j]->draw(mItemParams[i].num_pos_x +
(((vtx0.x + vtx3.x) * 0.5f) + (temp_f30 * j)),
@@ -3597,8 +3597,8 @@ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
i_alphaRate = mpItemXY[i_button]->getAlphaRate();
}
JGeometry::TVec3<f32> vtx0 = pane->getPanePtr()->getGlbVtx(0);
JGeometry::TVec3<f32> vtx3 = pane->getPanePtr()->getGlbVtx(3);
Vec vtx0 = pane->getPanePtr()->getGlbVtx(0);
Vec vtx3 = pane->getPanePtr()->getGlbVtx(3);
mpKanteraMeter[i_button]->setPos(((vtx0.x + vtx3.x) * 0.5f) + 9.0f + sp10[i_button],
vtx3.y + sp8[i_button]);
src/d/msg/d_msg_string.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ void dMsgString_c::resetStringLocal(J2DTextBox* p_textBox) {
/* 80249DE4-80249ED0 244724 00EC+00 1/0 0/0 0/0 .text
* drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf */
void dMsgString_c::drawOutFontLocal(J2DTextBox* p_textBox, f32 i_alpha) {
JGeometry::TVec3<f32> pos = p_textBox->getGlbVtx(0);
Vec pos = p_textBox->getGlbVtx(0);
f32 y = pos.y;
if (i_alpha == -1.0f) {
src/d/particle/d_particle.cpp
+1 -1
View File
@@ -1472,7 +1472,7 @@ static u8 lit_4054[12];
#pragma pop
/* 80424728-80424734 051448 000C+00 1/1 0/0 0/0 .bss pos$4424 */
static JGeometry::TVec3<f32> pos;
static Vec pos;
/* 8004B064-8004B168 0459A4 0104+00 2/2 0/0 0/0 .text
* createEmitter__19dPa_simpleEcallBackFP17JPAEmitterManager */