summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/map_scripts.asm4
-rwxr-xr-xdata/map_songs.asm2
-rwxr-xr-xdata/music1_headers.asm44
-rwxr-xr-xdata/music2_headers.asm90
-rwxr-xr-xdata/noise_instruments.asm2
-rwxr-xr-xdata/overworld_indexes.asm2
-rwxr-xr-xdata/sfx_headers.asm2
-rwxr-xr-xdata/vibrato_types.asm2
-rwxr-xr-xdata/warp_data.asm2
-rwxr-xr-xdata/wave_instruments.asm2
10 files changed, 76 insertions, 76 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 18:17:00 +0000