Skip to content

Commit 2f8a6bb

Browse files
Merge branch '96flashbacks:main' into main
2 parents d1795ad + 7406852 commit 2f8a6bb

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ For more questions, join our [Discord server](https://discord.gg/ynabeAS4eD).
5050
#### Main Programming
5151
- stalechilibeans
5252
- 1up Guy
53-
- elinspectorardilla
5453

5554
#### Additional Programming
5655
- ummheather
@@ -102,17 +101,20 @@ For more questions, join our [Discord server](https://discord.gg/ynabeAS4eD).
102101
#### Miscellaneous Help
103102
- packrcrackr
104103
- Xiartic
105-
- WooHale54
104+
- Woohale54
105+
- RM05
106106
- timmy6259
107107
- Zucchino
108108
- Xerox
109109

110110
#### Special Thanks
111111
- na0micakes
112+
- toonjoey
112113
- Matsilagi
113114
- lunr
114115
- CharD
115116
- RM05
117+
- icehotlemonade
116118
- Tony (Hard4Games)
117119
- aaali
118120

sound/samples/sfx_5/0B.aiff

-872 Bytes
Binary file not shown.

sound/samples/sfx_5/0C.aiff

109 KB
Binary file not shown.

src/game/mario_actions_airborne.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ s32 check_fall_damage(struct MarioState *m, u32 hardFallAction) {
5858
#pragma GCC diagnostic ignored "-Wtype-limits"
5959
#endif
6060

61-
damageHeight = 900.0f;
61+
damageHeight = 1000.0f;
6262

6363
#pragma GCC diagnostic pop
6464

6565
if (m->action != ACT_TWIRLING && m->floor->type != SURFACE_BURNING) {
6666
if (m->vel[1] < -55.0f) {
67-
if (fallHeight > 1800.0f) {
67+
if (fallHeight > 2000.0f) {
6868
m->hurtCounter += 16;
6969
return drop_and_set_mario_action(m, hardFallAction, 4);
7070
} else if (fallHeight > damageHeight && !mario_floor_is_slippery(m)) {

0 commit comments

Comments
 (0)