diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2022-07-31 16:44:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-31 19:44:47 -0400 |
| commit | 9c6461751d81191a94c45e2cf2cf654c583624e8 (patch) | |
| tree | 4b23693601ac313ee73b08161cf510d590b9e21c /src/code/z_actor.c | |
| parent | 706d5596bf4661ac895779bc6b9837ba8b0f8d99 (diff) | |
sceneNum -> sceneId (#1338)
* sceneNum -> sceneId
* forgot to save play
* scene -> sceneId where appropriate
* Missed 1 + format
* Update src/code/z_sram.c
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Update src/code/z_sram.c
Co-authored-by: mzxrules <mzxrules@gmail.com>
* PR
* Fix
Co-authored-by: mzxrules <mzxrules@gmail.com>
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 75409861f..ab310a446 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1958,7 +1958,7 @@ void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEnt SavedSceneFlags* savedSceneFlags; s32 i; - savedSceneFlags = &gSaveContext.sceneFlags[play->sceneNum]; + savedSceneFlags = &gSaveContext.sceneFlags[play->sceneId]; bzero(actorCtx, sizeof(*actorCtx)); @@ -3323,7 +3323,7 @@ Actor* Actor_GetProjectileActor(PlayState* play, Actor* refActor, f32 radius) { void Actor_SetTextWithPrefix(PlayState* play, Actor* actor, s16 baseTextId) { s16 prefix; - switch (play->sceneNum) { + switch (play->sceneId) { case SCENE_YDAN: case SCENE_YDAN_BOSS: case SCENE_MORIBOSSROOM: @@ -4515,7 +4515,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { } break; case 16: - if (play->sceneNum == SCENE_SPOT15) { + if (play->sceneId == SCENE_SPOT15) { retTextId = 0x7002; } else if (Flags_GetInfTable(INFTABLE_6A)) { retTextId = 0x7004; |