izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Persistent Cycle Weekeventregs (#1267)

Browse Source 
* persistent weekeventregs

* move macro

* PR Suggestions

* 2 to ALT

* PR Suggestions
This commit is contained in:
engineer124
2023-06-08 14:46:13 -04:00
committed by GitHub
parent 8c961f2b16
commit f05d1723d6
5 changed files with 195 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/macros.h
+11
View File
@@ -68,6 +68,17 @@
#define ALIGN64(val) (((val) + 0x3F) & ~0x3F)
#define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
#define BIT_FLAG_TO_SHIFT(flag) \
((flag & 0x80) ? 7 : \
(flag & 0x40) ? 6 : \
(flag & 0x20) ? 5 : \
(flag & 0x10) ? 4 : \
(flag & 0x8) ? 3 : \
(flag & 0x4) ? 2 : \
(flag & 0x2) ? 1 : \
(flag & 0x1) ? 0 : \
0)
/**
* `x` vertex x
* `y` vertex y
include/z64cutscene.h
-11
View File
@@ -580,17 +580,6 @@ typedef union CutsceneData {
s8 b[4];
} CutsceneData;
#define BIT_FLAG_TO_SHIFT(flag) \
((flag & 0x80) ? 7 : \
(flag & 0x40) ? 6 : \
(flag & 0x20) ? 5 : \
(flag & 0x10) ? 4 : \
(flag & 0x8) ? 3 : \
(flag & 0x4) ? 2 : \
(flag & 0x2) ? 1 : \
(flag & 0x1) ? 0 : \
0)
// Do not trigger the scripted cutscene upon any spawn
#define CS_SPAWN_FLAG_NONE 0xFF
// Always trigger the scripted cutscene upon the specified spawn
include/z64save.h
+1 -1
View File
@@ -970,7 +970,7 @@ typedef enum {
#define WEEKEVENTREG_51_40 PACK_WEEKEVENTREG_FLAG(51, 0x40)
#define WEEKEVENTREG_51_80 PACK_WEEKEVENTREG_FLAG(51, 0x80)
// ProtectedCremia
// Protected Cremia
#define WEEKEVENTREG_ESCORTED_CREMIA PACK_WEEKEVENTREG_FLAG(52, 0x01)
// Lose Milk Run minigame
#define WEEKEVENTREG_52_02 PACK_WEEKEVENTREG_FLAG(52, 0x02)