mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-18 21:17:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Collision Documentation (#640)

Browse Source 
* Collision related renames
This commit is contained in:
MegaMech
2024-06-26 19:22:38 -06:00
committed by GitHub
parent 975b96265c
commit 3d7cdcee8a
47 changed files with 2435 additions and 2415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/effects.c
+8 -8
View File
@@ -258,7 +258,7 @@ void func_8008C528(Player *player, s8 arg1) {
void func_8008C62C(Player *player, s8 arg1) {
func_80031F48(player, 5.0f);
decelerate_ai_player(player, 5.0f);
player->unk_0A8 += (s16)0xA0;
player->unk_042 += (s16)0x71C;
if (player->unk_0A8 >= 0x2000) {
@@ -356,15 +356,15 @@ void func_8008C9EC(Player *player, s8 arg1) {
player->unk_206 = 0;
player->slopeAccel = 0;
if ((player->unk_046 & 0x40) == 0x40) {
func_80031F48(player, 100.0f);
decelerate_ai_player(player, 100.0f);
} else {
if ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) {
func_80031F48(player, 1.0f);
decelerate_ai_player(player, 1.0f);
} else {
func_80031F48(player, 4.0f);
decelerate_ai_player(player, 4.0f);
}
if (!(player->type & PLAYER_HUMAN)) {
func_80031F48(player, 30.0f);
decelerate_ai_player(player, 30.0f);
}
}
if ((player->effects & 0x80) == 0x80) {
@@ -756,7 +756,7 @@ void apply_hit_effect(Player* player, s8 arg1) {
player->unk_0C0 = 0;
player->unk_08C = 0.0f;
player->currentSpeed = 0.0f;
if ((player->unk_110.unk3C[2] >= 600.0f) || ((player->effects & 0x1000) != 0)) { D_8018D990[arg1] = 3; } // placed block on same line to match
if ((player->collision.surfaceDistance[2] >= 600.0f) || ((player->effects & 0x1000) != 0)) { D_8018D990[arg1] = 3; } // placed block on same line to match
switch (D_8018D990[arg1]) {
case 0:
@@ -822,7 +822,7 @@ void apply_hit_effect(Player* player, s8 arg1) {
player->unk_238 = 0;
}
if (player->unk_110.unk3C[2] >= 600.0f) {
if (player->collision.surfaceDistance[2] >= 600.0f) {
D_8018D990[arg1] = 3;
}
@@ -920,7 +920,7 @@ void apply_lightning_effect(Player *player, s8 arg1) {
D_80165190[3][arg1] = 1;
}
}
func_80031F48(player, 1.0f);
decelerate_ai_player(player, 1.0f);
} else {
player->unk_0B0 += 1;
player->unk_08C = (f32) ((f64) player->unk_08C * 0.6);