Merge branch 'main' into item-manager

This commit is contained in:
Aetias
2024-04-20 14:01:33 +02:00
123 changed files with 5374 additions and 5227 deletions
-2
View File
@@ -4,7 +4,6 @@
#include "types.h"
#include "lib/math.h"
#include "System/Resource.hpp"
#include "Actor/Actor.hpp"
#include "Actor/ActorType.hpp"
#include "Item/Item.hpp"
@@ -24,7 +23,6 @@ enum RupeeId_ {
class ActorRupee : public Actor {
public:
static Resource gResource;
static ActorType gType;
/* 000 (base) */
-13
View File
@@ -1,13 +0,0 @@
#pragma once
#include "global.h"
#include "types.h"
typedef void (*ResourceCleanupFunc)(void *object);
struct Resource {
/* 0 */ Resource *next;
/* 4 */ ResourceCleanupFunc cleanup;
/* 8 */ void *object;
/* c */
};