GasStation destructor, enable, create (#561)

* GasStation destructor, enable, create

* Fixes

* Remove comment

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Joshua Peisach
2024-02-13 18:40:04 -05:00
committed by GitHub
parent 971ac8b6e7
commit eb3b339454
3 changed files with 87 additions and 21 deletions

View File

@@ -2,6 +2,7 @@
#define GASSTATION_H
#include "decomp.h"
#include "gasstationstate.h"
#include "legoworld.h"
#include "radio.h"
@@ -39,18 +40,18 @@ public:
// GasStation::`scalar deleting destructor'
private:
undefined2 m_unk0xf8; // 0xf8
undefined2 m_unk0xfa; // 0xfa
undefined4 m_unk0xfc; // 0xfc
undefined4 m_unk0x100; // 0x100
undefined2 m_unk0x104; // 0x104
undefined2 m_unk0x106; // 0x106
undefined4 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
undefined m_unk0x114; // 0x114
undefined m_unk0x115; // 0x115
Radio m_radio; // 0x118
undefined2 m_unk0xf8; // 0xf8
undefined2 m_unk0xfa; // 0xfa
undefined4 m_unk0xfc; // 0xfc
GasStationState* m_state; // 0x100
undefined2 m_unk0x104; // 0x104
undefined2 m_unk0x106; // 0x106
undefined4 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
undefined m_unk0x114; // 0x114
undefined m_unk0x115; // 0x115
Radio m_radio; // 0x118
};
#endif // GASSTATION_H

View File

@@ -7,6 +7,15 @@
// SIZE 0x24
class GasStationState : public LegoState {
public:
// SIZE 0x04
struct Unknown0x14 {
inline void SetUnknown0x00(undefined4 p_unk0x00) { m_unk0x00 = p_unk0x00; }
inline undefined4 GetUnknown0x00() { return m_unk0x00; }
private:
undefined4 m_unk0x00; // 0x00
};
GasStationState();
// FUNCTION: LEGO1 0x100061d0
@@ -27,9 +36,11 @@ public:
// SYNTHETIC: LEGO1 0x10006290
// GasStationState::`scalar deleting destructor'
inline Unknown0x14& GetUnknown0x14() { return m_unk0x14; }
private:
undefined4 m_unk0x08[3]; // 0x08
undefined4 m_unk0x14; // 0x14
Unknown0x14 m_unk0x14; // 0x14
undefined2 m_unk0x18; // 0x18
undefined2 m_unk0x1a; // 0x1a
undefined2 m_unk0x1c; // 0x1c