Give songs meaningful english names

This commit is contained in:
GriffinR
2020-08-29 03:11:03 -04:00
parent c5839905a1
commit bb56d4a3f4
964 changed files with 8731 additions and 8814 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY",
"name": "CeruleanCity",
"layout": "LAYOUT_CERULEAN_CITY",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
+3 -3
View File
@@ -42,7 +42,7 @@ CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9
CeruleanCity_EventScript_Rival:: @ 81664CC
textcolor 0
setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_RIVAL1, 0
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter
waitmovement 0
@@ -57,7 +57,7 @@ CeruleanCity_EventScript_Rival:: @ 81664CC
famechecker FAMECHECKER_BILL, 0
msgbox CeruleanCity_Text_RivalPostBattle
closemessage
playbgm MUS_RIVAL2, 0
playbgm MUS_RIVAL_EXIT, 0
compare VAR_TEMP_1, 0
call_if_eq CeruleanCity_EventScript_RivalStartExit
compare VAR_TEMP_1, 1
@@ -179,7 +179,7 @@ CeruleanCity_EventScript_Grunt:: @ 8166603
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated
message CeruleanCity_Text_GruntIntro
waitmessage
playbgm MUS_ROCKET, 0
playbgm MUS_ENCOUNTER_ROCKET, 0
waitbuttonpress
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
+1 -1
View File
@@ -53,7 +53,7 @@ CeruleanCity_Text_GruntIntro:: @ 817EE0E
.string "…Huh?\n"
.string "Me?\p"
.string "I'm an innocent bystander!\n"
.string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$"
.string "Don't you believe me?{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$"
CeruleanCity_Text_GruntDefeat:: @ 817EE70
.string "GRUNT: Stop! I give up!\n"