github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-29 19:18:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

use enum for starting age (#2085)

Browse source 
Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya 2022-12-06 00:34:30 -05:00 • committed by GitHub
parent acd07f2a07
commit 321e563c82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/src/code/z_parameter.c
View file

@ -1508,7 +1508,7 @@ void Inventory_SwapAgeEquipment(void) {
gSaveContext.equips.equipment = gSaveContext.childEquips.equipment;
gSaveContext.equips.equipment &= 0xFFF0;
gSaveContext.equips.equipment |= 0x0001;
} else if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_STARTING_AGE)) {
} else if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_STARTING_AGE) == RO_AGE_ADULT) {
/*If in rando and starting age is adult, childEquips is not initialized and buttonItems[0]
will be ITEM_NONE. When changing age from adult -> child, reset equips to "default"
(only kokiri tunic/boots equipped, no sword, no C-button items, no D-Pad items).

4
soh/src/code/z_sram.c
View file

@ -383,12 +383,12 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
int startingAge = Randomizer_GetSettingValue(RSK_STARTING_AGE);
switch (startingAge) {
case 1: //Adult
case RO_AGE_ADULT: //Adult
gSaveContext.linkAge = 0;
gSaveContext.entranceIndex = 0x5F4;
gSaveContext.savedSceneNum = SCENE_SPOT20; //Set scene num manually to ToT
break;
case 0: //Child
case RO_AGE_CHILD: //Child
gSaveContext.linkAge = 1;
break;
default: