mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-26 07:38:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #179 from Orstedra/d_t_gate_to_ground

Browse Source 
d_t_gate_to_ground OK
This commit is contained in:
robojumper
2025-05-25 21:36:15 +02:00
committed by GitHub
parent c1226361ed 2c23e69524
commit 018ef1971c
6 changed files with 108 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_t_gate_to_groundNP/symbols.txt
+8 -8
View File
@@ -2,15 +2,15 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
dTgGateToGround_c_classInit__Fv = .text:0x00000070; // type:function size:0x5C
TgGateToGround__init = .text:0x000000D0; // type:function size:0x7C
fn_205_150 = .text:0x00000150; // type:function size:0x8
TgGateToGround__update = .text:0x00000160; // type:function size:0x138
TgGateToGround__updateInEvent = .text:0x000002A0; // type:function size:0x44
fn_205_2F0 = .text:0x000002F0; // type:function size:0x8
create__17dTgGateToGround_cFv = .text:0x000000D0; // type:function size:0x7C
doDelete__17dTgGateToGround_cFv = .text:0x00000150; // type:function size:0x8
actorExecute__17dTgGateToGround_cFv = .text:0x00000160; // type:function size:0x138
actorExecuteInEvent__17dTgGateToGround_cFv = .text:0x000002A0; // type:function size:0x44
draw__17dTgGateToGround_cFv = .text:0x000002F0; // type:function size:0x8
__dt__17dTgGateToGround_cFv = .text:0x00000300; // type:function size:0x70
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_205_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float
@20562 = .rodata:0x00000000; // type:object size:0x4 data:float scope:local
g_profile_GATE2GND_TAG = .data:0x00000000; // type:object size:0x10
lbl_205_data_10 = .data:0x00000010; // type:object size:0xC
TgGateToGround__vtable = .data:0x0000001C; // type:object size:0x74
@20583 = .data:0x00000010; // type:object size:0xC scope:local
__vt__17dTgGateToGround_c = .data:0x0000001C; // type:object size:0x74
config/SOUE01/rels/d_t_heat_resistNP/symbols.txt
+2 -2
View File
@@ -9,6 +9,6 @@ draw__15dTgHeatResist_cFv = .text:0x000001B0; // type:function size:0x8
__dt__15dTgHeatResist_cFv = .text:0x000001C0; // type:function size:0x5C
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_444_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float
@19473 = .rodata:0x00000000; // type:object size:0x4 data:float
g_profile_TAG_HEAT_RESIST = .data:0x00000000; // type:object size:0x10
TgHeatResist__vtable = .data:0x00000010; // type:object size:0x74
__vt__15dTgHeatResist_c = .data:0x00000010; // type:object size:0x74
configure.py
+1 -1
View File
@@ -2470,7 +2470,7 @@ config.libs = [
Rel(NonMatching, "d_t_effect_gen", "REL/d/t/d_t_effect_gen.cpp"),
Rel(Matching, "d_t_fairytag", "REL/d/t/d_t_fairytag.cpp"),
Rel(NonMatching, "d_t_fence_synchronizer", "REL/d/t/d_t_fence_synchronizer.cpp"),
Rel(NonMatching, "d_t_gate_to_ground", "REL/d/t/d_t_gate_to_ground.cpp"),
Rel(Matching, "d_t_gate_to_ground", "REL/d/t/d_t_gate_to_ground.cpp"),
Rel(Matching, "d_t_gekotag", "REL/d/t/d_t_gekotag.cpp"),
Rel(Matching, "d_t_genki_dws_tgt", "REL/d/t/d_t_genki_dws_tgt.cpp"),
Rel(NonMatching, "d_t_group_summon", "REL/d/t/d_t_group_summon.cpp"),
include/d/d_camera.h
+1
View File
@@ -6,6 +6,7 @@
extern "C" bool fn_80081FE0(void *, const char *);
extern "C" bool fn_800918E0(void *, s32, s16);
extern "C" void fn_80080960(void *, s32, s32, s8, s32);
class dCamera_c : public dBase_c {
public:
include/d/t/d_t_gate_to_ground.h
+18 -3
View File
@@ -1,14 +1,29 @@
#ifndef D_T_GATE_TO_GROUND_H
#define D_T_GATE_TO_GROUND_H
#include "d/a/d_a_base.h"
#include "common.h"
#include "d/t/d_tg.h"
#include "m/m_mtx.h"
#include "toBeSorted/actor_event.h"
class dTgGateToGround_c : public dAcBase_c {
class dTgGateToGround_c : public dTg_c {
public:
dTgGateToGround_c() {}
dTgGateToGround_c() : mEventRelated(*this, nullptr) {}
virtual ~dTgGateToGround_c() {}
virtual int create() override;
virtual int doDelete() override; // fn_205_150
virtual int actorExecute() override;
virtual int actorExecuteInEvent() override;
virtual int draw() override; // fn_205_2F0
private:
/* 0xfc */ ActorEventRelated mEventRelated;
/* 0x14c */ mMtx_c matrix;
/* 0x17c */ s32 delayFrames;
/* 0x180 */ s16 params_FF_FF_00_00;
/* 0x182 */ s8 params_00_00_FF_00;
/* 0x183 */ s8 params_00_00_00_FF;
};
#endif
src/REL/d/t/d_t_gate_to_ground.cpp
+78
View File
@@ -1,3 +1,81 @@
#include "d/t/d_t_gate_to_ground.h"
#include "common.h"
#include "d/a/d_a_player.h"
#include "d/d_camera.h"
#include "d/d_sc_game.h"
#include "d/flag/storyflag_manager.h"
#include "f/f_base.h"
#include "toBeSorted/actor_event.h"
#include "toBeSorted/area_math.h"
#include "toBeSorted/event.h"
SPECIAL_ACTOR_PROFILE(GATE2GND_TAG, dTgGateToGround_c, fProfile::GATE2GND_TAG, 0x22, 0, 0);
int dTgGateToGround_c::create() {
matrixCreateFromPosRotYScale(matrix, position, rotation.y, mScale, nullptr, 0.0f);
delayFrames = 0;
union {
u32 val;
struct {
u16 a;
u8 b;
u8 c;
};
} v;
v.val = params;
params_FF_FF_00_00 = v.a;
params_00_00_FF_00 = v.b;
params_00_00_00_FF = v.c;
return SUCCEEDED;
}
int dTgGateToGround_c::doDelete() {
return SUCCEEDED;
}
int dTgGateToGround_c::actorExecute() {
dAcPy_c *player;
dCamera_c *cam;
if (params_FF_FF_00_00 != -1 && StoryflagManager::sInstance->getCounterOrFlag(params_FF_FF_00_00) == 0) {
return SUCCEEDED;
}
player = dAcPy_c::LINK;
if (checkIfVec3fInMatrix(matrix, player->position)) {
if (player->getRidingActorType() != dAcPy_c::RIDING_LOFTWING) {
if (delayFrames > 15) {
Event e("CloudHole", 100, 0, nullptr, nullptr);
mEventRelated.scheduleEvent(e, 0);
} else {
delayFrames++;
}
} else {
if (params_00_00_00_FF != -1) {
cam = dScGame_c::getCamera(0);
fn_80080960(cam->getField_0xD98(), params_00_00_00_FF, 0, roomid, 0);
}
delayFrames = 0;
}
} else {
delayFrames = 0;
}
return SUCCEEDED;
}
int dTgGateToGround_c::actorExecuteInEvent() {
if (mEventRelated.isThisActorInEvent() != 0) {
mEventRelated.advanceNext();
}
return SUCCEEDED;
}
int dTgGateToGround_c::draw() {
return SUCCEEDED;
}