mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-27 16:13:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_t_sound_area_mgr

Browse Source
This commit is contained in:
robojumper
2024-06-15 11:48:21 +02:00
parent 293423bdcf
commit d0668421e6
7 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_t_sound_area_mgrNP/splits.txt
+2 -1
View File
@@ -2,7 +2,7 @@ Sections:
.text type:code align:16
.ctors type:rodata align:4
.dtors type:rodata align:4
.rodata type:rodata align:16
.data type:data align:16
.bss type:bss align:8
REL/executor.c:
@@ -10,3 +10,4 @@ REL/executor.c:
REL/d/t/d_t_sound_area_mgr.cpp:
.text start:0x00000070 end:0x000001D8
.data start:0x00000000 end:0x00000084
config/SOUE01/rels/d_t_sound_area_mgrNP/symbols.txt
+8 -8
View File
@@ -1,13 +1,13 @@
_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
fn_498_70 = .text:0x00000070; // type:function size:0x54
fn_498_D0 = .text:0x000000D0; // type:function size:0x44
fn_498_120 = .text:0x00000120; // type:function size:0x8
fn_498_130 = .text:0x00000130; // type:function size:0x28
fn_498_160 = .text:0x00000160; // type:function size:0x8
fn_498_170 = .text:0x00000170; // type:function size:0x68
dTgSndMg_c_classInit__Fv = .text:0x00000070; // type:function size:0x54
create__10dTgSndMg_cFv = .text:0x000000D0; // type:function size:0x44
doDelete__10dTgSndMg_cFv = .text:0x00000120; // type:function size:0x8
actorExecute__10dTgSndMg_cFv = .text:0x00000130; // type:function size:0x28
draw__10dTgSndMg_cFv = .text:0x00000160; // type:function size:0x8
__dt__10dTgSndMg_cFv = .text:0x00000170; // type:function size:0x68
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_498_section4_0 = .rodata:0x00000000; // type:object size:0x10
lbl_498_section4_10 = .rodata:0x00000010; // type:object size:0x74
g_profile_SOUND_AREA_MGR = .data:0x00000000; // type:object size:0x10
__vt__10dTgSndMg_c = .data:0x00000010; // type:object size:0x74
config/SOUE01/symbols.txt
+1 -1
View File
@@ -40014,7 +40014,7 @@ lbl_805756E0 = .sbss:0x805756E0; // type:object size:0x4 data:4byte
lbl_805756E4 = .sbss:0x805756E4; // type:object size:0x4 data:4byte
lbl_805756E8 = .sbss:0x805756E8; // type:object size:0x1 data:byte
lbl_805756E9 = .sbss:0x805756E9; // type:object size:0x1 data:byte
lbl_805756EC = .sbss:0x805756EC; // type:object size:0x4 data:4byte
sInstance__10dTgSndMg_c = .sbss:0x805756EC; // type:object size:0x4 data:4byte
lbl_805756F0 = .sbss:0x805756F0; // type:object size:0x8 data:4byte
lbl_805756F8 = .sbss:0x805756F8; // type:object size:0x4 data:4byte
lbl_805756FC = .sbss:0x805756FC; // type:object size:0x1 data:byte
configure.py
+1 -1
View File
@@ -1096,7 +1096,7 @@ config.libs = [
Rel(NonMatching, "d_t_skyEnemy", "REL/d/t/d_t_skyEnemy.cpp"),
Rel(NonMatching, "d_t_sound", "REL/d/t/d_t_sound.cpp"),
Rel(Matching, "d_t_sound_area", "REL/d/t/d_t_sound_area.cpp"),
Rel(NonMatching, "d_t_sound_area_mgr", "REL/d/t/d_t_sound_area_mgr.cpp"),
Rel(Matching, "d_t_sound_area_mgr", "REL/d/t/d_t_sound_area_mgr.cpp"),
Rel(NonMatching, "d_t_sparks2", "REL/d/t/d_t_sparks2.cpp"),
Rel(NonMatching, "d_t_sparks", "REL/d/t/d_t_sparks.cpp"),
Rel(NonMatching, "d_t_spore", "REL/d/t/d_t_spore.cpp"),
include/d/tg/d_t_sound_area_mgr.h
+30
View File
@@ -0,0 +1,30 @@
#ifndef D_T_SOUND_AREA_MGR_H
#define D_T_SOUND_AREA_MGR_H
#include <d/tg/d_tg.h>
class dTgSndMg_c : public dTg_c {
public:
dTgSndMg_c() {
sInstance = this;
}
virtual ~dTgSndMg_c() {
sInstance = nullptr;
}
virtual int draw() override;
virtual int actorExecute() override;
virtual int doDelete() override;
virtual int create() override;
static dTgSndMg_c *sInstance;
void setBgmFlag(int flag) {
mBgmFlags |= 1 << flag;
}
private:
u32 mBgmFlags;
};
#endif
src/REL/d/t/d_t_sound_area.cpp
+4 -9
View File
@@ -1,6 +1,7 @@
#include <d/a/obj/d_a_obj_base.h>
#include <d/d_player.h>
#include <d/tg/d_t_sound_area.h>
#include <d/tg/d_t_sound_area_mgr.h>
#include <rvl/MTX.h>
SPECIAL_ACTOR_PROFILE(TAG_SOUND_AREA, dTgSndAr_c, fProfile::TAG_SOUND_AREA, 0x0146, 0, 0);
@@ -10,16 +11,10 @@ void float_ordering() {
0.01f;
}
struct SoundAreaManager {
u8 unk[0xFC];
u32 bgmFlags;
};
extern SoundAreaManager *lbl_805756EC;
int dTgSndAr_c::create() {
scale *= 0.01f;
if (lbl_805756EC == nullptr) {
if (dTgSndMg_c::sInstance == nullptr) {
dAcObjBase_c::createActorUnkGroup3(fProfile::SOUND_AREA_MGR, roomid, 0, nullptr, nullptr, nullptr, -1);
}
@@ -66,8 +61,8 @@ int dTgSndAr_c::actorExecute() {
}
if (lbl_80575D58 != nullptr) {
mVec3_c pos = lbl_80575D58->v;
if (checkPosInArea(pos) && lbl_805756EC != nullptr) {
lbl_805756EC->bgmFlags |= 1 << (params & 0xFF);
if (checkPosInArea(pos) && dTgSndMg_c::sInstance != nullptr) {
dTgSndMg_c::sInstance->setBgmFlag(params & 0xFF);
}
}
return 1;
src/REL/d/t/d_t_sound_area_mgr.cpp
+27
View File
@@ -0,0 +1,27 @@
#include <d/tg/d_t_sound_area_mgr.h>
#include <d/d_player.h>
SPECIAL_ACTOR_PROFILE(SOUND_AREA_MGR, dTgSndMg_c, fProfile::SOUND_AREA_MGR, 0x0145, 0, 0);
int dTgSndMg_c::create() {
s8 tmpRoomId = roomid;
addActorToRoom(-1);
roomid = tmpRoomId;
return 1;
}
int dTgSndMg_c::doDelete() {
return 1;
}
int dTgSndMg_c::actorExecute() {
if (dPlayer::LINK != nullptr) {
dPlayer::LINK->field_0xe8 = 0;
}
mBgmFlags = 0;
return 1;
}
int dTgSndMg_c::draw() {
return 1;
}