diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-19 01:04:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 01:04:35 -0400 |
| commit | 5d6e7a31da8f018c1a69e9e57eca0657ec19c283 (patch) | |
| tree | 3ce548fbada787a8d2dc686ef6612f06e2b9fc3a /src/field_player_avatar.c | |
| parent | 9effc97f69d46af00e45420661a775c5977049c8 (diff) | |
| parent | 3d96e954c845659f5184e99856ddf61ce1375b2f (diff) | |
Merge pull request #788 from kazblox/master
Fix NONMATCHINGs and actual English Debug support
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 12 |
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; } |