mirror of
				https://github.com/thornAvery/jep-hack.git
				synced 2025-11-04 12:50:59 +13:00 
			
		
		
		
	Five + Six island maps with another RBY style remix
This commit is contained in:
		
							parent
							
								
									5e81a6ce3a
								
							
						
					
					
						commit
						5b4eb17c1e
					
				| 
						 | 
				
			
			@ -174,7 +174,7 @@ JEP-affiliated musicians require music to be used with direct credit for non-com
 | 
			
		|||
 | 
			
		||||
### Unaffiliated
 | 
			
		||||
- FroggestSpirit: HGSS Poke Mart Demix
 | 
			
		||||
- TempoQuill: Gen 1 Style Remixes of Lake of Rage and Azalea Town (used in the Sevii Islands)
 | 
			
		||||
- TempoQuill: Gen 1 Style Remixes of Lake of Rage Azalea Town, and Violet City (used in the Sevii Islands)
 | 
			
		||||
 | 
			
		||||
## Other Sources
 | 
			
		||||
- Nob Ogasawara (Many prototype Pokemon names)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -178,6 +178,7 @@ INCLUDE "audio/music/FortunaSF.asm"
 | 
			
		|||
INCLUDE "audio/music/JasperForest.asm"
 | 
			
		||||
INCLUDE "audio/music/sevii.asm"
 | 
			
		||||
INCLUDE "audio/music/FourIsland.asm"
 | 
			
		||||
INCLUDE "audio/music/SixIsland.asm"
 | 
			
		||||
 | 
			
		||||
SECTION "Sound Effects", ROMX
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										577
									
								
								audio/music/SixIsland.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										577
									
								
								audio/music/SixIsland.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,577 @@
 | 
			
		|||
; By TempoQuill, from https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/violet.asm
 | 
			
		||||
; Minor tweaks by Zeta_Null to fix desync and one wrong note
 | 
			
		||||
Music_SixIsland:
 | 
			
		||||
	channel_count 4
 | 
			
		||||
	channel 1, Music_SixIsland_Ch1
 | 
			
		||||
	channel 2, Music_SixIsland_Ch2
 | 
			
		||||
	channel 3, Music_SixIsland_Ch3
 | 
			
		||||
	channel 4, Music_SixIsland_Ch4
 | 
			
		||||
 | 
			
		||||
Music_SixIsland_Ch1:
 | 
			
		||||
	tempo 156
 | 
			
		||||
	volume 7, 7
 | 
			
		||||
	vibrato 4, 3, 1
 | 
			
		||||
	pitch_offset 1
 | 
			
		||||
	duty_cycle 1
 | 
			
		||||
	note_type 12, 6, 4
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	volume_envelope 10, 3
 | 
			
		||||
	note B_, 10
 | 
			
		||||
	volume_envelope 6, 4
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	volume_envelope 10, 3
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	volume_envelope 6, 4
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	volume_envelope 10, 3
 | 
			
		||||
	note B_, 10
 | 
			
		||||
	volume_envelope 6, 4
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	volume_envelope 10, 5
 | 
			
		||||
	note B_, 6
 | 
			
		||||
	note A#, 4
 | 
			
		||||
.mainloop:
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	octave 3
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	octave 2
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	octave 3
 | 
			
		||||
	note C#, 4
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	note A#, 4
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	octave 2
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	octave 3
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	note E_, 4
 | 
			
		||||
	note D#, 6
 | 
			
		||||
	note E_, 6
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	sound_call .sub1
 | 
			
		||||
	note E_, 4
 | 
			
		||||
	sound_call .sub1
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	note D_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note D_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note C#, 4
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	note E_, 4
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	sound_jump .mainloop
 | 
			
		||||
 | 
			
		||||
.sub1:
 | 
			
		||||
	note G_, 2
 | 
			
		||||
	note D_, 4
 | 
			
		||||
	octave 4
 | 
			
		||||
	note D_, 2
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note E_, 6
 | 
			
		||||
	note F#, 6
 | 
			
		||||
	note A_, 6
 | 
			
		||||
	sound_ret
 | 
			
		||||
 | 
			
		||||
Music_SixIsland_Ch2:
 | 
			
		||||
	duty_cycle 3
 | 
			
		||||
	vibrato 11, 2, 2
 | 
			
		||||
	note_type 12, 10, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	volume_envelope 13, 3
 | 
			
		||||
	octave 4
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	volume_envelope 10, 2
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	volume_envelope 13, 3
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 4
 | 
			
		||||
	volume_envelope 10, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	volume_envelope 13, 3
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	volume_envelope 10, 2
 | 
			
		||||
	note A#, 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	volume_envelope 13, 6
 | 
			
		||||
	note C#, 8
 | 
			
		||||
