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
+2 -2
View File
@@ -2909,7 +2909,7 @@ public:
private:
/* 0x0000 */ fopAc_ac_c mActor;
/* 0x0538 */ u8 field_0x538[0xD1C];
/* 0x0570 */ u8 field_0x570[0xCE4];
/* 0x1254 */ daPy_actorKeep_c mZeldaActorKeep;
};
@@ -2932,7 +2932,7 @@ public:
private:
/* 0x0000 */ fopAc_ac_c mActor;
/* 0x0538 */ u8 field_0x538[0x35C];
/* 0x0570 */ u8 field_0x570[0x324];
/* 0x0894 */ u32 mStateFlg1;
/* 0x0898 */ u32 mEndResetStateFlg0;
};
+1 -4
View File
@@ -126,9 +126,6 @@ private:
class daPy_py_c : public fopAc_ac_c {
public:
/* 0x0538 */ u8 field_0x538[0x32];
/* 0x056A */ u8 field_0x56a;
/* 0x056B */ u8 field_0x56b[5];
/* 0x0570 */ int mNoResetFlg0;
/* 0x0574 */ int mNoResetFlg1;
/* 0x0578 */ int mNoResetFlg2;
@@ -390,7 +387,7 @@ public:
inline bool getSumouCameraMode() const {
bool sumouCameraMode = false;
if (field_0x56a != 0 && field_0x56a < 0x26) {
if (field_0x560[0xA] != 0 && field_0x560[0xA] < 0x26) {
sumouCameraMode = true;
}
return sumouCameraMode;