mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 13:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
engineer124
2022-08-16 15:25:50 -04:00
parent 6693c168a8
commit 5b6043cf6d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -2194,8 +2194,8 @@ void Scene_DrawConfigMatAnimManualStep(PlayState* play);
void Scene_DrawConfigGreatBayTemple(PlayState* play);
EntranceTableEntry* Entrance_GetTableEntry(u16 entrance);
s32 Entrance_GetSceneNum(u16 entrance);
u32 Entrance_GetSceneNumAbsolute(u16 entrance);
u32 Entrance_GetSpawnNum(u16 entrance);
s32 Entrance_GetSceneNumAbsolute(u16 entrance);
s32 Entrance_GetSpawnNum(u16 entrance);
s32 Entrance_GetTransitionFlags(u16 entrance);
s32 Schedule_RunScript(PlayState* play, u8* script, ScheduleOutput* output);
void SkelAnime_DrawLimbLod(PlayState* play, s32 limbIndex, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, Actor* actor, s32 lod);
src/code/z_play.c
+1 -6
View File
@@ -848,8 +848,6 @@ void func_8016A268(GameState* thisx, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg
MREG(68) = arg5;
}
// #ifdef NON_MATCHING
// a1/a2 reg swap around Entrance_GetSpawnNum
void Play_Init(GameState* thisx) {
PlayState* this = (PlayState*)thisx;
GraphicsContext* gfxCtx = this->state.gfxCtx;
@@ -884,7 +882,7 @@ void Play_Init(GameState* thisx) {
gSaveContext.unk_3CA7 = 0;
}
if ((s32)gSaveContext.save.entrance == -1) {
if (gSaveContext.save.entrance == -1) {
gSaveContext.save.entrance = 0;
this->state.running = false;
{
@@ -1124,9 +1122,6 @@ void Play_Init(GameState* thisx) {
D_801F6DFC = 0;
func_8016FC78(&D_801F6D50);
}
// #else
// #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Play_Init.s")
// #endif
// play_hireso need to confirm still
u16 D_801D0D78[] = { 0, 0, 0, 0 };