diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-12 15:15:21 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-12 15:17:56 -0400 |
| commit | 8824079a7ac2ac326ae247d54a694623adae3073 (patch) | |
| tree | 98a07b62e54adc04c83a7a3e1c3aba66596bcd9d | |
| parent | ac310f359bdb7eb9b665eb49f8eb014c97cac541 (diff) | |
Add line endings to EOFs
164 files changed, 248 insertions, 248 deletions
diff --git a/audio/music/boosterpack.asm b/audio/music/boosterpack.asm index e872fb8..e6e0e1c 100644 --- a/audio/music/boosterpack.asm +++ b/audio/music/boosterpack.asm @@ -111,4 +111,4 @@ Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) tie note G_, 6 music_end -; 0xf7df8
\ No newline at end of file +; 0xf7df8 diff --git a/audio/music/cardpop.asm b/audio/music/cardpop.asm index 339bc23..bce5ef8 100644 --- a/audio/music/cardpop.asm +++ b/audio/music/cardpop.asm @@ -296,4 +296,4 @@ Branch_f7196: note bass, 2 note snare1, 2 music_ret -; 0xf71a0
\ No newline at end of file +; 0xf71a0 diff --git a/audio/music/challengehall.asm b/audio/music/challengehall.asm index d133e50..109a12f 100644 --- a/audio/music/challengehall.asm +++ b/audio/music/challengehall.asm @@ -1084,4 +1084,4 @@ Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) note snare1, 3 rest 3 EndMainLoop -; 0xf9be5
\ No newline at end of file +; 0xf9be5 diff --git a/audio/music/club1.asm b/audio/music/club1.asm index d3592b5..6829706 100644 --- a/audio/music/club1.asm +++ b/audio/music/club1.asm @@ -917,4 +917,4 @@ Branch_fa06f: note snare3, 2 EndLoop music_ret -; 0xfa077
\ No newline at end of file +; 0xfa077 diff --git a/audio/music/club2.asm b/audio/music/club2.asm index e1e5df1..a8ae4c1 100644 --- a/audio/music/club2.asm +++ b/audio/music/club2.asm @@ -347,4 +347,4 @@ Branch_fa1f3: note B_, 2 musice8 6 music_ret -; 0xfa210
\ No newline at end of file +; 0xfa210 diff --git a/audio/music/club3.asm b/audio/music/club3.asm index d299e3e..6014e81 100644 --- a/audio/music/club3.asm +++ b/audio/music/club3.asm @@ -1099,4 +1099,4 @@ Branch_fa796: note snare4, 1 note bass, 1 music_ret -; 0xfa7a0
\ No newline at end of file +; 0xfa7a0 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index 54075e3..327afe3 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -2428,4 +2428,4 @@ Branch_fbeea: EndLoop note snare1, 13 music_ret -; 0xfbef7
\ No newline at end of file +; 0xfbef7 diff --git a/audio/music/darkdiddly.asm b/audio/music/darkdiddly.asm index 37b541a..d949503 100644 --- a/audio/music/darkdiddly.asm +++ b/audio/music/darkdiddly.asm @@ -104,4 +104,4 @@ Music_DarkDiddly_Ch3: ; f7d47 (3d:7d47) inc_octave note C_, 1 music_end -; 0xf7d60
\ No newline at end of file +; 0xf7d60 diff --git a/audio/music/deckmachine.asm b/audio/music/deckmachine.asm index 341293b..c18c38f 100644 --- a/audio/music/deckmachine.asm +++ b/audio/music/deckmachine.asm @@ -255,4 +255,4 @@ Branch_f7031: note bass, 7 note snare3, 8 music_ret -; 0xf703a
\ No newline at end of file +; 0xf703a diff --git a/audio/music/battletheme1.asm b/audio/music/dueltheme1.asm index 5fb5eb6..0df7093 100644 --- a/audio/music/battletheme1.asm +++ b/audio/music/dueltheme1.asm @@ -1,4 +1,4 @@ -Music_BattleTheme1_Ch1: ; f532a (3d:532a) +Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 7 musicdc 17 vibrato_type 8 @@ -509,7 +509,7 @@ Branch_f5580: music_ret -Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) +Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 7 musicdc 17 vibrato_type 8 @@ -1319,7 +1319,7 @@ Branch_f5a17: music_ret -Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) +Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) speed 7 musicdc 17 volume 32 @@ -1832,7 +1832,7 @@ Branch_f5c7e: music_ret -Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a) +Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a) speed 7 octave 1 MainLoop @@ -1998,4 +1998,4 @@ Branch_f5d58: note snare1, 1 EndLoop music_ret -; 0xf5d68
\ No newline at end of file +; 0xf5d68 diff --git a/audio/music/battletheme2.asm b/audio/music/dueltheme2.asm index 2b66f0d..e2ee7ce 100644 --- a/audio/music/battletheme2.asm +++ b/audio/music/dueltheme2.asm @@ -1,4 +1,4 @@ -Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) +Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) speed 9 musicdc 17 vibrato_type 8 @@ -429,7 +429,7 @@ Branch_f5f90: music_ret -Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) +Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) speed 9 musicdc 17 vibrato_type 8 @@ -841,7 +841,7 @@ Branch_f618f: music_ret -Music_BattleTheme2_Ch3: ; f61ac (3d:61ac) +Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) speed 9 musicdc 17 volume 32 @@ -1099,7 +1099,7 @@ Branch_f62e5: music_ret -Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3) +Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) speed 9 Loop 2 rest 12 @@ -1235,4 +1235,4 @@ Branch_f6396: note snare1, 1 EndLoop music_ret -; 0xf63a1
\ No newline at end of file +; 0xf63a1 diff --git a/audio/music/battletheme3.asm b/audio/music/dueltheme3.asm index 695e698..8be1c37 100644 --- a/audio/music/battletheme3.asm +++ b/audio/music/dueltheme3.asm @@ -1,4 +1,4 @@ -Music_BattleTheme3_Ch1: ; f63a1 (3d:63a1) +Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) speed 11 musicdc 17 vibrato_type 8 @@ -473,7 +473,7 @@ Branch_f661d: music_ret -Music_BattleTheme3_Ch2: ; f6649 (3d:6649) +Music_DuelTheme3_Ch2: ; f6649 (3d:6649) speed 11 musicdc 17 vibrato_type 8 @@ -907,7 +907,7 @@ Branch_f6866: music_ret -Music_BattleTheme3_Ch3: ; f68c2 (3d:68c2) +Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) speed 11 musicdc 17 volume 32 @@ -1218,7 +1218,7 @@ Branch_f69f0: music_ret -Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) +Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f) speed 11 MainLoop Loop 2 @@ -1525,4 +1525,4 @@ Branch_f6b9a: note snare1, 1 EndLoop music_ret -; 0xf6bb7
\ No newline at end of file +; 0xf6bb7 diff --git a/audio/music/hallofhonor.asm b/audio/music/hallofhonor.asm index 06bd193..8e2606e 100644 --- a/audio/music/hallofhonor.asm +++ b/audio/music/hallofhonor.asm @@ -395,4 +395,4 @@ Branch_fb1ec: note G_, 1 rest 1 music_ret -; 0xfb1fe
\ No newline at end of file +; 0xfb1fe diff --git a/audio/music/imakuni.asm b/audio/music/imakuni.asm index 667e581..0403be3 100644 --- a/audio/music/imakuni.asm +++ b/audio/music/imakuni.asm @@ -536,4 +536,4 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) note snare1, 15 note snare1, 15 EndMainLoop -; 0xfafea
\ No newline at end of file +; 0xfafea diff --git a/audio/music/matchloss.asm b/audio/music/matchloss.asm index b402792..402c96c 100644 --- a/audio/music/matchloss.asm +++ b/audio/music/matchloss.asm @@ -127,4 +127,4 @@ Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) musice8 8 note F_, 12 music_end -; 0xf7cdf
\ No newline at end of file +; 0xf7cdf diff --git a/audio/music/matchstart1.asm b/audio/music/matchstart1.asm index 775ab51..0dfeafb 100644 --- a/audio/music/matchstart1.asm +++ b/audio/music/matchstart1.asm @@ -51,4 +51,4 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) inc_octave note B_, 1 music_end -; 0xf7956
\ No newline at end of file +; 0xf7956 diff --git a/audio/music/matchstart2.asm b/audio/music/matchstart2.asm index 49f395e..c13b9c8 100644 --- a/audio/music/matchstart2.asm +++ b/audio/music/matchstart2.asm @@ -173,4 +173,4 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) note C_, 1 note E_, 1 music_end -; 0xf7a0f
\ No newline at end of file +; 0xf7a0f diff --git a/audio/music/matchstart3.asm b/audio/music/matchstart3.asm index c564b7a..b0e51f0 100644 --- a/audio/music/matchstart3.asm +++ b/audio/music/matchstart3.asm @@ -322,4 +322,4 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note C_, 1 dec_octave music_end -; 0xf7b61
\ No newline at end of file +; 0xf7b61 diff --git a/audio/music/matchvictory.asm b/audio/music/matchvictory.asm index 1fe2ca5..b9b1be1 100644 --- a/audio/music/matchvictory.asm +++ b/audio/music/matchvictory.asm @@ -147,4 +147,4 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) speed 8 note A_, 12 music_end -; 0xf7c2e
\ No newline at end of file +; 0xf7c2e diff --git a/audio/music/medal.asm b/audio/music/medal.asm index 7499bd1..bcbc5a4 100644 --- a/audio/music/medal.asm +++ b/audio/music/medal.asm @@ -157,4 +157,4 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) speed 1 note A_, 2 music_end -; 0xf7ec8
\ No newline at end of file +; 0xf7ec8 diff --git a/audio/music/overworld.asm b/audio/music/overworld.asm index 32508fd..f4511b9 100644 --- a/audio/music/overworld.asm +++ b/audio/music/overworld.asm @@ -1470,4 +1470,4 @@ Branch_f790a: note snare1, 2 note snare1, 1 music_ret -; 0xf7919
\ No newline at end of file +; 0xf7919 diff --git a/audio/music/pausemenu.asm b/audio/music/pausemenu.asm index 39b2f8d..9d6d967 100644 --- a/audio/music/pausemenu.asm +++ b/audio/music/pausemenu.asm @@ -580,4 +580,4 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) EndLoop EndLoop EndMainLoop -; 0xf6ef1
\ No newline at end of file +; 0xf6ef1 diff --git a/audio/music/pcmainmenu.asm b/audio/music/pcmainmenu.asm index b58acec..0fc3c1f 100644 --- a/audio/music/pcmainmenu.asm +++ b/audio/music/pcmainmenu.asm @@ -374,4 +374,4 @@ Branch_f9248: note bass, 1 note snare2, 1 music_ret -; 0xf9251
\ No newline at end of file +; 0xf9251 diff --git a/audio/music/pokemondome.asm b/audio/music/pokemondome.asm index e682f71..8529a92 100644 --- a/audio/music/pokemondome.asm +++ b/audio/music/pokemondome.asm @@ -796,4 +796,4 @@ Music_PokemonDome_Ch4: ; f9629 (3e:5629) note snare2, 3 EndLoop EndMainLoop -; 0xf9646
\ No newline at end of file +; 0xf9646 diff --git a/audio/music/ronald.asm b/audio/music/ronald.asm index 126c29d..50ce748 100644 --- a/audio/music/ronald.asm +++ b/audio/music/ronald.asm @@ -1214,4 +1214,4 @@ Branch_fad4f: note snare1, 13 note bass, 6 music_ret -; 0xfad55
\ No newline at end of file +; 0xfad55 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index a17d954..7125309 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -545,4 +545,4 @@ Branch_f531e: note snare2, 4 note snare2, 3 music_ret -; 0xf532a
\ No newline at end of file +; 0xf532a diff --git a/audio/sfx/sfx_01.asm b/audio/sfx/sfx_01.asm index c07b4b9..c2f1874 100644 --- a/audio/sfx/sfx_01.asm +++ b/audio/sfx/sfx_01.asm @@ -12,4 +12,4 @@ SFX_01_Ch1: ; fc4df (3f:44df) sfx_8 17 sfx_2 0 sfx_0 7, 193 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_02.asm b/audio/sfx/sfx_02.asm index 8040480..b105b15 100644 --- a/audio/sfx/sfx_02.asm +++ b/audio/sfx/sfx_02.asm @@ -33,4 +33,4 @@ SFX_02_Ch1: ; fc4f7 (3f:44f7) sfx_6 1 sfx_0 7, 214 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_03.asm b/audio/sfx/sfx_03.asm index cf233f5..59cadb1 100644 --- a/audio/sfx/sfx_03.asm +++ b/audio/sfx/sfx_03.asm @@ -29,4 +29,4 @@ SFX_03_Ch1: ; fc539 (3f:4539) sfx_8 17 sfx_2 0 sfx_0 7, 167 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_04.asm b/audio/sfx/sfx_04.asm index 0dc862e..2ec8391 100644 --- a/audio/sfx/sfx_04.asm +++ b/audio/sfx/sfx_04.asm @@ -20,4 +20,4 @@ SFX_04_Ch1: ; fc573 (3f:4573) sfx_0 4, 229 sfx_0 5, 17 sfx_0 4, 229 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_05.asm b/audio/sfx/sfx_05.asm index c8f20d8..7a12390 100644 --- a/audio/sfx/sfx_05.asm +++ b/audio/sfx/sfx_05.asm @@ -71,4 +71,4 @@ SFX_05_Ch1: ; fc59d (3f:459d) sfx_0 7, 214 sfx_0 7, 219 sfx_0 7, 223 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_06.asm b/audio/sfx/sfx_06.asm index 0c7b23a..6d33acb 100644 --- a/audio/sfx/sfx_06.asm +++ b/audio/sfx/sfx_06.asm @@ -83,4 +83,4 @@ SFX_06_Ch1: ; fc625 (3f:4625) sfx_0 7, 200 sfx_0 7, 209 sfx_0 7, 214 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_07.asm b/audio/sfx/sfx_07.asm index 085d3a7..0888aa7 100644 --- a/audio/sfx/sfx_07.asm +++ b/audio/sfx/sfx_07.asm @@ -25,4 +25,4 @@ SFX_07_Ch1: ; fc6c2 (3f:46c2) sfx_5 255 sfx_1 32 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_08.asm b/audio/sfx/sfx_08.asm index a9258de..4711720 100644 --- a/audio/sfx/sfx_08.asm +++ b/audio/sfx/sfx_08.asm @@ -22,4 +22,4 @@ SFX_08_Ch1: ; fc6f6 (3f:46f6) sfx_0 0, 65 sfx_0 0, 65 sfx_0 0, 65 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_09.asm b/audio/sfx/sfx_09.asm index eb0887f..648ef18 100644 --- a/audio/sfx/sfx_09.asm +++ b/audio/sfx/sfx_09.asm @@ -49,4 +49,4 @@ SFX_09_Ch1: ; fc725 (3f:4725) sfx_0 0, 55 sfx_0 0, 49 sfx_0 0, 55 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_0a.asm b/audio/sfx/sfx_0a.asm index 2f02b3a..ea1ec1f 100644 --- a/audio/sfx/sfx_0a.asm +++ b/audio/sfx/sfx_0a.asm @@ -71,4 +71,4 @@ SFX_0a_Ch1: ; fc78a (3f:478a) sfx_0 7, 200 sfx_0 7, 206 sfx_0 7, 219 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_0b.asm b/audio/sfx/sfx_0b.asm index c0e0341..5712c37 100644 --- a/audio/sfx/sfx_0b.asm +++ b/audio/sfx/sfx_0b.asm @@ -87,4 +87,4 @@ SFX_0b_Ch1: ; fc813 (3f:4813) sfx_0 7, 214 sfx_0 7, 214 sfx_0 7, 214 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_0c.asm b/audio/sfx/sfx_0c.asm index 1e612fd..7aebc8a 100644 --- a/audio/sfx/sfx_0c.asm +++ b/audio/sfx/sfx_0c.asm @@ -26,4 +26,4 @@ SFX_0c_Ch1: ; fc8bd (3f:48bd) sfx_1 79 sfx_0 0, 66 sfx_0 0, 66 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_0d.asm b/audio/sfx/sfx_0d.asm index 421c6d4..3b8e511 100644 --- a/audio/sfx/sfx_0d.asm +++ b/audio/sfx/sfx_0d.asm @@ -49,4 +49,4 @@ SFX_0d_Ch1: ; fc8f3 (3f:48f3) sfx_0 7, 177 sfx_0 7, 182 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_0e.asm b/audio/sfx/sfx_0e.asm index bfb9d1e..bb3c6b3 100644 --- a/audio/sfx/sfx_0e.asm +++ b/audio/sfx/sfx_0e.asm @@ -50,4 +50,4 @@ SFX_0e_Ch1: ; fc953 (3f:4953) sfx_6 1 sfx_0 7, 219 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_0f.asm b/audio/sfx/sfx_0f.asm index 0cf1b3d..0a997df 100644 --- a/audio/sfx/sfx_0f.asm +++ b/audio/sfx/sfx_0f.asm @@ -34,4 +34,4 @@ SFX_0f_Ch1: ; fc9b4 (3f:49b4) sfx_0 0, 98 sfx_0 0, 98 sfx_0 0, 98 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_10.asm b/audio/sfx/sfx_10.asm index 0e41189..6c013c8 100644 --- a/audio/sfx/sfx_10.asm +++ b/audio/sfx/sfx_10.asm @@ -70,4 +70,4 @@ SFX_10_Ch1: ; fc9fb (3f:49fb) sfx_0 7, 20 sfx_0 7, 5 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_11.asm b/audio/sfx/sfx_11.asm index 98a4ab1..dd036c7 100644 --- a/audio/sfx/sfx_11.asm +++ b/audio/sfx/sfx_11.asm @@ -89,4 +89,4 @@ SFX_11_Ch1: ; fca82 (3f:4a82) sfx_0 7, 172 sfx_0 7, 123 sfx_0 7, 190 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_12.asm b/audio/sfx/sfx_12.asm index 1f27679..27cb676 100644 --- a/audio/sfx/sfx_12.asm +++ b/audio/sfx/sfx_12.asm @@ -36,4 +36,4 @@ SFX_12_Ch1: ; fcb2d (3f:4b2d) sfx_0 6, 137 sfx_0 7, 172 sfx_0 6, 178 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_13.asm b/audio/sfx/sfx_13.asm index 56c218b..cd8a7a5 100644 --- a/audio/sfx/sfx_13.asm +++ b/audio/sfx/sfx_13.asm @@ -135,4 +135,4 @@ SFX_13_Ch1: ; fcb72 (3f:4b72) sfx_6 2 sfx_5 0 sfx_1 228 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_14.asm b/audio/sfx/sfx_14.asm index db88d81..a6b0d77 100644 --- a/audio/sfx/sfx_14.asm +++ b/audio/sfx/sfx_14.asm @@ -89,4 +89,4 @@ SFX_14_Ch1: ; fcc80 (3f:4c80) sfx_0 7, 177 sfx_0 7, 182 sfx_0 7, 182 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_15.asm b/audio/sfx/sfx_15.asm index ab1cb31..fc5613d 100644 --- a/audio/sfx/sfx_15.asm +++ b/audio/sfx/sfx_15.asm @@ -35,4 +35,4 @@ SFX_15_Ch1: ; fcd2f (3f:4d2f) sfx_0 5, 17 sfx_0 4, 22 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_16.asm b/audio/sfx/sfx_16.asm index 5fe207b..9b096fa 100644 --- a/audio/sfx/sfx_16.asm +++ b/audio/sfx/sfx_16.asm @@ -30,4 +30,4 @@ SFX_16_Ch1: ; fcd71 (3f:4d71) sfx_0 0, 17 sfx_0 0, 17 sfx_0 0, 17 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_17.asm b/audio/sfx/sfx_17.asm index b08c74e..56f08e1 100644 --- a/audio/sfx/sfx_17.asm +++ b/audio/sfx/sfx_17.asm @@ -63,4 +63,4 @@ SFX_17_Ch1: ; fcdb0 (3f:4db0) sfx_0 0, 81 sfx_0 0, 80 sfx_0 0, 81 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_18.asm b/audio/sfx/sfx_18.asm index ed7434f..a0fdb06 100644 --- a/audio/sfx/sfx_18.asm +++ b/audio/sfx/sfx_18.asm @@ -50,4 +50,4 @@ SFX_18_Ch1: ; fce31 (3f:4e31) sfx_0 0, 50 sfx_0 0, 51 sfx_0 0, 50 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_19.asm b/audio/sfx/sfx_19.asm index 6fd6c08..b01c70e 100644 --- a/audio/sfx/sfx_19.asm +++ b/audio/sfx/sfx_19.asm @@ -65,4 +65,4 @@ SFX_19_Ch1: ; fce98 (3f:4e98) sfx_0 0, 23 sfx_0 0, 23 sfx_0 0, 23 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_1a.asm b/audio/sfx/sfx_1a.asm index 16628b3..ce0d0d8 100644 --- a/audio/sfx/sfx_1a.asm +++ b/audio/sfx/sfx_1a.asm @@ -31,4 +31,4 @@ SFX_1a_Ch1: ; fcf1d (3f:4f1d) sfx_1 65 sfx_1 33 sfx_0 0, 15 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_1b.asm b/audio/sfx/sfx_1b.asm index 7ff0eb7..43e3ba4 100644 --- a/audio/sfx/sfx_1b.asm +++ b/audio/sfx/sfx_1b.asm @@ -81,4 +81,4 @@ SFX_1b_Ch1: ; fcf5d (3f:4f5d) sfx_0 0, 103 sfx_0 0, 87 sfx_0 0, 103 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_1c.asm b/audio/sfx/sfx_1c.asm index 2c1e953..76c1f46 100644 --- a/audio/sfx/sfx_1c.asm +++ b/audio/sfx/sfx_1c.asm @@ -94,4 +94,4 @@ SFX_1c_Ch1: ; fd001 (3f:5001) sfx_0 0, 68 sfx_0 0, 68 sfx_0 0, 68 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_1d.asm b/audio/sfx/sfx_1d.asm index bb6d3fe..5f472e9 100644 --- a/audio/sfx/sfx_1d.asm +++ b/audio/sfx/sfx_1d.asm @@ -97,4 +97,4 @@ SFX_1d_Ch1: ; fd0c0 (3f:50c0) sfx_0 0, 66 sfx_0 0, 65 sfx_0 0, 66 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_1e.asm b/audio/sfx/sfx_1e.asm index 6547856..9e921ed 100644 --- a/audio/sfx/sfx_1e.asm +++ b/audio/sfx/sfx_1e.asm @@ -129,4 +129,4 @@ SFX_1e_Ch1: ; fd185 (3f:5185) sfx_0 0, 65 sfx_0 0, 65 sfx_0 0, 65 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_1f.asm b/audio/sfx/sfx_1f.asm index 0f74dcd..7e45dda 100644 --- a/audio/sfx/sfx_1f.asm +++ b/audio/sfx/sfx_1f.asm @@ -88,4 +88,4 @@ SFX_1f_Ch1: ; fd28a (3f:528a) sfx_0 0, 84 sfx_0 0, 83 sfx_0 0, 85 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_20.asm b/audio/sfx/sfx_20.asm index 644668a..0711a70 100644 --- a/audio/sfx/sfx_20.asm +++ b/audio/sfx/sfx_20.asm @@ -64,4 +64,4 @@ SFX_20_Ch1: ; fd33b (3f:533b) sfx_1 33 sfx_0 0, 80 sfx_0 0, 81 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_21.asm b/audio/sfx/sfx_21.asm index b0a4be8..709f14c 100644 --- a/audio/sfx/sfx_21.asm +++ b/audio/sfx/sfx_21.asm @@ -71,4 +71,4 @@ SFX_21_Ch1: ; fd3bd (3f:53bd) sfx_0 0, 82 sfx_0 0, 81 sfx_0 0, 81 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_22.asm b/audio/sfx/sfx_22.asm index 5b00261..6fc2583 100644 --- a/audio/sfx/sfx_22.asm +++ b/audio/sfx/sfx_22.asm @@ -61,4 +61,4 @@ SFX_22_Ch1: ; fd44e (3f:544e) sfx_0 0, 82 sfx_0 0, 81 sfx_0 0, 81 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_23.asm b/audio/sfx/sfx_23.asm index 38641bf..6546376 100644 --- a/audio/sfx/sfx_23.asm +++ b/audio/sfx/sfx_23.asm @@ -120,4 +120,4 @@ SFX_23_Ch1: ; fd4ca (3f:54ca) sfx_0 0, 33 sfx_0 0, 36 sfx_0 0, 33 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_24.asm b/audio/sfx/sfx_24.asm index dad684e..e609cc2 100644 --- a/audio/sfx/sfx_24.asm +++ b/audio/sfx/sfx_24.asm @@ -44,4 +44,4 @@ SFX_24_Ch1: ; fd5bd (3f:55bd) sfx_0 0, 112 sfx_0 0, 112 sfx_0 0, 112 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_25.asm b/audio/sfx/sfx_25.asm index 2cd3da0..d1c3d13 100644 --- a/audio/sfx/sfx_25.asm +++ b/audio/sfx/sfx_25.asm @@ -111,4 +111,4 @@ SFX_25_Ch1: ; fd617 (3f:5617) sfx_6 1 sfx_0 7, 223 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_26.asm b/audio/sfx/sfx_26.asm index 1092d76..5d7bcb4 100644 --- a/audio/sfx/sfx_26.asm +++ b/audio/sfx/sfx_26.asm @@ -60,4 +60,4 @@ SFX_26_Ch1: ; fd6f2 (3f:56f2) sfx_0 6, 214 sfx_0 6, 196 sfx_0 6, 178 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_27.asm b/audio/sfx/sfx_27.asm index 79456ae..70d9fad 100644 --- a/audio/sfx/sfx_27.asm +++ b/audio/sfx/sfx_27.asm @@ -26,4 +26,4 @@ SFX_27_Ch1: ; fd769 (3f:5769) sfx_8 17 sfx_2 4 sfx_0 7, 157 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_28.asm b/audio/sfx/sfx_28.asm index d4c12b3..c4c1ebb 100644 --- a/audio/sfx/sfx_28.asm +++ b/audio/sfx/sfx_28.asm @@ -81,4 +81,4 @@ SFX_28_Ch2: ; fd7bf (3f:57bf) sfx_0 0, 68 sfx_0 0, 68 sfx_0 0, 68 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_29.asm b/audio/sfx/sfx_29.asm index 7f9e7ab..129b23e 100644 --- a/audio/sfx/sfx_29.asm +++ b/audio/sfx/sfx_29.asm @@ -24,4 +24,4 @@ SFX_29_Ch1: ; fd834 (3f:5834) sfx_1 31 sfx_0 0, 112 sfx_0 0, 114 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_2a.asm b/audio/sfx/sfx_2a.asm index 62ae925..a1560bd 100644 --- a/audio/sfx/sfx_2a.asm +++ b/audio/sfx/sfx_2a.asm @@ -46,4 +46,4 @@ SFX_2a_Ch1: ; fd866 (3f:5866) sfx_0 0, 114 sfx_0 0, 112 sfx_0 0, 114 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_2b.asm b/audio/sfx/sfx_2b.asm index 75a1ced..8cf6b66 100644 --- a/audio/sfx/sfx_2b.asm +++ b/audio/sfx/sfx_2b.asm @@ -89,4 +89,4 @@ SFX_2b_Ch1: ; fd8c4 (3f:58c4) sfx_6 15 sfx_5 255 sfx_1 31 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_2c.asm b/audio/sfx/sfx_2c.asm index 36a9c5d..cc5bb48 100644 --- a/audio/sfx/sfx_2c.asm +++ b/audio/sfx/sfx_2c.asm @@ -31,4 +31,4 @@ SFX_2c_Ch1: ; fd96f (3f:596f) sfx_8 17 sfx_2 8 sfx_0 7, 157 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_2d.asm b/audio/sfx/sfx_2d.asm index 3325d03..d9fb760 100644 --- a/audio/sfx/sfx_2d.asm +++ b/audio/sfx/sfx_2d.asm @@ -35,4 +35,4 @@ SFX_2d_Ch1: ; fd9ab (3f:59ab) sfx_1 31 sfx_0 0, 36 sfx_0 0, 53 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_2e.asm b/audio/sfx/sfx_2e.asm index 525ae0a..03cd8bd 100644 --- a/audio/sfx/sfx_2e.asm +++ b/audio/sfx/sfx_2e.asm @@ -51,4 +51,4 @@ SFX_2e_Ch1: ; fd9f4 (3f:59f4) sfx_1 31 sfx_0 0, 33 sfx_0 0, 49 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_2f.asm b/audio/sfx/sfx_2f.asm index 750ada7..0f034f1 100644 --- a/audio/sfx/sfx_2f.asm +++ b/audio/sfx/sfx_2f.asm @@ -82,4 +82,4 @@ SFX_2f_Ch1: ; fda5c (3f:5a5c) sfx_0 0, 52 sfx_0 0, 36 sfx_0 0, 53 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_30.asm b/audio/sfx/sfx_30.asm index 9b30491..c96ca1c 100644 --- a/audio/sfx/sfx_30.asm +++ b/audio/sfx/sfx_30.asm @@ -13,4 +13,4 @@ SFX_30_Ch1: ; fdb03 (3f:5b03) sfx_0 0, 209 sfx_0 0, 17 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_31.asm b/audio/sfx/sfx_31.asm index 498e47d..d900fa3 100644 --- a/audio/sfx/sfx_31.asm +++ b/audio/sfx/sfx_31.asm @@ -94,4 +94,4 @@ SFX_31_Ch1: ; fdb1e (3f:5b1e) sfx_0 7, 190 sfx_0 7, 186 sfx_0 7, 182 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_32.asm b/audio/sfx/sfx_32.asm index 7e1a61a..20e300d 100644 --- a/audio/sfx/sfx_32.asm +++ b/audio/sfx/sfx_32.asm @@ -273,4 +273,4 @@ SFX_32_Ch2: ; fdd3e (3f:5d3e) sfx_0 0, 81 sfx_0 0, 5 sfx_0 0, 81 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_33.asm b/audio/sfx/sfx_33.asm index 2a98021..3696a16 100644 --- a/audio/sfx/sfx_33.asm +++ b/audio/sfx/sfx_33.asm @@ -119,4 +119,4 @@ SFX_33_Ch2: ; fde73 (3f:5e73) sfx_0 0, 68 sfx_0 0, 68 sfx_0 0, 68 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_34.asm b/audio/sfx/sfx_34.asm index dbc258d..94fb687 100644 --- a/audio/sfx/sfx_34.asm +++ b/audio/sfx/sfx_34.asm @@ -26,4 +26,4 @@ SFX_34_Ch1: ; fdec8 (3f:5ec8) sfx_5 255 sfx_1 127 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_35.asm b/audio/sfx/sfx_35.asm index 7699f65..db50b5b 100644 --- a/audio/sfx/sfx_35.asm +++ b/audio/sfx/sfx_35.asm @@ -47,4 +47,4 @@ SFX_35_Ch1: ; fdefd (3f:5efd) sfx_0 0, 5 sfx_0 0, 5 sfx_0 0, 5 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_36.asm b/audio/sfx/sfx_36.asm index 877bc61..04c7c52 100644 --- a/audio/sfx/sfx_36.asm +++ b/audio/sfx/sfx_36.asm @@ -134,4 +134,4 @@ SFX_36_Ch1: ; fdf5d (3f:5f5d) sfx_0 7, 89 sfx_0 7, 123 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_37.asm b/audio/sfx/sfx_37.asm index 18c1dcc..0be5964 100644 --- a/audio/sfx/sfx_37.asm +++ b/audio/sfx/sfx_37.asm @@ -120,4 +120,4 @@ SFX_37_Ch2: ; fe0e4 (3f:60e4) sfx_1 31 sfx_0 0, 36 sfx_0 0, 36 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_38.asm b/audio/sfx/sfx_38.asm index b333f2a..66af1e6 100644 --- a/audio/sfx/sfx_38.asm +++ b/audio/sfx/sfx_38.asm @@ -377,4 +377,4 @@ SFX_38_Ch1: ; fe13b (3f:613b) sfx_6 1 sfx_5 255 sfx_1 20 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_39.asm b/audio/sfx/sfx_39.asm index f0664a1..68146e0 100644 --- a/audio/sfx/sfx_39.asm +++ b/audio/sfx/sfx_39.asm @@ -135,4 +135,4 @@ SFX_39_Ch2: ; fe4eb (3f:64eb) sfx_5 255 sfx_1 47 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_3a.asm b/audio/sfx/sfx_3a.asm index 6f451fd..961e94c 100644 --- a/audio/sfx/sfx_3a.asm +++ b/audio/sfx/sfx_3a.asm @@ -134,4 +134,4 @@ SFX_3a_Ch1: ; fe533 (3f:6533) sfx_6 1 sfx_0 7, 219 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_3b.asm b/audio/sfx/sfx_3b.asm index 4c46901..b134155 100644 --- a/audio/sfx/sfx_3b.asm +++ b/audio/sfx/sfx_3b.asm @@ -41,4 +41,4 @@ SFX_3b_Ch1: ; fe638 (3f:6638) sfx_0 7, 219 sfx_6 1 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_3c.asm b/audio/sfx/sfx_3c.asm index 523d58a..045b4f6 100644 --- a/audio/sfx/sfx_3c.asm +++ b/audio/sfx/sfx_3c.asm @@ -62,4 +62,4 @@ SFX_3c_Ch1: ; fe685 (3f:6685) sfx_8 17 sfx_2 8 sfx_0 4, 22 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_3d.asm b/audio/sfx/sfx_3d.asm index 3c7c8f9..da0a093 100644 --- a/audio/sfx/sfx_3d.asm +++ b/audio/sfx/sfx_3d.asm @@ -104,4 +104,4 @@ SFX_3d_Ch1: ; fe6fc (3f:66fc) sfx_0 7, 214 sfx_0 7, 223 sfx_0 7, 219 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_3e.asm b/audio/sfx/sfx_3e.asm index e1693da..c5db7f1 100644 --- a/audio/sfx/sfx_3e.asm +++ b/audio/sfx/sfx_3e.asm @@ -26,4 +26,4 @@ SFX_3e_Ch1: ; fe7c0 (3f:67c0) sfx_2 8 sfx_0 7, 89 sfx_6 7 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_3f.asm b/audio/sfx/sfx_3f.asm index a01476a..e672dc5 100644 --- a/audio/sfx/sfx_3f.asm +++ b/audio/sfx/sfx_3f.asm @@ -9,4 +9,4 @@ SFX_3f_Ch1: ; fe7f3 (3f:67f3) sfx_0 0, 15 sfx_0 0, 45 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_40.asm b/audio/sfx/sfx_40.asm index e5ec511..9599a66 100644 --- a/audio/sfx/sfx_40.asm +++ b/audio/sfx/sfx_40.asm @@ -134,4 +134,4 @@ SFX_40_Ch1: ; fe807 (3f:6807) sfx_0 7, 200 sfx_0 7, 209 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_41.asm b/audio/sfx/sfx_41.asm index 054a65b..57a78bb 100644 --- a/audio/sfx/sfx_41.asm +++ b/audio/sfx/sfx_41.asm @@ -108,4 +108,4 @@ SFX_41_Ch1: ; fe8f8 (3f:68f8) sfx_0 6, 137 sfx_0 6, 178 sfx_0 6, 137 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_42.asm b/audio/sfx/sfx_42.asm index 5fdf62b..5ee3bfe 100644 --- a/audio/sfx/sfx_42.asm +++ b/audio/sfx/sfx_42.asm @@ -65,4 +65,4 @@ SFX_42_Ch1: ; fe9cf (3f:69cf) sfx_0 7, 144 sfx_0 7, 157 sfx_0 7, 162 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_43.asm b/audio/sfx/sfx_43.asm index 02f24e0..dd7f416 100644 --- a/audio/sfx/sfx_43.asm +++ b/audio/sfx/sfx_43.asm @@ -43,4 +43,4 @@ SFX_43_Ch1: ; fea4d (3f:6a4d) sfx_0 0, 33 sfx_0 0, 33 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_44.asm b/audio/sfx/sfx_44.asm index 85eb2fc..807779b 100644 --- a/audio/sfx/sfx_44.asm +++ b/audio/sfx/sfx_44.asm @@ -91,4 +91,4 @@ SFX_44_Ch1: ; feaa5 (3f:6aa5) sfx_0 0, 66 sfx_0 0, 66 sfx_0 0, 66 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_45.asm b/audio/sfx/sfx_45.asm index e2c6abf..6242983 100644 --- a/audio/sfx/sfx_45.asm +++ b/audio/sfx/sfx_45.asm @@ -62,4 +62,4 @@ SFX_45_Ch1: ; feb5e (3f:6b5e) sfx_0 6, 11 sfx_6 1 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_46.asm b/audio/sfx/sfx_46.asm index bc1729f..f680133 100644 --- a/audio/sfx/sfx_46.asm +++ b/audio/sfx/sfx_46.asm @@ -159,4 +159,4 @@ SFX_46_Ch1: ; febd1 (3f:6bd1) sfx_0 7, 162 sfx_6 1 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_47.asm b/audio/sfx/sfx_47.asm index dcd9153..2e14f11 100644 --- a/audio/sfx/sfx_47.asm +++ b/audio/sfx/sfx_47.asm @@ -40,4 +40,4 @@ SFX_47_Ch1: ; fed02 (3f:6d02) sfx_1 31 sfx_0 0, 81 sfx_0 0, 81 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_48.asm b/audio/sfx/sfx_48.asm index fe3c672..e74ee65 100644 --- a/audio/sfx/sfx_48.asm +++ b/audio/sfx/sfx_48.asm @@ -58,4 +58,4 @@ SFX_48_Ch1: ; fed55 (3f:6d55) sfx_1 31 sfx_0 0, 85 sfx_0 0, 85 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_49.asm b/audio/sfx/sfx_49.asm index 443dd37..2e777af 100644 --- a/audio/sfx/sfx_49.asm +++ b/audio/sfx/sfx_49.asm @@ -90,4 +90,4 @@ SFX_49_Ch1: ; fedcc (3f:6dcc) sfx_0 7, 200 sfx_0 7, 223 sfx_0 7, 206 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_4a.asm b/audio/sfx/sfx_4a.asm index 64954fa..b4f59ed 100644 --- a/audio/sfx/sfx_4a.asm +++ b/audio/sfx/sfx_4a.asm @@ -92,4 +92,4 @@ SFX_4a_Ch1: ; fee7c (3f:6e7c) sfx_0 6, 137 sfx_0 5, 172 sfx_0 6, 114 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_4b.asm b/audio/sfx/sfx_4b.asm index 89ed64d..de97c38 100644 --- a/audio/sfx/sfx_4b.asm +++ b/audio/sfx/sfx_4b.asm @@ -47,4 +47,4 @@ SFX_4b_Ch1: ; fef2d (3f:6f2d) sfx_0 0, 5 sfx_0 0, 5 sfx_0 0, 5 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_4c.asm b/audio/sfx/sfx_4c.asm index d9ee4d7..55cde21 100644 --- a/audio/sfx/sfx_4c.asm +++ b/audio/sfx/sfx_4c.asm @@ -152,4 +152,4 @@ SFX_4c_Ch1: ; fef8d (3f:6f8d) sfx_0 7, 200 sfx_0 7, 223 sfx_0 7, 206 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_4d.asm b/audio/sfx/sfx_4d.asm index 4bf97a8..6fa0447 100644 --- a/audio/sfx/sfx_4d.asm +++ b/audio/sfx/sfx_4d.asm @@ -332,4 +332,4 @@ SFX_4d_Ch1: ; ff0b7 (3f:70b7) sfx_0 7, 223 sfx_0 7, 209 sfx_0 7, 223 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_4e.asm b/audio/sfx/sfx_4e.asm index 88fa0db..a797bd3 100644 --- a/audio/sfx/sfx_4e.asm +++ b/audio/sfx/sfx_4e.asm @@ -200,4 +200,4 @@ SFX_4e_Ch1: ; ff313 (3f:7313) sfx_2 8 sfx_0 7, 167 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_4f.asm b/audio/sfx/sfx_4f.asm index b068a74..b407f80 100644 --- a/audio/sfx/sfx_4f.asm +++ b/audio/sfx/sfx_4f.asm @@ -50,4 +50,4 @@ SFX_4f_Ch1: ; ff49b (3f:749b) sfx_2 0 sfx_0 6, 214 sfx_0 6, 178 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_50.asm b/audio/sfx/sfx_50.asm index c120d75..2ae5e33 100644 --- a/audio/sfx/sfx_50.asm +++ b/audio/sfx/sfx_50.asm @@ -132,4 +132,4 @@ SFX_50_Ch2: ; ff5a0 (3f:75a0) sfx_1 31 sfx_0 0, 2 sfx_0 0, 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_51.asm b/audio/sfx/sfx_51.asm index 01fda3d..114ccda 100644 --- a/audio/sfx/sfx_51.asm +++ b/audio/sfx/sfx_51.asm @@ -146,4 +146,4 @@ SFX_51_Ch2: ; ff6e6 (3f:76e6) sfx_0 0, 84 sfx_0 0, 83 sfx_0 0, 85 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_52.asm b/audio/sfx/sfx_52.asm index 0b6962e..c3e8b3a 100644 --- a/audio/sfx/sfx_52.asm +++ b/audio/sfx/sfx_52.asm @@ -139,4 +139,4 @@ SFX_52_Ch2: ; ff7bf (3f:77bf) sfx_0 0, 130 sfx_0 0, 131 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_53.asm b/audio/sfx/sfx_53.asm index d75e62b..f59c97c 100644 --- a/audio/sfx/sfx_53.asm +++ b/audio/sfx/sfx_53.asm @@ -142,4 +142,4 @@ SFX_53_Ch2: ; ff8c8 (3f:78c8) sfx_0 0, 82 sfx_0 0, 83 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_54.asm b/audio/sfx/sfx_54.asm index 32449c4..de05745 100644 --- a/audio/sfx/sfx_54.asm +++ b/audio/sfx/sfx_54.asm @@ -27,4 +27,4 @@ SFX_54_Ch1: ; ff92c (3f:792c) sfx_2 8 sfx_0 7, 214 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_55.asm b/audio/sfx/sfx_55.asm index bffa009..2bd0b61 100644 --- a/audio/sfx/sfx_55.asm +++ b/audio/sfx/sfx_55.asm @@ -22,4 +22,4 @@ SFX_55_Ch1: ; ff960 (3f:7960) sfx_2 8 sfx_0 6, 137 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_56.asm b/audio/sfx/sfx_56.asm index 8e271b6..d36edf5 100644 --- a/audio/sfx/sfx_56.asm +++ b/audio/sfx/sfx_56.asm @@ -63,4 +63,4 @@ SFX_56_Ch1: ; ff98b (3f:798b) sfx_6 1 sfx_0 7, 214 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_57.asm b/audio/sfx/sfx_57.asm index 6139eaa..3d2f5df 100644 --- a/audio/sfx/sfx_57.asm +++ b/audio/sfx/sfx_57.asm @@ -22,4 +22,4 @@ SFX_57_Ch1: ; ffa05 (3f:7a05) sfx_5 255 sfx_1 52 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_58.asm b/audio/sfx/sfx_58.asm index bf49aee..68e7271 100644 --- a/audio/sfx/sfx_58.asm +++ b/audio/sfx/sfx_58.asm @@ -109,4 +109,4 @@ SFX_58_Ch1: ; ffa30 (3f:7a30) sfx_0 4, 78 sfx_0 6, 11 sfx_0 4, 22 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_59.asm b/audio/sfx/sfx_59.asm index a0ff44b..b948993 100644 --- a/audio/sfx/sfx_59.asm +++ b/audio/sfx/sfx_59.asm @@ -123,4 +123,4 @@ SFX_59_Ch1: ; ffb0c (3f:7b0c) sfx_0 7, 219 sfx_0 7, 190 sfx_0 7, 223 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_5a.asm b/audio/sfx/sfx_5a.asm index 16f1da8..4cdbcab 100644 --- a/audio/sfx/sfx_5a.asm +++ b/audio/sfx/sfx_5a.asm @@ -97,4 +97,4 @@ SFX_5a_Ch1: ; ffc03 (3f:7c03) sfx_loop 10 sfx_0 7, 219 sfx_endloop - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_5b.asm b/audio/sfx/sfx_5b.asm index 9a332e2..528894a 100644 --- a/audio/sfx/sfx_5b.asm +++ b/audio/sfx/sfx_5b.asm @@ -81,4 +81,4 @@ SFX_5b_Ch1: ; ffcbf (3f:7cbf) sfx_6 1 sfx_0 7, 190 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_5c.asm b/audio/sfx/sfx_5c.asm index c7167ea..393f521 100644 --- a/audio/sfx/sfx_5c.asm +++ b/audio/sfx/sfx_5c.asm @@ -22,4 +22,4 @@ SFX_5c_Ch1: ; ffd5b (3f:7d5b) sfx_0 0, 84 sfx_0 0, 83 sfx_0 0, 85 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_5d.asm b/audio/sfx/sfx_5d.asm index 9149b62..343ec7f 100644 --- a/audio/sfx/sfx_5d.asm +++ b/audio/sfx/sfx_5d.asm @@ -143,4 +143,4 @@ SFX_5d_Ch3: ; ffe3f (3f:7e3f) sfx_0 0, 17 sfx_0 0, 16 sfx_0 0, 17 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_5e.asm b/audio/sfx/sfx_5e.asm index b97c61e..0d69559 100644 --- a/audio/sfx/sfx_5e.asm +++ b/audio/sfx/sfx_5e.asm @@ -57,4 +57,4 @@ SFX_5e_Ch1: ; ffe92 (3f:7e92) sfx_6 1 sfx_0 7, 190 sfx_6 1 - sfx_end
\ No newline at end of file + sfx_end diff --git a/audio/sfx/sfx_5f.asm b/audio/sfx/sfx_5f.asm index c3ff81c..a79d11e 100644 --- a/audio/sfx/sfx_5f.asm +++ b/audio/sfx/sfx_5f.asm @@ -28,4 +28,4 @@ SFX_5f_Ch1: ; fff04 (3f:7f04) sfx_0 0, 17 sfx_0 0, 16 sfx_0 0, 17 - sfx_end
\ No newline at end of file + sfx_end diff --git a/constants.asm b/constants.asm index 56ee9a3..3324119 100755 --- a/constants.asm +++ b/constants.asm @@ -1,3 +1,3 @@ INCLUDE "constants/map_constants.asm" INCLUDE "constants/music_constants.asm" -INCLUDE "constants/text_constants.asm"
\ No newline at end of file +INCLUDE "constants/text_constants.asm" diff --git a/constants/map_constants.asm b/constants/map_constants.asm index f3aa59e..c2e2388 100755 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -31,4 +31,4 @@ CHALLENGE_HALL_LOBBY EQU $1D CHALLENGE_HALL EQU $1E POKEMON_DOME_ENTRANCE EQU $1F POKEMON_DOME EQU $20 -HALL_OF_HONOR EQU $21
\ No newline at end of file +HALL_OF_HONOR EQU $21 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 846f9a6..a4c2526 100755 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -1,8 +1,8 @@ MUSIC_STOP EQU $00 MUSIC_TITLESCREEN EQU $01 -MUSIC_BATTLETHEME1 EQU $02 -MUSIC_BATTLETHEME2 EQU $03 -MUSIC_BATTLETHEME3 EQU $04 +MUSIC_DUELTHEME1 EQU $02 +MUSIC_DUELTHEME2 EQU $03 +MUSIC_DUELTHEME3 EQU $04 MUSIC_PAUSEMENU EQU $05 MUSIC_PCMAINMENU EQU $06 MUSIC_DECKMACHINE EQU $07 @@ -28,4 +28,4 @@ MUSIC_DARKDIDDLY EQU $1A ;MUSIC_UNUSED1B EQU $1B MUSIC_BOOSTERPACK EQU $1C MUSIC_MEDAL EQU $1D -;MUSIC_UNUSED1E EQU $1E
\ No newline at end of file +;MUSIC_UNUSED1E EQU $1E diff --git a/constants/text_constants.asm b/constants/text_constants.asm index 0a5d509..a018be1 100755 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -12,4 +12,4 @@ TX_WATER EQUS "$05,$04" TX_FIGHTING EQUS "$05,$05" TX_PSYCHIC EQUS "$05,$06" TX_COLORLESS EQUS "$05,$07" -TX_LVL EQUS "$05,$11"
\ No newline at end of file +TX_LVL EQUS "$05,$11" diff --git a/data/map_scripts.asm b/data/map_scripts.asm index ebe67c5..b85eb6f 100755 --- a/data/map_scripts.asm +++ b/data/map_scripts.asm @@ -7,7 +7,7 @@ ; 4: pressed A button ; 6: pressed A button ; 8: load map -; a: after battle +; a: after duel ; c: moved player ; e: load map/closed text box @@ -350,4 +350,4 @@ MapScripts: ; 1162a (4:562a) dw $7bdb dw $0000 dw $0000 - dw $0000
\ No newline at end of file + dw $0000 diff --git a/data/map_songs.asm b/data/map_songs.asm index 2a584ee..afb54a8 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -34,4 +34,4 @@ MapSongs: ; 1c374 (7:4374) db $30,$31,$00,$09,$15,MUSIC_OVERWORLD ; CHALLENGE_HALL db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE db $36,$37,$00,$0A,$17,MUSIC_POKEMONDOME ; POKEMON_DOME - db $3A,$3B,$00,$0A,$18,MUSIC_HALLOFHONOR ; HALL_OF_HONOR
\ No newline at end of file + db $3A,$3B,$00,$0A,$18,MUSIC_HALLOFHONOR ; HALL_OF_HONOR diff --git a/data/music1_headers.asm b/data/music1_headers.asm index a256371..3344365 100755 --- a/data/music1_headers.asm +++ b/data/music1_headers.asm @@ -4,9 +4,9 @@ NumberOfSongs1: ; 4fee5 (3d:4ee5) SongBanks1: ; f4ee6 (3d:4ee6) db BANK(Music_Stop) db BANK(Music_TitleScreen) - db BANK(Music_BattleTheme1) - db BANK(Music_BattleTheme2) - db BANK(Music_BattleTheme3) + db BANK(Music_DuelTheme1) + db BANK(Music_DuelTheme2) + db BANK(Music_DuelTheme3) db BANK(Music_PauseMenu) db BANK(Music_PCMainMenu) db BANK(Music_DeckMachine) @@ -37,9 +37,9 @@ SongBanks1: ; f4ee6 (3d:4ee6) SongHeaderPointers1: ; f4f05 (3d:4f05) dw Music_Stop dw Music_TitleScreen - dw Music_BattleTheme1 - dw Music_BattleTheme2 - dw Music_BattleTheme3 + dw Music_DuelTheme1 + dw Music_DuelTheme2 + dw Music_DuelTheme3 dw Music_PauseMenu dw $0000 dw Music_DeckMachine @@ -77,26 +77,26 @@ Music_TitleScreen: ; f4f44 (3d:4f44) dw Music_TitleScreen_Ch3 dw Music_TitleScreen_Ch4 -Music_BattleTheme1: ; f4f4d (3d:4f4d) +Music_DuelTheme1: ; f4f4d (3d:4f4d) db %1111 - dw Music_BattleTheme1_Ch1 - dw Music_BattleTheme1_Ch2 - dw Music_BattleTheme1_Ch3 - dw Music_BattleTheme1_Ch4 + dw Music_DuelTheme1_Ch1 + dw Music_DuelTheme1_Ch2 + dw Music_DuelTheme1_Ch3 + dw Music_DuelTheme1_Ch4 -Music_BattleTheme2: ; f4f56 (3d:4f56) +Music_DuelTheme2: ; f4f56 (3d:4f56) db %1111 - dw Music_BattleTheme2_Ch1 - dw Music_BattleTheme2_Ch2 - dw Music_BattleTheme2_Ch3 - dw Music_BattleTheme2_Ch4 + dw Music_DuelTheme2_Ch1 + dw Music_DuelTheme2_Ch2 + dw Music_DuelTheme2_Ch3 + dw Music_DuelTheme2_Ch4 -Music_BattleTheme3: ; f4f5f (3d:4f5f) +Music_DuelTheme3: ; f4f5f (3d:4f5f) db %1111 - dw Music_BattleTheme3_Ch1 - dw Music_BattleTheme3_Ch2 - dw Music_BattleTheme3_Ch3 - dw Music_BattleTheme3_Ch4 + dw Music_DuelTheme3_Ch1 + dw Music_DuelTheme3_Ch2 + dw Music_DuelTheme3_Ch3 + dw Music_DuelTheme3_Ch4 Music_PauseMenu: ; f4f68 (3d:4f68) db %1111 @@ -278,4 +278,4 @@ Music_Unused1e: ; f5049 (3d:5049) dw $0000 dw $0000 dw $0000 - dw $0000
\ No newline at end of file + dw $0000 diff --git a/data/music2_headers.asm b/data/music2_headers.asm index d41e8cb..cafaa4f 100755 --- a/data/music2_headers.asm +++ b/data/music2_headers.asm @@ -4,9 +4,9 @@ NumberOfSongs2: ; f8ee5 (3e:4ee5) SongBanks2: ; f8ee6 (3e:4ee6) db BANK(Music_Stop) db BANK(Music_TitleScreen) - db BANK(Music_BattleTheme1) - db BANK(Music_BattleTheme2) - db BANK(Music_BattleTheme3) + db BANK(Music_DuelTheme1) + db BANK(Music_DuelTheme2) + db BANK(Music_DuelTheme3) db BANK(Music_PauseMenu) db BANK(Music_PCMainMenu) db BANK(Music_DeckMachine) @@ -77,21 +77,21 @@ SongHeaderPointers2: ; f8f05 (3e:4f05) dw $0000 dw $0000 -;Music_BattleTheme1 +;Music_DuelTheme1 db %0000 dw $0000 dw $0000 dw $0000 dw $0000 -;Music_BattleTheme2 +;Music_DuelTheme2 db %0000 dw $0000 dw $0000 dw $0000 dw $0000 -;Music_BattleTheme3 +;Music_DuelTheme3 db %0000 dw $0000 dw $0000 @@ -107,10 +107,10 @@ SongHeaderPointers2: ; f8f05 (3e:4f05) Music_PCMainMenu: ; f8f71 (3e:4f71) db %1111 - dw Music_PCMainMenu_Ch1 ; 5052 - dw Music_PCMainMenu_Ch2 ; 50ED - dw Music_PCMainMenu_Ch3 ; 5189 - dw Music_PCMainMenu_Ch4 ; 522B + dw Music_PCMainMenu_Ch1 + dw Music_PCMainMenu_Ch2 + dw Music_PCMainMenu_Ch3 + dw Music_PCMainMenu_Ch4 ;Music_DeckMachine db %0000 @@ -135,66 +135,66 @@ Music_PCMainMenu: ; f8f71 (3e:4f71) Music_PokemonDome: ; f8f95 (3e:4f95) db %1111 - dw Music_PokemonDome_Ch1 ; 5251 - dw Music_PokemonDome_Ch2 ; 53F8 - dw Music_PokemonDome_Ch3 ; 5579 - dw Music_PokemonDome_Ch4 ; 5629 + dw Music_PokemonDome_Ch1 + dw Music_PokemonDome_Ch2 + dw Music_PokemonDome_Ch3 + dw Music_PokemonDome_Ch4 Music_ChallengeHall: ; f8f9e (3e:4f9e) db %1111 - dw Music_ChallengeHall_Ch1 ; 5646 - dw Music_ChallengeHall_Ch2 ; 5883 - dw Music_ChallengeHall_Ch3 ; 5a92 - dw Music_ChallengeHall_Ch4 ; 5bA9 + dw Music_ChallengeHall_Ch1 + dw Music_ChallengeHall_Ch2 + dw Music_ChallengeHall_Ch3 + dw Music_ChallengeHall_Ch4 Music_Club1: ; f8fa7 (3e:4fa7) db %1111 - dw Music_Club1_Ch1 ; 5bE5 - dw Music_Club1_Ch2 ; 5d5F - dw Music_Club1_Ch3 ; 5eC4 - dw Music_Club1_Ch4 ; 6044 + dw Music_Club1_Ch1 + dw Music_Club1_Ch2 + dw Music_Club1_Ch3 + dw Music_Club1_Ch4 Music_Club2: ; f8fb0 (3e:4fb0) db %0111 - dw Music_Club2_Ch1 ; 6077 - dw Music_Club2_Ch2 ; 60E3 - dw Music_Club2_Ch3 ; 6164 + dw Music_Club2_Ch1 + dw Music_Club2_Ch2 + dw Music_Club2_Ch3 dw $0000 Music_Club3: ; f8fb9 (3e:4fb9) db %1111 - dw Music_Club3_Ch1 ; 6210 - dw Music_Club3_Ch2 ; 6423 - dw Music_Club3_Ch3 ; 663E - dw Music_Club3_Ch4 ; 6772 + dw Music_Club3_Ch1 + dw Music_Club3_Ch2 + dw Music_Club3_Ch3 + dw Music_Club3_Ch4 Music_Ronald: ; f8fc2 (3e:4fc2) db %1111 - dw Music_Ronald_Ch1 ; 67A0 - dw Music_Ronald_Ch2 ; 6a0E - dw Music_Ronald_Ch3 ; 6bC0 - dw Music_Ronald_Ch4 ; 6cE0 + dw Music_Ronald_Ch1 + dw Music_Ronald_Ch2 + dw Music_Ronald_Ch3 + dw Music_Ronald_Ch4 Music_Imakuni: ; f8fcb (3e:4fcb) db %1111 - dw Music_Imakuni_Ch1 ; 6d55 - dw Music_Imakuni_Ch2 ; 6e32 - dw Music_Imakuni_Ch3 ; 6eBC - dw Music_Imakuni_Ch4 ; 6fA4 + dw Music_Imakuni_Ch1 + dw Music_Imakuni_Ch2 + dw Music_Imakuni_Ch3 + dw Music_Imakuni_Ch4 Music_HallOfHonor: ; f8fd4 (3e:4fd4) db %0111 - dw Music_HallOfHonor_Ch1 ; 6fEA - dw Music_HallOfHonor_Ch2 ; 706E - dw Music_HallOfHonor_Ch3 ; 70D5 + dw Music_HallOfHonor_Ch1 + dw Music_HallOfHonor_Ch2 + dw Music_HallOfHonor_Ch3 dw $0000 Music_Credits: ; f8fdd (3e:4fdd) db %1111 - dw Music_Credits_Ch1 ; 71FE - dw Music_Credits_Ch2 ; 768A - dw Music_Credits_Ch3 ; 7b9D - dw Music_Credits_Ch4 ; 7e51 + dw Music_Credits_Ch1 + dw Music_Credits_Ch2 + dw Music_Credits_Ch3 + dw Music_Credits_Ch4 ;Music_Unused13 db %0000 @@ -278,4 +278,4 @@ Music_Credits: ; f8fdd (3e:4fdd) dw $0000 dw $0000 dw $0000 - dw $0000
\ No newline at end of file + dw $0000 diff --git a/data/noise_instruments.asm b/data/noise_instruments.asm index 3081a51..96433ab 100755 --- a/data/noise_instruments.asm +++ b/data/noise_instruments.asm @@ -34,4 +34,4 @@ .snare5 db $88,$00,$c4,$80,$05,$03,$03,$03,$03,$03,$03,$03,$03,$02,$02,$02,$02,$02 db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02 - db $02,$02,$02,$02,$02,$02,$02,$02,$02,$01,$01,$01,$01,$01,$01,$ff
\ No newline at end of file + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$01,$01,$01,$01,$01,$01,$ff diff --git a/data/overworld_indexes.asm b/data/overworld_indexes.asm index 18d8e65..7df99de 100755 --- a/data/overworld_indexes.asm +++ b/data/overworld_indexes.asm @@ -16,4 +16,4 @@ OverworldMapIndexes: ; 10f88 (4:4f88) db SCIENCE_CLUB_ENTRANCE, $08,$0E,$00 db FIRE_CLUB_ENTRANCE, $08,$0E,$00 db CHALLENGE_HALL_ENTRANCE,$08,$0E,$00 - db POKEMON_DOME_ENTRANCE, $0E,$0E,$00
\ No newline at end of file + db POKEMON_DOME_ENTRANCE, $0E,$0E,$00 diff --git a/data/sfx_headers.asm b/data/sfx_headers.asm index 0e698aa..6485425 100755 --- a/data/sfx_headers.asm +++ b/data/sfx_headers.asm @@ -491,4 +491,4 @@ SFX_5e: ; fc47f (3f:447f) SFX_5f: ; fc482 (3f:4482) db %1000 - dw SFX_5f_Ch1
\ No newline at end of file + dw SFX_5f_Ch1 diff --git a/data/vibrato_types.asm b/data/vibrato_types.asm index 979697a..d51546e 100755 --- a/data/vibrato_types.asm +++ b/data/vibrato_types.asm @@ -41,4 +41,4 @@ db $01,$02,$04,$02,$01,$00,$ff,$fe,$fc,$fe,$ff,$00,$80,$08 .vibratoTypeA - db $01,$01,$01,$01,$00,$00,$00,$00,$ff,$ff,$ff,$ff,$00,$00,$00,$00,$80,$80
\ No newline at end of file + db $01,$01,$01,$01,$00,$00,$00,$00,$ff,$ff,$ff,$ff,$00,$00,$00,$00,$80,$80 diff --git a/data/warp_data.asm b/data/warp_data.asm index 8844542..cb34721 100755 --- a/data/warp_data.asm +++ b/data/warp_data.asm @@ -247,4 +247,4 @@ PokemonDomeWarpData: ; 1c319 (7:4319) HallOfHonorWarpData: ; 1c32f (7:432f) db $0A,$18,POKEMON_DOME,$0E,$02 db $0C,$18,POKEMON_DOME,$10,$02 - db $00,$00
\ No newline at end of file + db $00,$00 diff --git a/data/wave_instruments.asm b/data/wave_instruments.asm index 132042f..98197dc 100755 --- a/data/wave_instruments.asm +++ b/data/wave_instruments.asm @@ -17,4 +17,4 @@ db $7a,$df,$ff,$da,$74,$10,$00,$14,$7a,$df,$ff,$da,$74,$10,$00,$14 .wave4 - db $ee,$ee,$ee,$ee,$ee,$ee,$ee,$ee,$00,$00,$00,$00,$00,$00,$00,$00
\ No newline at end of file + db $ee,$ee,$ee,$ee,$ee,$ee,$ee,$ee,$00,$00,$00,$00,$00,$00,$00,$00 diff --git a/engine/bank1.asm b/engine/bank1.asm index 9241b44..6feadff 100755 --- a/engine/bank1.asm +++ b/engine/bank1.asm @@ -57,4 +57,4 @@ Func_7571: ; 7571 (1:7571) INCBIN "baserom.gbc",$7571,$758f - $7571 Func_758f: ; 758f (1:758f) -INCBIN "baserom.gbc",$758f,$8000 - $758f
\ No newline at end of file +INCBIN "baserom.gbc",$758f,$8000 - $758f diff --git a/engine/bank1c.asm b/engine/bank1c.asm index de26d29..33d01ed 100755 --- a/engine/bank1c.asm +++ b/engine/bank1c.asm @@ -306,4 +306,4 @@ Func_70214: ; 70214 (1c:4214) ret Unknown_7024a: ; 7024a (1c:424a) -INCBIN "baserom.gbc",$7024a,$74000 - $7024a
\ No newline at end of file +INCBIN "baserom.gbc",$7024a,$74000 - $7024a diff --git a/engine/bank2.asm b/engine/bank2.asm index b8adb02..28c8e40 100755 --- a/engine/bank2.asm +++ b/engine/bank2.asm @@ -788,4 +788,4 @@ Unknown_a77e: ; a77e (2:677e) INCBIN "baserom.gbc",$a77e,$b177 - $a77e Func_b177: ; b177 (2:7177) -INCBIN "baserom.gbc",$b177,$c000 - $b177
\ No newline at end of file +INCBIN "baserom.gbc",$b177,$c000 - $b177 diff --git a/engine/bank20.asm b/engine/bank20.asm index e3e0100..187a14b 100755 --- a/engine/bank20.asm +++ b/engine/bank20.asm @@ -130,4 +130,4 @@ Unknown_80e5a: ; 80e5a (20:4e5a) INCBIN "baserom.gbc",$80e5a,$80e5d - $80e5a MapDataPointers: ; 80e5d (20:4e5d) -INCBIN "baserom.gbc",$80e5d,$84000 - $80e5d
\ No newline at end of file +INCBIN "baserom.gbc",$80e5d,$84000 - $80e5d diff --git a/engine/bank3.asm b/engine/bank3.asm index 7df99a4..a3a6418 100755 --- a/engine/bank3.asm +++ b/engine/bank3.asm @@ -1383,4 +1383,4 @@ Unknown_fc68: ; fc68 (3:7c68) INCBIN "baserom.gbc",$fc68,$fcad - $fc68 Func_fcad: ; fcad (3:7cad) -INCBIN "baserom.gbc",$fcad,$10000 - $fcad
\ No newline at end of file +INCBIN "baserom.gbc",$fcad,$10000 - $fcad diff --git a/engine/bank4.asm b/engine/bank4.asm index a541d62..a42ed28 100755 --- a/engine/bank4.asm +++ b/engine/bank4.asm @@ -926,4 +926,4 @@ Func_131b3: ; 131b3 (4:71b3) INCBIN "baserom.gbc",$131b3,$131d3 - $131b3 Func_131d3: ; 131d3 (4:71d3) -INCBIN "baserom.gbc",$131d3,$14000 - $131d3
\ No newline at end of file +INCBIN "baserom.gbc",$131d3,$14000 - $131d3 diff --git a/engine/bank6.asm b/engine/bank6.asm index 6cccfe0..71212cb 100755 --- a/engine/bank6.asm +++ b/engine/bank6.asm @@ -113,4 +113,4 @@ Func_1a6cc: ; 1a6cc (6:66cc) INCBIN "baserom.gbc",$1a6cd,$1ad89 - $1a6cd Func_1ad89: ; 1ad89 (6:6d89) -INCBIN "baserom.gbc",$1ad89,$1c000 - $1ad89
\ No newline at end of file +INCBIN "baserom.gbc",$1ad89,$1c000 - $1ad89 diff --git a/engine/bank7.asm b/engine/bank7.asm index f57b8af..1f9e1aa 100755 --- a/engine/bank7.asm +++ b/engine/bank7.asm @@ -124,4 +124,4 @@ Func_1d306: ; 1d306 (7:5306) INCBIN "baserom.gbc",$1d306,$1d6ad - $1d306 Func_1d6ad: ; 1d6ad (7:56ad) -INCBIN "baserom.gbc",$1d6ad,$20000 - $1d6ad
\ No newline at end of file +INCBIN "baserom.gbc",$1d6ad,$20000 - $1d6ad diff --git a/engine/home.asm b/engine/home.asm index ca32146..05c0562 100755 --- a/engine/home.asm +++ b/engine/home.asm @@ -4222,4 +4222,4 @@ Bankswitch3d: ; 3fe0 (0:3fe0) rept $a db $ff -endr
\ No newline at end of file +endr diff --git a/engine/music1.asm b/engine/music1.asm index 75595d9..6527069 100755 --- a/engine/music1.asm +++ b/engine/music1.asm @@ -1870,9 +1870,9 @@ INCBIN "baserom.gbc",$f4e85,$f4ee5 - $f4e85 INCLUDE "data/music1_headers.asm" INCLUDE "audio/music/titlescreen.asm" -INCLUDE "audio/music/battletheme1.asm" -INCLUDE "audio/music/battletheme2.asm" -INCLUDE "audio/music/battletheme3.asm" +INCLUDE "audio/music/dueltheme1.asm" +INCLUDE "audio/music/dueltheme2.asm" +INCLUDE "audio/music/dueltheme3.asm" INCLUDE "audio/music/pausemenu.asm" INCLUDE "audio/music/deckmachine.asm" INCLUDE "audio/music/cardpop.asm" @@ -1888,4 +1888,4 @@ INCLUDE "audio/music/medal.asm" rept $138 db $ff -endr
\ No newline at end of file +endr diff --git a/engine/music2.asm b/engine/music2.asm index 623c2ea..0b308b8 100755 --- a/engine/music2.asm +++ b/engine/music2.asm @@ -1882,4 +1882,4 @@ INCLUDE "audio/music/credits.asm" rept $109 db $ff -endr
\ No newline at end of file +endr diff --git a/engine/sfx.asm b/engine/sfx.asm index 6c04265..7fb7861 100755 --- a/engine/sfx.asm +++ b/engine/sfx.asm @@ -596,4 +596,4 @@ INCLUDE "audio/sfx/sfx_5f.asm" rept $c1 db $ff -endr
\ No newline at end of file +endr @@ -197,4 +197,4 @@ ENDM sfx_end: MACRO db $f0 -ENDM
\ No newline at end of file +ENDM @@ -196,4 +196,4 @@ SECTION "bank3E",ROMX,BANK[$3E] INCLUDE "engine/music2.asm" SECTION "bank3F",ROMX,BANK[$3F] -INCLUDE "engine/sfx.asm"
\ No newline at end of file +INCLUDE "engine/sfx.asm" diff --git a/text/text1.asm b/text/text1.asm index ebb72a5..3d10001 100755 --- a/text/text1.asm +++ b/text/text1.asm @@ -891,4 +891,4 @@ Text00f3: ; 37fa8 (d:7fa8) Text00f4: ; 37fcd (d:7fcd) db TX_START,"Damage check!\n" - db "If Heads, x ",TX_RAM3," damage!!",TX_END
\ No newline at end of file + db "If Heads, x ",TX_RAM3," damage!!",TX_END diff --git a/text/text2.asm b/text/text2.asm index cb779e7..6164638 100644 --- a/text/text2.asm +++ b/text/text2.asm @@ -1463,4 +1463,4 @@ Text026b: ; 3bf73 (e:7f73) Text026c: ; 3bf9e (e:7f9e) db TX_START,"This Deck can only be built if\n" - db "you dismantle another Deck.",TX_END
\ No newline at end of file + db "you dismantle another Deck.",TX_END diff --git a/text/text3.asm b/text/text3.asm index e663832..de8239c 100644 --- a/text/text3.asm +++ b/text/text3.asm @@ -1604,4 +1604,4 @@ Text0404: ; 3ff4d (f:7f4d) db TX_START,TX_RAM1,", I know you can do it!\n" db "Go win the Fighting Medal!\n" db "Mason Laboratory\n" - db " Doctor Mason ;)",TX_END
\ No newline at end of file + db " Doctor Mason ;)",TX_END diff --git a/text/text4.asm b/text/text4.asm index 984754c..5a16284 100644 --- a/text/text4.asm +++ b/text/text4.asm @@ -913,4 +913,4 @@ Text048a: ; 43f61 (10:7f61) db "again, I must defeat you first!",TX_END Text048b: ; 43fd9 (10:7fd9) - db TX_START,"Would you like to duel Chris?",TX_END
\ No newline at end of file + db TX_START,"Would you like to duel Chris?",TX_END diff --git a/text/text5.asm b/text/text5.asm index 000021e..6fbceaa 100644 --- a/text/text5.asm +++ b/text/text5.asm @@ -864,4 +864,4 @@ Text0522: ; 47e73 (11:7e73) Text0523: ; 47f08 (11:7f08) db TX_START,"Hey, ",TX_RAM1,"!\n" - db "What are you doing here?",TX_END
\ No newline at end of file + db "What are you doing here?",TX_END diff --git a/text/text6.asm b/text/text6.asm index 574affe..553943e 100644 --- a/text/text6.asm +++ b/text/text6.asm @@ -983,4 +983,4 @@ Text05da: ; 4be3e (12:7e3e) db "choosing the PKMN Power command.\n" db "There are many different Pok`mon\n" db "Powers, so read each card's text\n" - db "carefully.",TX_END
\ No newline at end of file + db "carefully.",TX_END diff --git a/text/text7.asm b/text/text7.asm index b0775d3..1f0f3d1 100644 --- a/text/text7.asm +++ b/text/text7.asm @@ -956,4 +956,4 @@ Text0682: ; 4ff1a (13:7f1a) Text0683: ; 4ffa9 (13:7fa9) db TX_START,"And here, take this\n" - db "LABORATORY Booster Pack!",TX_END
\ No newline at end of file + db "LABORATORY Booster Pack!",TX_END diff --git a/text/text8.asm b/text/text8.asm index a077f9d..46c711d 100644 --- a/text/text8.asm +++ b/text/text8.asm @@ -1042,4 +1042,4 @@ Text073e: ; 53d5b (14:7d5b) db "not to use the Legendary Cards \n" db "for dueling. Make sure your \n" db "Duels are worthy of\n" - db "the Legendary Pok`mon Cards.",TX_END
\ No newline at end of file + db "the Legendary Pok`mon Cards.",TX_END diff --git a/text/text9.asm b/text/text9.asm index 8e5372e..ef44df8 100644 --- a/text/text9.asm +++ b/text/text9.asm @@ -1203,4 +1203,4 @@ Text0838: ; 57f57 (15:7f57) db TX_START,"Flip a coin. If heads, prevent all\n" db "damage done to Kakuna during your\n" db "opponent's next turn. (Any other\n" - db "effects of attacks still happen.)",TX_END
\ No newline at end of file + db "effects of attacks still happen.)",TX_END diff --git a/text/text_offsets.asm b/text/text_offsets.asm index 91f1b98..710bd4c 100755 --- a/text/text_offsets.asm +++ b/text/text_offsets.asm @@ -2988,4 +2988,4 @@ TextOffsets: ; 34000 (d:4000) text Text0baa text Text0bab text Text0bac - text Text0bad
\ No newline at end of file + text Text0bad diff --git a/text/texta.asm b/text/texta.asm index 191f9a6..dbe0aed 100644 --- a/text/texta.asm +++ b/text/texta.asm @@ -1274,4 +1274,4 @@ Text0973: ; 5bf4b (16:7f4b) db "If tails, that attack does nothing.",TX_END Text0974: ; 5bfd7 (16:7fd7) - db TX_START,"Dragon",TX_END
\ No newline at end of file + db TX_START,"Dragon",TX_END diff --git a/text/textb.asm b/text/textb.asm index 83b68ce..108f8ac 100644 --- a/text/textb.asm +++ b/text/textb.asm @@ -1156,4 +1156,4 @@ Text0a82: ; 5ffb8 (17:7fb8) db TX_START,"Alakazam",TX_END Text0a83: ; 5ffc2 (17:7fc2) - db TX_START,"Damage Swap",TX_END
\ No newline at end of file + db TX_START,"Damage Swap",TX_END diff --git a/text/textc.asm b/text/textc.asm index d8c0076..5256939 100644 --- a/text/textc.asm +++ b/text/textc.asm @@ -1144,4 +1144,4 @@ Text0b8c: ; 63f39 (18:7f39) db "afterward.",TX_END Text0b8d: ; 63fed (18:7fed) - db TX_START,"Scoop Up",TX_END
\ No newline at end of file + db TX_START,"Scoop Up",TX_END diff --git a/text/textd.asm b/text/textd.asm index d1da111..91593c3 100644 --- a/text/textd.asm +++ b/text/textd.asm @@ -154,4 +154,4 @@ Text0bad: ; 6495e (19:495e) rept $3655 db $ff -endr
\ No newline at end of file +endr @@ -62,4 +62,4 @@ wMusicE4: ; ddea ds $9 wMusicReturnAddress: ; ddf3 - ds $8
\ No newline at end of file + ds $8 |