mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-23 07:45:55 +00:00
Code Issues Projects Releases Wiki Activity

Use "entry" terminology in map select (#2479)

Browse source 
* use entry terminology in map select

* missed one
This commit is contained in:
fig02 2025-02-19 19:59:21 -05:00 • committed by GitHub
parent 981af4b6af
commit 4cfb5f05a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/z64.h
View file

@ -80,23 +80,23 @@ typedef struct ConsoleLogoState {
struct MapSelectState; struct MapSelectState;
typedef struct SceneSelectEntry { typedef struct MapSelectEntry {
/* 0x00 */ char* name; /* 0x00 */ char* name;
/* 0x04 */ void (*loadFunc)(struct MapSelectState*, s32); /* 0x04 */ void (*loadFunc)(struct MapSelectState*, s32);
/* 0x08 */ s32 entranceIndex; /* 0x08 */ s32 entranceIndex;
} SceneSelectEntry; // size = 0xC } MapSelectEntry; // size = 0xC
typedef struct MapSelectState { typedef struct MapSelectState {
/* 0x0000 */ GameState state; /* 0x0000 */ GameState state;
/* 0x00A8 */ View view; /* 0x00A8 */ View view;
/* 0x01D0 */ s32 count; /* 0x01D0 */ s32 count;
/* 0x01D4 */ SceneSelectEntry* scenes; /* 0x01D4 */ MapSelectEntry* entries;
/* 0x01D8 */ s32 currentScene; /* 0x01D8 */ s32 currentEntry;
/* 0x01DC */ s32 pageDownIndex; // Index of pageDownStops /* 0x01DC */ s32 pageDownIndex; // Index of pageDownStops
/* 0x01E0 */ s32 pageDownStops[7]; /* 0x01E0 */ s32 pageDownStops[7];
/* 0x01FC */ char unk_1FC[0x0C]; /* 0x01FC */ char unk_1FC[0x0C];
/* 0x0208 */ s32 opt; /* 0x0208 */ s32 opt;
/* 0x020C */ s32 topDisplayedScene; // The scene which is currently at the top of the screen /* 0x020C */ s32 topDisplayedEntry; // The entry which is currently at the top of the screen
/* 0x0210 */ char unk_210[0x0C]; /* 0x0210 */ char unk_210[0x0C];
/* 0x021C */ s32 verticalInputAccumulator; /* 0x021C */ s32 verticalInputAccumulator;
/* 0x0220 */ s32 verticalInput; /* 0x0220 */ s32 verticalInput;

64
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -66,7 +66,7 @@ void func_80800B08_unknown(MapSelectState* this, s32 arg1) {
} }
#endif #endif
static SceneSelectEntry sScenes[] = { static MapSelectEntry sMapSelectEntries[] = {
{ " 1:SPOT00", MapSelect_LoadGame, ENTR_HYRULE_FIELD_0 }, { " 1:SPOT00", MapSelect_LoadGame, ENTR_HYRULE_FIELD_0 },
{ " 2:SPOT01", MapSelect_LoadGame, ENTR_KAKARIKO_VILLAGE_0 }, { " 2:SPOT01", MapSelect_LoadGame, ENTR_KAKARIKO_VILLAGE_0 },
{ " 3:SPOT02", MapSelect_LoadGame, ENTR_GRAVEYARD_0 }, { " 3:SPOT02", MapSelect_LoadGame, ENTR_GRAVEYARD_0 },
@ -279,13 +279,13 @@ static SceneSelectEntry sScenes[] = {
void MapSelect_UpdateMenu(MapSelectState* this) { void MapSelect_UpdateMenu(MapSelectState* this) {
Input* input = &this->state.input[0]; Input* input = &this->state.input[0];
s32 pad; s32 pad;
SceneSelectEntry* selectedScene; MapSelectEntry* selectedEntry;
if (this->verticalInputAccumulator == 0) { if (this->verticalInputAccumulator == 0) {
if (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_START)) { if (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_START)) {
selectedScene = &this->scenes[this->currentScene]; selectedEntry = &this->entries[this->currentEntry];
if (selectedScene->loadFunc != NULL) { if (selectedEntry->loadFunc != NULL) {
selectedScene->loadFunc(this, selectedScene->entranceIndex); selectedEntry->loadFunc(this, selectedEntry->entranceIndex);
} }
} }
@ -423,7 +423,7 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
this->pageDownIndex++; this->pageDownIndex++;
this->pageDownIndex = this->pageDownIndex =
(this->pageDownIndex + ARRAY_COUNT(this->pageDownStops)) % ARRAY_COUNT(this->pageDownStops); (this->pageDownIndex + ARRAY_COUNT(this->pageDownStops)) % ARRAY_COUNT(this->pageDownStops);
this->currentScene = this->topDisplayedScene = this->pageDownStops[this->pageDownIndex]; this->currentEntry = this->topDisplayedEntry = this->pageDownStops[this->pageDownIndex];
} }
this->verticalInputAccumulator += this->verticalInput; this->verticalInputAccumulator += this->verticalInput;
@ -432,12 +432,12 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
this->verticalInput = 0; this->verticalInput = 0;
this->verticalInputAccumulator = 0; this->verticalInputAccumulator = 0;
this->currentScene++; this->currentEntry++;
this->currentScene = (this->currentScene + this->count) % this->count; this->currentEntry = (this->currentEntry + this->count) % this->count;
if (this->currentScene == ((this->topDisplayedScene + this->count + 19) % this->count)) { if (this->currentEntry == ((this->topDisplayedEntry + this->count + 19) % this->count)) {
this->topDisplayedScene++; this->topDisplayedEntry++;
this->topDisplayedScene = (this->topDisplayedScene + this->count) % this->count; this->topDisplayedEntry = (this->topDisplayedEntry + this->count) % this->count;
} }
} }
@ -445,25 +445,25 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
this->verticalInput = 0; this->verticalInput = 0;
this->verticalInputAccumulator = 0; this->verticalInputAccumulator = 0;
if (this->currentScene == this->topDisplayedScene) { if (this->currentEntry == this->topDisplayedEntry) {
this->topDisplayedScene -= 2; this->topDisplayedEntry -= 2;
this->topDisplayedScene = (this->topDisplayedScene + this->count) % this->count; this->topDisplayedEntry = (this->topDisplayedEntry + this->count) % this->count;
} }
this->currentScene--; this->currentEntry--;
this->currentScene = (this->currentScene + this->count) % this->count; this->currentEntry = (this->currentEntry + this->count) % this->count;
if (this->currentScene == ((this->topDisplayedScene + this->count) % this->count)) { if (this->currentEntry == ((this->topDisplayedEntry + this->count) % this->count)) {
this->topDisplayedScene--; this->topDisplayedEntry--;
this->topDisplayedScene = (this->topDisplayedScene + this->count) % this->count; this->topDisplayedEntry = (this->topDisplayedEntry + this->count) % this->count;
} }
} }
this->currentScene = (this->currentScene + this->count) % this->count; this->currentEntry = (this->currentEntry + this->count) % this->count;
this->topDisplayedScene = (this->topDisplayedScene + this->count) % this->count; this->topDisplayedEntry = (this->topDisplayedEntry + this->count) % this->count;
dREG(80) = this->currentScene; dREG(80) = this->currentEntry;
dREG(81) = this->topDisplayedScene; dREG(81) = this->topDisplayedEntry;
dREG(82) = this->pageDownIndex; dREG(82) = this->pageDownIndex;
if (this->timerUp != 0) { if (this->timerUp != 0) {
@ -496,14 +496,14 @@ void MapSelect_PrintMenu(MapSelectState* this, GfxPrint* printer) {
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
GfxPrint_SetPos(printer, 9, i + 4); GfxPrint_SetPos(printer, 9, i + 4);
scene = (this->topDisplayedScene + i + this->count) % this->count; scene = (this->topDisplayedEntry + i + this->count) % this->count;
if (scene == this->currentScene) { if (scene == this->currentEntry) {
GfxPrint_SetColor(printer, 255, 20, 20, 255); GfxPrint_SetColor(printer, 255, 20, 20, 255);
} else { } else {
GfxPrint_SetColor(printer, 200, 200, 55, 255); GfxPrint_SetColor(printer, 200, 200, 55, 255);
} }
name = this->scenes[scene].name; name = this->entries[scene].name;
if (name == NULL) { if (name == NULL) {
name = "**Null**"; name = "**Null**";
} }
@ -692,9 +692,9 @@ void MapSelect_Init(GameState* thisx) {
this->state.main = MapSelect_Main; this->state.main = MapSelect_Main;
this->state.destroy = MapSelect_Destroy; this->state.destroy = MapSelect_Destroy;
this->scenes = sScenes; this->entries = sMapSelectEntries;
this->topDisplayedScene = 0; this->topDisplayedEntry = 0;
this->currentScene = 0; this->currentEntry = 0;
this->pageDownStops[0] = 0; // Hyrule Field this->pageDownStops[0] = 0; // Hyrule Field
this->pageDownStops[1] = 19; // Temple Of Time this->pageDownStops[1] = 19; // Temple Of Time
this->pageDownStops[2] = 37; // Treasure Chest Game this->pageDownStops[2] = 37; // Treasure Chest Game
@ -704,7 +704,7 @@ void MapSelect_Init(GameState* thisx) {
this->pageDownStops[6] = 91; // Escaping Ganon's Tower 3 this->pageDownStops[6] = 91; // Escaping Ganon's Tower 3
this->pageDownIndex = 0; this->pageDownIndex = 0;
this->opt = 0; this->opt = 0;
this->count = ARRAY_COUNT(sScenes); this->count = ARRAY_COUNT(sMapSelectEntries);
View_Init(&this->view, this->state.gfxCtx); View_Init(&this->view, this->state.gfxCtx);
this->view.flags = (VIEW_PROJECTION_ORTHO | VIEW_VIEWPORT); this->view.flags = (VIEW_PROJECTION_ORTHO | VIEW_VIEWPORT);
this->verticalInputAccumulator = 0; this->verticalInputAccumulator = 0;
@ -716,8 +716,8 @@ void MapSelect_Init(GameState* thisx) {
this->unk_234 = 0; this->unk_234 = 0;
if ((dREG(80) >= 0) && (dREG(80) < this->count)) { if ((dREG(80) >= 0) && (dREG(80) < this->count)) {
this->currentScene = dREG(80); this->currentEntry = dREG(80);
this->topDisplayedScene = dREG(81); this->topDisplayedEntry = dREG(81);
this->pageDownIndex = dREG(82); this->pageDownIndex = dREG(82);
} }