diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-10-13 03:27:29 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 13:27:29 -0300 |
| commit | 3aeadb42b8a195b3d2f67ce71fcd184ddf26d856 (patch) | |
| tree | 9b7ae22819651306b4bd8c59f2384ac84c15de99 /src/code/z_room.c | |
| parent | 4c43661cf34544a6ffc6817912021de5679e8f42 (diff) | |
Macros: `PLAYER` -> `GET_PLAYER(globalCtx)` and `ACTIVE_CAM` -> `GET_ACTIVE_CAM(globalCtx)` (#283)
* PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)
* formatter
* PR Suggestions
* `FIRST_ENEMY` -> `GET_FIRST_ENEMY(globalCtx)`
* Fix merge conflicts
Diffstat (limited to 'src/code/z_room.c')
| -rw-r--r-- | src/code/z_room.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_room.c b/src/code/z_room.c index 0a11f83fe..5f900ea87 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -114,7 +114,7 @@ s32 Room_HandleLoadCallbacks(GlobalContext* globalCtx, RoomContext* roomCtx) { gSegments[3] = PHYSICAL_TO_VIRTUAL(roomCtx->activeRoomVram); Scene_ProcessHeader(globalCtx, (SceneCmd*)roomCtx->currRoom.segment); - func_80123140(globalCtx, PLAYER); + func_80123140(globalCtx, GET_PLAYER(globalCtx)); Actor_SpawnTransitionActors(globalCtx, &globalCtx->actorCtx); if (((globalCtx->sceneNum != SCENE_IKANA) || (roomCtx->currRoom.num != 1)) && |