.mainloop:
 | 
			
		||||
	volume_envelope 13, 4
 | 
			
		||||
	octave 4
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note F#, 6
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	volume_envelope 13, 5
 | 
			
		||||
	note E_, 14
 | 
			
		||||
	volume_envelope 13, 4
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	note E_, 6
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	volume_envelope 13, 5
 | 
			
		||||
	note D#, 14
 | 
			
		||||
	volume_envelope 13, 4
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	note D#, 6
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	note G#, 4
 | 
			
		||||
	note B_, 6
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	note C#, 4
 | 
			
		||||
	volume_envelope 13, 7
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 16
 | 
			
		||||
	duty_cycle 2
 | 
			
		||||
	sound_call .sub1
 | 
			
		||||
	note D_, 6
 | 
			
		||||
	duty_cycle 1
 | 
			
		||||
	sound_call .sub1
 | 
			
		||||
	note F#, 4
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note F#, 14
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note F#, 12
 | 
			
		||||
	octave 3
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 12
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 4
 | 
			
		||||
	note A#, 14
 | 
			
		||||
	duty_cycle 3
 | 
			
		||||
	sound_jump .mainloop
 | 
			
		||||
 | 
			
		||||
.sub1:
 | 
			
		||||
	rest 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	note D_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note E_, 2
 | 
			
		||||
	note D_, 2
 | 
			
		||||
	note C#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note A_, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note E_, 4
 | 
			
		||||
	sound_ret
 | 
			
		||||
 | 
			
		||||
Music_SixIsland_Ch3:
 | 
			
		||||
	note_type 12, 1, 1
 | 
			
		||||
	rest 6
 | 
			
		||||
	octave 4
 | 
			
		||||
	note E_, 4
 | 
			
		||||
	rest 12
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	rest 10
 | 
			
		||||
	octave 3
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note D#, 4
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	rest 2
 | 
			
		||||
	note G#, 2
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	note D#, 2
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 2
 | 
			
		||||
	octave 4
 | 
			
		||||
	note F#, 2
 | 
			
		||||
	rest 2
 | 
			
		||||
.mainloop:
 | 
			
		||||
	octave 3
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	octave 5
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 3
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	octave 3
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
.loop1:
 | 
			
		||||
	octave 4
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note G_, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note G_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note E_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	sound_loop 2, .loop1
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note D_, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	octave 4
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	rest 3
 | 
			
		||||
	octave 4
 | 
			
		||||
	note A_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note D#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 5
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	octave 4
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note G#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note A#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note B_, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note F#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	note C#, 1
 | 
			
		||||
	rest 1
 | 
			
		||||
	sound_jump .mainloop
 | 
			
		||||
 | 
			
		||||
Music_SixIsland_Ch4:
 | 
			
		||||
	toggle_noise 1
 | 
			
		||||
	drum_speed 12
 | 
			
		||||
.loop1:
 | 
			
		||||
	drum_note 5, 2
 | 
			
		||||
	drum_note 5, 4
 | 
			
		||||
	drum_note 6, 10
 | 
			
		||||
	drum_note 5, 2
 | 
			
		||||
	drum_note 5, 4
 | 
			
		||||
	drum_note 6, 6
 | 
			
		||||
	drum_note 5, 4
 | 
			
		||||
	sound_loop 2, .loop1
 | 
			
		||||
.mainloop:
 | 
			
		||||
	drum_note 10, 6
 | 
			
		||||
	drum_note 12, 4
 | 
			
		||||
	drum_note 12, 2
 | 
			
		||||
	drum_note 6, 4
 | 
			
		||||
	drum_note 10, 2
 | 
			
		||||
	drum_note 12, 4
 | 
			
		||||
	drum_note 12, 4
 | 
			
		||||
	drum_note 6, 2
 | 
			
		||||
	drum_note 12, 4
 | 
			
		||||
	sound_loop 7, .mainloop
 | 
			
		||||
	drum_note 10, 6
 | 
			
		||||
	drum_note 12, 4
 | 
			
		||||
	drum_note 12, 2
 | 
			
		||||
	drum_note 6, 4
 | 
			
		||||
	drum_note 12, 2
 | 
			
		||||
	drum_note 10, 4
 | 
			
		||||
	drum_note 6, 6
 | 
			
		||||
	drum_note 12, 4
 | 
			
		||||
	sound_jump .mainloop
 | 
			
		||||
| 
						 | 
				
			
			@ -130,4 +130,5 @@ Music:
 | 
			
		|||
	dba Music_JasperForest
 | 
			
		||||
	dba Music_Sevii
 | 
			
		||||
	dba Music_FourIsland
 | 
			
		||||
	dba Music_SixIsland
 | 
			
		||||
	assert_table_length NUM_MUSIC_SONGS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -598,7 +598,7 @@ ENDM
 | 
			
		|||
	endgroup
 | 
			
		||||
	
 | 
			
		||||
	newgroup FIVE_ISLAND ; 32
 | 
			
		||||
	map_const FIVE_ISLAND,							10, 10 ; 1
 | 
			
		||||
	map_const FIVE_ISLAND,							10, 9 ; 1
 | 
			
		||||
	map_const FIVE_ISLAND_MEADOW,					10, 10 ; 2
 | 
			
		||||
	map_const MEMORIAL_PILLAR,						10, 10 ; 3
 | 
			
		||||
	map_const WATER_LABYRINTH,						10, 10 ; 4
 | 
			
		||||
