diff options
| author | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-01-08 15:01:18 +0100 |
|---|---|---|
| committer | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-01-08 15:01:18 +0100 |
| commit | 4ab73f8eb752722a682d5a610e2e8d2836e4bf38 (patch) | |
| tree | 12717c09505853f2a0a3a80075546810902f9199 /include | |
| parent | 1d2d1cd786915571c93f4ac2426729584550f8f9 (diff) | |
Name some more functions in common.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 2 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/save.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/asm.h b/include/asm.h index 837cebca..1f15a0ea 100644 --- a/include/asm.h +++ b/include/asm.h @@ -17,7 +17,7 @@ extern void LoadResourceAsync(const void*, u32, u32); extern void GenericConfused(struct Entity_*); extern void sub_08001290(struct Entity_*, u32); extern void GenericKnockback(struct Entity_*); -extern u32 sub_08002632(struct Entity_*); +extern u32 GetFuserId(struct Entity_*); extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY); extern u32 GravityUpdate(struct Entity_*, u32); extern u32 CheckOnScreen(struct Entity_*); diff --git a/include/common.h b/include/common.h index ff4e027a..011e5a8a 100644 --- a/include/common.h +++ b/include/common.h @@ -122,9 +122,9 @@ void sub_0801E1B8(u32, u32); void AddKinstoneToBag(u32); void sub_0801DFB4(struct Entity_*, u32, u32, u32); u32 sub_0801E00C(void); -bool32 sub_0801E810(u32); +bool32 CheckFusionMapMarkerDisabled(u32); u32 sub_0801DB94(void); -u32 sub_0801EA74(u8*); +u32 GetRandomSharedFusion(u8*); typedef struct { u8 unk_0; diff --git a/include/save.h b/include/save.h index ef5ec931..5193e692 100644 --- a/include/save.h +++ b/include/save.h @@ -64,7 +64,8 @@ typedef struct { /*0x141*/ u8 fuserProgress[128]; // indexed by fuser id, incremented after fusion /*0x1C1*/ u8 fuserOffers[128]; // available kinstone fusion for each fuser /*0x241*/ u8 fusedKinstones[13]; /**< Bitfield for fused kinstones. @see CheckKinstoneFused */ - /*0x24E*/ u8 unk24E[14]; // TODO something else with kinstones @see sub_0801E810 + /*0x24E*/ u8 fusionUnmarked[13]; /**< Bitfield for disabled fusion map markers. @see CheckFusionMapMarkerDisabled */ + /*0x25B*/ u8 filler25B; /*0x25C*/ u8 flags[0x200]; /**< Flags. */ /*0x45C*/ u8 dungeonKeys[0x10]; // TODO Indexed by dungeon id, keys per dungeon /*0x46C*/ u8 dungeonItems[0x10]; // TODO items in the dungeon. 4: compass, 2: big key, 1: small key |