diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-23 21:49:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 21:49:49 -0400 |
| commit | 9d0f9042febd46d506110778a3beeec90c8c9c1e (patch) | |
| tree | c3bf2f4b0b3183de111bfcc89fac3316f562c937 /src/field_door.c | |
| parent | 0c2e9a5b4c1c0c0f2a62be6165e826760dd572cb (diff) | |
| parent | a6ab2eb883b4cef727a6caee993745cfeff1274b (diff) | |
Merge pull request #1498 from LOuroboros/trailingSpaces
Removed trailing spaces in the most relevant files
Diffstat (limited to 'src/field_door.c')
| -rw-r--r-- | src/field_door.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_door.c b/src/field_door.c index 8aeb1d491..3f2034ea6 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -307,7 +307,7 @@ static void door_build_blockdef(u16 *a, u16 b, const u8 *c) static void DrawCurrentDoorAnimFrame(const struct DoorGraphics *gfx, u32 x, u32 y, const u8 *pal) { u16 arr[24]; - + if (gfx->size == 2) { door_build_blockdef(&arr[8], 0x3F0, pal); @@ -524,7 +524,7 @@ bool8 FieldIsDoorAnimationRunning(void) u32 GetDoorSoundEffect(u32 x, u32 y) { int sound = GetDoorSoundType(sDoorAnimGraphicsTable, x, y); - + if (sound == DOOR_SOUND_NORMAL) return SE_DOOR; else if (sound == DOOR_SOUND_SLIDING) @@ -540,7 +540,7 @@ static bool8 ShouldUseMultiCorridorDoor(void) { if (FlagGet(FLAG_ENABLE_MULTI_CORRIDOR_DOOR)) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR)) { return TRUE; |