diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-09-04 23:51:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 17:51:08 -0400 |
| commit | dc469461a96589d9b4e4be0d0310b38cc4dfc952 (patch) | |
| tree | dae755800dc48fb4d135f297441724bdc4611520 /src/code | |
| parent | c7b55f9a072359d3c28b9cfca2d20e2fc23b35a4 (diff) | |
Pause docs: `WorldMapArea` enum and related data (#2130)
* Pause docs: WorldMapArea enum and related data
* `WORLD_MAP_AREA_20` -> `_QUESTION_MARK`
* bss
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/sys_cfb.c | 2 | ||||
| -rw-r--r-- | src/code/sys_matrix.c | 2 | ||||
| -rw-r--r-- | src/code/z_play.c | 2 | ||||
| -rw-r--r-- | src/code/z_scene.c | 2 | ||||
| -rw-r--r-- | src/code/z_skin.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 5c7c0bcae..e77002575 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -1,6 +1,6 @@ #include "global.h" -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" uintptr_t sSysCfbFbPtr[2]; uintptr_t sSysCfbEnd; diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 440e4c6d6..08fb31579 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -19,7 +19,7 @@ MtxF gMtxFClear = { }; // clang-format on -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" MtxF* sMatrixStack; // "Matrix_stack" MtxF* sCurrentMatrix; // "Matrix_now" diff --git a/src/code/z_play.c b/src/code/z_play.c index c650cbd6c..4a0309b5f 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1527,7 +1527,7 @@ void Play_InitScene(PlayState* this, s32 spawn) { TransitionActor_InitContext(&this->state, &this->transiActorCtx); func_80096FD4(this, &this->roomCtx.curRoom); R_SCENE_CAM_TYPE = SCENE_CAM_TYPE_DEFAULT; - gSaveContext.worldMapArea = 0; + gSaveContext.worldMapArea = WORLD_MAP_AREA_HYRULE_FIELD; Scene_ExecuteCommands(this, this->sceneSegment); Play_InitEnvironment(this, this->skyboxId); } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 34ddb933f..83714b8a4 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -462,7 +462,7 @@ BAD_RETURN(s32) Scene_CommandMiscSettings(PlayState* play, SceneCmd* cmd) { if ((play->sceneId == SCENE_BAZAAR) || (play->sceneId == SCENE_SHOOTING_GALLERY)) { if (LINK_AGE_IN_YEARS == YEARS_ADULT) { - gSaveContext.worldMapArea = 1; + gSaveContext.worldMapArea = WORLD_MAP_AREA_KAKARIKO_VILLAGE; } } diff --git a/src/code/z_skin.c b/src/code/z_skin.c index ab3b8624a..77b7aedc4 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -1,6 +1,6 @@ #include "global.h" -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn |