decoration.c, field_player_avatar.c, field_tasks.c: fix NONMATCHINGs

1 files changed, 2 insertions, 10 deletions

diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index cd6e67c8c..cb0bf760f 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -681,24 +681,16 @@ void SetPlayerAvatarTransitionFlags(u16 a)
 static void DoPlayerAvatarTransition(void)
 {
     u8 i;
-    u32 flags = gPlayerAvatar.unk1;
+    u8 flags = gPlayerAvatar.unk1;
 
     if (flags != 0)
     {
-        for (i = 0; i < 8; i++, flags >>= 1)
+        for (i = 0; i < ARRAY_COUNT(gUnknown_0830FC14); i++, flags >>= 1)
         {
-#ifdef NONMATCHING
             if (flags & 1)
             {
                 gUnknown_0830FC14[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
             }
-#else
-            if (flags & 1)
-            {
-                register void (*const *funcs)(struct ObjectEvent *) asm("r0") = gUnknown_0830FC14;
-                funcs[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
-            }
-#endif
         }
         gPlayerAvatar.unk1 = 0;
     }