Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring up to date with 2.0F #6

Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
198c743
Validity checks removal
SaltContainer Apr 12, 2023
ed99c50
Merge branch 'validity-checks' into 2-0-f
SaltContainer Apr 16, 2023
cca16e3
Removed validity check logs
SaltContainer Apr 19, 2023
de50d94
Custom Script Commands framework
SaltContainer Apr 20, 2023
4fe05ea
FormNo check commands
SaltContainer Apr 20, 2023
b26720e
Nature box check command
SaltContainer Apr 20, 2023
d92f621
Refactor and document custom_script.cpp
SaltContainer Apr 20, 2023
3402c7a
Release Pokémon Command
SaltContainer Apr 20, 2023
3930c7b
Fix form seen issues
SaltContainer Apr 21, 2023
92de7b0
Merge branch 'custom-commands' into 2-0-f
SaltContainer Apr 22, 2023
90dc0c3
Add overrides for diploma checks
SaltContainer Apr 22, 2023
775965c
Merge branch '2-0-f' into custom-commands
SaltContainer Apr 22, 2023
0226230
Restore Shiny Charm
SaltContainer Apr 23, 2023
668f4ea
Example Sunyshore gym gear command recreation
SaltContainer Apr 25, 2023
af73bb9
Toggle Box Collider command
SaltContainer Apr 25, 2023
cacbb9d
Reverse Ability Patch and Doubles Fix
SaltContainer Apr 26, 2023
13c9400
Merge branch 'custom-commands' into 2-0-f
SaltContainer Apr 26, 2023
0df9bc7
Merge branch 'item-changes' into 2-0-f
SaltContainer Apr 27, 2023
98a950d
Thief puts items in bag after wild battle
SaltContainer Apr 28, 2023
4af7e3d
Add fadeTime argument to _STOP_EFFECT
SaltContainer May 3, 2023
67d4676
Merge branch 'thief-bag' into 2-0-f
SaltContainer May 3, 2023
99df92b
Re-index custom commands
SaltContainer May 3, 2023
61024a6
Merge branch 'custom-commands' into 2-0-f
SaltContainer May 3, 2023
c6da047
First draft for new encounters methos
SaltContainer May 6, 2023
67ed41d
Finalize new encounter methods
SaltContainer May 8, 2023
e0ec4fc
Infinite Repel
SaltContainer May 8, 2023
04f9c99
Added repel sound to infinite repel
SaltContainer May 8, 2023
1d3aa3c
Merge branch 'encounter-slots' into 2-0-f
SaltContainer May 8, 2023
4609d10
Can't Escape Flag behavior
SaltContainer May 12, 2023
5719706
Merge branch 'cant-escape-flag' into 2-0-f
SaltContainer May 12, 2023
8aa351c
Extended local trades
SaltContainer May 15, 2023
166884c
Mewtwo MK1 Armor form change
SaltContainer May 25, 2023
c2493dc
WIP (crashes on title screen)
SaltContainer May 28, 2023
402514a
Fixed thief crashes + allow wild thief when holding item
SaltContainer May 31, 2023
d8c809c
Fixed form change held item issues
SaltContainer Jun 1, 2023
784e106
Merge branch 'thief-fix' into 2-0-f
SaltContainer Jun 1, 2023
fccd854
Pickup on level caps
SaltContainer Jun 3, 2023
79aabf9
Remove debug 100% pickup
SaltContainer Jun 4, 2023
4d898aa
Merge branch 'pickup-changes' into 2-0-f
SaltContainer Jun 6, 2023
f290464
Merge branch '2-0-f' into local-trades
SaltContainer Jun 7, 2023
99d99dd
Allow custom IVs in trade with tokusei
SaltContainer Jun 7, 2023
81b1861
Add extra data in seikaku and change how IVs are given
SaltContainer Jun 8, 2023
92d88c3
Adjusted Level caps and pickup
SaltContainer Jun 9, 2023
e6d7889
Merge branch 'local-trades' into 2-0-f
SaltContainer Jun 9, 2023
fb2ab3c
Held Items on static encounters
SaltContainer Jun 9, 2023
ad0dfa0
Merge branch 'static-held-items' into 2-0-f
SaltContainer Jun 10, 2023
090e155
Remove broken badge swap
SaltContainer Jun 11, 2023
0425353
Ancient Power handler on Ominous Wind and Silver Wind
SaltContainer Jun 11, 2023
43f6ecb
Merge branch 'small-move-fixes' into 2-0-f
SaltContainer Jun 12, 2023
7e0eeca
Fix reminder TMs
SaltContainer Jun 12, 2023
4275fd1
_INSTALL_CHECK command
SaltContainer Jul 6, 2023
6a83d6e
Merge pull request #1 from SaltContainer/2-0-f
SaltContainer Jul 6, 2023
a1b707c
Remove custom handler for Magnitude
SaltContainer Aug 24, 2023
ef00e98
2.0F Hotfix fixes
SaltContainer Oct 22, 2023
0646e72
Gigaton Hammer
SaltContainer Oct 30, 2023
7e707f0
Gigaton Hammer over Happy Hour
SaltContainer Oct 30, 2023
7ece58a
Unselectable fixes
SaltContainer Nov 6, 2023
fc624d9
Eevee moves
SaltContainer Nov 7, 2023
44d5866
Backport of FFFFFFFF PID fix from ExLaunch
SaltContainer Nov 7, 2023
6cd5ddf
Backport Leek on Sirfetch'd
SaltContainer Nov 7, 2023
7aba216
Finally fixed Magnitude
SaltContainer Nov 8, 2023
1c179e0
Quick Draw and Curious Medicine
SaltContainer Nov 8, 2023
f9b218c
Sp.Atk Flower Gift
SaltContainer Nov 9, 2023
bc73142
Shiny Eggs and Releasable eggs
SaltContainer Mar 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions include/AnimationPlayer.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#pragma once

