mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 06:54:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix func_800BC5E0 NON_EQUIVALENT (matched) (#697)

Browse source 
* mark func_800BC5E0 NON_EQUIVALENT

* fixed
This commit is contained in:
louist103 2021-02-13 11:45:00 -05:00 • committed by GitHub
parent cf06b27b15
commit f214743494
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/z_play.c
View file

@ -45,8 +45,6 @@ void func_800BC590(GlobalContext* globalCtx) {
}
}
#ifdef NON_MATCHING
// single minor ordering difference
void func_800BC5E0(GlobalContext* globalCtx, s32 transitionType) {
TransitionContext* transitionCtx = &globalCtx->transitionCtx;
@ -95,6 +93,7 @@ void func_800BC5E0(GlobalContext* globalCtx, s32 transitionType) {
case 5:
case 6:
case 7:
case 13:
case 17:
case 18:
case 19:
@ -133,9 +132,6 @@ void func_800BC5E0(GlobalContext* globalCtx, s32 transitionType) {
}
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC5E0.s")
#endif
void func_800BC88C(GlobalContext* globalCtx) {
globalCtx->transitionCtx.transitionType = -1;