diff options
| author | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-04-29 02:56:08 +0200 |
|---|---|---|
| committer | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-04-29 02:56:08 +0200 |
| commit | fcfbd73dd26284d6b89bec62483502a9e13aecdc (patch) | |
| tree | e14abf47a47c4d376ce2a3a0b528de4f89d25dcd /include | |
| parent | a82ad2951a2d78533fb18bf08203cb4b3256a2f1 (diff) | |
Name the special values used with Kinstone Fusions
Diffstat (limited to 'include')
| -rw-r--r-- | include/kinstone.h | 7 | ||||
| -rw-r--r-- | include/npc.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/kinstone.h b/include/kinstone.h index e05c815e..ac6b9b83 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -35,7 +35,7 @@ typedef struct { extern const KinstoneWorldEvent gKinstoneWorldEvents[]; typedef enum { - KINSTONE_0, + KINSTONE_NONE, KINSTONE_MYSTERIOUS_CLOUD_TOP_RIGHT, KINSTONE_MYSTERIOUS_CLOUD_BOTTOM_LEFT, KINSTONE_MYSTERIOUS_CLOUD_TOP_LEFT, @@ -136,6 +136,11 @@ typedef enum { KINSTONE_62, KINSTONE_63, KINSTONE_64, + /* some special values, mostly for fusers */ + KINSTONE_NEEDS_REPLACEMENT = 0xF1, + KINSTONE_JUST_FUSED = 0xF2, + KINSTONE_FUSER_DONE = 0xF3, + KINSTONE_RANDOM = 0xFF, } KinstoneId; typedef struct { diff --git a/include/npc.h b/include/npc.h index d81ea4a7..dff0378c 100644 --- a/include/npc.h +++ b/include/npc.h @@ -84,12 +84,12 @@ void NPCInit(Entity* ent); void CollideFollowers(void); // TODO move? -void AddInteractableWhenBigFuser(Entity* ent, u32 arg1); +void AddInteractableWhenBigFuser(Entity* ent, u32 kinstoneId); u32 sub_0806F5A4(u32); u32 GetFusionToOffer(Entity*); void AddInteractableWhenBigObject(Entity*); void sub_0807000C(Entity*); -void AddInteractableAsMinishFuser(Entity*, u32); +void AddInteractableAsMinishFuser(Entity* ent, u32 kinstoneId); enum NPC { /*0x00*/ NPC_NONE_0, |