#include "il2cpp.hpp"

struct AnimationPlayer_Fields
{
// TODO: Add fields and dependencies
};

struct AnimationPlayer_RGCTXs
{
};

struct AnimationPlayer_VTable
{
VirtualInvokeData _0_Equals;
VirtualInvokeData _1_Finalize;
VirtualInvokeData _2_GetHashCode;
VirtualInvokeData _3_ToString;
};

struct AnimationPlayer_c
{
Il2CppClass_1 _1;
struct AnimationPlayer_StaticFields* static_fields;
AnimationPlayer_RGCTXs* rgctx_data;
Il2CppClass_2 _2;
AnimationPlayer_VTable vtable;
};

struct AnimationPlayer_o
{
AnimationPlayer_c *klass;
void *monitor;
AnimationPlayer_Fields fields;

// 0211e9b0
void Play (int32_t index, float duration, float startTime, MethodInfo *method);
};

struct AnimationPlayer_StaticFields
{
};
7 changes: 7 additions & 0 deletions include/AttributeID.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#pragma once

struct AttributeID
{
// 021267d0
static bool MATR_IsWater(int32_t matr_code, MethodInfo *method);
};
60 changes: 60 additions & 0 deletions include/Audio/AudioInstance.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#pragma once

#include "il2cpp.hpp"

namespace Audio
{
struct AudioInstance_Fields
{
struct AkGameObj_o* _akGameObj;
int32_t _listenerType;
uint32_t _playEventId;
uint32_t _stopEventId;
struct UnityEngine_Transform_o* _attachedTransform;
struct UnityEngine_Vector3_o _localPosition;
struct UnityEngine_Quaternion_o _localRotation;
struct UnityEngine_Events_UnityAction_AudioInstance__o* _onFinished;
float _volume;
uint32_t _playId;
float _duration;
bool _isDurtyRtpc;
bool _isManualRemoved;
int32_t _stateBits;
};

struct AudioInstance_RGCTXs
{
};

struct AudioInstance_VTable
{
VirtualInvokeData _0_Equals;
VirtualInvokeData _1_Finalize;
VirtualInvokeData _2_GetHashCode;
VirtualInvokeData _3_ToString;
VirtualInvokeData _4_IObjectPoolInstance_SetGameObject;
VirtualInvokeData _5_IObjectPoolInstance_GetGameObject;
VirtualInvokeData _6_IObjectPoolInstance_OnCreate;
VirtualInvokeData _7_IObjectPoolInstance_OnRelease;
};

struct AudioInstance_c
{
Il2CppClass_1 _1;
struct AudioInstance_StaticFields* static_fields;
AudioInstance_RGCTXs* rgctx_data;
Il2CppClass_2 _2;
AudioInstance_VTable vtable;
};

struct AudioInstance_o
{
AudioInstance_c *klass;
void *monitor;
AudioInstance_Fields fields;
};

struct AudioInstance_StaticFields
{
};
}
68 changes: 68 additions & 0 deletions include/Audio/AudioManager.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#pragma once

#include "il2cpp.hpp"
#include "Audio/AudioInstance.hpp"
#include "UnityEngine/GameObject.hpp"

struct SmartPoint_AssetAssistant_SingletonMonoBehaviour_AudioManager__Fields {
UnityEngine_MonoBehaviour_Fields super;
};

