mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Restructure event flags in z64save.h (1/?) (#2380)

Browse source 
* Simplify most event flags

* EVENTINF_HORSES_INDEX -> EVENTINF_INDEX_HORSES

* Add missing index numbers

* pr suggestions

* Clean up INGO_RACE flags
This commit is contained in:
mzxrules 2024-12-21 16:03:10 -05:00 • committed by GitHub
parent 471fe51c82
commit ee4b3474a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 166 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -108,22 +108,22 @@ static EnFrPointers sEnFrPointers = {
};
#define FROG_HAS_SONG_BEEN_PLAYED(frogSongIndex) \
(gSaveContext.save.info.eventChkInf[EVENTCHKINF_SONGS_FOR_FROGS_INDEX] & \
(gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_SONGS_FOR_FROGS] & \
sFrogSongIndexToEventChkInfSongsForFrogsMask[frogSongIndex])
#define FROG_SET_SONG_PLAYED(frogSongIndex) \
gSaveContext.save.info.eventChkInf[EVENTCHKINF_SONGS_FOR_FROGS_INDEX] |= \
gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_SONGS_FOR_FROGS] |= \
sFrogSongIndexToEventChkInfSongsForFrogsMask[frogSongIndex];
static u16 sFrogSongIndexToEventChkInfSongsForFrogsMask[] = {
EVENTCHKINF_SONGS_FOR_FROGS_ZL_MASK, // FROG_ZL
EVENTCHKINF_SONGS_FOR_FROGS_EPONA_MASK, // FROG_EPONA
EVENTCHKINF_SONGS_FOR_FROGS_SARIA_MASK, // FROG_SARIA
EVENTCHKINF_SONGS_FOR_FROGS_SUNS_MASK, // FROG_SUNS
EVENTCHKINF_SONGS_FOR_FROGS_SOT_MASK, // FROG_SOT
EVENTCHKINF_SONGS_FOR_FROGS_STORMS_MASK, // FROG_STORMS
EVENTCHKINF_SONGS_FOR_FROGS_CHOIR_MASK, // FROG_CHOIR_SONG
0, // FROG_NO_SONG
EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_ZL), // FROG_ZL
EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_EPONA), // FROG_EPONA
EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_SARIA), // FROG_SARIA
EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_SUNS), // FROG_SUNS
EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_SOT), // FROG_SOT
EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_STORMS), // FROG_STORMS
EVENTCHKINF_MASK(EVENTCHKINF_SONGS_FOR_FROGS_CHOIR), // FROG_CHOIR_SONG
0, // FROG_NO_SONG
};
static u8 sFrogToFrogSongIndex[] = {