mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-22 06:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

__sinit_d_com_inf_game_cpp OK (#140)

Browse Source 
* mass mng header

* d_cc_d start

* c_cc_d ok

* tmp commit

* almost, reordering of vtable functions

* progress

* more progress

* cleanup, still non matching

* mark all of d_cc_d as nonmatching to OK

* c_cc_s

* c_cc_s OK

* d_cc_mass_s OK

* cleanup

* gameinfo __sinit, not OK

* a bit of cleanup

* format

* remove asm

Co-authored-by: lepelog <lepelog@users.noreply.github.com>
This commit is contained in:
lepelog
2021-08-17 02:59:00 +02:00
committed by GitHub
parent 9765844d92
commit 38eca47ad5
114 changed files with 2085 additions and 5680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/save/d_save.h
+12 -4
View File
@@ -757,7 +757,7 @@ private:
class dSv_memory_c {
public:
dSv_memory_c(void);
dSv_memory_c(void) { this->init(); }
void init(void);
dSv_memBit_c& getMemBit() { return mMemBit; }
const dSv_memBit_c& getMemBitConst() const { return mMemBit; }
@@ -767,9 +767,11 @@ private:
u8 padding30[2];
};
STATIC_ASSERT(sizeof(dSv_memory_c) == 0x20);
class dSv_memory2_c {
public:
dSv_memory2_c(void);
dSv_memory2_c(void) { this->init(); }
void init(void);
void onVisitedRoom(int);
void offVisitedRoom(int);
@@ -779,6 +781,8 @@ private:
u32 mVisitedRoom[2];
};
STATIC_ASSERT(sizeof(dSv_memory2_c) == 8);
class dSv_danBit_c {
public:
bool init(s8);
@@ -839,7 +843,7 @@ private:
class dSv_zone_c {
public:
dSv_zone_c(void); // the assembly for this is in d_com_inf_game.s
dSv_zone_c(void) { mRoomNo = -1; } // the assembly for this is in d_com_inf_game.s
void init(int);
dSv_zoneBit_c& getZoneBit() { return mBit; }
const dSv_zoneBit_c& getZoneBitConst() const { return mBit; }
@@ -855,6 +859,8 @@ private:
dSv_zoneActor_c mActor;
};
STATIC_ASSERT(sizeof(dSv_zone_c) == 0x20);
class dSv_restart_c {
public:
void setRoom(const cXyz&, s16, s8);
@@ -914,7 +920,7 @@ public:
static const int STAGE_MAX = 32;
static const int STAGE2_MAX = 64;
private:
// private:
dSv_player_c mPlayer;
dSv_memory_c mSave[STAGE_MAX];
dSv_memory2_c mSave2[STAGE2_MAX];
@@ -925,6 +931,8 @@ private:
#pragma pack(push, 1)
class dSv_info_c {
public:
dSv_info_c() {}
~dSv_info_c() {}
void init(void);
void getSave(int);
void putSave(int);