mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-07-07 22:22:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix special itemboxes providing Bananas instead (#310)

Browse Source 
* Update update_objects.h

* Update update_objects.c

* Update actors.c
This commit is contained in:
MegaMech
2025-06-22 09:06:10 -06:00
committed by GitHub
parent 3d568038b5
commit be8b88fdf2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/racing/actors.c
+2 -2
View File
@@ -2222,7 +2222,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor
actor->flags = -0x8000;
actor->unk_04 = 0;
if (player->type & PLAYER_HUMAN) {
func_8007ABFC(player - gPlayerOne, 7);
func_8007ABFC(player - gPlayerOne, ITEM_BLUE_SPINY_SHELL);
}
} else if (actor->state == 0) {
actor->state = 1;
@@ -2235,7 +2235,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor
actor->flags = -0x8000;
actor->unk_04 = 0;
if (player->type & PLAYER_HUMAN) {
func_8007ABFC(player - gPlayerOne, 0);
func_8007ABFC(player - gPlayerOne, ITEM_NONE);
}
} else if (actor->state == 0) {
actor->state = 1;
src/update_objects.c
+2 -2
View File
@@ -2610,14 +2610,14 @@ void func_80078C70(s32 arg0) {
}
}
void func_8007ABFC(s32 playerId, bool arg1) {
void func_8007ABFC(s32 playerId, s32 arg1) {
s32 itemWindow;
if (playerHUD[playerId].raceCompleteBool == false) {
itemWindow = gItemWindowObjectByPlayerId[playerId];
if (func_80072354(itemWindow, 4) != 0) {
init_object(itemWindow, 0);
if (arg1 != 0) {
if (arg1 != ITEM_NONE) {
playerHUD[playerId].itemOverride = arg1;
}
}
src/update_objects.h
+1 -1
View File
@@ -196,7 +196,7 @@ void func_8007A88C(s32);
void func_8007A910(s32);
void update_object_lakitu(s32);
void func_8007AA44(s32);
void func_8007ABFC(s32, bool);
void func_8007ABFC(s32, s32);
void consume_item(s32);
u8 gen_random_item(s16, s16);
u8 gen_random_item_human(s16, s16);