From 5b8abe3c3a0fe9384f96b07b0ff8782911da60e0 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Mon, 6 May 2024 22:32:58 +0200
Subject: [PATCH] Fix errors after rebase

---
 config/SOUE01/symbols.txt        | 2 +-
 include/egg/core/eggController.h | 2 +-
 src/egg/core/eggController.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index 099ff528..a89eb182 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -37102,7 +37102,7 @@ lbl_8056E990 = .data:0x8056E990; // type:object size:0xB data:string
 __vt__Q23EGG7ExpHeap = .data:0x8056E9A0; // type:object size:0x30
 lbl_8056E9D0 = .data:0x8056E9D0; // type:object size:0x30
 lbl_8056EA00 = .data:0x8056EA00; // type:object size:0x30
-__vt__Q23EGG8Disposer = .data:0x8056EA30; // type:object size:0x10
+__vt__Q23EGG8Disposer = .data:0x8056EA30; // type:object size:0xC
 __vt__Q23EGG6Thread = .data:0x8056EA40; // type:object size:0x18
 lbl_8056EA58 = .data:0x8056EA58; // type:object size:0x70
 __vt__Q23EGG7Display = .data:0x8056EAC8; // type:object size:0x20
diff --git a/include/egg/core/eggController.h b/include/egg/core/eggController.h
index ff9c9170..b3b4c024 100644
--- a/include/egg/core/eggController.h
+++ b/include/egg/core/eggController.h
@@ -156,7 +156,7 @@ public:
 class ControllerRumbleUnit {
 public:
     // 0x00 vtable | 8056ebb4
-    inline ControllerRumbleUnit() { init(); }
+    inline ControllerRumbleUnit(): mFlag(0) { init(); }
     /* vt 0x08 | 8049a8e0 */ virtual ~ControllerRumbleUnit() {}
 
 public:
diff --git a/src/egg/core/eggController.cpp b/src/egg/core/eggController.cpp
index dd69e5db..fb359817 100644
--- a/src/egg/core/eggController.cpp
+++ b/src/egg/core/eggController.cpp
@@ -49,7 +49,7 @@ static Allocator *sWPADAllocator;
     return result;
 }
 
-/* 0x80499050 */ CoreController::CoreController() : mDpdPos(), mAccel(), mAccelFlags(nullptr) {
+/* 0x80499050 */ CoreController::CoreController() : mDpdPos(), mAccel(), mAccelFlags(), mFlag(0) {
     this->mRumbleMgr = nullptr;
     this->mButtonHeld = 0;
     this->mButtonTriggered = 0;