summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorlouist103 <35883445+louist103@users.noreply.github.com>2021-02-13 11:45:00 -0500
committerGitHub <noreply@github.com>2021-02-13 17:45:00 +0100
commitf214743494dc0f8c36ee67bfbb16a9ed3ea1d289 (patch)
tree39dfea84aecef8093060b4f8f81e393eba79c052 /src/code
parentcf06b27b15dc85f4a743c105a7539f8679ae59fd (diff)
Fix func_800BC5E0 NON_EQUIVALENT (matched) (#697)
* mark func_800BC5E0 NON_EQUIVALENT * fixed
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_play.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 06a5f82d9..b9331e49d 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -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;