| 
						 | 
				
			
			@ -607,7 +607,7 @@ ENDM
 | 
			
		|||
	endgroup
 | 
			
		||||
	
 | 
			
		||||
	newgroup SIX_ISLAND ; 33
 | 
			
		||||
	map_const SIX_ISLAND,							10, 10 ; 1
 | 
			
		||||
	map_const SIX_ISLAND,							10, 18 ; 1
 | 
			
		||||
	map_const WATER_PATH,							10, 10 ; 2
 | 
			
		||||
	map_const RUIN_VALLEY,							10, 10 ; 3
 | 
			
		||||
	map_const DOTTED_HOLE,							10, 10 ; 4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -127,7 +127,8 @@
 | 
			
		|||
	const MUSIC_FORTUNASF					 ; 7a
 | 
			
		||||
	const MUSIC_JASPERFOREST				 ; 7b
 | 
			
		||||
	const MUSIC_SEVII						 ; 7c
 | 
			
		||||
	const MUSIC_FOURISLAND					 ; 7d (We're coming up on $80, there's a fix in the pokecrystal design flaws section but that and above may be buggy)
 | 
			
		||||
	const MUSIC_FOURISLAND					 ; 7d
 | 
			
		||||
	const MUSIC_SIXISLAND					 ; 7e
 | 
			
		||||
DEF NUM_MUSIC_SONGS EQU const_value
 | 
			
		||||
 | 
			
		||||
; GetMapMusic picks music for these values (see home/map.asm)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -660,17 +660,17 @@ MapGroup_FourIsland:	; 31
 | 
			
		|||
 | 
			
		||||
MapGroup_FiveIsland:	; 32
 | 
			
		||||
	table_width MAP_LENGTH, MapGroup_FiveIsland
 | 
			
		||||
	map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map FiveIsland, TILESET_SEVII, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 | 
			
		||||
	assert_table_length NUM_FIVE_ISLAND_MAPS
 | 
			
		||||
 | 
			
		||||
MapGroup_SixIsland:	; 33
 | 
			
		||||
	table_width MAP_LENGTH, MapGroup_SixIsland
 | 
			
		||||
	map SixIsland, TILESET_CAVE, TOWN, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map SixIsland, TILESET_SEVII, TOWN, LANDMARK_SIX_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map WaterPath, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map RuinValley, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map DottedHole, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 | 
			
		||||
| 
						 | 
				
			
			@ -682,7 +682,7 @@ MapGroup_SixIsland:	; 33
 | 
			
		|||
 | 
			
		||||
MapGroup_SevenIsland:	; 34
 | 
			
		||||
	table_width MAP_LENGTH, MapGroup_SevenIsland
 | 
			
		||||
	map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map CanyonEntrance, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map SevaultCanyon, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map TanobyRuins, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -418,7 +418,7 @@ DebugRoom_MapEvents:
 | 
			
		|||
	warp_event 35, 17, SUNGLOW_CITY, 1 ; east warp
 | 
			
		||||
	warp_event  5, 35, LAVENDER_TOWN, 1 ; southwest warp
 | 
			
		||||
	warp_event 19, 34, KANTO_SAFARI_ZONE_CENTER, 1 ; southern warp
 | 
			
		||||
	warp_event 33, 33, FOUR_ISLAND, 1 ; southeast warp
 | 
			
		||||
	warp_event 33, 33, SIX_ISLAND, 1 ; southeast warp
 | 
			
		||||
	warp_event  5,  3, HAUNTED_HOUSE_FOYER, 1
 | 
			
		||||
	warp_event 34, 11, WINNERS_PATH, 3
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -14,7 +14,8 @@ FiveIsland_MapEvents:
 | 
			
		|||
	db 0, 0 ; filler
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
 | 
			
		||||
	warp_event 8, 11, DEBUG_ROOM, 1
 | 
			
		||||
	warp_event 9, 11, DEBUG_ROOM, 1
 | 
			
		||||
	def_coord_events
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -14,7 +14,9 @@ SixIsland_MapEvents:
 | 
			
		|||
	db 0, 0 ; filler
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
 | 
			
		||||
	warp_event 6, 27, DEBUG_ROOM, 1
 | 
			
		||||
	warp_event 7, 27, DEBUG_ROOM, 1
 | 
			
		||||
	
 | 
			
		||||
	def_coord_events
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue