From 38a3953ee8b073c1c22f913942d1ee60137424b2 Mon Sep 17 00:00:00 2001 From: MarioMastr Date: Thu, 8 Aug 2024 12:41:27 +0100 Subject: [PATCH] remove problematic paddings (i genuinely didnt think that commit would be added to the pr) --- bindings/2.206/Extras.bro | 12 +++++----- bindings/2.206/GeometryDash.bro | 40 ++++++++++++++++----------------- test/members/MacOSArm.cpp | 28 ----------------------- 3 files changed, 25 insertions(+), 55 deletions(-) diff --git a/bindings/2.206/Extras.bro b/bindings/2.206/Extras.bro index 46ae2805b..fee306397 100644 --- a/bindings/2.206/Extras.bro +++ b/bindings/2.206/Extras.bro @@ -8,20 +8,20 @@ class AdvancedFollowInstance { } class SFXTriggerInstance { - PAD = win 0x10, m1 0x0; + PAD = win 0x10; SFXTriggerGameObject* m_sfxTriggerGameObject; } class EventTriggerInstance { - PAD = win 0x10, m1 0x0; + PAD = win 0x10; gd::vector m_unkVecInt; } class SongChannelState { SongTriggerGameObject* m_songTriggerGameObject1; - PAD = win 0x8, m1 0x0; + PAD = win 0x8; SongTriggerGameObject* m_songTriggerGameObject2; - PAD = win 0x8, m1 0x0; + PAD = win 0x8; } class SongTriggerState { @@ -140,9 +140,9 @@ class FMODSoundState { } class TimerItem { - PAD = win 0x38, m1 0x0; + PAD = win 0x38; gd::vector m_unkVecInt; - PAD = win 0x4, m1 0x0; + PAD = win 0x4; } class EnterEffectAnimValue { diff --git a/bindings/2.206/GeometryDash.bro b/bindings/2.206/GeometryDash.bro index 1a791c902..658d702bd 100644 --- a/bindings/2.206/GeometryDash.bro +++ b/bindings/2.206/GeometryDash.bro @@ -1980,7 +1980,7 @@ class CheckpointObject : cocos2d::CCNode { void* m_maybeAPointer1; int m_unkInt1; short m_unkShort1; - PAD = win 0x2, m1 0x2; + PAD = win 0x2; void* m_maybeAPointer2; gd::vector m_vectorDynamicSaveObjects; gd::vector m_vectorActiveSaveObjects1; @@ -1988,11 +1988,9 @@ class CheckpointObject : cocos2d::CCNode { EffectManagerState m_effectManagerState; cocos2d::CCArray* m_gradientTriggerObjectArray; bool m_unkBool1; - PAD = win 0x7, m1 0x0; + PAD = win 0x7; gd::unordered_map m_sequenceTriggerStateUnorderedMap; - PAD = m1 0x1; void* m_maybeAPointer3; - int m_unkGetsCopiedFromGameState; } [[link(android)]] @@ -2022,7 +2020,7 @@ class CollisionBlockPopup : FLAlertLayer, TextInputDelegate { [[link(android)]] class CollisionTriggerAction { - PAD = win 0x20, m1 0x0; + PAD = win 0x20; gd::vector m_unkVecInt; } @@ -2414,7 +2412,7 @@ class ConfigureValuePopupDelegate { class CountTriggerAction { // CountTriggerAction(CountTriggerAction&&); - PAD = win 0x24, m1 0x0; + PAD = win 0x24; gd::vector m_unkVecInt; } @@ -4418,11 +4416,11 @@ class EnterEffectInstance { void updateTransitions(float, GJBaseGameLayer*) = imac 0x5dc680, m1 0x506dcc; gd::map m_enterEffectAnimMap; - PAD = win 0x8c, m1 0x0; + PAD = win 0x8c; GameObject* m_gameObject; - PAD = win 0x1c, m1 0x0; + PAD = win 0x1c; gd::vector m_unkVecInt; - PAD = win 0x4, m1 0x0; + PAD = win 0x4; } [[link(android)]] @@ -10460,13 +10458,13 @@ class GroupCommandObject2 { TodoReturn updateAction(int, float); TodoReturn updateEffectAction(float, int); - PAD = win 0x1b8, m1 0x0; // there may be a pointer in there somewhere since it changed from 0x1b4 + PAD = win 0x1b8; // there may be a pointer in there somewhere since it changed from 0x1b4 gd::vector m_unkVecKeyframeObject; - PAD = win 0x8, m1 0x0; + PAD = win 0x8; GameObject* m_gameObject; - PAD = win 0x8, m1 0x0; + PAD = win 0x8; gd::vector m_unkVecInt; - PAD = win 0x8, m1 0x0; + PAD = win 0x8; } [[link(android)]] @@ -10782,19 +10780,19 @@ class KeyframeObject { TodoReturn setupSpline(gd::vector&); - PAD = win 0x20, m1 0x0; + PAD = win 0x20; gd::vector m_unkVecDouble1; gd::vector m_unkVecDouble2; gd::vector m_unkVecDouble3; gd::vector m_unkVecDouble4; gd::vector m_unkVecDouble5; - PAD = win 0x29, m1 0x0; + PAD = win 0x29; gd::vector m_unkVecDouble6; gd::vector m_unkVecDouble7; gd::vector m_unkVecDouble8; gd::vector m_unkVecDouble9; gd::vector m_unkVecDouble10; - PAD = win 0x80, m1 0x0; + PAD = win 0x80; } [[link(android)]] @@ -13381,7 +13379,7 @@ class PlayerCheckpoint : cocos2d::CCNode { bool m_isRobot; bool m_isSpider; bool m_isOnGround; - PAD = win 0x2, m1 0x2; + PAD = win 0x2; int m_hasGhostTrail; uint8_t m_unkBytes1[4]; float m_speed; @@ -17587,7 +17585,7 @@ class SpawnTriggerAction { bool isFinished(); TodoReturn step(float); - PAD = win 0x28, m1 0x0; + PAD = win 0x28; GameObject* m_gameObject; gd::vector m_unkVecInt; } @@ -18106,7 +18104,7 @@ class TextStyleSection : cocos2d::CCObject { [[link(android)]] class TimerTriggerAction { - PAD = win 0x20, m1 0x0; + PAD = win 0x20; gd::vector m_unkVecInt; } @@ -18125,7 +18123,7 @@ class TimerTriggerGameObject : EffectGameObject { [[link(android)]] class ToggleTriggerAction { - PAD = win 0x14, m1 0x0; + PAD = win 0x14; gd::vector m_unkVecInt; } @@ -18169,7 +18167,7 @@ class TOSPopup : FLAlertLayer { [[link(android)]] class TouchToggleAction { - PAD = win 0x20, m1 0x0; + PAD = win 0x20; gd::vector m_unkVecInt; } diff --git a/test/members/MacOSArm.cpp b/test/members/MacOSArm.cpp index 1d13515d0..e9e47d4ce 100644 --- a/test/members/MacOSArm.cpp +++ b/test/members/MacOSArm.cpp @@ -30,34 +30,6 @@ GEODE_MEMBER_CHECK(GJBaseGameLayer, m_sections, 0x32f8); GEODE_MEMBER_CHECK(GJBaseGameLayer, m_audioVisualizerBG, 0x3420); GEODE_MEMBER_CHECK(GJBaseGameLayer, m_loadingLayer, 0x3498); -GEODE_MEMBER_CHECK(EnterEffectInstance, m_gameObject, 0x18); -GEODE_MEMBER_CHECK(EnterEffectInstance, m_unkVecInt, 0x20); - -GEODE_MEMBER_CHECK(CountTriggerAction, m_unkVecInt, 0x0); - -GEODE_MEMBER_CHECK(CollisionTriggerAction, m_unkVecInt, 0x0); - -GEODE_MEMBER_CHECK(EventTriggerInstance, m_unkVecInt, 0x0); - -GEODE_SIZE_CHECK(KeyframeObject, 0xf0); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble1, 0x0); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble2, 0x18); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble3, 0x30); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble4, 0x48); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble5, 0x60); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble6, 0x78); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble7, 0x90); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble8, 0xa8); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble9, 0xc0); -GEODE_MEMBER_CHECK(KeyframeObject, m_unkVecDouble10, 0xd8); - -GEODE_MEMBER_CHECK(GroupCommandObject2, m_unkVecKeyframeObject, 0x0); -GEODE_MEMBER_CHECK(GroupCommandObject2, m_gameObject, 0x18); -GEODE_MEMBER_CHECK(GroupCommandObject2, m_unkVecInt, 0x20); - -GEODE_MEMBER_CHECK(SongChannelState, m_songTriggerGameObject1, 0x0); -GEODE_MEMBER_CHECK(SongChannelState, m_songTriggerGameObject2, 0x8); - // GEODE_SIZE_CHECK(PlayerObject, 0xbe8); GEODE_MEMBER_CHECK(PlayerObject, m_mainLayer, 0x550);