Merge remote-tracking branch 'origin/main' into randomizer

# Conflicts:
#	src/d/actor/d_a_npc_kkri.cpp
#	src/d/actor/d_a_npc_rafrel.cpp
This commit is contained in:
CraftyBoss
2026-05-28 01:15:08 -07:00
977 changed files with 5302 additions and 4924 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
void menuIn();
void menuOut();
bool isMovieDemo();
void setDemoName(char* demoName);
void setDemoName(DUSK_CONST char* demoName);
void processTime();
bool checkDayTime();
void setEventBit(void* eventBit);