mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-03 08:33:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename eeprom flags to savefile flags

Browse Source
This commit is contained in:
Ryan Dwyer
2019-12-31 09:11:48 +10:00
parent d466433cda
commit 8a85edb37a
21 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/commands.h
+8 -8
View File
@@ -2022,22 +2022,22 @@
mkshort(pad), \
label,
#define set_eeprom_flag(eeprom_flag) \
#define set_savefile_flag(flag) \
mkshort(0x0190), \
eeprom_flag,
flag,
#define unset_eeprom_flag(eeprom_flag) \
#define unset_savefile_flag(flag) \
mkshort(0x0191), \
eeprom_flag,
flag,
#define if_eeprom_flag_is_set(eeprom_flag, label) \
#define if_savefile_flag_is_set(flag, label) \
mkshort(0x0192), \
eeprom_flag, \
flag, \
label,
#define if_eeprom_flag_is_unset(eeprom_flag, label) \
#define if_savefile_flag_is_unset(flag, label) \
mkshort(0x0193), \
eeprom_flag, \
flag, \
label,
#define if_object_health_lt(object, value, label) \
src/include/constants.h
+26 -26
View File
@@ -342,32 +342,6 @@
#define DRCAROLLIMAGE_DEAD 4
#define EEPROMFLAG_USED_TRANSFERPAK 0x23
#define EEPROMFLAG_CI_TOUR_DONE 0x24
#define EEPROMFLAG_CI_HOLO7_DONE 0x29
#define EEPROMFLAG_CI_HOLO6_DONE 0x2a
#define EEPROMFLAG_CI_HOLO5_DONE 0x2b
#define EEPROMFLAG_CI_HOLO4_DONE 0x2c
#define EEPROMFLAG_CI_HOLO3_DONE 0x2d
#define EEPROMFLAG_CI_HOLO2_DONE 0x2e
#define EEPROMFLAG_CI_HOLO1_DONE 0x2f
#define EEPROMFLAG_CI_CLOAK_DONE 0x30
#define EEPROMFLAG_CI_DISGUISE_DONE 0x31
#define EEPROMFLAG_CI_XRAY_DONE 0x32
#define EEPROMFLAG_CI_IR_DONE 0x33
#define EEPROMFLAG_CI_RTRACKER_DONE 0x34
#define EEPROMFLAG_CI_DOORDECODER_DONE 0x35
#define EEPROMFLAG_CI_NIGHTVISION_DONE 0x36
#define EEPROMFLAG_CI_CAMSPY_DONE 0x37
#define EEPROMFLAG_CI_ECMMINE_DONE 0x38
#define EEPROMFLAG_CI_UPLINK_DONE 0x39
#define EEPROMFLAG_CI_TOUR_STARTED 0x3a
#define EEPROMFLAG_CRASHSITE_BIKE 0x3b
#define EEPROMFLAG_DEFENSE_JON 0x3c
#define EEPROMFLAG_AF1_ENTRY 0x3d
#define EEPROMFLAG_RESCUE_MECHANIC_DEAD 0x3e
#define EEPROMFLAG_G5_MINE 0x3f // true if thrown on top door
#define ENTITYTYPE_CHR 0x0004
#define ENTITYTYPE_PAD 0x0008
#define ENTITYTYPE_DIRECTION 0x0010
@@ -720,6 +694,32 @@
#define RACE_ROBOT 3
#define RACE_4 4
#define SAVEFILEFLAG_USED_TRANSFERPAK 0x23
#define SAVEFILEFLAG_CI_TOUR_DONE 0x24
#define SAVEFILEFLAG_CI_HOLO7_DONE 0x29
#define SAVEFILEFLAG_CI_HOLO6_DONE 0x2a
#define SAVEFILEFLAG_CI_HOLO5_DONE 0x2b
#define SAVEFILEFLAG_CI_HOLO4_DONE 0x2c
#define SAVEFILEFLAG_CI_HOLO3_DONE 0x2d
#define SAVEFILEFLAG_CI_HOLO2_DONE 0x2e
#define SAVEFILEFLAG_CI_HOLO1_DONE 0x2f
#define SAVEFILEFLAG_CI_CLOAK_DONE 0x30
#define SAVEFILEFLAG_CI_DISGUISE_DONE 0x31
#define SAVEFILEFLAG_CI_XRAY_DONE 0x32
#define SAVEFILEFLAG_CI_IR_DONE 0x33
#define SAVEFILEFLAG_CI_RTRACKER_DONE 0x34
#define SAVEFILEFLAG_CI_DOORDECODER_DONE 0x35
#define SAVEFILEFLAG_CI_NIGHTVISION_DONE 0x36
#define SAVEFILEFLAG_CI_CAMSPY_DONE 0x37
#define SAVEFILEFLAG_CI_ECMMINE_DONE 0x38
#define SAVEFILEFLAG_CI_UPLINK_DONE 0x39
#define SAVEFILEFLAG_CI_TOUR_STARTED 0x3a
#define SAVEFILEFLAG_CRASHSITE_BIKE 0x3b
#define SAVEFILEFLAG_DEFENSE_JON 0x3c
#define SAVEFILEFLAG_AF1_ENTRY 0x3d
#define SAVEFILEFLAG_RESCUE_MECHANIC_DEAD 0x3e
#define SAVEFILEFLAG_G5_MINE 0x3f // true if thrown on top door
#define SPEED_WALK 0
#define SPEED_JOG 1
#define SPEED_RUN 2
src/include/game/chr/chraicommands.h
+4 -4
View File
@@ -377,10 +377,10 @@
/*0x018d*/ bool aiActivateLift(void);
/*0x018e*/ bool aiMiniSkedarTryPounce(void);
/*0x018f*/ bool aiIfObjectDistanceToPadLessThan(void);
/*0x0190*/ bool aiEepromSet(void);
/*0x0191*/ bool aiEepromUnset(void);
/*0x0192*/ bool aiIfEepromSet(void);
/*0x0193*/ bool aiIfEepromUnset(void);
/*0x0190*/ bool aiSetSavefileFlag(void);
/*0x0191*/ bool aiUnsetSavefileFlag(void);
/*0x0192*/ bool aiIfSavefileFlagIsSet(void);
/*0x0193*/ bool aiIfSavefileFlagIsUnset(void);
/*0x019e*/ bool aiIfObjHealthLessThan(void);
/*0x019f*/ bool aiSetObjHealth(void);
/*0x01a0*/ bool aiSetChrSpecialDeathAnimation(void);
src/include/game/game_10ccd0.h
+3 -3
View File
@@ -3,9 +3,9 @@
#include <ultra64.h>
#include "types.h"
u32 eepromGet(u32 value);
void eepromSet(u32 value);
void eepromUnset(u32 value);
u32 savefileHasFlag(u32 value);
void savefileSetFlag(u32 value);
void savefileUnsetFlag(u32 value);
u32 func0f10ce74(void);
u32 func0f10cf2c(void);
u32 func0f10d044(void);
src/include/types.h
+1 -1
View File
@@ -3913,7 +3913,7 @@ struct savefile_solo {
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ u32 unk10;
/*0x14*/ u32 eepromflags;
/*0x14*/ u32 flags;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u16 besttimes[21][3];