izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

En_Test4 OK (#366)

Browse Source
This commit is contained in:
engineer124
2021-10-27 16:02:44 -03:00
committed by GitHub
parent 8beaa7841e
commit dc47432ce0
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
-4
View File
@@ -2907,11 +2907,7 @@ beginseg
name "ovl_En_Test4"
compress
include "build/src/overlays/actors/ovl_En_Test4/z_en_test4.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Test4/ovl_En_Test4_reloc.o"
#else
include "build/data/ovl_En_Test4/ovl_En_Test4.reloc.o"
#endif
endseg
beginseg
src/overlays/actors/ovl_En_Test4/z_en_test4.c
+3 -7
View File
@@ -287,8 +287,6 @@ void func_80A425E4(EnTest4* this, GlobalContext* globalCtx) {
}
}
#ifdef NON_MATCHING
// 1 instruction in the wrong place
void EnTest4_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 dayTemp;
EnTest4* this = THIS;
@@ -317,11 +315,12 @@ void EnTest4_Init(Actor* thisx, GlobalContext* globalCtx) {
if (gSaveContext.time < CLOCK_TIME(6, 1)) {
gSaveContext.time = CLOCK_TIME(6, 0);
gSaveContext.gameMode = 0;
do {
{
GameState* state = &globalCtx->state;
state->running = false;
} while (0);
}
SET_NEXT_GAMESTATE(&globalCtx->state, Daytelop_Init, DaytelopContext);
if (this && this && this) {}
this->unk_144 = 1;
gSaveContext.time = CLOCK_TIME(6, 0);
Actor_MarkForDeath(&this->actor);
@@ -363,9 +362,6 @@ void EnTest4_Init(Actor* thisx, GlobalContext* globalCtx) {
gSaveContext.unk_3F64 = 1000.0f;
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test4/EnTest4_Init.s")
#endif
void EnTest4_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}