diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-06-01 15:11:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 15:11:11 -0400 |
| commit | eb24680be36616c36009e17e1e09608db17560b8 (patch) | |
| tree | eb75033e198852c8bbac91489b2493ea04360f33 /src/code/z_sram_NES.c | |
| parent | 64959177d90f158e2e39ca3a6b728f915bf084b5 (diff) | |
`z_horse.c` OK (#1245)
* func_800F3940
* func_800F3B2C, func_800F415C and func_800F41E4
* func_800F40A0
* func_800F3ED4
* func_800F3C44
* func_800F3B68 NON_MATCHING
* func_800F3A64 kinda
* func_800F39B4
* cleanups
* import data
* fix fake match
* format
* Scene enum
* minor cleanup on data usage
* Horse_RotateToPoint and ENHORSE_PARAMS
* scene setup index
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* fix merge
* z64horse.h
* Renames
* and even more renames
* format
* fix
* review
* Horse_IsActive
* review
* bss
* fix
* remove comments
* Update src/code/z_horse.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
* Update src/code/z_horse.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
---------
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/code/z_sram_NES.c')
| -rw-r--r-- | src/code/z_sram_NES.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index cfd230569..ac68f0fac 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -1,5 +1,6 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "z64horse.h" #include "overlays/gamestates/ovl_file_choose/z_file_choose.h" void func_80146EBC(SramContext* sramCtx, s32 curPage, s32 numPages); @@ -454,7 +455,7 @@ void Sram_SaveEndOfCycle(PlayState* play) { gSaveContext.jinxTimer = 0; gSaveContext.rupeeAccumulator = 0; - func_800F3B2C(play); + Horse_ResetHorseData(play); } void Sram_IncrementDay(void) { @@ -884,8 +885,8 @@ void Sram_ResetSaveFromMoonCrash(SramContext* sramCtx) { gSaveContext.timerPausedOsTimes[i] = 0; } - D_801BDAA0 = 1; - D_801BDA9C = 0; + D_801BDAA0 = true; + gHorseIsMounted = false; gSaveContext.powderKegTimer = 0; gSaveContext.unk_1014 = 0; gSaveContext.jinxTimer = 0; |