Merge pull request #330 from PikalaxALT/scriptmacrorenaming

Scriptmacrorenaming
This commit is contained in:
yenatch 2016-01-04 07:41:19 -05:00
commit 0add51451c
747 changed files with 62196 additions and 56816 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,70 +1,70 @@
; e91b0 ; e91b0
dba Cry_00 dba Cry_Nidoran_M
dba Cry_01 dba Cry_Nidoran_F
dba Cry_02 dba Cry_Slowpoke
dba Cry_03 dba Cry_Kangaskhan
dba Cry_04 dba Cry_Charmander
dba Cry_05 dba Cry_Grimer
dba Cry_06 dba Cry_Voltorb
dba Cry_07 dba Cry_Muk
dba Cry_08 dba Cry_Oddish
dba Cry_09 dba Cry_Raichu
dba Cry_0A dba Cry_Nidoqueen
dba Cry_0B dba Cry_Diglett
dba Cry_0C dba Cry_Seel
dba Cry_0D dba Cry_Drowzee
dba Cry_0E dba Cry_Pidgey
dba Cry_0F dba Cry_Bulbasaur
dba Cry_10 dba Cry_Spearow
dba Cry_11 dba Cry_Rhydon
dba Cry_12 dba Cry_Golem
dba Cry_13 dba Cry_Blastoise
dba Cry_14 dba Cry_Pidgeotto
dba Cry_15 dba Cry_Weedle
dba Cry_16 dba Cry_Caterpie
dba Cry_17 dba Cry_Ekans
dba Cry_18 dba Cry_Fearow
dba Cry_19 dba Cry_Clefairy
dba Cry_1A dba Cry_Venonat
dba Cry_1B dba Cry_Lapras
dba Cry_1C dba Cry_Metapod
dba Cry_1D dba Cry_Squirtle
dba Cry_1E dba Cry_Paras
dba Cry_1F dba Cry_Growlithe
dba Cry_20 dba Cry_Krabby
dba Cry_21 dba Cry_Psyduck
dba Cry_22 dba Cry_Rattata
dba Cry_23 dba Cry_Vileplume
dba Cry_24 dba Cry_Vulpix
dba Cry_25 dba Cry_Weepinbell
dba Cry_26 dba Cry_Marill
dba Cry_27 dba Cry_Spinarak
dba Cry_28 dba Cry_Togepi
dba Cry_29 dba Cry_Girafarig
dba Cry_2A dba Cry_Raikou
dba Cry_2B dba Cry_Mareep
dba Cry_2C dba Cry_Togetic
dba Cry_2D dba Cry_Hoothoot
dba Cry_2E dba Cry_Sentret
dba Cry_2F dba Cry_Slowking
dba Cry_30 dba Cry_Cyndaquil
dba Cry_31 dba Cry_Chikorita
dba Cry_32 dba Cry_Totodile
dba Cry_33 dba Cry_Gligar
dba Cry_34 dba Cry_Cleffa
dba Cry_35 dba Cry_Slugma
dba Cry_36 dba Cry_Ledyba
dba Cry_37 dba Cry_Entei
dba Cry_38 dba Cry_Wooper
dba Cry_39 dba Cry_Mantine
dba Cry_3A dba Cry_Typhlosion
dba Cry_3B dba Cry_Natu
dba Cry_3C dba Cry_Teddiursa
dba Cry_3D dba Cry_Sunflora
dba Cry_3E dba Cry_Ampharos
dba Cry_3F dba Cry_Magcargo
dba Cry_40 dba Cry_Pichu
dba Cry_41 dba Cry_Aipom
dba Cry_42 dba Cry_Dunsparce
dba Cry_43 dba Cry_Donphan
; e927c ; e927c

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
Music_AfterTheRivalFight: ; f5127 Music_AfterTheRivalFight: ; f5127
dbw $c0, Music_AfterTheRivalFight_Ch1 musicheader 4, 1, Music_AfterTheRivalFight_Ch1
dbw $01, Music_AfterTheRivalFight_Ch2 musicheader 1, 2, Music_AfterTheRivalFight_Ch2
dbw $02, Music_AfterTheRivalFight_Ch3 musicheader 1, 3, Music_AfterTheRivalFight_Ch3
dbw $03, Music_AfterTheRivalFight_Ch4 musicheader 1, 4, Music_AfterTheRivalFight_Ch4
; f5133 ; f5133
Music_AfterTheRivalFight_Ch1: ; f5133 Music_AfterTheRivalFight_Ch1: ; f5133

View File

@ -1,8 +1,8 @@
Music_AzaleaTown: ; f57e8 Music_AzaleaTown: ; f57e8
dbw $c0, Music_AzaleaTown_Ch1 musicheader 4, 1, Music_AzaleaTown_Ch1
dbw $01, Music_AzaleaTown_Ch2 musicheader 1, 2, Music_AzaleaTown_Ch2
dbw $02, Music_AzaleaTown_Ch3 musicheader 1, 3, Music_AzaleaTown_Ch3
dbw $03, Music_AzaleaTown_Ch4 musicheader 1, 4, Music_AzaleaTown_Ch4
; f57f4 ; f57f4
Music_AzaleaTown_Ch1: ; f57f4 Music_AzaleaTown_Ch1: ; f57f4

