move / fix bunch of stuff (#133)

* fix some class structures / d_event wip

* d_event wip

* move gamepad stuff

* move m_Do_main

* move d_bomb / partial m_Do_reset

* format

* remove asm

* add Z2SoundID enum

* move some Z2 classes

* fix

* move more Z2 stuff

* fix fopAc_ac_c more
This commit is contained in:
TakaRikka
2021-06-12 15:22:36 -07:00
committed by GitHub
parent 5be309a186
commit 4448c08ac0
132 changed files with 6755 additions and 3217 deletions
+11 -23
View File
@@ -11,8 +11,6 @@
// Types:
//
struct _GXColor {};
struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
/* 800080D0 */ void fadeOut(f32);
@@ -61,10 +59,6 @@ struct dEvent_manager_c {
/* 8004817C */ void cutEnd(int);
};
struct dEvDtCut_c {
/* 800460A8 */ void startCheck();
};
struct dDlst_list_c {
/* 800568D8 */ void wipeIn(f32);
@@ -360,25 +354,19 @@ asm void dEvDtFlag_c::flagSet(int param_0) {
}
#pragma pop
/* 80043E30-80043E58 03E770 0028+00 2/2 0/0 0/0 .text flagMaxCheck__11dEvDtFlag_cFi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dEvDtFlag_c::flagMaxCheck(int param_0) {
nofralloc
#include "asm/d/event/d_event_data/flagMaxCheck__11dEvDtFlag_cFi.s"
}
#pragma pop
bool dEvDtFlag_c::flagMaxCheck(int flag_id) {
if (flag_id == -1) {
return true;
}
/* 80043E58-80043E78 03E798 0020+00 0/0 3/3 0/0 .text init__11dEvDtFlag_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dEvDtFlag_c::init() {
nofralloc
#include "asm/d/event/d_event_data/init__11dEvDtFlag_cFv.s"
return FlagMax <= flag_id;
}
void dEvDtFlag_c::init() {
for (int i = 0; i < 320; i++) {
mFlags[i] = 0;
}
}
#pragma pop
/* 80043E78-80043EFC 03E7B8 0084+00 0/0 1/1 0/0 .text finishCheck__12dEvDtEvent_cFv */
#pragma push