diff options
| author | notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com> | 2020-08-24 13:26:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 13:26:13 -0700 |
| commit | ae5ecd017ab2da1291cbbd4380a6e78fe4fe6d41 (patch) | |
| tree | 2b1f36aa1ef2fd7111057ad2e676ab9459d5bc76 /include | |
| parent | 30137c802fd95afe8807a2d9ef120ecb3d78d03a (diff) | |
| parent | 73497fd8c26f5c5f19dc0f7769d0cd8be6f3027c (diff) | |
Merge pull request #73 from HookedBehemoth:slime-fireguy
decompile slime and fireball guy
Diffstat (limited to 'include')
| -rw-r--r-- | include/entity.h | 5 | ||||
| -rw-r--r-- | include/room.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/entity.h b/include/entity.h index 36b02000..069f2073 100644 --- a/include/entity.h +++ b/include/entity.h @@ -167,7 +167,10 @@ extern void SetSpriteSubEntryOffsetData2(Entity*, u32, u32); extern u32 GetFacingDirection(Entity*, Entity*); -extern void DeleteThisEntity(); +extern void DeleteThisEntity(void); +extern void CopyPosition(Entity*, Entity*); +extern void DeleteEntity(Entity*); +extern void PositionRelative(Entity*, Entity*, s32, s32); extern Entity gUnk_03003DA0; diff --git a/include/room.h b/include/room.h index 6245d225..9e0bacbd 100644 --- a/include/room.h +++ b/include/room.h @@ -27,8 +27,10 @@ typedef struct { u8 screenShakeMagnitude; u8 unk7; u16 screenShakeTime; - u16 filler2[6]; - u8 filler3[4]; + u16 filler2[3]; + u16 width; + u16 height; + u8 filler3[6]; union SplitWord bg3OffsetX; union SplitWord bg3OffsetY; Entity* cameraTarget; |