mirror of
https://github.com/zeldaret/oot.git
synced 2024-09-21 04:24:43 +00:00
Match `z_select.c
` (#1659)
* match ``z_select.c`` * add missing newline * missed newlines * ifdef -> if
This commit is contained in:
parent
9816f62129
commit
24df1480a3
@ -11,7 +11,11 @@
|
|||||||
|
|
||||||
void MapSelect_LoadTitle(MapSelectState* this) {
|
void MapSelect_LoadTitle(MapSelectState* this) {
|
||||||
this->state.running = false;
|
this->state.running = false;
|
||||||
SET_NEXT_GAMESTATE(&this->state, ConsoleLogo_Init, ConsoleLogoState);
|
{
|
||||||
|
GameState* state = &this->state;
|
||||||
|
|
||||||
|
SET_NEXT_GAMESTATE(state, ConsoleLogo_Init, ConsoleLogoState);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
|
void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
|
||||||
@ -39,8 +43,13 @@ void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
|
|||||||
gSaveContext.natureAmbienceId = 0xFF;
|
gSaveContext.natureAmbienceId = 0xFF;
|
||||||
gSaveContext.showTitleCard = true;
|
gSaveContext.showTitleCard = true;
|
||||||
gWeatherMode = WEATHER_MODE_CLEAR;
|
gWeatherMode = WEATHER_MODE_CLEAR;
|
||||||
|
|
||||||
this->state.running = false;
|
this->state.running = false;
|
||||||
SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState);
|
{
|
||||||
|
GameState* state = &this->state;
|
||||||
|
|
||||||
|
SET_NEXT_GAMESTATE(state, Play_Init, PlayState);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// "Translation" (Actual name)
|
// "Translation" (Actual name)
|
||||||
@ -263,6 +272,7 @@ static SceneSelectEntry sScenes[] = {
|
|||||||
{ "114:" GFXP_HIRAGANA "カクシトビコミアナ 13", MapSelect_LoadGame, ENTR_GROTTOS_13 },
|
{ "114:" GFXP_HIRAGANA "カクシトビコミアナ 13", MapSelect_LoadGame, ENTR_GROTTOS_13 },
|
||||||
// "115: Hyrule Cutscenes"
|
// "115: Hyrule Cutscenes"
|
||||||
{ "115:" GFXP_KATAKANA "ハイラル デモ", MapSelect_LoadGame, ENTR_CUTSCENE_MAP_0 },
|
{ "115:" GFXP_KATAKANA "ハイラル デモ", MapSelect_LoadGame, ENTR_CUTSCENE_MAP_0 },
|
||||||
|
#if OOT_DEBUG
|
||||||
// "116: Special Room (Treasure Chest Warp)" (Ganondorf Test Room)
|
// "116: Special Room (Treasure Chest Warp)" (Ganondorf Test Room)
|
||||||
{ "116:" GFXP_HIRAGANA "ベッシツ (タカラバコ" GFXP_KATAKANA "ワープ)", MapSelect_LoadGame, ENTR_BESITU_0 },
|
{ "116:" GFXP_HIRAGANA "ベッシツ (タカラバコ" GFXP_KATAKANA "ワープ)", MapSelect_LoadGame, ENTR_BESITU_0 },
|
||||||
// "117: Sasaki Test" (Sasa Test)
|
// "117: Sasaki Test" (Sasa Test)
|
||||||
@ -283,6 +293,7 @@ static SceneSelectEntry sScenes[] = {
|
|||||||
{ "124:depth" GFXP_KATAKANA "テスト", MapSelect_LoadGame, ENTR_DEPTH_TEST_0 },
|
{ "124:depth" GFXP_KATAKANA "テスト", MapSelect_LoadGame, ENTR_DEPTH_TEST_0 },
|
||||||
// "125: Hyrule Garden Game 2" (Early Hyrule Garden Game)
|
// "125: Hyrule Garden Game 2" (Early Hyrule Garden Game)
|
||||||
{ "125:" GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ニワ" GFXP_KATAKANA "ゲーム2", MapSelect_LoadGame, ENTR_HAIRAL_NIWA2_0 },
|
{ "125:" GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ニワ" GFXP_KATAKANA "ゲーム2", MapSelect_LoadGame, ENTR_HAIRAL_NIWA2_0 },
|
||||||
|
#endif
|
||||||
// "title" (Title Screen)
|
// "title" (Title Screen)
|
||||||
{ "title", (void*)MapSelect_LoadTitle, 0 },
|
{ "title", (void*)MapSelect_LoadTitle, 0 },
|
||||||
};
|
};
|
||||||
@ -711,8 +722,6 @@ void MapSelect_Destroy(GameState* thisx) {
|
|||||||
|
|
||||||
void MapSelect_Init(GameState* thisx) {
|
void MapSelect_Init(GameState* thisx) {
|
||||||
MapSelectState* this = (MapSelectState*)thisx;
|
MapSelectState* this = (MapSelectState*)thisx;
|
||||||
u32 size;
|
|
||||||
s32 pad;
|
|
||||||
|
|
||||||
this->state.main = MapSelect_Main;
|
this->state.main = MapSelect_Main;
|
||||||
this->state.destroy = MapSelect_Destroy;
|
this->state.destroy = MapSelect_Destroy;
|
||||||
@ -739,17 +748,21 @@ void MapSelect_Init(GameState* thisx) {
|
|||||||
this->lockDown = 0;
|
this->lockDown = 0;
|
||||||
this->unk_234 = 0;
|
this->unk_234 = 0;
|
||||||
|
|
||||||
size = (uintptr_t)_z_select_staticSegmentRomEnd - (uintptr_t)_z_select_staticSegmentRomStart;
|
|
||||||
|
|
||||||
if ((dREG(80) >= 0) && (dREG(80) < this->count)) {
|
if ((dREG(80) >= 0) && (dREG(80) < this->count)) {
|
||||||
this->currentScene = dREG(80);
|
this->currentScene = dREG(80);
|
||||||
this->topDisplayedScene = dREG(81);
|
this->topDisplayedScene = dREG(81);
|
||||||
this->pageDownIndex = dREG(82);
|
this->pageDownIndex = dREG(82);
|
||||||
}
|
}
|
||||||
|
|
||||||
R_UPDATE_RATE = 1;
|
R_UPDATE_RATE = 1;
|
||||||
|
|
||||||
|
{
|
||||||
|
u32 size = (uintptr_t)_z_select_staticSegmentRomEnd - (uintptr_t)_z_select_staticSegmentRomStart;
|
||||||
|
|
||||||
this->staticSegment = GAME_STATE_ALLOC(&this->state, size, "../z_select.c", 1114);
|
this->staticSegment = GAME_STATE_ALLOC(&this->state, size, "../z_select.c", 1114);
|
||||||
DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
|
DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
|
||||||
|
}
|
||||||
|
|
||||||
gSaveContext.save.cutsceneIndex = 0x8000;
|
gSaveContext.save.cutsceneIndex = 0x8000;
|
||||||
gSaveContext.save.linkAge = LINK_AGE_CHILD;
|
gSaveContext.save.linkAge = LINK_AGE_CHILD;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user