The-Homebrew-Cloud/Zelda64Recomp
2
0
Fork 0
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git synced 2024-12-23 11:31:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add events and exports for Play_Init (#495)

Browse Source
This commit is contained in:
LittleCube 2024-10-12 23:13:42 -04:00 committed by Mr-Wiseguy
parent e5699e59a1
commit 8c8f5b889f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/play_patches.c
View File

@ -150,6 +150,15 @@ extern u8 D_80784600[];
void DayTelop_Init_NORELOCATE(GameState*); void DayTelop_Init_NORELOCATE(GameState*);
void TitleSetup_Init_NORELOCATE(GameState*); void TitleSetup_Init_NORELOCATE(GameState*);
RECOMP_DECLARE_EVENT(recomp_on_play_init(PlayState* this));
bool allow_no_ocarina_tf = false;
// @recomp_export void recomp_set_allow_no_ocarina(bool new_val): Set whether to force Termina Field to load normally even if Link has no ocarina.
RECOMP_EXPORT void recomp_set_allow_no_ocarina(bool new_val) {
allow_no_ocarina_tf = new_val;
}
RECOMP_PATCH void Play_Init(GameState* thisx) { RECOMP_PATCH void Play_Init(GameState* thisx) {
PlayState* this = (PlayState*)thisx; PlayState* this = (PlayState*)thisx;
GraphicsContext* gfxCtx = this->state.gfxCtx; GraphicsContext* gfxCtx = this->state.gfxCtx;
@ -162,6 +171,9 @@ RECOMP_PATCH void Play_Init(GameState* thisx) {
u8 sceneLayer; u8 sceneLayer;
s32 scene; s32 scene;
// @recomp_event recomp_on_play_init(PlayState* this): A new PlayState is being constructed.
recomp_on_play_init(this);
if ((gSaveContext.respawnFlag == -4) || (gSaveContext.respawnFlag == -0x63)) { if ((gSaveContext.respawnFlag == -4) || (gSaveContext.respawnFlag == -0x63)) {
if (CHECK_EVENTINF(EVENTINF_TRIGGER_DAYTELOP)) { if (CHECK_EVENTINF(EVENTINF_TRIGGER_DAYTELOP)) {
CLEAR_EVENTINF(EVENTINF_TRIGGER_DAYTELOP); CLEAR_EVENTINF(EVENTINF_TRIGGER_DAYTELOP);
@ -223,7 +235,8 @@ RECOMP_PATCH void Play_Init(GameState* thisx) {
} }
// "First cycle" Termina Field // "First cycle" Termina Field
if (INV_CONTENT(ITEM_OCARINA_OF_TIME) != ITEM_OCARINA_OF_TIME) { // @recomp_use_export_var allow_no_ocarina_tf: Skip loading into "First cycle" Termina Field if mods enable it.
if (!allow_no_ocarina_tf && INV_CONTENT(ITEM_OCARINA_OF_TIME) != ITEM_OCARINA_OF_TIME) {
if ((scene == ENTR_SCENE_TERMINA_FIELD) && if ((scene == ENTR_SCENE_TERMINA_FIELD) &&
(((void)0, gSaveContext.save.entrance) != ENTRANCE(TERMINA_FIELD, 10))) { (((void)0, gSaveContext.save.entrance) != ENTRANCE(TERMINA_FIELD, 10))) {
gSaveContext.nextCutsceneIndex = 0xFFF4; gSaveContext.nextCutsceneIndex = 0xFFF4;