View File

@ -1,8 +1,8 @@
Music_BattleTowerLobby: ; 17948b Music_BattleTowerLobby: ; 17948b
dbw $c0, Music_BattleTowerLobby_Ch1 musicheader 4, 1, Music_BattleTowerLobby_Ch1
dbw $01, Music_BattleTowerLobby_Ch2 musicheader 1, 2, Music_BattleTowerLobby_Ch2
dbw $02, Music_BattleTowerLobby_Ch3 musicheader 1, 3, Music_BattleTowerLobby_Ch3
dbw $03, Music_BattleTowerLobby_Ch4 musicheader 1, 4, Music_BattleTowerLobby_Ch4
; 179497 ; 179497
Music_BattleTowerLobby_Ch1: ; 179497 Music_BattleTowerLobby_Ch1: ; 179497

View File

@ -1,8 +1,8 @@
Music_BattleTowerTheme: ; 178889 Music_BattleTowerTheme: ; 178889
dbw $c0, Music_BattleTowerTheme_Ch1 musicheader 4, 1, Music_BattleTowerTheme_Ch1
dbw $01, Music_BattleTowerTheme_Ch2 musicheader 1, 2, Music_BattleTowerTheme_Ch2
dbw $02, Music_BattleTowerTheme_Ch3 musicheader 1, 3, Music_BattleTowerTheme_Ch3
dbw $03, Music_BattleTowerTheme_Ch4 musicheader 1, 4, Music_BattleTowerTheme_Ch4
; 178895 ; 178895
Music_BattleTowerTheme_Ch1: ; 178895 Music_BattleTowerTheme_Ch1: ; 178895

View File

@ -1,8 +1,8 @@
Music_Bicycle: ; ee119 Music_Bicycle: ; ee119
dbw $c0, Music_Bicycle_Ch1 musicheader 4, 1, Music_Bicycle_Ch1
dbw $01, Music_Bicycle_Ch2 musicheader 1, 2, Music_Bicycle_Ch2
dbw $02, Music_Bicycle_Ch3 musicheader 1, 3, Music_Bicycle_Ch3
dbw $03, Music_Bicycle_Ch4 musicheader 1, 4, Music_Bicycle_Ch4
; ee125 ; ee125
Music_Bicycle_Ch1: ; ee125 Music_Bicycle_Ch1: ; ee125

View File

@ -1,8 +1,8 @@
Music_BuenasPassword: ; 178153 Music_BuenasPassword: ; 178153
dbw $c0, Music_BuenasPassword_Ch1 musicheader 4, 1, Music_BuenasPassword_Ch1
dbw $01, Music_BuenasPassword_Ch2 musicheader 1, 2, Music_BuenasPassword_Ch2
dbw $02, Music_BuenasPassword_Ch3 musicheader 1, 3, Music_BuenasPassword_Ch3
dbw $03, Music_BuenasPassword_Ch4 musicheader 1, 4, Music_BuenasPassword_Ch4
; 17815f ; 17815f
Music_BuenasPassword_Ch1: ; 17815f Music_BuenasPassword_Ch1: ; 17815f

View File

@ -1,8 +1,8 @@
Music_BugCatchingContest: ; f7c16 Music_BugCatchingContest: ; f7c16
dbw $c0, Music_BugCatchingContest_Ch1 musicheader 4, 1, Music_BugCatchingContest_Ch1
dbw $01, Music_BugCatchingContest_Ch2 musicheader 1, 2, Music_BugCatchingContest_Ch2
dbw $02, Music_BugCatchingContest_Ch3 musicheader 1, 3, Music_BugCatchingContest_Ch3
dbw $03, Music_BugCatchingContest_Ch4 musicheader 1, 4, Music_BugCatchingContest_Ch4
; f7c22 ; f7c22
Music_BugCatchingContest_Ch1: ; f7c22 Music_BugCatchingContest_Ch1: ; f7c22

View File

@ -1,8 +1,8 @@
Music_BurnedTower: ; f6a99 Music_BurnedTower: ; f6a99
dbw $c0, Music_BurnedTower_Ch1 musicheader 4, 1, Music_BurnedTower_Ch1
dbw $01, Music_BurnedTower_Ch2 musicheader 1, 2, Music_BurnedTower_Ch2
dbw $02, Music_BurnedTower_Ch3 musicheader 1, 3, Music_BurnedTower_Ch3
dbw $03, Music_BurnedTower_Ch4 musicheader 1, 4, Music_BurnedTower_Ch4
; f6aa5 ; f6aa5
Music_BurnedTower_Ch1: ; f6aa5 Music_BurnedTower_Ch1: ; f6aa5

View File

@ -1,7 +1,7 @@
Music_CeladonCity: ; f435b Music_CeladonCity: ; f435b
dbw $80, Music_CeladonCity_Ch1 musicheader 3, 1, Music_CeladonCity_Ch1
dbw $01, Music_CeladonCity_Ch2 musicheader 1, 2, Music_CeladonCity_Ch2
dbw $02, Music_CeladonCity_Ch3 musicheader 1, 3, Music_CeladonCity_Ch3
; f4364 ; f4364
Music_CeladonCity_Ch1: ; f4364 Music_CeladonCity_Ch1: ; f4364

