ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 19:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect pike curtain SE names

Browse Source
This commit is contained in:
GriffinR 2020-08-20 20:23:08 -04:00
parent 3014241179
commit d356e35b64
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
berry_fix/charmap.txt
View File

@ -720,8 +720,8 @@ SE_POKENAV_CALL = 07 01
SE_POKENAV_HANG_UP = 08 01 SE_POKENAV_HANG_UP = 08 01
SE_ARENA_TIMEUP1 = 09 01 SE_ARENA_TIMEUP1 = 09 01
SE_ARENA_TIMEUP2 = 0A 01 SE_ARENA_TIMEUP2 = 0A 01
SE_PIKE_CURTAIN_OPEN = 0B 01 SE_PIKE_CURTAIN_CLOSE = 0B 01
SE_PIKE_CURTAIN_CLOSE = 0C 01 SE_PIKE_CURTAIN_OPEN = 0C 01
SE_SUDOWOODO_SHAKE = 0D 01 SE_SUDOWOODO_SHAKE = 0D 01
MUS_LITTLEROOT_TEST = 5E 01 MUS_LITTLEROOT_TEST = 5E 01
MUS_GSC_ROUTE38 = 5F 01 MUS_GSC_ROUTE38 = 5F 01

4
berry_fix/payload/charmap.txt
View File

@ -720,8 +720,8 @@ SE_POKENAV_CALL = 07 01
SE_POKENAV_HANG_UP = 08 01 SE_POKENAV_HANG_UP = 08 01
SE_ARENA_TIMEUP1 = 09 01 SE_ARENA_TIMEUP1 = 09 01
SE_ARENA_TIMEUP2 = 0A 01 SE_ARENA_TIMEUP2 = 0A 01
SE_PIKE_CURTAIN_OPEN = 0B 01 SE_PIKE_CURTAIN_CLOSE = 0B 01
SE_PIKE_CURTAIN_CLOSE = 0C 01 SE_PIKE_CURTAIN_OPEN = 0C 01
SE_SUDOWOODO_SHAKE = 0D 01 SE_SUDOWOODO_SHAKE = 0D 01
MUS_LITTLEROOT_TEST = 5E 01 MUS_LITTLEROOT_TEST = 5E 01
MUS_GSC_ROUTE38 = 5F 01 MUS_GSC_ROUTE38 = 5F 01

4
charmap.txt
View File

@ -724,8 +724,8 @@ SE_POKENAV_CALL = 07 01
SE_POKENAV_HANG_UP = 08 01 SE_POKENAV_HANG_UP = 08 01
SE_ARENA_TIMEUP1 = 09 01 SE_ARENA_TIMEUP1 = 09 01
SE_ARENA_TIMEUP2 = 0A 01 SE_ARENA_TIMEUP2 = 0A 01
SE_PIKE_CURTAIN_OPEN = 0B 01 SE_PIKE_CURTAIN_CLOSE = 0B 01
SE_PIKE_CURTAIN_CLOSE = 0C 01 SE_PIKE_CURTAIN_OPEN = 0C 01
SE_SUDOWOODO_SHAKE = 0D 01 SE_SUDOWOODO_SHAKE = 0D 01
MUS_LITTLEROOT_TEST = 5E 01 MUS_LITTLEROOT_TEST = 5E 01
MUS_GSC_ROUTE38 = 5F 01 MUS_GSC_ROUTE38 = 5F 01

2
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
View File

@ -265,7 +265,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
end end
BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49 BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
playse SE_PIKE_CURTAIN_OPEN playse SE_PIKE_CURTAIN_CLOSE
special CloseBattlePikeCurtain special CloseBattlePikeCurtain
waitstate waitstate
waitse waitse

4
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
View File

@ -111,7 +111,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy
waitmovement 0 waitmovement 0
playse SE_PIKE_CURTAIN_OPEN playse SE_PIKE_CURTAIN_CLOSE
call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed
delay 4 delay 4
call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
@ -120,7 +120,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
delay 4 delay 4
waitse waitse
delay 60 delay 60
playse SE_PIKE_CURTAIN_CLOSE playse SE_PIKE_CURTAIN_OPEN
delay 65 delay 65
call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
showobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL showobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL

4
include/constants/songs.h
View File

@ -273,8 +273,8 @@
#define SE_POKENAV_HANG_UP 264 // SE_TOREOFF #define SE_POKENAV_HANG_UP 264 // SE_TOREOFF
#define SE_ARENA_TIMEUP1 265 // SE_HANTEI1 #define SE_ARENA_TIMEUP1 265 // SE_HANTEI1
#define SE_ARENA_TIMEUP2 266 // SE_HANTEI2 #define SE_ARENA_TIMEUP2 266 // SE_HANTEI2
#define SE_PIKE_CURTAIN_OPEN 267 // SE_CURTAIN #define SE_PIKE_CURTAIN_CLOSE 267 // SE_CURTAIN
#define SE_PIKE_CURTAIN_CLOSE 268 // SE_CURTAIN1 #define SE_PIKE_CURTAIN_OPEN 268 // SE_CURTAIN1
#define SE_SUDOWOODO_SHAKE 269 // SE_USSOKI #define SE_SUDOWOODO_SHAKE 269 // SE_USSOKI
// Music // Music

2
ld_script.txt
View File

@ -964,8 +964,8 @@ SECTIONS {
sound/songs/midi/se_pokenav_hang_up.o(.rodata); sound/songs/midi/se_pokenav_hang_up.o(.rodata);
sound/songs/midi/se_arena_timeup1.o(.rodata); sound/songs/midi/se_arena_timeup1.o(.rodata);
sound/songs/midi/se_arena_timeup2.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_close.o(.rodata);
sound/songs/midi/se_pike_curtain_open.o(.rodata);
sound/songs/midi/se_sudowoodo_shake.o(.rodata); sound/songs/midi/se_sudowoodo_shake.o(.rodata);
sound/songs/midi/mus_littleroot_test.o(.rodata); sound/songs/midi/mus_littleroot_test.o(.rodata);
sound/songs/midi/mus_gsc_route38.o(.rodata); sound/songs/midi/mus_gsc_route38.o(.rodata);

4
songs.mk
View File

@ -831,10 +831,10 @@ $(MID_SUBDIR)/se_contest_icon_clear.s: %.s: %.mid
$(MID_SUBDIR)/se_card.s: %.s: %.mid $(MID_SUBDIR)/se_card.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 $(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) $< $@ -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) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_ledge.s: %.s: %.mid $(MID_SUBDIR)/se_ledge.s: %.s: %.mid

2
sound/song_table.inc
View File

@ -268,8 +268,8 @@ gSongTable:: @ 86B49F0
song se_pokenav_hang_up, 1, 1 song se_pokenav_hang_up, 1, 1
song se_arena_timeup1, 1, 1 song se_arena_timeup1, 1, 1
song se_arena_timeup2, 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_close, 1, 1
song se_pike_curtain_open, 1, 1
song se_sudowoodo_shake, 1, 1 song se_sudowoodo_shake, 1, 1
song dummy_song_header, 0, 0 song dummy_song_header, 0, 0
song dummy_song_header, 0, 0 song dummy_song_header, 0, 0

BIN
sound/songs/midi/se_pike_curtain_close.mid
View File

Binary file not shown.

BIN
sound/songs/midi/se_pike_curtain_open.mid
View File

Binary file not shown.