namespace Audio
{
struct AudioManager_Fields
{
SmartPoint_AssetAssistant_SingletonMonoBehaviour_AudioManager__Fields super;
struct UnityEngine::GameObject_o* _prefab;
struct System_Int32_array* _poolCounts;
struct UnityEngine_Transform_o* _listenerRoot;
struct System_String_o* _commonBankName;
struct System_Collections_Generic_List_AudioManager_ListenerParam__o* _listenerParams;
struct System_Collections_Generic_List_AudioInstance__o* _audioInstances;
struct ObjectPool_AudioManager_PoolType__AudioInstance__o* _objectPool;
struct System_Collections_Generic_HashSet_AudioData__o* _audioDatas;
uint32_t _eventId;
uint32_t _bgmPlayId;
bool _isUpdateListenerCamera;
float _duration;
struct UnityEngine_Events_UnityAction_uint__o* onFinishBgm;
int32_t _configVoice;
};

struct AudioManager_RGCTXs
{
};

struct AudioManager_VTable
{
VirtualInvokeData _0_Equals;
VirtualInvokeData _1_Finalize;
VirtualInvokeData _2_GetHashCode;
VirtualInvokeData _3_ToString;
VirtualInvokeData _4_Awake;
VirtualInvokeData _5_OnApplicationQuit;
};

struct AudioManager_c
{
Il2CppClass_1 _1;
struct AudioManager_StaticFields* static_fields;
AudioManager_RGCTXs* rgctx_data;
Il2CppClass_2 _2;
AudioManager_VTable vtable;
};

struct AudioManager_o
{
AudioManager_c *klass;
void *monitor;
AudioManager_Fields fields;

// 021eb8d0
AudioInstance_o * PlaySe(uint32_t playEventId, void *onFinished, MethodInfo *method);
};

struct AudioManager_StaticFields
{
};
}
62 changes: 62 additions & 0 deletions include/BaseEntity.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#pragma once

#include "il2cpp.hpp"

struct BaseEntity_Fields
{
UnityEngine_MonoBehaviour_Fields super;
struct System_String_o* _enityName;
bool _alreadyRegistered;
float yawAngle;
struct UnityEngine_Vector3_o worldPosition;
float savedYawAngle;
struct UnityEngine_Vector3_o savedPosition;
struct UnityEngine_Vector3_o _beforePosition_k__BackingField;
struct UnityEngine_Transform_o* _cacheTransform;
int32_t _currentSequence_k__BackingField;
int32_t _nextSequence_k__BackingField;
float _sequenceTime_k__BackingField;
struct BaseEntity_o* _target_k__BackingField;
};

struct BaseEntity_RGCTXs
{
};

struct BaseEntity_VTable
{
VirtualInvokeData _0_Equals;
VirtualInvokeData _1_Finalize;
VirtualInvokeData _2_GetHashCode;
VirtualInvokeData _3_ToString;
VirtualInvokeData _4_get_entityType;
VirtualInvokeData _5_GetAnimationPlayer;
VirtualInvokeData _6_Awake;
VirtualInvokeData _7_OnEnable;
VirtualInvokeData _8_OnDisable;
VirtualInvokeData _9_OnDestroy;
VirtualInvokeData _10_OnUpdate;
VirtualInvokeData _11_OnLateUpdate;
VirtualInvokeData _12_SwitchToNext;
VirtualInvokeData _13_ProcessSequence;
};

struct BaseEntity_c
{
Il2CppClass_1 _1;
struct BaseEntity_StaticFields* static_fields;
BaseEntity_RGCTXs* rgctx_data;
Il2CppClass_2 _2;
BaseEntity_VTable vtable;
};

struct BaseEntity_o
{
BaseEntity_c *klass;
void *monitor;
BaseEntity_Fields fields;
};

struct BaseEntity_StaticFields
{
};
5 changes: 3 additions & 2 deletions include/DpData.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "System/Array.hpp"
#include "System/String.hpp"
#include "Pml/PokePara/SavePokeParty.hpp"
#include "il2cpp.hpp"

namespace DPData
Expand Down Expand Up @@ -936,7 +937,7 @@ namespace DPData
int32_t ReturnGridPosZ;
struct LOCATION_WORK_o ReturnZenmetsu_Ground;
struct DigPos_array* DigPoints;
struct Pml::PokePara::SerializedPokemonFull_array* EncountPokes;
Pml::PokePara::SerializedPokemonFull_array* EncountPokes;
struct UnityEngine_Vector3_array* EncountPokePositions;
int32_t ReturnUgZoneID;
struct UGRecord_o ugRecord;
Expand Down Expand Up @@ -1313,4 +1314,4 @@ namespace DPData
}


#endif
#endif
28 changes: 28 additions & 0 deletions include/Dpr/Battle/Logic/BTLV_STRPARAM.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#pragma once

#include "il2cpp.hpp"

namespace Dpr
{
namespace Battle
{
namespace Logic
{
struct BTLV_STRPARAM_Fields {
uint16_t strID;
uint8_t wait;
uint8_t strType;
uint8_t argCnt;
struct System_Int32_array* args;
};

struct BTLV_STRPARAM_c;

struct BTLV_STRPARAM_o {
BTLV_STRPARAM_c *klass;
void *monitor;
BTLV_STRPARAM_Fields fields;
};
}
}
}
Loading