diff options
| author | Kenix3 <kenixwhisperwind@gmail.com> | 2021-04-29 18:56:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 18:56:18 -0400 |
| commit | c40bb119e1f64972e6a0879110826c455a28437b (patch) | |
| tree | fb1a29a657a985bcd707004a31d43086310d9d95 /include/PR | |
| parent | e97f10a6fa573e8b817ed03a4674d52b1818dafa (diff) | |
Adds in scene support (#117)
* 1 scene done, Z2_SOUGEN OK
* All scenes OK
* Makefile improvements
* Use WIP ZAPD branch as submodule
* Add spawn rotation flag macro
* Fix bad merge
* Move scenes to be in their own subfolders
* Rename and restructure extracted baserom files
* Progress tracking for assets
* Add asset progress to csv
* Use master ZAPD
* Use distclean like in OOT
* Fix up a few things with the makefile
* Fix scenes not being dumped from ELF
Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
Diffstat (limited to 'include/PR')
| -rw-r--r-- | include/PR/pfs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/PR/pfs.h b/include/PR/pfs.h index 71e2a20f6..ff7f72bc5 100644 --- a/include/PR/pfs.h +++ b/include/PR/pfs.h @@ -1,7 +1,7 @@ #ifndef _ULTRA64_PFS_H_ #define _ULTRA64_PFS_H_ -#include "global.h" +#include "os.h" /* File System size */ #define OS_PFS_VERSION 0x0200 @@ -38,7 +38,7 @@ #define PFS_ERR_NOPACK 1 /* no memory card is plugged or */ #define PFS_ERR_NEW_PACK 2 /* ram pack has been changed to a different one */ #define PFS_ERR_INCONSISTENT 3 /* need to run Pfschecker*/ -#define PFS_ERR_CONTRFAIL CONT_OVERRUN_ERROR +#define PFS_ERR_CONTRFAIL CONT_OVERRUN_ERROR #define PFS_ERR_INVALID 5 /* invalid parameter or file not exist*/ #define PFS_ERR_BAD_DATA 6 /* the data read from pack are bad*/ #define PFS_DATA_FULL 7 /* no free pages on ram pack*/ |