Merge branch 'develop' into zelda64

2022-06-21 19:27:46 -04:00
parent a7ed748973 abcf713cc1
commit 1435b5d314
41 changed files with 24544 additions and 1235 deletions
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -240,7 +240,6 @@ void Gameplay_Init(GameState* thisx) {
    globalCtx->cameraPtrs[MAIN_CAM]->uid = 0;
    globalCtx->activeCamera = MAIN_CAM;
    func_8005AC48(&globalCtx->mainCamera, 0xFF);
-    Sram_Init(globalCtx, &globalCtx->sramCtx);
    func_80112098(globalCtx);
    Message_Init(globalCtx);
    GameOver_Init(globalCtx);