diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /src/unk_8159F40.c | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/unk_8159F40.c')
| -rw-r--r-- | src/unk_8159F40.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/unk_8159F40.c b/src/unk_8159F40.c index a6f6e67fc..ab27cea63 100644 --- a/src/unk_8159F40.c +++ b/src/unk_8159F40.c @@ -28,7 +28,7 @@ void sub_8159F40(void) s32 opIdx = 0; const struct UnkStruct_84792D0 * data; - gBattleTypeFlags = BATTLE_TYPE_DOME; + gBattleTypeFlags = BATTLE_TYPE_POKEDUDE; ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); data = gUnknown_84792D0[gSpecialVar_0x8004]; @@ -612,7 +612,7 @@ void sub_815A540(void) s16 x, y; PlayerGetDestCoords(&x, &y); - if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(0x08)) + if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) { struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; SetPlayerAvatarTransitionFlags(0x01); |