print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Fix reference to missing function (#589)

Browse Source
This commit is contained in:
Gregory Heskett
2023-03-07 00:32:19 -05:00
committed by GitHub
parent 8d8812ab1b
commit 81e1cb38da
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/object_helpers.c
View File

@@ -1882,7 +1882,11 @@ void bhv_init_room(void) {
s32 is_mario_in_room(void) {
if (o->oRoom != -1 && gMarioCurrentRoom != 0) {
if (is_room_loaded()) {
if (
gMarioCurrentRoom == o->oRoom ||
gDoorAdjacentRooms[gMarioCurrentRoom][0] == o->oRoom ||
gDoorAdjacentRooms[gMarioCurrentRoom][1] == o->oRoom
) {
return MARIO_INSIDE_ROOM;
}
return MARIO_OUTSIDE_ROOM;

1
src/game/object_helpers.h
View File

@@ -241,7 +241,6 @@ void cur_obj_call_action_function(ObjActionFunc actionFunctions[]);
s32 cur_obj_mario_far_away(void);
s32 is_mario_moving_fast_or_in_air(s32 speedThreshold);
s32 is_item_in_array(s8 item, s8 *array);
u32 is_room_loaded(void);
s32 is_mario_in_room(void);
void cur_obj_enable_disable_room_rendering(s32 inRoom);
s32 cur_obj_set_hitbox_and_die_if_attacked(struct ObjectHitbox *hitbox, s32 deathSound, s32 noLootCoins);