dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give songs meaningful english names

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_scripts.s
+1068 -1068
View File
File diff suppressed because it is too large Load Diff
data/battle_scripts_1.s
+2 -2
View File
@@ -3119,7 +3119,7 @@ BattleScript_Pausex20::
return
BattleScript_LevelUp::
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNGREWTOLV
setbyte sLVLBOX_STATE, 0
drawlvlupbox
@@ -3149,7 +3149,7 @@ BattleScript_ForgotAndLearnedNewMove::
printstring STRINGID_ANDELLIPSIS
BattleScript_LearnedNewMove::
buffermovetolearn
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage 0x40
updatechoicemoveonlvlup BS_ATTACKER
data/battle_scripts_2.s
+6 -6
View File
@@ -134,7 +134,7 @@ BattleScript_PlayerUseItem::
BattleScript_AIUseFullRestoreOrHpHeal::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@@ -150,7 +150,7 @@ BattleScript_AIUseFullRestoreOrHpHeal::
BattleScript_AIUseStatRestore::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@@ -163,7 +163,7 @@ BattleScript_AIUseStatRestore::
BattleScript_AIUseXstat::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@@ -175,7 +175,7 @@ BattleScript_AIUseXstat::
BattleScript_AIUseGuardSpec::
printstring STRINGID_EMPTYSTRING3
pause 48
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 64
useitemonopponent
@@ -185,7 +185,7 @@ BattleScript_AIUseGuardSpec::
finishaction
BattleScript_UseFluffyTail::
playse SE_NIGERU
playse SE_FLEE
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
@@ -199,7 +199,7 @@ BattleScript_UsePokeFlute::
BattleScript_PokeFluteWakeUp::
printstring STRINGID_POKEFLUTE
waitmessage 64
fanfare MUS_POKEFUE
fanfare MUS_POKE_FLUTE
waitfanfare BS_ATTACKER
printstring STRINGID_MONHEARINGFLUTEAWOKE
waitmessage 64
data/event_scripts.s
+3 -3
View File
@@ -1078,13 +1078,13 @@ Common_ShowEasyChatScreen:: @ 81A6AC0
@ Unused
EventScript_GymBadgeFanfare:: @ 81A6C21
playfanfare MUS_ME_BACHI
playfanfare MUS_OBTAIN_BADGE
waitfanfare
return
EventScript_OutOfCenterPartyHeal:: @ 81A6C26
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
fadescreen FADE_FROM_BLACK
@@ -1113,7 +1113,7 @@ EventScript_ChangePokemonNickname:: @ 81A74EB
@ Unused
EventScript_HandOverItem:: @ 81A74F2
getitemname 0, VAR_0x8004
playfanfare MUS_ME_WAZA
playfanfare MUS_OBTAIN_TMHM
message Text_HandedOverItem
waitmessage
waitfanfare
data/maps/BattleColosseum_2P/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum_2P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/BattleColosseum_4P/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum_4P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
setfieldeffectarg 1, 56
setfieldeffectarg 2, 2
dofieldeffect 68
playbgm MUS_DEOEYE, 0
playbgm MUS_ENCOUNTER_DEOXYS, 0
waitfieldeffect 68
applymovement 2, Movement_DeoxysApproach
waitmovement 0
data/maps/CeladonCity/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY",
"name": "CeladonCity",
"layout": "LAYOUT_CELADON_CITY",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/CeladonCity_Condominiums_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_1F",
"name": "CeladonCity_Condominiums_1F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_2F",
"name": "CeladonCity_Condominiums_2F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_3F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_3F",
"name": "CeladonCity_Condominiums_3F",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_Roof/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF",
"name": "CeladonCity_Condominiums_Roof",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
"name": "CeladonCity_Condominiums_RoofRoom",
"layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+2 -2
View File
@@ -21,7 +21,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
removeobject 2
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
waitmessage
waitfanfare
@@ -36,7 +36,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA
removeobject 2
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
waitmessage
waitfanfare
data/maps/CeladonCity_DepartmentStore_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F",
"name": "CeladonCity_DepartmentStore_1F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F",
"name": "CeladonCity_DepartmentStore_2F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_3F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F",
"name": "CeladonCity_DepartmentStore_3F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_4F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F",
"name": "CeladonCity_DepartmentStore_4F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_5F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F",
"name": "CeladonCity_DepartmentStore_5F",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_Elevator/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
"name": "CeladonCity_DepartmentStore_Elevator",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_Roof/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF",
"name": "CeladonCity_DepartmentStore_Roof",
"layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+2 -2
View File
@@ -149,7 +149,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C
goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
additem VAR_0x8009
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message Text_ReceivedItemFromLittleGirl
waitmessage
waitfanfare
@@ -269,7 +269,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
updatemoneybox 0, 0, 0
getitemname 0, VAR_TEMP_0
playse SE_JIHANKI
playse SE_VEND
msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut
additem VAR_TEMP_0
goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink
data/maps/CeladonCity_GameCorner/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_GAME_CORNER",
"name": "CeladonCity_GameCorner",
"layout": "LAYOUT_CELADON_CITY_GAME_CORNER",
"music": "MUS_SLOT",
"music": "MUS_GAME_CORNER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_GameCorner/scripts.inc
+1 -1
View File
@@ -403,7 +403,7 @@ CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA
end
CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE
playse SE_KI_GASYAN
playse SE_UNLOCK
setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0
setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1
setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1
data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
"name": "CeladonCity_GameCorner_PrizeRoom",
"layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+2 -2
View File
@@ -214,7 +214,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3
removecoins VAR_TEMP_2
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare
@@ -228,7 +228,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0
removecoins VAR_TEMP_2
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare
data/maps/CeladonCity_Gym/text.inc
+1 -1
View File
@@ -12,7 +12,7 @@ CeladonCity_Gym_Text_ErikaIntro:: @ 8197114
.string "GRASS type.\p"
.string "…Oh, I'm sorry, I had no idea that\n"
.string "you wished to challenge me.\p"
.string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$"
.string "Very well, but I shall not lose.{PLAY_BGM MUS_ENCOUNTER_GYM_LEADER}$"
CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260
.string "Oh!\n"
data/maps/CeladonCity_Hotel/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_HOTEL",
"name": "CeladonCity_Hotel",
"layout": "LAYOUT_CELADON_CITY_HOTEL",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_HOUSE1",
"name": "CeladonCity_House1",
"layout": "LAYOUT_HOUSE5",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
"name": "CeladonCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_POKEMON_CENTER_2F",
"name": "CeladonCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity_Restaurant/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CELADON_CITY_RESTAURANT",
"name": "CeladonCity_Restaurant",
"layout": "LAYOUT_CELADON_CITY_RESTAURANT",
"music": "MUS_TAMAMUSI",
"music": "MUS_CELADON",
"region_map_section": "MAPSEC_CELADON_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_1F",
"name": "CeruleanCave_1F",
"layout": "LAYOUT_CERULEAN_CAVE_1F",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_2F",
"name": "CeruleanCave_2F",
"layout": "LAYOUT_CERULEAN_CAVE_2F",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_B1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CAVE_B1F",
"name": "CeruleanCave_B1F",
"layout": "LAYOUT_CERULEAN_CAVE_B1F",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_CERULEAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
waitmessage
waitmoncry
delay 20
playbgm MUS_EXEYE, 0
playbgm MUS_ENCOUNTER_GYM_LEADER, 0
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
data/maps/CeruleanCity/map.json
+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",
data/maps/CeruleanCity/scripts.inc
+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
data/maps/CeruleanCity/text.inc
+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"
data/maps/CeruleanCity_BikeShop/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_BIKE_SHOP",
"name": "CeruleanCity_BikeShop",
"layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_BikeShop/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: @ 816AC15
CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22
msgbox CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo
msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_FAN5
msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_OBTAIN_KEY_ITEM
setflag FLAG_GOT_BICYCLE
additem ITEM_BICYCLE
removeitem ITEM_BIKE_VOUCHER
data/maps/CeruleanCity_Gym/text.inc
+1 -1
View File
@@ -5,7 +5,7 @@ CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF
.string "What is your approach when you\n"
.string "catch and train POKéMON?\p"
.string "My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$"
.string "with WATER-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF
.string "TM03 teaches WATER PULSE.\p"
data/maps/CeruleanCity_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE1",
"name": "CeruleanCity_House1",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE1",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House2/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE2",
"name": "CeruleanCity_House2",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE2",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House3/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE3",
"name": "CeruleanCity_House3",
"layout": "LAYOUT_HOUSE1",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House4/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE4",
"name": "CeruleanCity_House4",
"layout": "LAYOUT_HOUSE1",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_House5/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_HOUSE5",
"name": "CeruleanCity_House5",
"layout": "LAYOUT_CERULEAN_CITY_HOUSE5",
"music": "MUS_HANADA",
"music": "MUS_FUCHSIA",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_Mart/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_MART",
"name": "CeruleanCity_Mart",
"layout": "LAYOUT_MART",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
"name": "CeruleanCity_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeruleanCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F",
"name": "CeruleanCity_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CERULEAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND",
"name": "CinnabarIsland",
"layout": "LAYOUT_CINNABAR_ISLAND",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/CinnabarIsland/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ CinnabarIsland_OnTransition:: @ 8166EE1
end
CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B
savebgm MUS_ANNAI
savebgm MUS_FOLLOW_ME
setflag FLAG_TEMP_2
setobjectxyperm LOCALID_BILL, 15, 12
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT
data/maps/CinnabarIsland_Gym/scripts.inc
+7 -7
View File
@@ -217,7 +217,7 @@ CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00
end
CinnabarIsland_Gym_EventScript_CorrectAnswer:: @ 816DC27
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
waitfanfare
msgbox CinnabarIsland_Gym_Text_CorrectGoOnThrough
return
@@ -238,7 +238,7 @@ CinnabarIsland_Gym_EventScript_Quiz1Correct:: @ 816DC43
end
CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor1
special DrawWholeMapView
@@ -318,7 +318,7 @@ CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C
end
CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor2
special DrawWholeMapView
@@ -403,7 +403,7 @@ CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA
end
CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor3
special DrawWholeMapView
@@ -479,7 +479,7 @@ CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1
end
CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor4
special DrawWholeMapView
@@ -555,7 +555,7 @@ CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8
end
CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor5
special DrawWholeMapView
@@ -631,7 +631,7 @@ CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F
end
CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094
playse SE_KI_GASYAN
playse SE_UNLOCK
waitse
call CinnabarIsland_Gym_EventScript_OpenDoor6
special DrawWholeMapView
data/maps/CinnabarIsland_Gym/text.inc
+1 -1
View File
@@ -6,7 +6,7 @@ CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543
.string "and ready with intense heat!\p"
.string "They incinerate all challengers!\p"
.string "Hah!\n"
.string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$"
.string "You better have BURN HEAL!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA
.string "I have burned down to nothing!\n"
data/maps/CinnabarIsland_Mart/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_MART",
"name": "CinnabarIsland_Mart",
"layout": "LAYOUT_MART",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
"name": "CinnabarIsland_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -34,8 +34,8 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A
goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail
msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo
closemessage
playbgm MUS_ANNAI, 1
savebgm MUS_ANNAI
playbgm MUS_FOLLOW_ME, 1
savebgm MUS_FOLLOW_ME
setflag FLAG_DONT_TRANSITION_MUSIC
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F",
"name": "CinnabarIsland_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
"name": "CinnabarIsland_PokemonLab_Entrance",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
"name": "CinnabarIsland_PokemonLab_ExperimentRoom",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+2 -2
View File
@@ -255,7 +255,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
waitmessage
waitfanfare
@@ -270,7 +270,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E82
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
waitmessage
waitfanfare
data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
"name": "CinnabarIsland_PokemonLab_Lounge",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
"name": "CinnabarIsland_PokemonLab_ResearchRoom",
"layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM",
"music": "MUS_GUREN",
"music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/DiglettsCave_B1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_B1F",
"name": "DiglettsCave_B1F",
"layout": "LAYOUT_DIGLETTS_CAVE_B1F",
"music": "MUS_T_MORI",
"music": "MUS_VIRIDIAN_FOREST",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/DiglettsCave_NorthEntrance/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
"name": "DiglettsCave_NorthEntrance",
"layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE",
"music": "MUS_T_MORI",
"music": "MUS_VIRIDIAN_FOREST",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/DiglettsCave_SouthEntrance/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE",
"name": "DiglettsCave_SouthEntrance",
"layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE",
"music": "MUS_T_MORI",
"music": "MUS_VIRIDIAN_FOREST",
"region_map_section": "MAPSEC_DIGLETTS_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND",
"name": "FiveIsland",
"layout": "LAYOUT_FIVE_ISLAND",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_Harbor/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HARBOR",
"name": "FiveIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HOUSE1",
"name": "FiveIsland_House1",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_House2/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_HOUSE2",
"name": "FiveIsland_House2",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_LostCave_Entrance/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
"name": "FiveIsland_LostCave_Entrance",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_LostCave_Room1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1",
"name": "FiveIsland_LostCave_Room1",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room10/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10",
"name": "FiveIsland_LostCave_Room10",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room11/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11",
"name": "FiveIsland_LostCave_Room11",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room12/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12",
"name": "FiveIsland_LostCave_Room12",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room13/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13",
"name": "FiveIsland_LostCave_Room13",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room14/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14",
"name": "FiveIsland_LostCave_Room14",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room2/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2",
"name": "FiveIsland_LostCave_Room2",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room3/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3",
"name": "FiveIsland_LostCave_Room3",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room4/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4",
"name": "FiveIsland_LostCave_Room4",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room5/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5",
"name": "FiveIsland_LostCave_Room5",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room6/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6",
"name": "FiveIsland_LostCave_Room6",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room7/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7",
"name": "FiveIsland_LostCave_Room7",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room8/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8",
"name": "FiveIsland_LostCave_Room8",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_LostCave_Room9/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9",
"name": "FiveIsland_LostCave_Room9",
"layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_LOST_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
data/maps/FiveIsland_Meadow/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_MEADOW",
"name": "FiveIsland_Meadow",
"layout": "LAYOUT_FIVE_ISLAND_MEADOW",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_FIVE_ISLE_MEADOW",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_MemorialPillar/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR",
"name": "FiveIsland_MemorialPillar",
"layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_MEMORIAL_PILLAR",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_PokemonCenter_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
"name": "FiveIsland_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F",
"name": "FiveIsland_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_FIVE_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_ResortGorgeous/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS",
"name": "FiveIsland_ResortGorgeous",
"layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_RESORT_GORGEOUS",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_ResortGorgeous_House/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
"name": "FiveIsland_ResortGorgeous_House",
"layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_RESORT_GORGEOUS",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_RocketWarehouse/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE",
"name": "FiveIsland_RocketWarehouse",
"layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE",
"music": "MUS_AJITO",
"music": "MUS_ROCKET_HIDEOUT",
"region_map_section": "MAPSEC_ROCKET_WAREHOUSE",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FiveIsland_WaterLabyrinth/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FIVE_ISLAND_WATER_LABYRINTH",
"name": "FiveIsland_WaterLabyrinth",
"layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH",
"music": "MUS_NANASHIMA",
"music": "MUS_SEVII_ROUTE",
"region_map_section": "MAPSEC_WATER_LABYRINTH",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
textcolor 3
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan
waitfanfare
waitmessage
data/maps/FourIsland/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND",
"name": "FourIsland",
"layout": "LAYOUT_FOUR_ISLAND",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
data/maps/FourIsland/scripts.inc
+3 -3
View File
@@ -32,7 +32,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC
textcolor 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
waitmovement 0
playbgm MUS_RIVAL1, 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Movement_Delay48
@@ -46,7 +46,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
waitmovement 0
fadedefaultbgm
playse SE_KAIDAN
playse SE_EXIT
delay 35
removeobject LOCALID_RIVAL
setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
@@ -113,7 +113,7 @@ FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB
textcolor 3
message DayCare_Text_ReceivedEgg
call EventScript_RestorePrevTextColor
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
waitfanfare
waitbuttonpress
msgbox DayCare_Text_TakeGoodCareOfIt
data/maps/FourIsland_Harbor/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_HARBOR",
"name": "FourIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FourIsland_House1/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_HOUSE1",
"name": "FourIsland_House1",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FourIsland_House2/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_HOUSE2",
"name": "FourIsland_House2",
"layout": "LAYOUT_HOUSE3",
"music": "MUS_NANA45",
"music": "MUS_SEVII_45",
"region_map_section": "MAPSEC_FOUR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/FourIsland_IcefallCave_1F/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F",
"name": "FourIsland_IcefallCave_1F",
"layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F",
"music": "MUS_NANADUNGEON",
"music": "MUS_SEVII_CAVE",
"region_map_section": "MAPSEC_ICEFALL_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

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