Skip to content

Commit ed42b15

Browse files
authored
Debug build now takes .alf as input instead of .dol (#2360)
* Fix debug build * Debug build now takes .alf as input instead of .dol I had to manually remove the following line from symbols.txt for DTK to work: ``` .data = .sbss:0x8074C97C; // type:object size:0x4 scope:local data:byte ``` After that it built OK, and DTK automatically modified all other lines in symbols.txt. * Fix pragma in header messing up debug optimization level
1 parent b427ac8 commit ed42b15

File tree

18 files changed

+70390
-70411
lines changed

18 files changed

+70390
-70411
lines changed

config/ShieldD/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: framework
22
object_base: orig/ShieldD
3-
object: sys/main.dol
4-
hash: 16415549d9adce985b8cf736f1a5d7afb570b48e
3+
object: RframeworkD.alf
4+
hash: 14b910141cc0c0a4b24e62c3d3fd9cd14338f725
55
symbols: config/ShieldD/symbols.txt
66
splits: config/ShieldD/splits.txt
77
# map: orig/ShieldD/fixed_maps/RframeworkD.map

config/ShieldD/symbols.txt

Lines changed: 70340 additions & 70336 deletions
Large diffs are not rendered by default.

include/JSystem/JGadget/binary.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ struct TValueIterator {
9292

9393
const void* get() const { return mBegin; }
9494

95-
typename Parser::ParseType operator*() {
95+
typename Parser::ParseType operator*() const {
9696
return *(typename Parser::ParseType*)get();
9797
}
9898

include/JSystem/JStudio/JStudio/stb.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ struct TParseData_fixed : public TParseData<T> {
201201
return TParseData::isValid() && getNext() != NULL;
202202
}
203203

204-
Iterator begin() {
204+
Iterator begin() const {
205205
return Iterator(fileCount);
206206
}
207207

208-
Iterator end() {
208+
Iterator end() const {
209209
Iterator i(fileCount);
210210
i += size();
211211
return i;

include/JSystem/JStudio/JStudio_JAudio2/control.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ struct TCreateObject : public JStudio::TCreateObject {
1515
pJAISoundStarter_ = p_soundStarter;
1616
pJSGSystem_ = p_system;
1717
mPermit_onExit_notEnd = false;
18+
JUT_ASSERT(45, pJAISoundStarter_!=0);
1819
}
1920

2021
/* 8028D550 */ virtual ~TCreateObject();

include/JSystem/JStudio/JStudio_JParticle/control.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ struct TCreateObject : public JStudio::TCreateObject {
1414
pJPAEmitterManager_ = p_emitMgr;
1515
pJSGSystem_ = p_system;
1616
mPermit_onExit_notEnd = false;
17+
JUT_ASSERT(48, pJPAEmitterManager_!=0);
1718
}
1819

1920
/* 8028E3A0 */ virtual ~TCreateObject();

include/JSystem/JStudio/JStudio_JStage/control.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ typedef JStudio::TObject* (*ObjCreateFuncT)(const JStudio::stb::data::TParse_TBl
1616
struct TCreateObject : public JStudio::TCreateObject {
1717
TCreateObject(const JStage::TSystem* pSystem) {
1818
pJSGSystem_ = pSystem;
19+
JUT_ASSERT(42, pJSGSystem_!=0);
1920
}
2021

2122
/* 80289B00 */ virtual ~TCreateObject();

include/d/actor/d_a_alink.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3195,9 +3195,10 @@ class daAlink_c : public daPy_py_c {
31953195

31963196

31973197
// this might be a fake match, but helps fix usage in many functions
3198+
#pragma push
31983199
#pragma optimization_level 2
31993200
BOOL checkAttentionLock() { return mAttention->Lockon(); }
3200-
#pragma optimization_level 3
3201+
#pragma pop
32013202

32023203
bool checkUpperAnime(u16 i_idx) const { return mUpperAnmHeap[UPPER_2].getIdx() == i_idx; }
32033204
bool checkUnderAnime(u16 i_idx) const { return mUnderAnmHeap[UNDER_2].getIdx() == i_idx; }

include/d/actor/d_a_b_bh.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,12 @@ class b_bh_class : public fopEn_enemy_c {
8989

9090
STATIC_ASSERT(sizeof(b_bh_class) == 0xf4c);
9191

92-
class daB_BH_HIO_c
93-
#ifdef DEBUG
94-
: public JORReflexible
95-
#endif
96-
{
92+
class daB_BH_HIO_c : public JORReflexible {
9793
public:
9894
/* 805AE26C */ daB_BH_HIO_c();
9995
/* 805B3098 */ virtual ~daB_BH_HIO_c() {}
10096

101-
#ifdef DEBUG
102-
virtual void genMessage(JORMContext*);
103-
#endif
97+
void genMessage(JORMContext*);
10498

10599
/* 0x04 */ s8 no;
106100
/* 0x08 */ f32 model_size;

include/d/actor/d_a_b_gnd.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,13 @@ class b_gnd_class : public fopEn_enemy_c {
189189

190190
STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790);
191191

192-
class daB_GND_HIO_c
193-
#ifdef DEBUG
194-
: public JORReflexible
195-
#endif
196-
{
192+
class daB_GND_HIO_c : public JORReflexible {
197193
public:
198194
/* 805F4A4C */ daB_GND_HIO_c();
199-
#if DEBUG
200-
virtual void genMessage(JORMContext*);
201-
#endif
202195
/* 80602230 */ virtual ~daB_GND_HIO_c() {}
203196

197+
void genMessage(JORMContext*);
198+
204199
/* 0x04 */ s8 no;
205200
/* 0x08 */ f32 model_size;
206201
/* 0x0C */ f32 field_0xc;

0 commit comments

Comments
 (0)