summaryrefslogtreecommitdiff
path: root/data-de
diff options
context:
space:
mode:
Diffstat (limited to 'data-de')
-rw-r--r--data-de/event_scripts.s120
-rw-r--r--data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc2
2 files changed, 20 insertions, 102 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 1966ca9b8..f96aaa140 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -841,84 +841,25 @@ EventScript_BackupMrBrineyLocation:: @ 81A010C
.include "data/scripts/dynamic_npc_graphics.inc"
.include "data/scripts/set_gym_trainers.inc"
-DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
-DewfordTown_Hall_EventScript_1A029B:: @ 81A029B
-FallarborTown_House1_EventScript_1A029B:: @ 81A029B
-FortreeCity_Gym_EventScript_1A029B:: @ 81A029B
-FortreeCity_House2_EventScript_1A029B:: @ 81A029B
-FortreeCity_House4_EventScript_1A029B:: @ 81A029B
-LavaridgeTown_Gym_1F_EventScript_1A029B:: @ 81A029B
-LavaridgeTown_HerbShop_EventScript_1A029B:: @ 81A029B
-LilycoveCity_EventScript_1A029B:: @ 81A029B
-LilycoveCity_House2_EventScript_1A029B:: @ 81A029B
-LittlerootTown_BrendansHouse_1F_EventScript_1A029B:: @ 81A029B
-MauvilleCity_EventScript_1A029B:: @ 81A029B
-MauvilleCity_Gym_EventScript_1A029B:: @ 81A029B
-MossdeepCity_EventScript_1A029B:: @ 81A029B
-MossdeepCity_Gym_EventScript_1A029B:: @ 81A029B
-MossdeepCity_SpaceCenter_1F_EventScript_1A029B:: @ 81A029B
-MtPyre_1F_EventScript_1A029B:: @ 81A029B
-PacifidlogTown_House2_EventScript_1A029B:: @ 81A029B
-PetalburgCity_Gym_EventScript_1A029B:: @ 81A029B
-PetalburgWoods_EventScript_1A029B:: @ 81A029B
-Route104_EventScript_1A029B:: @ 81A029B
-Route104_PrettyPetalFlowerShop_EventScript_1A029B:: @ 81A029B
-Route109_EventScript_1A029B:: @ 81A029B
-Route111_EventScript_1A029B:: @ 81A029B
-Route111_WinstrateFamilysHouse_EventScript_1A029B:: @ 81A029B
-Route114_EventScript_1A029B:: @ 81A029B
-Route114_FossilManiacsHouse_EventScript_1A029B:: @ 81A029B
-Route120_EventScript_1A029B:: @ 81A029B
-Route123_BerryMastersHouse_EventScript_1A029B:: @ 81A029B
-Route123_EventScript_1A029B:: @ 81A029B
-RustboroCity_DevonCorp_3F_EventScript_1A029B:: @ 81A029B
-RustboroCity_Flat2_2F_EventScript_1A029B:: @ 81A029B
-RustboroCity_Gym_EventScript_1A029B:: @ 81A029B
-RustboroCity_PokemonSchool_EventScript_1A029B:: @ 81A029B
-SSTidalRooms_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideEntranceRoom_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideInnerRoom_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideLowerRoom_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideStairsRoom_EventScript_1A029B:: @ 81A029B
-SlateportCity_ContestHall_EventScript_1A029B:: @ 81A029B
-SlateportCity_Harbor_EventScript_1A029B:: @ 81A029B
-SlateportCity_PokemonFanClub_EventScript_1A029B:: @ 81A029B
-SootopolisCity_EventScript_1A029B:: @ 81A029B
-SootopolisCity_Gym_1F_EventScript_1A029B:: @ 81A029B
-VerdanturfTown_ContestLobby_EventScript_1A029B:: @ 81A029B
- msgbox MauvilleCity_Text_1A0CC2, MSGBOX_DEFAULT
+Common_EventScript_ShowBagIsFull:: @ 81A029B
+ msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
release
end
-MauvilleCity_GameCorner_EventScript_1A02A5:: @ 81A02A5
-Route110_TrickHouseEnd_EventScript_1A02A5:: @ 81A02A5
-Route110_TrickHouseEntrance_EventScript_1A02A5:: @ 81A02A5
-Route113_GlassWorkshop_EventScript_1A02A5:: @ 81A02A5
- msgbox MauvilleCity_GameCorner_Text_1A0CC2, MSGBOX_DEFAULT
+Common_EventScript_BagIsFull:: @ 81A02A5
+ msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
return
-Route114_LanettesHouse_EventScript_1A02AE:: @ 81A02AE
- msgbox Route114_LanettesHouse_Text_1A0CEF, MSGBOX_DEFAULT
+Common_EventScript_ShowNoRoomForDecor:: @ 81A02AE
+ msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT
release
end
-LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8:: @ 81A02B8
-MauvilleCity_GameCorner_EventScript_1A02B8:: @ 81A02B8
-Route110_TrickHouseEnd_EventScript_1A02B8:: @ 81A02B8
-Route110_TrickHouseEntrance_EventScript_1A02B8:: @ 81A02B8
-Route113_GlassWorkshop_EventScript_1A02B8:: @ 81A02B8
- msgbox MauvilleCity_GameCorner_Text_1A0CEF, MSGBOX_DEFAULT
+Common_EventScript_NoRoomForDecor:: @ 81A02B8
+ msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT
return
-EverGrandeCity_EventScript_1A02C1:: @ 81A02C1
-LilycoveCity_EventScript_1A02C1:: @ 81A02C1
-MossdeepCity_EventScript_1A02C1:: @ 81A02C1
-Route124_EventScript_1A02C1:: @ 81A02C1
-Route125_EventScript_1A02C1:: @ 81A02C1
-Route126_EventScript_1A02C1:: @ 81A02C1
-Route127_EventScript_1A02C1:: @ 81A02C1
-Route128_EventScript_1A02C1:: @ 81A02C1
-SootopolisCity_EventScript_1A02C1:: @ 81A02C1
+Common_EventScript_SetLegendaryWeather:: @ 81A02C1
.ifdef SAPPHIRE
setweather WEATHER_RAIN_HEAVY
.else
@@ -926,23 +867,12 @@ SootopolisCity_EventScript_1A02C1:: @ 81A02C1
.endif
return
-DewfordTown_Gym_EventScript_1A02C5:: @ 81A02C5
-FortreeCity_Gym_EventScript_1A02C5:: @ 81A02C5
-LavaridgeTown_Gym_1F_EventScript_1A02C5:: @ 81A02C5
-LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5:: @ 81A02C5
-MauvilleCity_Gym_EventScript_1A02C5:: @ 81A02C5
-MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
-PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
-RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
-SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
+Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5
playfanfare MUS_ME_BACHI
waitfanfare
return
-LittlerootTown_BrendansHouse_1F_EventScript_1A02CA:: @ 81A02CA
-Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
-Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
-SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
+Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
waitfanfare
@@ -950,26 +880,22 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
fadescreen FADE_FROM_BLACK
return
-Event_WorldMap:: @ 81A02D6
+EventScript_RegionMap:: @ 81A02D6
lockall
- msgbox UnknownString_817303D, MSGBOX_DEFAULT
+ msgbox Text_LookCloserAtMap, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
special FieldShowRegionMap
waitstate
releaseall
end
-DewfordTown_EventScript_1A02E7:: @ 81A02E7
-Route104_EventScript_1A02E7:: @ 81A02E7
-Route109_EventScript_1A02E7:: @ 81A02E7
- setflag FLAG_SPECIAL_FLAG_1
+Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7
+ setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_M_BOAT, FALSE
return
-DewfordTown_EventScript_1A02EF:: @ 81A02EF
-Route104_EventScript_1A02EF:: @ 81A02EF
-Route109_EventScript_1A02EF:: @ 81A02EF
- clearflag FLAG_SPECIAL_FLAG_1
+Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF
+ clearflag FLAG_DONT_TRANSITION_MUSIC
fadedefaultbgm
return
@@ -1623,22 +1549,14 @@ Message_PutAwayItem: @ 81A0C8C
Message_FoundOneItem: @ 81A0CB1
.string "{PLAYER} hat {STR_VAR_2} gefunden!$"
-MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2
-MauvilleCity_Text_1A0CC2:: @ 81A0CC2
-MtChimney_Text_1A0CC2:: @ 81A0CC2
-OldaleTown_Text_1A0CC2:: @ 81A0CC2
-Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2
-Message_BagFull:
+Text_TooBadBagIsFull:
.string "Zu schade!\n"
.string "Der BEUTEL ist voll...$"
Message_ObtainedDecoration: @ 81A0CDE
.string "{STR_VAR_2} erhalten.$"
-BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF
-MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF
-Route114_LanettesHouse_Text_1A0CEF:: @ 81A0CEF
-SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF
+Text_NoRoomLeftForAnother:: @ 81A0CEF
.string "Zu schade! Es ist kein Platz für\n"
.string "{STR_VAR_2}...$"
diff --git a/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc
index 102eb6664..61fe3a85a 100644
--- a/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc
+++ b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc
@@ -29,7 +29,7 @@ LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A
.string "Speichere den Fortschritt mit SICHERN.\p"
.string "Die übrigen Seiten sind leer.$"
-UnknownString_817303D: @ 817303D
+Text_LookCloserAtMap: @ 817303D
.string "{PLAYER} schaut sich die Karte der\n"
.string "HOENN-Region genauer an.$"