diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2026-09-24 05:56:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-24 05:56:15 +0200 |
| commit | 39070bb9dd5bba8b60363b81ef0b36f4590e68f4 (patch) | |
| tree | dec35cfe12833c27ca6ac6302b0a60b9e6e12949 /include | |
| parent | 5d80451f3109232d05432f67d8425ff5e7bef68a (diff) | |
Fix misc 24 (#2760)
* rm PROJECT_DIR var from makefile
* fix tlutoffset missing 0x prefix
* fix FTOFIX32 redef warning
* `@bug:` -> `@bug`
* playerFloorPoly -> sPlayerFloorPoly
* fix settingChangeSuccessful use as bool
* fix broken english
* osEPiStartDma: use OS_MESG_PRI_HIGH
* EffectSsHahen_SpawnBurst: pass OBJECT_ for objId
* remove extra parens
* fix trailing comma warnings in enums
* EnRu1: decimal alpha
* fix parens
* fix ATELEM_SFX_NORMAL comment (collider "type" was renamed to material)
* fix comment in Math3D_TriChkPointParaYImpl
* use ANIMMODE_ more
* Remove leading 0s from enum comments (as they indicate octal in C)
Diffstat (limited to 'include')
| -rw-r--r-- | include/collision_check.h | 2 | ||||
| -rw-r--r-- | include/game_over.h | 10 | ||||
| -rw-r--r-- | include/ultra64/gu.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/collision_check.h b/include/collision_check.h index d3d756abc..2e486d83d 100644 --- a/include/collision_check.h +++ b/include/collision_check.h @@ -381,7 +381,7 @@ typedef struct CollisionCheckContext { #define ATELEM_HIT (1 << 1) // Had an AT collision #define ATELEM_NEAREST (1 << 2) // For COLSHAPE_QUAD colliders, only collide with the closest AC element #define ATELEM_SFX_MASK (3 << 3) -#define ATELEM_SFX_NORMAL (0 << 3) // Hit sound effect based on AC collider's type +#define ATELEM_SFX_NORMAL (0 << 3) // Hit sound effect based on AC collider's material #define ATELEM_SFX_HARD (1 << 3) // Always uses hard deflection sound #define ATELEM_SFX_WOOD (2 << 3) // Always uses wood deflection sound #define ATELEM_SFX_NONE (3 << 3) // No hit sound effect diff --git a/include/game_over.h b/include/game_over.h index e91ad0413..2d3d4ebcc 100644 --- a/include/game_over.h +++ b/include/game_over.h @@ -6,11 +6,11 @@ struct PlayState; typedef enum GameOverState { - /* 00 */ GAMEOVER_INACTIVE, - /* 01 */ GAMEOVER_DEATH_START, - /* 02 */ GAMEOVER_DEATH_WAIT_GROUND, // wait for link to fall and hit the ground - /* 03 */ GAMEOVER_DEATH_DELAY_MENU, // wait for 1 second before showing the game over menu - /* 04 */ GAMEOVER_DEATH_MENU, // do nothing while kaleidoscope handles the game over menu + /* 0 */ GAMEOVER_INACTIVE, + /* 1 */ GAMEOVER_DEATH_START, + /* 2 */ GAMEOVER_DEATH_WAIT_GROUND, // wait for link to fall and hit the ground + /* 3 */ GAMEOVER_DEATH_DELAY_MENU, // wait for 1 second before showing the game over menu + /* 4 */ GAMEOVER_DEATH_MENU, // do nothing while kaleidoscope handles the game over menu /* 20 */ GAMEOVER_REVIVE_START = 20, /* 21 */ GAMEOVER_REVIVE_RUMBLE, /* 22 */ GAMEOVER_REVIVE_WAIT_GROUND, // wait for link to fall and hit the ground diff --git a/include/ultra64/gu.h b/include/ultra64/gu.h index d0548b3a8..19be1a1a9 100644 --- a/include/ultra64/gu.h +++ b/include/ultra64/gu.h @@ -5,7 +5,9 @@ #define GU_PI 3.1415926 +#ifndef FTOFIX32 #define FTOFIX32(x) (s32)((x) * (f32)0x00010000) +#endif #define FIX32TOF(x) ((f32)(x) * (1.0f / (f32)0x00010000)) #define ROUND(x) (s32)(((x) >= 0.0) ? ((x) + 0.5) : ((x) - 0.5)) |