From 2062499f0c17e7564e30b4a9c7ae96a32491c5c1 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Fri, 13 May 2022 18:44:14 +0300 Subject: Initial version of enum extractor script --- include/definitions.h | 3 +++ include/droptables.h | 2 ++ include/hitbox.h | 3 +++ include/kinstone.h | 1 + include/projectile.h | 2 ++ 5 files changed, 11 insertions(+) (limited to 'include') diff --git a/include/definitions.h b/include/definitions.h index 896e125b..7a18b709 100644 --- a/include/definitions.h +++ b/include/definitions.h @@ -1,6 +1,9 @@ #ifndef SPRITEDATA_H #define SPRITEDATA_H +#include "gba/types.h" +#include "entity.h" + // Definition for enemies and projectiles typedef struct EnemyDefinition { u16 gfx; diff --git a/include/droptables.h b/include/droptables.h index f05ae94e..78d75970 100644 --- a/include/droptables.h +++ b/include/droptables.h @@ -1,6 +1,8 @@ #ifndef TMC_DROPTABLES_H #define TMC_DROPTABLES_H +#include "global.h" + typedef union { struct { s16 none; diff --git a/include/hitbox.h b/include/hitbox.h index 483c7e1d..0426c992 100644 --- a/include/hitbox.h +++ b/include/hitbox.h @@ -1,5 +1,8 @@ #ifndef HITBOX_H #define HITBOX_H + +#include "entity.h" + extern const Hitbox gHitbox_0; extern const Hitbox gHitbox_1; extern const Hitbox gHitbox_2; diff --git a/include/kinstone.h b/include/kinstone.h index a293104a..987446e4 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -2,6 +2,7 @@ #define KINSTONE_H #include "global.h" +#include "entity.h" extern void sub_08018C58(u32); diff --git a/include/projectile.h b/include/projectile.h index dd73d433..64df8ac4 100644 --- a/include/projectile.h +++ b/include/projectile.h @@ -1,6 +1,8 @@ #ifndef PROJECTILE_H #define PROJECTILE_H +#include "entity.h" + Entity* CreateProjectile(u32); bool32 IsProjectileOffScreen(Entity*); -- cgit v1.2.3 From 968e200c78f057f46fae5bb9b71fec64bfb48bfe Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sat, 14 May 2022 20:51:30 +0300 Subject: Use enums across more scripts and files --- include/kinstone.h | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) (limited to 'include') diff --git a/include/kinstone.h b/include/kinstone.h index 987446e4..f3c0bd00 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -32,4 +32,103 @@ typedef struct { } struct_080C9CBC; extern struct_080C9CBC gUnk_080C9CBC[]; +typedef enum { + KINSTONE_0, + KINSTONE_1, + KINSTONE_2, + KINSTONE_3, + KINSTONE_4, + KINSTONE_5, + KINSTONE_CASTOR_WILDS_STATUE_LEFT, + KINSTONE_CASTOR_WILDS_STATUE_MIDDLE, + KINSTONE_CASTOR_WILDS_STATUE_RIGHT, + KINSTONE_9, + KINSTONE_A, + KINSTONE_B, + KINSTONE_C, + KINSTONE_D, + KINSTONE_E, + KINSTONE_F, + KINSTONE_10, + KINSTONE_11, + KINSTONE_12, + KINSTONE_13, + KINSTONE_14, + KINSTONE_15, + KINSTONE_16, + KINSTONE_17, + KINSTONE_18, + KINSTONE_19, + KINSTONE_1A, + KINSTONE_1B, + KINSTONE_1C, + KINSTONE_1D, + KINSTONE_1E, + KINSTONE_1F, + KINSTONE_20, + KINSTONE_21, + KINSTONE_22, + KINSTONE_23, + KINSTONE_24, + KINSTONE_25, + KINSTONE_26, + KINSTONE_27, + KINSTONE_28, + KINSTONE_29, + KINSTONE_2A, + KINSTONE_2B, + KINSTONE_2C, + KINSTONE_2D, + KINSTONE_2E, + KINSTONE_2F, + KINSTONE_30, + KINSTONE_31, + KINSTONE_32, + KINSTONE_33, + KINSTONE_34, + KINSTONE_35, + KINSTONE_36, + KINSTONE_37, + KINSTONE_38, + KINSTONE_39, + KINSTONE_3A, + KINSTONE_3B, + KINSTONE_3C, + KINSTONE_3D, + KINSTONE_3E, + KINSTONE_3F, + KINSTONE_40, + KINSTONE_41, + KINSTONE_42, + KINSTONE_43, + KINSTONE_44, + KINSTONE_45, + KINSTONE_46, + KINSTONE_47, + KINSTONE_48, + KINSTONE_49, + KINSTONE_4A, + KINSTONE_4B, + KINSTONE_4C, + KINSTONE_4D, + KINSTONE_4E, + KINSTONE_4F, + KINSTONE_50, + KINSTONE_51, + KINSTONE_52, + KINSTONE_53, + KINSTONE_54, + KINSTONE_55, + KINSTONE_56, + KINSTONE_57, + KINSTONE_58, + KINSTONE_59, + KINSTONE_5A, + KINSTONE_5B, + KINSTONE_5C, + KINSTONE_5D, + KINSTONE_5E, + KINSTONE_5F, +} KinstoneFlag; + #endif // KINSTONE_H -- cgit v1.2.3