Fix incorrect pike curtain SE names

11 files changed, 15 insertions, 15 deletions

diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt
index e6184b8e1..efb88b8f4 100644
--- a/berry_fix/charmap.txt
+++ b/berry_fix/charmap.txt
@@ -720,8 +720,8 @@ SE_POKENAV_CALL = 07 01
 SE_POKENAV_HANG_UP = 08 01
 SE_ARENA_TIMEUP1 = 09 01
 SE_ARENA_TIMEUP2 = 0A 01
-SE_PIKE_CURTAIN_OPEN = 0B 01
-SE_PIKE_CURTAIN_CLOSE = 0C 01
+SE_PIKE_CURTAIN_CLOSE = 0B 01
+SE_PIKE_CURTAIN_OPEN = 0C 01
 SE_SUDOWOODO_SHAKE = 0D 01
 MUS_LITTLEROOT_TEST = 5E 01
 MUS_GSC_ROUTE38 = 5F 01
diff --git a/berry_fix/payload/charmap.txt b/berry_fix/payload/charmap.txt
index e6184b8e1..efb88b8f4 100644
--- a/berry_fix/payload/charmap.txt
+++ b/berry_fix/payload/charmap.txt
@@ -720,8 +720,8 @@ SE_POKENAV_CALL = 07 01
 SE_POKENAV_HANG_UP = 08 01
 SE_ARENA_TIMEUP1 = 09 01
 SE_ARENA_TIMEUP2 = 0A 01
-SE_PIKE_CURTAIN_OPEN = 0B 01
-SE_PIKE_CURTAIN_CLOSE = 0C 01
+SE_PIKE_CURTAIN_CLOSE = 0B 01
+SE_PIKE_CURTAIN_OPEN = 0C 01
 SE_SUDOWOODO_SHAKE = 0D 01
 MUS_LITTLEROOT_TEST = 5E 01
 MUS_GSC_ROUTE38 = 5F 01
diff --git a/charmap.txt b/charmap.txt
index 045ad2694..23fe569d5 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -724,8 +724,8 @@ SE_POKENAV_CALL = 07 01
 SE_POKENAV_HANG_UP = 08 01
 SE_ARENA_TIMEUP1 = 09 01
 SE_ARENA_TIMEUP2 = 0A 01
-SE_PIKE_CURTAIN_OPEN = 0B 01
-SE_PIKE_CURTAIN_CLOSE = 0C 01
+SE_PIKE_CURTAIN_CLOSE = 0B 01
+SE_PIKE_CURTAIN_OPEN = 0C 01
 SE_SUDOWOODO_SHAKE = 0D 01
 MUS_LITTLEROOT_TEST = 5E 01
 MUS_GSC_ROUTE38 = 5F 01
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index f322c4784..3e6111f42 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -265,7 +265,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
 	end
 
 BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
-	playse SE_PIKE_CURTAIN_OPEN
+	playse SE_PIKE_CURTAIN_CLOSE
 	special CloseBattlePikeCurtain
 	waitstate
 	waitse
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
index 35e76a66d..4238dd3f3 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -111,7 +111,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
 	applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy
 	waitmovement 0
-	playse SE_PIKE_CURTAIN_OPEN
+	playse SE_PIKE_CURTAIN_CLOSE
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed
 	delay 4
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
@@ -120,7 +120,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
 	delay 4
 	waitse
 	delay 60
-	playse SE_PIKE_CURTAIN_CLOSE
+	playse SE_PIKE_CURTAIN_OPEN
 	delay 65
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
 	showobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
diff --git a/include/constants/songs.h b/include/constants/songs.h
index 129cd44a2..87bb741af 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -273,8 +273,8 @@
 #define SE_POKENAV_HANG_UP          264 // SE_TOREOFF
 #define SE_ARENA_TIMEUP1            265 // SE_HANTEI1
 #define SE_ARENA_TIMEUP2            266 // SE_HANTEI2
-#define SE_PIKE_CURTAIN_OPEN        267 // SE_CURTAIN
-#define SE_PIKE_CURTAIN_CLOSE       268 // SE_CURTAIN1
+#define SE_PIKE_CURTAIN_CLOSE       267 // SE_CURTAIN
+#define SE_PIKE_CURTAIN_OPEN        268 // SE_CURTAIN1
 #define SE_SUDOWOODO_SHAKE          269 // SE_USSOKI
 
 // Music
diff --git a/ld_script.txt b/ld_script.txt
index 52e6c7c7f..9ed3e8a5e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -964,8 +964,8 @@ SECTIONS {
         sound/songs/midi/se_pokenav_hang_up.o(.rodata);
         sound/songs/midi/se_arena_timeup1.o(.rodata);
         sound/songs/midi/se_arena_timeup2.o(.rodata);
-        sound/songs/midi/se_pike_curtain_open.o(.rodata);
         sound/songs/midi/se_pike_curtain_close.o(.rodata);
+        sound/songs/midi/se_pike_curtain_open.o(.rodata);
         sound/songs/midi/se_sudowoodo_shake.o(.rodata);
         sound/songs/midi/mus_littleroot_test.o(.rodata);
         sound/songs/midi/mus_gsc_route38.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 6d76eeeea..8c500457a 100644
--- a/songs.mk
+++ b/songs.mk
@@ -831,10 +831,10 @@ $(MID_SUBDIR)/se_contest_icon_clear.s: %.s: %.mid
 $(MID_SUBDIR)/se_card.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
-$(MID_SUBDIR)/se_pike_curtain_open.s: %.s: %.mid
+$(MID_SUBDIR)/se_pike_curtain_close.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_pike_curtain_close.s: %.s: %.mid
+$(MID_SUBDIR)/se_pike_curtain_open.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
 $(MID_SUBDIR)/se_ledge.s: %.s: %.mid
diff --git a/sound/song_table.inc b/sound/song_table.inc
index a6695ee27..8ad178f92 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -268,8 +268,8 @@ gSongTable:: @ 86B49F0
 	song se_pokenav_hang_up, 1, 1
 	song se_arena_timeup1, 1, 1
 	song se_arena_timeup2, 1, 1
-	song se_pike_curtain_open, 1, 1
 	song se_pike_curtain_close, 1, 1
+	song se_pike_curtain_open, 1, 1
 	song se_sudowoodo_shake, 1, 1
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
diff --git a/sound/songs/midi/se_pike_curtain_close.mid b/sound/songs/midi/se_pike_curtain_close.mid
index 0a40e158e..88c684318 100644
--- a/sound/songs/midi/se_pike_curtain_close.mid
+++ b/sound/songs/midi/se_pike_curtain_close.mid
diff --git a/sound/songs/midi/se_pike_curtain_open.mid b/sound/songs/midi/se_pike_curtain_open.mid
index 88c684318..0a40e158e 100644
--- a/sound/songs/midi/se_pike_curtain_open.mid
+++ b/sound/songs/midi/se_pike_curtain_open.mid