mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-08 18:13:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/linkfix2' into wip/linkfix

Browse Source
This commit is contained in:
Lurs
2026-02-11 07:20:44 +01:00
parent ef1e1e954c 6b212d913d
commit 143c973b49
1035 changed files with 30170 additions and 22971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2AudioCS.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef Z2AUDIOCS_H
#define Z2AUDIOCS_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JKRHeap;
class JKRArchive;
include/Z2AudioLib/Z2AudioMgr.h
+2 -2
View File
@@ -4,14 +4,14 @@
#include "JSystem/JAudio2/JASAudioReseter.h"
#include "Z2AudioLib/Z2Audience.h"
#include "Z2AudioLib/Z2FxLineMgr.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2SeMgr.h"
#include "Z2AudioLib/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2StatusMgr.h"
#include "Z2AudioLib/Z2SoundInfo.h"
#include "Z2AudioLib/Z2SoundMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SpeechMgr2.h"
#include "Z2AudioLib/Z2StatusMgr.h"
#include "Z2AudioLib/Z2DebugSys.h"
#include "global.h"
include/Z2AudioLib/Z2Calc.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef Z2CALC_H
#define Z2CALC_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "m_Do/m_Do_lib.h"
namespace Z2Calc {
include/Z2AudioLib/Z2LinkMgr.h
+2 -1
View File
@@ -58,6 +58,7 @@ public:
void setMarkState(u8 state) { mMarkState = state; }
static Z2CreatureLink* mLinkPtr;
static Z2CreatureLink* getLink() { return mLinkPtr; }
friend class Z2LinkSoundStarter;
friend class Z2RideSoundStarter;
@@ -96,7 +97,7 @@ private:
}; // Size: 0xD0
inline Z2CreatureLink* Z2GetLink() {
return Z2CreatureLink::mLinkPtr;
return Z2CreatureLink::getLink();
}
class Z2CreatureRide;
include/Z2AudioLib/Z2Param.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef Z2PARAM_H
#define Z2PARAM_H
#include "dolphin/types.h"
#include <dolphin/types.h>
struct Z2Param {
static f32 DISTANCE_MAX;
include/Z2AudioLib/Z2SoundObjMgr.h
+3 -2
View File
@@ -82,7 +82,7 @@ enum Z2EnemyID {
/* 0x3F */ Z2_ENEMY_TN,
};
class Z2SoundObjMgr : public JASGlobalInstance<Z2SoundObjMgr>, protected JSUList<Z2CreatureEnemy> {
class Z2SoundObjMgr : public JASGlobalInstance<Z2SoundObjMgr> {
public:
Z2SoundObjMgr();
void setForceBattleArea(bool forceBattle, u16, u16, u16);
@@ -98,13 +98,14 @@ public:
u8 getEnemyNumNear() const { return enemuNumNear_; }
u8 getEnemyNumVeryFar() const { return enemuNumVeryFar_; }
bool isForceBattle() { return forceBattle_; }
JSUList<Z2CreatureEnemy>* getEnemyList() { return this; }
JSUList<Z2CreatureEnemy>* getEnemyList() { return &field_0x0; }
#if DEBUG
JSUList<Z2SoundObjBase>* getAllList() { return &allList_; }
#endif
private:
/* 0x00 */ JSUList<Z2CreatureEnemy> field_0x0;
#if DEBUG
/* 0x0C */ JSUList<Z2SoundObjBase> allList_;
#endif