mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-06 07:56:32 +00:00
Code Issues Projects Releases Wiki Activity

Restructure event flags in z64save.h (2/?): Carpenters (#2385)

Browse source 
* Clean up EVENTCHKINF for Carpenters

* hardcode EVENTCHKINF_INDEX_CARPENTERS_RESCUED
This commit is contained in:
mzxrules 2024-12-27 18:48:56 -05:00 • committed by GitHub
parent ccfb3594ac
commit ba6a83533a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 101 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/z_map_exp.c
View file

@ -122,11 +122,11 @@ void Map_InitData(PlayState* play, s16 room) {
extendedMapIndex = 0x15;
}
} else if (play->sceneId == SCENE_GERUDO_VALLEY) {
if ((LINK_AGE_IN_YEARS == YEARS_ADULT) && !GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) {
if ((LINK_AGE_IN_YEARS == YEARS_ADULT) && !GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) {
extendedMapIndex = 0x16;
}
} else if (play->sceneId == SCENE_GERUDOS_FORTRESS) {
if (GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) {
if (GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED()) {
extendedMapIndex = 0x17;
}
}