diff options
| author | Lucas Shaw <49287729+shawlucas@users.noreply.github.com> | 2020-07-06 17:15:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 20:15:01 -0400 |
| commit | 7e195a35621e629f47be7ebd70f91775a01498da (patch) | |
| tree | f2f1ef0440bce50131dd18547ee63ab268be42f0 /src/code | |
| parent | e6ca2dfd70ef4f76af85b8492e67fb17b1e4dc71 (diff) | |
Matched most remaining libultra files (#221)
* osPfsIsPlug.c and osContSetCh.c OK
* update
* __osPfsGetStatus.c OK
* removed unused asm
* Updated all libultra controller files to use new structs instead of the temporary structs. Added os_pfs.h
* controller updates
* fixed header guard
* Made suggested changes
* guLookAt.c OK
* commit
* __osPfsSelectBank.c OK
* osPfsDeleteFile.c OK
* pfsreadwritefile.c OK
* osPfsFreeBlocks.c OK
* cleaned up ospfsfreeblocks
* started pfsinitpak.c
* pfsallocatefile.c OK
* contpfs.c decompiled with 1 non matching
* osPfsFindFile.c OK
* pfsinitpak.c decompiled. one non-matching
* Actually fixed merge conflict
* sins.c OK
* cosf.c sinf.c and sins.c OK
* moved osAfterPreNMI to its own file. Renamed code_801031F0 to contquery.c
* pfschecker.c OK
* final update and rename
* Removed makefile testing thing that i accidentally added
* Made suggested changes
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_800C3C20.c | 2 | ||||
| -rw-r--r-- | src/code/z_play.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/code/code_800C3C20.c b/src/code/code_800C3C20.c index 52d02ca68..714de7254 100644 --- a/src/code/code_800C3C20.c +++ b/src/code/code_800C3C20.c @@ -6,7 +6,7 @@ u8 D_8012D200[] = { void func_800C3C20(void) { s32 i; - + for (i = 0; i < ARRAY_COUNT(D_8012D200) & 0xFFFFFFFFu; i++) { func_800F87A0(D_8012D200[i]); } diff --git a/src/code/z_play.c b/src/code/z_play.c index d91464eaa..26b44c394 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -714,7 +714,8 @@ void Gameplay_Update(GlobalContext* globalCtx) { break; case 13: - Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); if (globalCtx->sceneLoadFlag == -0x14) { if (globalCtx->envCtx.unk_E7 < 0x6E) { gTrnsnUnkState = 0; @@ -747,7 +748,8 @@ void Gameplay_Update(GlobalContext* globalCtx) { break; case 15: - Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); if (globalCtx->sceneLoadFlag == -0x14) { if (globalCtx->envCtx.unk_E7 <= 0) { gTrnsnUnkState = 0; |