View File

@ -1,7 +1,7 @@
Music_ChampionBattle: ; ea9c1 Music_ChampionBattle: ; ea9c1
dbw $80, Music_ChampionBattle_Ch1 musicheader 3, 1, Music_ChampionBattle_Ch1
dbw $01, Music_ChampionBattle_Ch2 musicheader 1, 2, Music_ChampionBattle_Ch2
dbw $02, Music_ChampionBattle_Ch3 musicheader 1, 3, Music_ChampionBattle_Ch3
; ea9ca ; ea9ca
Music_ChampionBattle_Ch1: ; ea9ca Music_ChampionBattle_Ch1: ; ea9ca

View File

@ -1,8 +1,8 @@
Music_CherrygroveCity: ; f5b03 Music_CherrygroveCity: ; f5b03
dbw $c0, Music_CherrygroveCity_Ch1 musicheader 4, 1, Music_CherrygroveCity_Ch1
dbw $01, Music_CherrygroveCity_Ch2 musicheader 1, 2, Music_CherrygroveCity_Ch2
dbw $02, Music_CherrygroveCity_Ch3 musicheader 1, 3, Music_CherrygroveCity_Ch3
dbw $03, Music_CherrygroveCity_Ch4 musicheader 1, 4, Music_CherrygroveCity_Ch4
; f5b0f ; f5b0f
Music_CherrygroveCity_Ch1: ; f5b0f Music_CherrygroveCity_Ch1: ; f5b0f

View File

@ -1,8 +1,8 @@
Music_Clair: ; 1fa8d Music_Clair: ; 1fa8d
dbw $c0, Music_Clair_Ch1 musicheader 4, 1, Music_Clair_Ch1
dbw $01, Music_Clair_Ch2 musicheader 1, 2, Music_Clair_Ch2
dbw $02, Music_Clair_Ch3 musicheader 1, 3, Music_Clair_Ch3
dbw $03, Music_Clair_Ch4 musicheader 1, 4, Music_Clair_Ch4
; 1fa99 ; 1fa99
Music_Clair_Ch1: ; 1fa99 Music_Clair_Ch1: ; 1fa99

View File

@ -1,8 +1,8 @@
Music_ContestResults: ; efb3e Music_ContestResults: ; efb3e
dbw $c0, Music_ContestResults_Ch1 musicheader 4, 1, Music_ContestResults_Ch1
dbw $01, Music_ContestResults_Ch2 musicheader 1, 2, Music_ContestResults_Ch2
dbw $02, Music_ContestResults_Ch3 musicheader 1, 3, Music_ContestResults_Ch3
dbw $03, Music_ContestResults_Ch4 musicheader 1, 4, Music_ContestResults_Ch4
; efb4a ; efb4a
Music_ContestResults_Ch1: ; efb4a Music_ContestResults_Ch1: ; efb4a

View File

@ -1,8 +1,8 @@
Music_Credits: ; 1f31c Music_Credits: ; 1f31c
dbw $c0, Music_Credits_Ch1 musicheader 4, 1, Music_Credits_Ch1
dbw $01, Music_Credits_Ch2 musicheader 1, 2, Music_Credits_Ch2
dbw $02, Music_Credits_Ch3 musicheader 1, 3, Music_Credits_Ch3
dbw $03, Music_Credits_Ch4 musicheader 1, 4, Music_Credits_Ch4
; 1f328 ; 1f328
Music_Credits_Ch1: ; 1f328 Music_Credits_Ch1: ; 1f328

View File

@ -1,8 +1,8 @@
Music_CrystalOpening: ; 1786e8 Music_CrystalOpening: ; 1786e8
dbw $c0, Music_CrystalOpening_Ch1 musicheader 4, 1, Music_CrystalOpening_Ch1
dbw $01, Music_CrystalOpening_Ch2 musicheader 1, 2, Music_CrystalOpening_Ch2
dbw $02, Music_CrystalOpening_Ch3 musicheader 1, 3, Music_CrystalOpening_Ch3
dbw $03, Music_CrystalOpening_Ch4 musicheader 1, 4, Music_CrystalOpening_Ch4
; 1786f4 ; 1786f4
Music_CrystalOpening_Ch1: ; 1786f4 Music_CrystalOpening_Ch1: ; 1786f4

View File

@ -1,7 +1,7 @@
Music_DancingHall: ; ef9bc Music_DancingHall: ; ef9bc
dbw $80, Music_DancingHall_Ch1 musicheader 3, 1, Music_DancingHall_Ch1
dbw $01, Music_DancingHall_Ch2 musicheader 1, 2, Music_DancingHall_Ch2
dbw $02, Music_DancingHall_Ch3 musicheader 1, 3, Music_DancingHall_Ch3
; ef9c5 ; ef9c5
db $3 db $3

Some files were not shown because too many files have changed in this diff Show More