Skip to content

Commit

Permalink
rel: Small cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
PistonMiner committed Feb 22, 2021
1 parent 4af8443 commit de084fd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions ttyd-tools/rel/include/ttyd/envdrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ void envMain();
void envBlurOn(int32_t bStatic, int32_t duration);
void envBlurOff();

// Glare, used in Riverside.
void envGlareFilter(int32_t type, int16_t top, int16_t left, int16_t bottom, int16_t right);
void envGlareFilterZ(float z);

Expand Down
1 change: 0 additions & 1 deletion ttyd-tools/rel/include/ttyd/evt_mobj.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ EVT_DECLARE_USER_FUNC(evt_mobj_breaking_floor, 7)
EVT_DECLARE_USER_FUNC(evt_mobj_kururing_floor, 7)

#if TTYD_EU
// TODO(LinusS): Add remaining EU MOBJs
// evt_mobj_trap_floor(char *name, float x, float y, float z, char *mapobj_name, int unused, int &used)
// Only available on EU due to `tst`.
EVT_DECLARE_USER_FUNC(evt_mobj_trap_floor, 7)
Expand Down
8 changes: 4 additions & 4 deletions ttyd-tools/rel/include/ttyd/mario.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ struct Player
float unk_190;
float wControlStickSensitivity;
float wControlStickAngle;
float unk_19c;
float unk_1a0;
float viewDirectionForwardWorld;
float playerDirectionWorld;
float wPlayerAngle;
float unk_1a8;
float wPlayerDirection;
uint32_t unk_1b0;
float playerDisplayDirectionCurrent;
float playerDisplayDirectionTarget;
uint32_t unk_1b4;
float wPlayerCollisionBox[3];
float wPlayerCollisionRelated[3];
Expand Down
2 changes: 1 addition & 1 deletion ttyd-tools/rel/include/ttyd/npcdrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct NpcEntry
{
uint32_t flags;
uint32_t reactionFlags;
char wUnkAnimation[32];
char name[32];
NpcTribeDescription *tribe;
char currentAnimation[32];
char stayAnimation[32];
Expand Down

0 comments on commit de084fd

Please sign in to comment.