summaryrefslogtreecommitdiff
path: root/data-de
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-10-08 23:54:46 -0400
committerGitHub <noreply@github.com>2017-10-08 23:54:46 -0400
commitb0d49dbbfbfcf39c2a9f88572437b6af77c8f709 (patch)
treebe0dadd4cb3a6c36e27233836a6f104359d49949 /data-de
parentb21c159b08c57a948edb268ac9b9b5baf6b4332d (diff)
parent3776a9fb4f0531535b0b5879dab7b3b6bd231736 (diff)
Merge branch 'master' into scaninc
Diffstat (limited to 'data-de')
-rw-r--r--data-de/event_scripts.s1313
-rw-r--r--data-de/field_move_scripts.inc162
-rw-r--r--data-de/text/bard.inc18
-rw-r--r--data-de/text/giddy.inc8
-rw-r--r--data-de/text/hipster.inc8
-rw-r--r--data-de/text/storyteller.inc236
-rw-r--r--data-de/text/trader.inc28
7 files changed, 882 insertions, 891 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 4d809241c..677aa9f21 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -386,27 +386,27 @@ gStdScripts_End::
gUnknown_0815F36C:: @ 815F36C
lockall
- playsfx 2
+ playse 2
message UnknownString_81A3A72
- doanimation 61
+ dofieldeffect 61
waitstate
- waittext
+ waitmessage
waitbutton
- playsfx 5
- jump EventScript_15F384
+ playse 5
+ goto EventScript_15F384
end
EventScript_15F384:
message UnknownString_81A3A87
- waittext
+ waitmessage
checkflag 268
- jumpeq EventScript_15F3A0
- jump EventScript_15F3E2
+ goto_if_eq EventScript_15F3A0
+ goto EventScript_15F3E2
end
gUnknown_0815F399:: @ 815F399
lockall
- jump EventScript_15F384
+ goto EventScript_15F384
end
EventScript_15F3A0:
@@ -431,8 +431,8 @@ EventScript_15F3E2:
EventScript_15F419:
msgbox UnknownString_81A38FB, 5
compare RESULT, 0
- jumpeq EventScript_15F384
- closebutton
+ goto_if_eq EventScript_15F384
+ closemessage
special SecretBasePC_PackUp
releaseall
end
@@ -448,18 +448,18 @@ EventScript_15F436:
gUnknown_0815F43A:: @ 815F43A
lockall
message UnknownString_81A3A72
- playsfx 2
- doanimation 61
+ playse 2
+ dofieldeffect 61
waitstate
- waittext
+ waitmessage
waitbutton
- playsfx 5
- jump EventScript_15F452
+ playse 5
+ goto EventScript_15F452
end
EventScript_15F452:
message UnknownString_81A3A87
- waittext
+ waitmessage
multichoice 0, 0, 7, 0
switch RESULT
case 0, EventScript_15F4A1
@@ -471,19 +471,19 @@ EventScript_15F452:
gUnknown_0815F49A:: @ 815F49A
lockall
- jump EventScript_15F452
+ goto EventScript_15F452
end
EventScript_15F4A1:
special sub_80BC56C
compare RESULT, 1
- jumpeq EventScript_15F4E0
+ goto_if_eq EventScript_15F4E0
compare RESULT, 2
- jumpeq EventScript_15F503
+ goto_if_eq EventScript_15F503
special sub_80BC224
msgbox UnknownString_81A3958, 5
compare RESULT, 0
- jumpeq EventScript_15F452
+ goto_if_eq EventScript_15F452
msgbox UnknownString_81A3A22, 3
special sub_80BC5BC
special sub_80C683C
@@ -493,7 +493,7 @@ EventScript_15F4A1:
EventScript_15F4E0:
msgbox UnknownString_81A3982, 5
compare RESULT, 0
- jumpeq EventScript_15F452
+ goto_if_eq EventScript_15F452
msgbox UnknownString_81A3A3A, 3
special sub_80BC5BC
special sub_80C683C
@@ -503,37 +503,37 @@ EventScript_15F4E0:
EventScript_15F503:
msgbox UnknownString_81A39C0, 3
special sub_80C683C
- closebutton
+ closemessage
releaseall
end
EventScript_15F511:
message UnknownString_81A3AA2
- waittext
- jump EventScript_15F452
+ waitmessage
+ goto EventScript_15F452
end
EventScript_15F51D:
special sub_80C683C
- closebutton
+ closemessage
releaseall
end
gUnknown_0815F523:: @ 815F523
- doanimation 52
+ dofieldeffect 52
waitstate
end
gUnknown_0815F528:: @ 815F528
special GetShieldToyTVDecorationInfo
compare RESULT, 0
- jumpeq EventScript_15F558
+ goto_if_eq EventScript_15F558
compare RESULT, 1
- jumpeq EventScript_15F561
+ goto_if_eq EventScript_15F561
compare RESULT, 2
- jumpeq EventScript_15F56A
+ goto_if_eq EventScript_15F56A
compare RESULT, 3
- jumpeq EventScript_15F573
+ goto_if_eq EventScript_15F573
end
EventScript_15F558:
@@ -891,7 +891,7 @@ Std_2:
lock
faceplayer
message 0x0
- waittext
+ waitmessage
waitbutton
release
return
@@ -899,137 +899,137 @@ Std_2:
Std_3:
lockall
message 0x0
- waittext
+ waitmessage
waitbutton
releaseall
return
Std_4:
message 0x0
- waittext
+ waitmessage
waitbutton
return
Std_5:
message 0x0
- waittext
+ waitmessage
yesnobox 20, 8
return
@ 819F805
return
-BattleTower_Lobby_EventScript_19F806:: @ 819F806
-FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
-LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
-MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
-OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
-SecretBase_RedCave1_EventScript_19F806:: @ 819F806
- special InitSaveDialog
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+ special ScrSpecial_DoSaveDialog
waitstate
return
gUnknown_0819F80B:: @ 819F80B
lock
special PlayTrainerEncounterMusic
- special sub_80847C8
+ special ScrSpecial_EndTrainerApproach
waitstate
- jump EventScript_19F8F2
+ goto EventScript_19F8F2
gUnknown_0819F818:: @ 819F818
lock
faceplayer
- move LAST_TALKED, Movement_19F8F0
- waitmove 0
- specialval RESULT, sub_8082564
+ applymovement LAST_TALKED, Movement_19F8F0
+ waitmovement 0
+ specialvar RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
- jumpif 5, EventScript_19F83F
+ goto_if 5, EventScript_19F83F
special PlayTrainerEncounterMusic
special sub_8082524
- jump EventScript_19F8F2
+ goto EventScript_19F8F2
EventScript_19F83F:
- endtrainerbattle
+ ontrainerbattleend
gUnknown_0819F840:: @ 819F840
lock
faceplayer
call EventScript_19F8E5
- specialval RESULT, sub_8082564
+ specialvar RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
- jumpif 5, EventScript_19F877
+ goto_if 5, EventScript_19F877
special CheckForAlivePartyMons
compare RESULT, 0
- jumpif 5, EventScript_19F870
+ goto_if 5, EventScript_19F870
special PlayTrainerEncounterMusic
special sub_8082524
- jump EventScript_19F8F2
+ goto EventScript_19F8F2
EventScript_19F870:
- special sub_8082718
- waittext
+ special ScrSpecial_ShowTrainerNonBattlingSpeech
+ waitmessage
waitbutton
release
end
EventScript_19F877:
- endtrainerbattle
+ ontrainerbattleend
gUnknown_0819F878:: @ 819F878
- move LAST_TALKED, Movement_19F8F0
- waitmove 0
+ applymovement LAST_TALKED, Movement_19F8F0
+ waitmovement 0
special PlayTrainerEncounterMusic
- reptrainerbattle
- endtrainerbattle
+ battlebegin
+ ontrainerbattleend
gUnknown_0819F887:: @ 819F887
call EventScript_19F8E5
- specialval RESULT, sub_8082C9C
+ specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
- jumpeq EventScript_19F8AD
+ goto_if_eq EventScript_19F8AD
special PlayTrainerEncounterMusic
special sub_8082524
- special sub_80826D8
- waittext
+ special ScrSpecial_ShowTrainerIntroSpeech
+ waitmessage
waitbutton
- special sub_80826B0
+ special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
EventScript_19F8AD:
- endtrainerbattle
+ ontrainerbattleend
gUnknown_0819F8AE:: @ 819F8AE
- specialval RESULT, sub_8082C9C
+ specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
- jumpeq EventScript_19F8DD
+ goto_if_eq EventScript_19F8DD
special CheckForAlivePartyMons
compare RESULT, 0
- jumpif 5, EventScript_19F8DE
+ goto_if 5, EventScript_19F8DE
special PlayTrainerEncounterMusic
special sub_8082524
- special sub_80826D8
- waittext
+ special ScrSpecial_ShowTrainerIntroSpeech
+ waitmessage
waitbutton
- special sub_80826B0
+ special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
EventScript_19F8DD:
- endtrainerbattle
+ ontrainerbattleend
EventScript_19F8DE:
- special sub_8082718
- waittext
+ special ScrSpecial_ShowTrainerNonBattlingSpeech
+ waitmessage
waitbutton
release
end
EventScript_19F8E5:
- move LAST_TALKED, Movement_19F8F0
- waitmove 0
+ applymovement LAST_TALKED, Movement_19F8F0
+ waitmovement 0
return
Movement_19F8F0::
@@ -1037,117 +1037,117 @@ Movement_19F8F0::
step_end
EventScript_19F8F2:
- special sub_80826D8
- waittext
+ special ScrSpecial_ShowTrainerIntroSpeech
+ waitmessage
waitbutton
- reptrainerbattle
- specialval RESULT, sub_8082558
+ battlebegin
+ specialvar RESULT, ScrSpecial_GetTrainerBattleMode
compare RESULT, 0
- jumpeq EventScript_19F934
+ goto_if_eq EventScript_19F934
compare RESULT, 2
- jumpeq EventScript_19F936
+ goto_if_eq EventScript_19F936
compare RESULT, 1
- jumpeq EventScript_19F936
+ goto_if_eq EventScript_19F936
compare RESULT, 6
- jumpeq EventScript_19F936
+ goto_if_eq EventScript_19F936
compare RESULT, 8
- jumpeq EventScript_19F936
+ goto_if_eq EventScript_19F936
EventScript_19F934:
releaseall
end
EventScript_19F936:
- endtrainerbattle2
+ ontrainerbattleendgoto
Std_6::
message 0x0
- waittext
+ waitmessage
waitbutton
release
return
Event_ResetBerryTrees: @ 19F940
- event_8a 2, 7, 5
- event_8a 1, 3, 5
- event_8a 11, 7, 5
- event_8a 13, 3, 5
- event_8a 4, 7, 5
- event_8a 76, 1, 5
- event_8a 8, 1, 5
- event_8a 10, 6, 5
- event_8a 25, 20, 5
- event_8a 26, 2, 5
- event_8a 66, 2, 5
- event_8a 67, 20, 5
- event_8a 69, 22, 5
- event_8a 70, 22, 5
- event_8a 71, 22, 5
- event_8a 55, 17, 5
- event_8a 56, 17, 5
- event_8a 5, 1, 5
- event_8a 6, 6, 5
- event_8a 7, 1, 5
- event_8a 16, 18, 5
- event_8a 17, 18, 5
- event_8a 18, 18, 5
- event_8a 29, 19, 5
- event_8a 28, 19, 5
- event_8a 27, 19, 5
- event_8a 24, 4, 5
- event_8a 23, 3, 5
- event_8a 22, 3, 5
- event_8a 21, 4, 5
- event_8a 19, 16, 5
- event_8a 20, 16, 5
- event_8a 80, 7, 5
- event_8a 81, 7, 5
- event_8a 77, 8, 5
- event_8a 78, 8, 5
- event_8a 68, 8, 5
- event_8a 31, 10, 5
- event_8a 33, 10, 5
- event_8a 34, 21, 5
- event_8a 35, 21, 5
- event_8a 36, 21, 5
- event_8a 83, 24, 5
- event_8a 84, 24, 5
- event_8a 85, 10, 5
- event_8a 86, 6, 5
- event_8a 37, 5, 5
- event_8a 38, 5, 5
- event_8a 39, 5, 5
- event_8a 40, 3, 5
- event_8a 41, 3, 5
- event_8a 42, 3, 5
- event_8a 46, 19, 5
- event_8a 45, 20, 5
- event_8a 44, 18, 5
- event_8a 43, 16, 5
- event_8a 47, 8, 5
- event_8a 48, 5, 5
- event_8a 49, 4, 5
- event_8a 50, 2, 5
- event_8a 52, 18, 5
- event_8a 53, 18, 5
- event_8a 62, 6, 5
- event_8a 64, 6, 5
- event_8a 58, 21, 5
- event_8a 59, 21, 5
- event_8a 60, 25, 5
- event_8a 61, 25, 5
- event_8a 79, 23, 5
- event_8a 14, 23, 5
- event_8a 15, 21, 5
- event_8a 30, 21, 5
- event_8a 65, 25, 5
- event_8a 72, 25, 5
- event_8a 73, 23, 5
- event_8a 74, 23, 5
- event_8a 87, 3, 5
- event_8a 88, 10, 5
- event_8a 89, 4, 5
- event_8a 82, 36, 5
+ plantberrytree 2, 7, 5
+ plantberrytree 1, 3, 5
+ plantberrytree 11, 7, 5
+ plantberrytree 13, 3, 5
+ plantberrytree 4, 7, 5
+ plantberrytree 76, 1, 5
+ plantberrytree 8, 1, 5
+ plantberrytree 10, 6, 5
+ plantberrytree 25, 20, 5
+ plantberrytree 26, 2, 5
+ plantberrytree 66, 2, 5
+ plantberrytree 67, 20, 5
+ plantberrytree 69, 22, 5
+ plantberrytree 70, 22, 5
+ plantberrytree 71, 22, 5
+ plantberrytree 55, 17, 5
+ plantberrytree 56, 17, 5
+ plantberrytree 5, 1, 5
+ plantberrytree 6, 6, 5
+ plantberrytree 7, 1, 5
+ plantberrytree 16, 18, 5
+ plantberrytree 17, 18, 5
+ plantberrytree 18, 18, 5
+ plantberrytree 29, 19, 5
+ plantberrytree 28, 19, 5
+ plantberrytree 27, 19, 5
+ plantberrytree 24, 4, 5
+ plantberrytree 23, 3, 5
+ plantberrytree 22, 3, 5
+ plantberrytree 21, 4, 5
+ plantberrytree 19, 16, 5
+ plantberrytree 20, 16, 5
+ plantberrytree 80, 7, 5
+ plantberrytree 81, 7, 5
+ plantberrytree 77, 8, 5
+ plantberrytree 78, 8, 5
+ plantberrytree 68, 8, 5
+ plantberrytree 31, 10, 5
+ plantberrytree 33, 10, 5
+ plantberrytree 34, 21, 5
+ plantberrytree 35, 21, 5
+ plantberrytree 36, 21, 5
+ plantberrytree 83, 24, 5
+ plantberrytree 84, 24, 5
+ plantberrytree 85, 10, 5
+ plantberrytree 86, 6, 5
+ plantberrytree 37, 5, 5
+ plantberrytree 38, 5, 5
+ plantberrytree 39, 5, 5
+ plantberrytree 40, 3, 5
+ plantberrytree 41, 3, 5
+ plantberrytree 42, 3, 5
+ plantberrytree 46, 19, 5
+ plantberrytree 45, 20, 5
+ plantberrytree 44, 18, 5
+ plantberrytree 43, 16, 5
+ plantberrytree 47, 8, 5
+ plantberrytree 48, 5, 5
+ plantberrytree 49, 4, 5
+ plantberrytree 50, 2, 5
+ plantberrytree 52, 18, 5
+ plantberrytree 53, 18, 5
+ plantberrytree 62, 6, 5
+ plantberrytree 64, 6, 5
+ plantberrytree 58, 21, 5
+ plantberrytree 59, 21, 5
+ plantberrytree 60, 25, 5
+ plantberrytree 61, 25, 5
+ plantberrytree 79, 23, 5
+ plantberrytree 14, 23, 5
+ plantberrytree 15, 21, 5
+ plantberrytree 30, 21, 5
+ plantberrytree 65, 25, 5
+ plantberrytree 72, 25, 5
+ plantberrytree 73, 23, 5
+ plantberrytree 74, 23, 5
+ plantberrytree 87, 3, 5
+ plantberrytree 88, 10, 5
+ plantberrytree 89, 4, 5
+ plantberrytree 82, 36, 5
return
gUnknown_0819FA81:: @ 819FA81
@@ -1298,13 +1298,13 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
clearflag 861
special sub_810FAA0
checkflag 291
- callif 0, EverGrandeCity_HallOfFame_EventScript_19FC62
+ call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62
checkflag 255
- callif 0, EverGrandeCity_HallOfFame_EventScript_19FC70
+ call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70
checkflag 298
- callif 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
+ call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
checkflag 123
- callif 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
+ call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
return
EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
@@ -1325,28 +1325,28 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
setflag 2141
return
-EventScript_LeagueWhiteOut:: @ 819FC74
+S_WhiteOut:: @ 819FC74
call EverGrandeCity_HallOfFame_EventScript_19FD09
call EventScript_19FC84
- jump gUnknown_0819FC9F
+ goto gUnknown_0819FC9F
end
EventScript_19FC84:
checkflag 221
- jumpeq Route101_EventScript_1A14DC
+ goto_if_eq Route101_EventScript_1A14DC
checkflag 1213
- jumpif 0, Route101_EventScript_1A14DC
+ goto_if 0, Route101_EventScript_1A14DC
clearflag 929
setvar 0x4053, 2
return
gUnknown_0819FC9F:: @ 819FC9F
compare 0x4096, 1
- jumpeq EventScript_19FCC1
+ goto_if_eq EventScript_19FCC1
compare 0x4096, 2
- jumpeq EventScript_19FCD7
+ goto_if_eq EventScript_19FCD7
compare 0x4096, 3
- jumpeq EventScript_19FCF0
+ goto_if_eq EventScript_19FCF0
end
EventScript_19FCC1:
@@ -1399,15 +1399,15 @@ RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
checkflag 188
- jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+ goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
checkflag 1217
- jumpeq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
+ goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
checkflag 742
- jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
+ goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
checkflag 740
- jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
+ goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
checkflag 741
- jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55
+ goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55
return
OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49
@@ -1438,54 +1438,54 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
lock
faceplayer
- msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
+ msgbox gText_NurseJoy_Welcome, 5
compare RESULT, 1
- jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
+ goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
compare RESULT, 0
- jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
+ goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
end
OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
- inccounter GAME_STAT_USED_POKECENTER
- message OldaleTown_PokemonCenter_1F_Text_1A1245
- waittext
- move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
- waitmove 0
- doanimation 25
- checkanimation 25
- move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
- waitmove 0
- special HealPlayerParty
+ incrementgamestat GAME_STAT_USED_POKECENTER
+ message gText_NurseJoy_OkayIllTakeYourPokemon
+ waitmessage
+ applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
+ waitmovement 0
+ dofieldeffect 25
+ waitfieldeffect 25
+ applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
+ waitmovement 0
+ special ScrSpecial_HealPlayerParty
checkflag 273
- jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
- jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0
+ goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
+ goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0
end
OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
- message OldaleTown_PokemonCenter_1F_Text_1A0B14
- waittext
- move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
- waitmove 0
- message OldaleTown_PokemonCenter_1F_Text_1A0AFA
- waittext
+ message gText_NurseJoy_ThankYouForWaiting
+ waitmessage
+ applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
+ waitmovement 0
+ message gText_NurseJoy_WeHopeToSeeYouAgain
+ waitmessage
return
OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
- message OldaleTown_PokemonCenter_1F_Text_1A0AFA
- waittext
+ message gText_NurseJoy_WeHopeToSeeYouAgain
+ waitmessage
return
OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
- specialval RESULT, IsPokerusInParty
+ specialvar RESULT, IsPokerusInParty
compare RESULT, 1
- jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDEA
+ goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA
compare RESULT, 0
- jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDB0
+ goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0
end
OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
- message OldaleTown_PokemonCenter_1F_Text_1A1275
- waittext
+ message gText_NurseJoy_Pokerus
+ waitmessage
setflag 273
return
@@ -1501,13 +1501,13 @@ Std_ObtainItem: @ 819FDF7
return
Std_ObtainItem_: @ 819FE07
- bufferitem 1, 0x8000
+ getitemname 1, 0x8000
checkitemtype 0x8000
call GetItem_HandlePocket
compare 0x8007, 0x1
- callif 1, Std_ObtainItem_Success
+ call_if 1, Std_ObtainItem_Success
compare 0x8007, 0x0
- callif 1, Std_ObtainItem_Fail
+ call_if 1, Std_ObtainItem_Fail
return
GetItem_HandlePocket:
@@ -1520,39 +1520,39 @@ GetItem_HandlePocket:
end
GetItem_HandlePocket_Items:
- bufferstd 2, 0xE
+ getstdstring 2, 0xE
compare 0x8007, 1
- callif 1, PlayGetItemFanfare
+ call_if 1, PlayGetItemFanfare
return
GetItem_HandlePocket_KeyItems:
- bufferstd 2, 0xF
+ getstdstring 2, 0xF
compare 0x8007, 1
- callif 1, PlayGetItemFanfare
+ call_if 1, PlayGetItemFanfare
return
GetItem_HandlePocket_PokeBalls:
- bufferstd 2, 0x10
+ getstdstring 2, 0x10
compare 0x8007, 1
- callif 1, PlayGetItemFanfare
+ call_if 1, PlayGetItemFanfare
return
GetItem_HandlePocket_TMsHMs:
- bufferstd 2, 0x11
+ getstdstring 2, 0x11
compare 0x8007, 1
- callif 1, PlayGetTMHMFanfare
+ call_if 1, PlayGetTMHMFanfare
return
GetItem_HandlePocket_Berries:
- bufferstd 2, 0x12
+ getstdstring 2, 0x12
compare 0x8007, 1
- callif 1, PlayGetItemFanfare
+ call_if 1, PlayGetItemFanfare
return
Std_ObtainItem_Success: @ 819FEB7
message Message_ObtainedItem
waitfanfare
- waittext
+ waitmessage
msgbox Message_PutAwayItem
setvar RESULT, 1
return
@@ -1562,11 +1562,11 @@ Std_ObtainItem_Fail: @ 819FECC
return
PlayGetItemFanfare:
- fanfare 0x172
+ playfanfare 0x172
return
PlayGetTMHMFanfare:
- fanfare 0x174
+ playfanfare 0x174
return
Std_ObtainDecoration: @ 819FEDA
@@ -1576,18 +1576,18 @@ Std_ObtainDecoration: @ 819FEDA
return
Std_ObtainDecoration_: @ 819FEE8
- bufferdecor 1, 0x8000
+ getdecorname 1, 0x8000
compare 0x8007, 1
- callif 1, Std_ObtainDecoration_Success
+ call_if 1, Std_ObtainDecoration_Success
compare 0x8007, 0
- callif 1, Std_ObtainDecoration_Fail
+ call_if 1, Std_ObtainDecoration_Fail
return
Std_ObtainDecoration_Success: @ 819FF03
- fanfare 0x172
+ playfanfare 0x172
message Message_ObtainedDecoration
waitfanfare
- waittext
+ waitmessage
msgbox Message_TransferredToPC
setvar RESULT, 1
return
@@ -1599,24 +1599,24 @@ Std_ObtainDecoration_Fail: @ 819FF1B
Std_FindItem: @ 819FF21
lock
faceplayer
- checksound
+ waitse
additem 0x8000, 0x8001
copyvar 0x8007, RESULT
- bufferitem 1, 0x8000
+ getitemname 1, 0x8000
checkitemtype 0x8000
call GetItem_HandlePocket
compare 0x8007, 1
- callif 1, Std_FindItem_Success
+ call_if 1, Std_FindItem_Success
compare 0x8007, 0
- callif 1, Std_FindItem_Fail
+ call_if 1, Std_FindItem_Fail
release
return
Std_FindItem_Success: @ 819FF52
- disappear LAST_TALKED
+ removeobject LAST_TALKED
message Message_FoundOneItem
waitfanfare
- waittext
+ waitmessage
msgbox Message_PutAwayItem
return
@@ -1628,22 +1628,22 @@ Std_FindItem_Fail: @ 819FF65
HiddenItemScript:: @ 819FF7B
lockall
- checksound
+ waitse
additem 0x8005, 1
copyvar 0x8007, RESULT
- bufferitem 0x1, 0x8005
+ getitemname 0x1, 0x8005
checkitemtype 0x8005
call GetItem_HandlePocket
compare 0x8007, 1
- jumpeq HiddenItemScript_Success
+ goto_if_eq HiddenItemScript_Success
compare 0x8007, 0
- jumpeq HiddenItemScript_Fail
+ goto_if_eq HiddenItemScript_Fail
end
HiddenItemScript_Success:
message Message_FoundOneItem
waitfanfare
- waittext
+ waitmessage
msgbox Message_PutAwayItem
special SetFlagInVar
releaseall
@@ -1661,10 +1661,10 @@ UnusedMixRecordsScript: @ 819FFD5
faceplayer
msgbox UnusedMixRecordsPromptText, 5
compare RESULT, 1
- jumpeq UnusedMixRecordsScript_Yes
+ goto_if_eq UnusedMixRecordsScript_Yes
compare RESULT, 0
- jumpeq UnusedMixRecordsScript_Done
- jump UnusedMixRecordsScript_Done
+ goto_if_eq UnusedMixRecordsScript_Done
+ goto UnusedMixRecordsScript_Done
UnusedMixRecordsScript_Yes: @ 819FFFA
special sub_80B929C
waitstate
@@ -1672,7 +1672,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA
faceplayer
UnusedMixRecordsScript_Done: @ 81A0000
message UnusedMixRecordsSeeYouAgainText
- waittext
+ waitmessage
waitbutton
release
end
@@ -1681,17 +1681,17 @@ gUnknown_081A0009:: @ 81A0009
lockall
setvar 0x8004, 0
special DoPCTurnOnEffect
- playsfx 4
+ playse 4
msgbox UnknownString_81A09EC, 4
- jump EventScript_1A0023
+ goto EventScript_1A0023
end
EventScript_1A0023:
message gPCText_WhichPCShouldBeAccessed
- waittext
- special TryCreatePCMenu
+ waitmessage
+ special ScrSpecial_CreatePCMenu
waitstate
- jump EventScript_1A0033
+ goto EventScript_1A0033
end
EventScript_1A0033:
@@ -1704,23 +1704,23 @@ EventScript_1A0033:
end
EventScript_1A0070:
- playsfx 2
+ playse 2
msgbox UnknownString_81A0A54, 4
special PlayerPC
waitstate
- jump EventScript_1A0023
+ goto EventScript_1A0023
end
EventScript_1A0085:
- playsfx 2
+ playse 2
checkflag 2123
- callif 0, EventScript_1A00AC
+ call_if 0, EventScript_1A00AC
checkflag 2123
- callif 1, EventScript_1A00B5
+ call_if 1, EventScript_1A00B5
msgbox UnknownString_81A0A35, 4
special ShowPokemonStorageSystem
waitstate
- jump EventScript_1A0023
+ goto EventScript_1A0023
end
EventScript_1A00AC:
@@ -1733,18 +1733,18 @@ EventScript_1A00B5:
EventScript_1A00BE:
setvar 0x8004, 0
- playsfx 3
+ playse 3
special DoPCTurnOffEffect
releaseall
end
EventScript_1A00CB:
checkflag 2052
- jumpif 0, EventScript_1A00BE
- playsfx 2
+ goto_if 0, EventScript_1A00BE
+ playse 2
special AccessHallOfFamePC
waitstate
- jump EventScript_1A0033
+ goto EventScript_1A0033
end
FallarborTown_EventScript_1A00E1:: @ 81A00E1
@@ -1803,7 +1803,7 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB
DewfordTown_EventScript_1A0102:: @ 81A0102
DewfordTown_Hall_EventScript_1A0102:: @ 81A0102
- checkdailyflags
+ dodailyevents
setvar 0x8004, 0
special sub_80FA5BC
return
@@ -1816,17 +1816,17 @@ Route109_EventScript_1A010C:: @ 81A010C
return
UseSurfScript:: @ 81A0117
- checkattack MOVE_SURF
+ checkpokemove MOVE_SURF
compare RESULT, 6
- jumpeq UseSurfScript_NoMon
- bufferpartypoke 0, RESULT
- setanimation 0, RESULT
+ goto_if_eq UseSurfScript_NoMon
+ getpartypokename 0, RESULT
+ setfieldeffect 0, RESULT
lockall
msgbox UseSurfPromptText, 5
compare RESULT, 0
- jumpeq UseSurfScript_No
+ goto_if_eq UseSurfScript_No
msgbox UsedSurfText, 4
- doanimation 9
+ dofieldeffect 9
UseSurfScript_No: @ 81A014C
releaseall
UseSurfScript_NoMon: @ 81A014D
@@ -1841,11 +1841,11 @@ Route103_EventScript_1A014E:: @ 81A014E
Route110_EventScript_1A014E:: @ 81A014E
Route119_EventScript_1A014E:: @ 81A014E
RustboroCity_EventScript_1A014E:: @ 81A014E
- checkgender
+ checkplayergender
compare RESULT, 0
- jumpeq RustboroCity_EventScript_1A0166
+ goto_if_eq RustboroCity_EventScript_1A0166
compare RESULT, 1
- jumpeq RustboroCity_EventScript_1A016C
+ goto_if_eq RustboroCity_EventScript_1A016C
end
RustboroCity_EventScript_1A0166:: @ 81A0166
@@ -1859,11 +1859,11 @@ RustboroCity_EventScript_1A016C:: @ 81A016C
LavaridgeTown_EventScript_1A0172:: @ 81A0172
Route110_EventScript_1A0172:: @ 81A0172
Route119_EventScript_1A0172:: @ 81A0172
- checkgender
+ checkplayergender
compare RESULT, 0
- jumpeq LavaridgeTown_EventScript_1A018A
+ goto_if_eq LavaridgeTown_EventScript_1A018A
compare RESULT, 1
- jumpeq LavaridgeTown_EventScript_1A0190
+ goto_if_eq LavaridgeTown_EventScript_1A0190
end
LavaridgeTown_EventScript_1A018A:: @ 81A018A
@@ -1945,66 +1945,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
end
DewfordTown_Gym_EventScript_1A021E:: @ 81A021E
- cleartrainerflag OPPONENT_JOSH
- cleartrainerflag OPPONENT_TOMMY
+ settrainerflag OPPONENT_JOSH
+ settrainerflag OPPONENT_TOMMY
return
DewfordTown_Gym_EventScript_1A0225:: @ 81A0225
- cleartrainerflag OPPONENT_HIDEKI
- cleartrainerflag OPPONENT_TESSA
- cleartrainerflag OPPONENT_LAURA
+ settrainerflag OPPONENT_HIDEKI
+ settrainerflag OPPONENT_TESSA
+ settrainerflag OPPONENT_LAURA
return
DewfordTown_Gym_EventScript_1A022F:: @ 81A022F
- cleartrainerflag OPPONENT_KIRK
- cleartrainerflag OPPONENT_SHAWN
- cleartrainerflag OPPONENT_BEN
- cleartrainerflag OPPONENT_VIVIAN
+ settrainerflag OPPONENT_KIRK
+ settrainerflag OPPONENT_SHAWN
+ settrainerflag OPPONENT_BEN
+ settrainerflag OPPONENT_VIVIAN
return
DewfordTown_Gym_EventScript_1A023C:: @ 81A023C
- cleartrainerflag OPPONENT_COLE
- cleartrainerflag OPPONENT_AXLE
- cleartrainerflag OPPONENT_ANDY
- cleartrainerflag OPPONENT_ZANE
- cleartrainerflag OPPONENT_SADIE
+ settrainerflag OPPONENT_COLE
+ settrainerflag OPPONENT_AXLE
+ settrainerflag OPPONENT_ANDY
+ settrainerflag OPPONENT_ZANE
+ settrainerflag OPPONENT_SADIE
return
DewfordTown_Gym_EventScript_1A024C:: @ 81A024C
- cleartrainerflag OPPONENT_RANDALL
- cleartrainerflag OPPONENT_PARKER
- cleartrainerflag OPPONENT_GEORGE
- cleartrainerflag OPPONENT_BERKE
- cleartrainerflag OPPONENT_MARY
- cleartrainerflag OPPONENT_LORI
- cleartrainerflag OPPONENT_JODY
+ settrainerflag OPPONENT_RANDALL
+ settrainerflag OPPONENT_PARKER
+ settrainerflag OPPONENT_GEORGE
+ settrainerflag OPPONENT_BERKE
+ settrainerflag OPPONENT_MARY
+ settrainerflag OPPONENT_LORI
+ settrainerflag OPPONENT_JODY
return
DewfordTown_Gym_EventScript_1A0262:: @ 81A0262
- cleartrainerflag OPPONENT_JARED
- cleartrainerflag OPPONENT_TERRELL
- cleartrainerflag OPPONENT_KYLEE
- cleartrainerflag OPPONENT_WILL
+ settrainerflag OPPONENT_JARED
+ settrainerflag OPPONENT_TERRELL
+ settrainerflag OPPONENT_KYLEE
+ settrainerflag OPPONENT_WILL
return
DewfordTown_Gym_EventScript_1A026F:: @ 81A026F
- cleartrainerflag OPPONENT_PRESTON
- cleartrainerflag OPPONENT_VIRGIL
- cleartrainerflag OPPONENT_FRITZ
- cleartrainerflag OPPONENT_HANNAH
- cleartrainerflag OPPONENT_SAMANTHA
- cleartrainerflag OPPONENT_MAURA
+ settrainerflag OPPONENT_PRESTON
+ settrainerflag OPPONENT_VIRGIL
+ settrainerflag OPPONENT_FRITZ
+ settrainerflag OPPONENT_HANNAH
+ settrainerflag OPPONENT_SAMANTHA
+ settrainerflag OPPONENT_MAURA
return
DewfordTown_Gym_EventScript_1A0282:: @ 81A0282
- cleartrainerflag OPPONENT_ANDREA
- cleartrainerflag OPPONENT_CRISSY
- cleartrainerflag OPPONENT_BRIANNA_2
- cleartrainerflag OPPONENT_CONNIE
- cleartrainerflag OPPONENT_BRIDGET
- cleartrainerflag OPPONENT_OLIVIA
- cleartrainerflag OPPONENT_TIFFANY
- cleartrainerflag OPPONENT_MARISSA
+ settrainerflag OPPONENT_ANDREA
+ settrainerflag OPPONENT_CRISSY
+ settrainerflag OPPONENT_BRIANNA_2
+ settrainerflag OPPONENT_CONNIE
+ settrainerflag OPPONENT_BRIDGET
+ settrainerflag OPPONENT_OLIVIA
+ settrainerflag OPPONENT_TIFFANY
+ settrainerflag OPPONENT_MARISSA
return
DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
@@ -2101,7 +2101,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
- fanfare 369
+ playfanfare 369
waitfanfare
return
@@ -2110,9 +2110,9 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
fadescreen 1
- fanfare 368
+ playfanfare 368
waitfanfare
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
fadescreen 0
return
@@ -2129,37 +2129,37 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7
Route104_EventScript_1A02E7:: @ 81A02E7
Route109_EventScript_1A02E7:: @ 81A02E7
setflag 0x4001
- playmusic 431, 0
+ playbgm 431, 0
return
DewfordTown_EventScript_1A02EF:: @ 81A02EF
Route104_EventScript_1A02EF:: @ 81A02EF
Route109_EventScript_1A02EF:: @ 81A02EF
clearflag 0x4001
- fadedefault
+ fadedefaultbgm
return
LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4
Route101_EventScript_1A02F4:: @ 81A02F4
Route103_EventScript_1A02F4:: @ 81A02F4
compare 0x4085, 0
- jumpeq Route101_EventScript_1A14DC
+ goto_if_eq Route101_EventScript_1A14DC
compare 0x4049, 0
- callif 1, Route101_EventScript_1A0358
+ call_if 1, Route101_EventScript_1A0358
compare 0x4049, 1
- callif 1, Route101_EventScript_1A0358
+ call_if 1, Route101_EventScript_1A0358
compare 0x4049, 2
- callif 1, Route101_EventScript_1A0365
+ call_if 1, Route101_EventScript_1A0365
compare 0x4049, 3
- callif 1, Route101_EventScript_1A0365
+ call_if 1, Route101_EventScript_1A0365
compare 0x4049, 4
- callif 1, Route101_EventScript_1A0372
+ call_if 1, Route101_EventScript_1A0372
compare 0x4049, 5
- callif 1, Route101_EventScript_1A0372
+ call_if 1, Route101_EventScript_1A0372
compare 0x4049, 6
- callif 1, Route101_EventScript_1A0358
+ call_if 1, Route101_EventScript_1A0358
compare 0x4049, 7
- callif 1, Route101_EventScript_1A0358
+ call_if 1, Route101_EventScript_1A0358
return
Route101_EventScript_1A0358:: @ 81A0358
@@ -2190,7 +2190,7 @@ Route103_EventScript_1A037F:: @ 81A037F
faceplayer
msgbox Route101_Text_1C4449, 5
compare RESULT, 0
- jumpeq Route101_EventScript_1A039B
+ goto_if_eq Route101_EventScript_1A039B
call Route101_EventScript_1A03B0
release
end
@@ -2203,38 +2203,38 @@ Route101_EventScript_1A039B:: @ 81A039B
Route101_EventScript_1A03A5:: @ 81A03A5
copyvar 0x8004, 0x8009
special ShowPokedexRatingMessage
- waittext
+ waitmessage
waitbutton
return
EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0
Route101_EventScript_1A03B0:: @ 81A03B0
setvar 0x8004, 0
- specialval RESULT, ScriptGetPokedexInfo
+ specialvar RESULT, ScriptGetPokedexInfo
copyvar 0x8008, 0x8005
copyvar 0x8009, 0x8006
copyvar 0x800a, RESULT
- buffernum 0, 0x8008
- buffernum 1, 0x8009
+ getnumberstring 0, 0x8008
+ getnumberstring 1, 0x8009
msgbox Route101_Text_1C44DC, 4
call Route101_EventScript_1A03A5
compare 0x800a, 0
- jumpeq Route101_EventScript_1A14DC
+ goto_if_eq Route101_EventScript_1A14DC
setvar 0x8004, 1
- specialval RESULT, ScriptGetPokedexInfo
+ specialvar RESULT, ScriptGetPokedexInfo
copyvar 0x8008, 0x8005
copyvar 0x8009, 0x8006
- buffernum 0, 0x8008
- buffernum 1, 0x8009
+ getnumberstring 0, 0x8008
+ getnumberstring 1, 0x8009
msgbox Route101_Text_1C4B05, 4
return
BattleTower_Outside_EventScript_1A040E:: @ 81A040E
LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E
SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E
- pause 60
- move 0x8004, SlateportCity_Harbor_Movement_1A041C
- waitmove 0
+ delay 60
+ applymovement 0x8004, SlateportCity_Harbor_Movement_1A041C
+ waitmovement 0
return
SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
@@ -2260,8 +2260,8 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
return
RusturfTunnel_EventScript_1A0442:: @ 81A0442
- disappear 1
- disappear 10
+ removeobject 1
+ removeobject 10
clearflag 808
clearflag 984
setvar 0x409a, 6
@@ -2269,14 +2269,14 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442
return
EventScript_1A0457: @ unreferenced?
- pause 30
- move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
- waitmove 0
- spritevisible 255, 0, 0
- pause 30
- move 255, Movement_1A047A
- waitmove 0
- pause 30
+ delay 30
+ applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
+ waitmovement 0
+ showobject 255, 0, 0
+ delay 30
+ applymovement 255, Movement_1A047A
+ waitmovement 0
+ delay 30
return
Movement_1A047A:
@@ -2286,18 +2286,18 @@ Movement_1A047A:
BattleTower_Outside_EventScript_1A047C:: @ 81A047C
SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
compare FACING, 1
- callif 1, BattleTower_Outside_EventScript_160B2F
+ call_if 1, BattleTower_Outside_EventScript_160B2F
compare FACING, 3
- callif 1, BattleTower_Outside_EventScript_160B3A
- pause 30
- spriteinvisible 255, 0, 0
+ call_if 1, BattleTower_Outside_EventScript_160B3A
+ delay 30
+ hideobject 255, 0, 0
call BattleTower_Outside_EventScript_1A040E
return
CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0
lockall
- checksound
- pokecry SPECIES_GROUDON_OR_KYOGRE, 2
+ waitse
+ playpokecry SPECIES_GROUDON_OR_KYOGRE, 2
waitpokecry
setvar 0x4005, 1
releaseall
@@ -2309,20 +2309,20 @@ CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF
CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF
lockall
setvar 0x4001, 1
- jump CaveOfOrigin_1F_EventScript_1A04D3
+ goto CaveOfOrigin_1F_EventScript_1A04D3
end
CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB
CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB
lockall
setvar 0x4002, 1
- jump CaveOfOrigin_B2F_EventScript_1A04D3
+ goto CaveOfOrigin_B2F_EventScript_1A04D3
end
@ 81A04C7
lockall
setvar 0x4003, 1
- jump CaveOfOrigin_B2F_EventScript_1A04D3
+ goto CaveOfOrigin_B2F_EventScript_1A04D3
end
CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3
@@ -2351,9 +2351,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
- checksound
- pokecry SPECIES_ELECTRODE, 2
- pause 40
+ waitse
+ playpokecry SPECIES_ELECTRODE, 2
+ delay 40
waitpokecry
setflag 977
setflag 2145
@@ -2367,9 +2367,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
- checksound
- pokecry SPECIES_ELECTRODE, 2
- pause 40
+ waitse
+ playpokecry SPECIES_ELECTRODE, 2
+ delay 40
waitpokecry
setflag 978
setflag 2145
@@ -2382,56 +2382,56 @@ Route120_EventScript_1A0539:: @ 81A0539
lock
faceplayer
setvar 0x8004, 1
- jump Route120_EventScript_1A0594
+ goto Route120_EventScript_1A0594
end
Route120_EventScript_1A0546:: @ 81A0546
lock
faceplayer
setvar 0x8004, 2
- jump Route120_EventScript_1A0594
+ goto Route120_EventScript_1A0594
end
Route120_EventScript_1A0553:: @ 81A0553
lock
faceplayer
setvar 0x8004, 3
- jump Route120_EventScript_1A0594
+ goto Route120_EventScript_1A0594
end
Route120_EventScript_1A0560:: @ 81A0560
lock
faceplayer
setvar 0x8004, 4
- jump Route120_EventScript_1A0594
+ goto Route120_EventScript_1A0594
end
Route120_EventScript_1A056D:: @ 81A056D
lock
faceplayer
setvar 0x8004, 5
- jump Route120_EventScript_1A0594
+ goto Route120_EventScript_1A0594
end
Route119_EventScript_1A057A:: @ 81A057A
lock
faceplayer
setvar 0x8004, 6
- jump Route119_EventScript_1A0594
+ goto Route119_EventScript_1A0594
end
Route119_EventScript_1A0587:: @ 81A0587
lock
faceplayer
setvar 0x8004, 7
- jump Route119_EventScript_1A0594
+ goto Route119_EventScript_1A0594
end
Route119_EventScript_1A0594:: @ 81A0594
Route120_EventScript_1A0594:: @ 81A0594
checkitem ITEM_DEVON_SCOPE, 1
compare RESULT, 1
- jumpeq Route119_EventScript_1A05AE
+ goto_if_eq Route119_EventScript_1A05AE
msgbox Route119_Text_171B93, 4
release
end
@@ -2439,36 +2439,36 @@ Route120_EventScript_1A0594:: @ 81A0594
Route119_EventScript_1A05AE:: @ 81A05AE
msgbox Route119_Text_171BB6, 5
compare RESULT, 1
- jumpeq Route119_EventScript_1A05C3
+ goto_if_eq Route119_EventScript_1A05C3
release
end
Route119_EventScript_1A05C3:: @ 81A05C3
msgbox Route119_Text_171BF6, 4
- closebutton
- move LAST_TALKED, Route119_Movement_1A0839
- waitmove 0
- move LAST_TALKED, Route119_Movement_1A0662
- waitmove 0
- checksound
- pokecry SPECIES_KECLEON, 2
- pause 40
+ closemessage
+ applymovement LAST_TALKED, Route119_Movement_1A0839
+ waitmovement 0
+ applymovement LAST_TALKED, Route119_Movement_1A0662
+ waitmovement 0
+ waitse
+ playpokecry SPECIES_KECLEON, 2
+ delay 40
waitpokecry
setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
compare 0x8004, 1
- callif 1, Route119_EventScript_1A0646
+ call_if 1, Route119_EventScript_1A0646
compare 0x8004, 2
- callif 1, Route119_EventScript_1A064A
+ call_if 1, Route119_EventScript_1A064A
compare 0x8004, 3
- callif 1, Route119_EventScript_1A064E
+ call_if 1, Route119_EventScript_1A064E
compare 0x8004, 4
- callif 1, Route119_EventScript_1A0652
+ call_if 1, Route119_EventScript_1A0652
compare 0x8004, 5
- callif 1, Route119_EventScript_1A0656
+ call_if 1, Route119_EventScript_1A0656
compare 0x8004, 6
- callif 1, Route119_EventScript_1A065A
+ call_if 1, Route119_EventScript_1A065A
compare 0x8004, 7
- callif 1, Route119_EventScript_1A065E
+ call_if 1, Route119_EventScript_1A065E
setflag 2145
dowildbattle
clearflag 2145
@@ -2542,10 +2542,10 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F
GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
MtPyre_Summit_EventScript_1A067F:: @ 81A067F
SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
- bufferitem 0, 0x8004
- fanfare 372
+ getitemname 0, 0x8004
+ playfanfare 372
message FallarborTown_House1_Text_1A1498
- waittext
+ waitmessage
waitfanfare
removeitem 0x8004, 1
return
@@ -2554,9 +2554,9 @@ EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693
EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693
EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693
EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
- move 255, EverGrandeCity_SidneysRoom_Movement_1A0853
- waitmove 0
- playsfx 8
+ applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853
+ waitmovement 0
+ playse 8
setmaptile 6, 1, 836, 0
setmaptile 6, 2, 837, 0
setmaptile 0, 2, 734, 1
@@ -2576,9 +2576,9 @@ EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710
EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710
EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710
EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
- move 255, EverGrandeCity_SidneysRoom_Movement_1A0847
- waitmove 0
- playsfx 52
+ applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847
+ waitmovement 0
+ playse 52
setmaptile 5, 12, 518, 1
setmaptile 6, 12, 518, 1
setmaptile 7, 12, 518, 1
@@ -2986,16 +2986,16 @@ UnknownString_81A0A54: @ 81A0A54
UnknownString_81A0A66: @ 81A0A66
.string "Verbindung zu LANETTES PC hergestellt.$"
-OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
+gText_NurseJoy_Welcome:: @ 81A0A7D
.string "Willkommen im POKéMON-CENTER!\p"
.string "Wir heilen deine POKéMON und\n"
.string "machen sie wieder fit.\p"
.string "O.K. Wir benötigen deine POKéMON.$"
-OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
.string "Komm jederzeit wieder vorbei!$"
-OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
.string "Danke!\p"
.string "Deine POKéMON sind wieder topfit!$"
@@ -3214,11 +3214,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
.string "nehmen und dir unter der Hand tolle\l"
.string "Sachen verkaufen.$"
-OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
+gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
.string "Okay, ich nehme deine POKéMON für einen\n"
.string "Moment in meine Obhut.$"
-OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
+gText_NurseJoy_Pokerus:: @ 81A1275
.string "Dein POKéMON scheint von dem\n"
.string "POKéRUS befallen zu sein.\p"
.string "Über den POKéRUS ist bisher wenig be-\n"
@@ -3264,13 +3264,13 @@ gUnknown_081A14B8:: @ 81A14B8
special ExecuteWhiteOut
waitstate
compare RESULT, 1
- jumpeq EventScript_1A14CA
+ goto_if_eq EventScript_1A14CA
releaseall
end
EventScript_1A14CA::
message UnknownString_81A1141
- waittext
+ waitmessage
waitbutton
special sub_8081924
waitstate
@@ -3619,44 +3619,44 @@ gUnknown_081A2C51:: @ 81A2C51
special sub_80BB70C
special sub_80BB63C
compare RESULT, 1
- jumpeq EventScript_1A2E45
- checkattack MOVE_SECRET_POWER
- setanimation 0, RESULT
- bufferattack 1, MOVE_SECRET_POWER
+ goto_if_eq EventScript_1A2E45
+ checkpokemove MOVE_SECRET_POWER
+ setfieldeffect 0, RESULT
+ getmovename 1, MOVE_SECRET_POWER
compare 0x8007, 1
- jumpeq EventScript_1A2CB0
+ goto_if_eq EventScript_1A2CB0
compare 0x8007, 2
- jumpeq EventScript_1A2CB0
+ goto_if_eq EventScript_1A2CB0
compare 0x8007, 3
- jumpeq EventScript_1A2CB0
+ goto_if_eq EventScript_1A2CB0
compare 0x8007, 4
- jumpeq EventScript_1A2CB0
+ goto_if_eq EventScript_1A2CB0
compare 0x8007, 5
- jumpeq EventScript_1A2D08
+ goto_if_eq EventScript_1A2D08
compare 0x8007, 6
- jumpeq EventScript_1A2D60
+ goto_if_eq EventScript_1A2D60
end
EventScript_1A2CB0:
lockall
compare RESULT, 6
- jumpeq EventScript_1A2CF1
- bufferpartypoke 0, RESULT
+ goto_if_eq EventScript_1A2CF1
+ getpartypokename 0, RESULT
msgbox UnknownString_8198F34, 5
compare RESULT, 0
- jumpeq EventScript_1A2F3A
+ goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
- closebutton
- doanimation 11
+ closemessage
+ dofieldeffect 11
waitstate
- jump EventScript_1A2CFA
+ goto EventScript_1A2CFA
end
gUnknown_081A2CE6:: @ 81A2CE6
lockall
- doanimation 11
+ dofieldeffect 11
waitstate
- jump EventScript_1A2CFA
+ goto EventScript_1A2CFA
end
EventScript_1A2CF1:
@@ -3665,29 +3665,29 @@ EventScript_1A2CF1:
EventScript_1A2CFA:
msgbox UnknownString_8198F6E, 4
- jump EventScript_1A2DB8
+ goto EventScript_1A2DB8
end
EventScript_1A2D08:
lockall
compare RESULT, 6
- jumpeq EventScript_1A2D49
- bufferpartypoke 0, RESULT
+ goto_if_eq EventScript_1A2D49
+ getpartypokename 0, RESULT
msgbox UnknownString_81A197B, 5
compare RESULT, 0
- jumpeq EventScript_1A2F3A
+ goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
- closebutton
- doanimation 26
+ closemessage
+ dofieldeffect 26
waitstate
- jump EventScript_1A2D52
+ goto EventScript_1A2D52
end
gUnknown_081A2D3E:: @ 81A2D3E
lockall
- doanimation 26
+ dofieldeffect 26
waitstate
- jump EventScript_1A2D52
+ goto EventScript_1A2D52
end
EventScript_1A2D49:
@@ -3696,29 +3696,29 @@ EventScript_1A2D49:
EventScript_1A2D52:
msgbox UnknownString_81A19C4, 4
- jump EventScript_1A2DB8
+ goto EventScript_1A2DB8
end
EventScript_1A2D60:
lockall
compare RESULT, 6
- jumpeq EventScript_1A2DA1
- bufferpartypoke 0, RESULT
+ goto_if_eq EventScript_1A2DA1
+ getpartypokename 0, RESULT
msgbox UnknownString_81A1A4B, 5
compare RESULT, 0
- jumpeq EventScript_1A2F3A
+ goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
- closebutton
- doanimation 27
+ closemessage
+ dofieldeffect 27
waitstate
- jump EventScript_1A2DAA
+ goto EventScript_1A2DAA
end
gUnknown_081A2D96:: @ 81A2D96
lockall
- doanimation 27
+ dofieldeffect 27
waitstate
- jump EventScript_1A2DAA
+ goto EventScript_1A2DAA
end
EventScript_1A2DA1:
@@ -3727,12 +3727,12 @@ EventScript_1A2DA1:
EventScript_1A2DAA:
msgbox UnknownString_81A1AA9, 4
- jump EventScript_1A2DB8
+ goto EventScript_1A2DB8
end
EventScript_1A2DB8:
- closebutton
- playsfx 9
+ closemessage
+ playse 9
setvar 0x4097, 0
setflag 173
special sub_80BB8CC
@@ -3745,19 +3745,19 @@ EventScript_1A2DB8:
end
SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
- move 255, SecretBase_RedCave1_Movement_1A2E11
- waitmove 0
+ applymovement 255, SecretBase_RedCave1_Movement_1A2E11
+ waitmovement 0
setvar 0x4097, 1
msgbox SecretBase_RedCave1_Text_198F89, 5
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A2E08
- closebutton
- playsfx 9
+ goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
+ closemessage
+ playse 9
special sub_80BC440
end
SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
- closebutton
+ closemessage
setflag 96
special sub_80BBC78
waitstate
@@ -3771,10 +3771,10 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
gUnknown_081A2E14:: @ 81A2E14
lockall
setvar 0x4097, 1
- playsfx 9
+ playse 9
special sub_80BC114
compare RESULT, 0
- jumpeq EventScript_1A2E38
+ goto_if_eq EventScript_1A2E38
clearflag 173
special sub_80BBAF0
setvar 0x4089, 0
@@ -3789,63 +3789,63 @@ EventScript_1A2E38:
end
EventScript_1A2E45:
- checkattack MOVE_SECRET_POWER
+ checkpokemove MOVE_SECRET_POWER
compare RESULT, 6
- jumpeq EventScript_1A2EF7
- setanimation 0, RESULT
+ goto_if_eq EventScript_1A2EF7
+ setfieldeffect 0, RESULT
setorcopyvar 0x8004, RESULT
lockall
special GetSecretBaseNearbyMapName
msgbox UnknownString_81A3C71, 5
compare RESULT, 0
- jumpeq EventScript_1A2F3A
+ goto_if_eq EventScript_1A2F3A
msgbox UnknownString_81A38FB, 5
compare RESULT, 0
- jumpeq EventScript_1A2F3A
+ goto_if_eq EventScript_1A2F3A
fadescreen 1
special sub_80BC50C
- closebutton
+ closemessage
fadescreen 0
msgbox UnknownString_81A3CC9, 5
compare RESULT, 0
- jumpeq EventScript_1A2F3A
- bufferpartypoke 0, 0x8004
- bufferattack 1, MOVE_SECRET_POWER
+ goto_if_eq EventScript_1A2F3A
+ getpartypokename 0, 0x8004
+ getmovename 1, MOVE_SECRET_POWER
msgbox UsedCutRockSmashText, 4
- closebutton
- closebutton
+ closemessage
+ closemessage
compare 0x8007, 1
- jumpeq gUnknown_081A2CE6
+ goto_if_eq gUnknown_081A2CE6
compare 0x8007, 2
- jumpeq gUnknown_081A2CE6
+ goto_if_eq gUnknown_081A2CE6
compare 0x8007, 3
- jumpeq gUnknown_081A2CE6
+ goto_if_eq gUnknown_081A2CE6
compare 0x8007, 4
- jumpeq gUnknown_081A2CE6
+ goto_if_eq gUnknown_081A2CE6
compare 0x8007, 5
- jumpeq gUnknown_081A2D3E
+ goto_if_eq gUnknown_081A2D3E
compare 0x8007, 6
- jumpeq gUnknown_081A2D96
+ goto_if_eq gUnknown_081A2D96
releaseall
end
EventScript_1A2EF7::
compare 0x8007, 1
- jumpeq EventScript_1A2CF1
+ goto_if_eq EventScript_1A2CF1
compare 0x8007, 2
- jumpeq EventScript_1A2CF1
+ goto_if_eq EventScript_1A2CF1
compare 0x8007, 3
- jumpeq EventScript_1A2CF1
+ goto_if_eq EventScript_1A2CF1
compare 0x8007, 4
- jumpeq EventScript_1A2CF1
+ goto_if_eq EventScript_1A2CF1
compare 0x8007, 5
- jumpeq EventScript_1A2D49
+ goto_if_eq EventScript_1A2D49
compare 0x8007, 6
- jumpeq EventScript_1A2DA1
+ goto_if_eq EventScript_1A2DA1
end
EventScript_1A2F3A::
- closebutton
+ closemessage
releaseall
end
@@ -3879,7 +3879,7 @@ SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68
gUnknown_081A2F7B:: @ 81A2F7B
setvar 0x8005, 0
- jump EventScript_1A2F86
+ goto EventScript_1A2F86
end
EventScript_1A2F86:
@@ -3888,19 +3888,19 @@ EventScript_1A2F86:
gUnknown_081A2F8A:: @ 81A2F8A
setvar 0x8004, 0
- jump EventScript_1A2F95
+ goto EventScript_1A2F95
end
EventScript_1A2F95:
special sub_8100A7C
compare RESULT, 1
- jumpeq EventScript_1A2FBF
+ goto_if_eq EventScript_1A2FBF
addvar 0x8004, 1
compare 0x8005, 0
- jumpeq EventScript_1A2F95
- disappear 0x8006
+ goto_if_eq EventScript_1A2F95
+ removeobject 0x8006
setflag 0x8005
- jump EventScript_1A2F95
+ goto EventScript_1A2F95
end
EventScript_1A2FBF:
@@ -3932,45 +3932,45 @@ SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0
SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
special sub_80BCE90
compare 0x8004, 0
- jumpeq SecretBase_RedCave1_EventScript_1A3032
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3032
compare 0x8004, 1
- jumpeq SecretBase_RedCave1_EventScript_1A30AE
+ goto_if_eq SecretBase_RedCave1_EventScript_1A30AE
compare 0x8004, 2
- jumpeq SecretBase_RedCave1_EventScript_1A312A
+ goto_if_eq SecretBase_RedCave1_EventScript_1A312A
compare 0x8004, 3
- jumpeq SecretBase_RedCave1_EventScript_1A31A6
+ goto_if_eq SecretBase_RedCave1_EventScript_1A31A6
compare 0x8004, 4
- jumpeq SecretBase_RedCave1_EventScript_1A3222
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3222
compare 0x8004, 5
- jumpeq SecretBase_RedCave1_EventScript_1A329E
+ goto_if_eq SecretBase_RedCave1_EventScript_1A329E
compare 0x8004, 6
- jumpeq SecretBase_RedCave1_EventScript_1A331A
+ goto_if_eq SecretBase_RedCave1_EventScript_1A331A
compare 0x8004, 7
- jumpeq SecretBase_RedCave1_EventScript_1A3396
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3396
compare 0x8004, 8
- jumpeq SecretBase_RedCave1_EventScript_1A3412
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3412
compare 0x8004, 9
- jumpeq SecretBase_RedCave1_EventScript_1A348E
+ goto_if_eq SecretBase_RedCave1_EventScript_1A348E
end
SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A3086
+ goto_if 0, SecretBase_RedCave1_EventScript_1A3086
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A30A5
+ goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A1AEA, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A308F
+ goto_if_eq SecretBase_RedCave1_EventScript_1A308F
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A308F
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A308F
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1B83, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
@@ -3980,7 +3980,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1B97, 2
end
@@ -3990,22 +3990,22 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A3102
+ goto_if 0, SecretBase_RedCave1_EventScript_1A3102
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A3121
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3121
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A1E67, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A310B
+ goto_if_eq SecretBase_RedCave1_EventScript_1A310B
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A310B
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A310B
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1F04, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
@@ -4015,7 +4015,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1F2E, 2
end
@@ -4025,22 +4025,22 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A317E
+ goto_if 0, SecretBase_RedCave1_EventScript_1A317E
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A319D
+ goto_if_eq SecretBase_RedCave1_EventScript_1A319D
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A218F, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A3187
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3187
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A3187
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3187
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2220, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
@@ -4050,7 +4050,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2230, 2
end
@@ -4060,22 +4060,22 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A31FA
+ goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A3219
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3219
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A24E1, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A3203
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3203
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A3203
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3203
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A256F, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
@@ -4085,7 +4085,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A258A, 2
end
@@ -4095,22 +4095,22 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A3276
+ goto_if 0, SecretBase_RedCave1_EventScript_1A3276
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A3295
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3295
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A2830, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A327F
+ goto_if_eq SecretBase_RedCave1_EventScript_1A327F
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A327F
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A327F
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A28D7, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
@@ -4120,7 +4120,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A28F4, 2
end
@@ -4130,22 +4130,22 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A32F2
+ goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A3311
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3311
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A1CB2, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A32FB
+ goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A32FB
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1D48, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
@@ -4155,7 +4155,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1D59, 2
end
@@ -4165,22 +4165,22 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A336E
+ goto_if 0, SecretBase_RedCave1_EventScript_1A336E
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A338D
+ goto_if_eq SecretBase_RedCave1_EventScript_1A338D
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A2026, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A3377
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3377
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A3377
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3377
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2095, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
@@ -4190,7 +4190,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A20AE, 2
end
@@ -4200,22 +4200,22 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A33EA
+ goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A3409
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3409
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A236A, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A33F3
+ goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A33F3
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2405, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
@@ -4225,7 +4225,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2420, 2
end
@@ -4235,22 +4235,22 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A3466
+ goto_if 0, SecretBase_RedCave1_EventScript_1A3466
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A3485
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3485
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A2663, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A346F
+ goto_if_eq SecretBase_RedCave1_EventScript_1A346F
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A346F
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A346F
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2710, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
@@ -4260,7 +4260,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2736, 2
end
@@ -4270,22 +4270,22 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
checkflag 2052
- jumpif 0, SecretBase_RedCave1_EventScript_1A34E2
+ goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
compare RESULT, 1
- jumpeq SecretBase_RedCave1_EventScript_1A3501
+ goto_if_eq SecretBase_RedCave1_EventScript_1A3501
lock
faceplayer
msgbox SecretBase_RedCave1_Text_1A2A13, 5
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A34EB
+ goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
- jumpeq SecretBase_RedCave1_EventScript_1A34EB
- hidebox 0, 0, 15, 10
+ goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2AE2, 4
- jump SecretBase_RedCave1_EventScript_1A350A
+ goto SecretBase_RedCave1_EventScript_1A350A
end
SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
@@ -4295,7 +4295,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB
setvar RESULT, 0
special sub_80BCE4C
- hidebox 0, 0, 15, 10
+ erasebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2AFB, 2
end
@@ -4309,7 +4309,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
setvar 0x8005, 0
special sub_813556C
waitstate
- special HealPlayerParty
+ special ScrSpecial_HealPlayerParty
release
end
@@ -4406,7 +4406,7 @@ FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46
SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46
SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46
special sub_80BDE48
- inccounter GAME_STAT_GOT_INTERVIEWED
+ incrementgamestat GAME_STAT_GOT_INTERVIEWED
release
end
@@ -4414,13 +4414,13 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D
setvar 0x8005, 1
special sub_80BF2C4
compare RESULT, 1
- jumpeq SlateportCity_PokemonFanClub_EventScript_1ADED6
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6
copyvar 0x8009, 0x8006
msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5
compare RESULT, 1
- jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE84
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84
compare RESULT, 0
- jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEB9
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9
end
SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84
@@ -4432,9 +4432,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84
lock
faceplayer
compare RESULT, 1
- jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEC3
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEC3
compare RESULT, 0
- jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEB9
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9
end
SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9
@@ -4445,7 +4445,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9
SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3
msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4
setvar 0x8005, 1
- jump SlateportCity_PokemonFanClub_EventScript_1ADE46
+ goto SlateportCity_PokemonFanClub_EventScript_1ADE46
end
SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6
@@ -4459,24 +4459,24 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
setvar 0x8005, 2
special sub_80BF2C4
compare RESULT, 1
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
copyvar 0x8009, 0x8006
checkflag 105
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
setflag 105
msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5
compare RESULT, 1
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
compare RESULT, 0
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
end
SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25
msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5
compare RESULT, 1
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
compare RESULT, 0
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
end
SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44
@@ -4488,9 +4488,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44
lock
faceplayer
compare RESULT, 1
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83
compare RESULT, 0
- jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
+ goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
end
SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79
@@ -4501,7 +4501,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79
SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83
msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4
setvar 0x8005, 2
- jump SlateportCity_OceanicMuseum_1F_EventScript_1ADE46
+ goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46
end
SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96
@@ -4512,19 +4512,19 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96
SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0
lock
faceplayer
- specialval RESULT, sub_80BF544
+ specialvar RESULT, sub_80BF544
compare RESULT, 0
- jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE4D
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D
setvar 0x8005, 3
special sub_80BF2C4
compare RESULT, 1
- jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0AC
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC
copyvar 0x8009, 0x8006
msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5
compare RESULT, 1
- jumpeq SlateportCity_PokemonFanClub_EventScript_1ADFE9
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9
compare RESULT, 0
- jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
end
SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9
@@ -4539,17 +4539,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9
SlateportCity_PokemonFanClub_EventScript_1AE020:: @ 81AE020
msgbox SlateportCity_PokemonFanClub_Text_1A8414, 4
- jump SlateportCity_PokemonFanClub_EventScript_1AE04A
+ goto SlateportCity_PokemonFanClub_EventScript_1AE04A
end
SlateportCity_PokemonFanClub_EventScript_1AE02E:: @ 81AE02E
msgbox SlateportCity_PokemonFanClub_Text_1A8470, 4
- jump SlateportCity_PokemonFanClub_EventScript_1AE04A
+ goto SlateportCity_PokemonFanClub_EventScript_1AE04A
end
SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C
msgbox SlateportCity_PokemonFanClub_Text_1A84D5, 4
- jump SlateportCity_PokemonFanClub_EventScript_1AE04A
+ goto SlateportCity_PokemonFanClub_EventScript_1AE04A
end
SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A
@@ -4560,18 +4560,18 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A
lock
faceplayer
compare RESULT, 0
- jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4
setvar 0x8006, 1
call SlateportCity_PokemonFanClub_EventScript_1A00F3
lock
faceplayer
compare RESULT, 0
- jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2
+ goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4
copyvar 0x8007, 0x800a
setvar 0x8005, 3
- jump SlateportCity_PokemonFanClub_EventScript_1ADE46
+ goto SlateportCity_PokemonFanClub_EventScript_1ADE46
end
SlateportCity_PokemonFanClub_EventScript_1AE0A2:: @ 81AE0A2
@@ -4591,17 +4591,17 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
lock
faceplayer
checkflag 2
- jumpeq FallarborTown_ContestLobby_EventScript_1AE17E
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
setvar 0x8005, 6
special sub_80BF2C4
compare RESULT, 1
- jumpeq FallarborTown_ContestLobby_EventScript_1AE17E
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
copyvar 0x8009, 0x8006
msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5
compare RESULT, 1
- jumpeq FallarborTown_ContestLobby_EventScript_1AE0F8
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8
compare RESULT, 0
- jumpeq FallarborTown_ContestLobby_EventScript_1AE12D
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
end
FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8
@@ -4613,9 +4613,9 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8
lock
faceplayer
compare RESULT, 1
- jumpeq FallarborTown_ContestLobby_EventScript_1AE137
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE137
compare RESULT, 0
- jumpeq FallarborTown_ContestLobby_EventScript_1AE12D
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
end
FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D
@@ -4634,11 +4634,11 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137
lock
faceplayer
compare RESULT, 0
- jumpeq FallarborTown_ContestLobby_EventScript_1AE12D
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
msgbox FallarborTown_ContestLobby_Text_1A7153, 4
setflag 2
setvar 0x8005, 6
- jump FallarborTown_ContestLobby_EventScript_1ADE46
+ goto FallarborTown_ContestLobby_EventScript_1ADE46
end
FallarborTown_ContestLobby_EventScript_1AE17E:: @ 81AE17E
@@ -4651,11 +4651,11 @@ LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188
SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188
VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
compare 0x4086, 2
- jumpif 5, FallarborTown_ContestLobby_EventScript_1AE1FE
+ goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE
setvar 0x8005, 6
special sub_80BF2C4
compare RESULT, 1
- jumpeq FallarborTown_ContestLobby_EventScript_1AE1FE
+ goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE
switch 0x4088
case 0, FallarborTown_ContestLobby_EventScript_1AE1FE
case 2, FallarborTown_ContestLobby_EventScript_1AE1EE
@@ -4688,28 +4688,28 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
lock
faceplayer
checkflag 2
- jumpeq BattleTower_Lobby_EventScript_1AE2E3
+ goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
setvar 0x8005, 7
special sub_80BF2C4
compare RESULT, 1
- jumpeq BattleTower_Lobby_EventScript_1AE2E3
+ goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
copyvar 0x8009, 0x8006
msgbox BattleTower_Lobby_Text_1A776D, 5
compare RESULT, 1
- jumpeq BattleTower_Lobby_EventScript_1AE241
+ goto_if_eq BattleTower_Lobby_EventScript_1AE241
compare RESULT, 0
- jumpeq BattleTower_Lobby_EventScript_1AE297
+ goto_if_eq BattleTower_Lobby_EventScript_1AE297
end
BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
message BattleTower_Lobby_Text_1A7823
- waittext
+ waitmessage
multichoice 19, 8, 45, 1
copyvar 0x8008, RESULT
compare RESULT, 0
- callif 1, BattleTower_Lobby_EventScript_1AE2A1
+ call_if 1, BattleTower_Lobby_EventScript_1AE2A1
compare RESULT, 1
- callif 1, BattleTower_Lobby_EventScript_1AE2AA
+ call_if 1, BattleTower_Lobby_EventScript_1AE2AA
msgbox BattleTower_Lobby_Text_1A79EB, 4
setvar 0x8004, 12
copyvar 0x8005, 0x8009
@@ -4717,9 +4717,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
lock
faceplayer
compare RESULT, 1
- jumpeq BattleTower_Lobby_EventScript_1AE2B3
+ goto_if_eq BattleTower_Lobby_EventScript_1AE2B3
compare RESULT, 0
- jumpeq BattleTower_Lobby_EventScript_1AE2D9
+ goto_if_eq BattleTower_Lobby_EventScript_1AE2D9
end
BattleTower_Lobby_EventScript_1AE297:: @ 81AE297
@@ -4737,12 +4737,12 @@ BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA
BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3
compare RESULT, 0
- jumpeq BattleTower_Lobby_EventScript_1AE2D9
+ goto_if_eq BattleTower_Lobby_EventScript_1AE2D9
msgbox BattleTower_Lobby_Text_1A7A6E, 4
setflag 2
copyvar 0x8004, 0x8008
setvar 0x8005, 7
- jump BattleTower_Lobby_EventScript_1ADE46
+ goto BattleTower_Lobby_EventScript_1ADE46
end
BattleTower_Lobby_EventScript_1AE2D9:: @ 81AE2D9
@@ -4757,11 +4757,11 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3
BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED
compare 0x40bc, 0
- jumpeq BattleTower_Lobby_EventScript_1AE30F
+ goto_if_eq BattleTower_Lobby_EventScript_1AE30F
setvar 0x8005, 7
special sub_80BF2C4
compare RESULT, 1
- jumpeq BattleTower_Lobby_EventScript_1AE30F
+ goto_if_eq BattleTower_Lobby_EventScript_1AE30F
clearflag 918
return
@@ -4771,16 +4771,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
.include "data/scripts/gabby_and_ty.inc"
- .include "data/scripts/bard.inc"
- .include "data/scripts/hipster.inc"
- .include "data/text/trader.inc"
- .include "data/scripts/trader.inc"
- .include "data/text/storyteller.inc"
- .include "data/scripts/storyteller.inc"
- .include "data/text/giddy.inc"
- .include "data/scripts/giddy.inc"
- .include "data/text/bard.inc"
- .include "data/text/hipster.inc"
+ .include "data/scripts/mauville_man.inc"
.include "data/field_move_scripts.inc"
.include "data/item_ball_scripts.inc"
@@ -4804,13 +4795,13 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
.include "data/text/magma_summit.inc"
gUnknown_081B694A:: @ 81B694A
- lighten 1
- darken 1
+ animdarklevel 1
+ setdarklevel 1
end
.include "data/scripts/players_house.inc"
-Event_RunningShoesManual:: @ 81B6E5A
+S_RunningShoesManual:: @ 81B6E5A
msgbox UnknownString_81728E3, 3
end
@@ -4819,7 +4810,7 @@ Event_RunningShoesManual:: @ 81B6E5A
.include "data/text/trainers.inc"
-Event_RepelWoreOff:: @ 81C33E6
+S_RepelWoreOff:: @ 81C33E6
msgbox Text_RepelWoreOff, 3
end
@@ -4832,25 +4823,25 @@ Text_RepelWoreOff: @ 81C33EF
MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E
checkitem ITEM_COIN_CASE, 1
compare RESULT, 0
- jumpeq MauvilleCity_GameCorner_EventScript_1572B5
+ goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 0
- event_96 2
+ getpricereduction 2
compare RESULT, 0
- jumpeq MauvilleCity_GameCorner_EventScript_1C40DA
+ goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
addvar 0x8004, 128
- jump MauvilleCity_GameCorner_EventScript_1C40DA
+ goto MauvilleCity_GameCorner_EventScript_1C40DA
end
MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC
checkitem ITEM_COIN_CASE, 1
compare RESULT, 0
- jumpeq MauvilleCity_GameCorner_EventScript_1572B5
+ goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 1
- event_96 2
+ getpricereduction 2
compare RESULT, 0
- jumpeq MauvilleCity_GameCorner_EventScript_1C40DA
+ goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
addvar 0x8004, 128
- jump MauvilleCity_GameCorner_EventScript_1C40DA
+ goto MauvilleCity_GameCorner_EventScript_1C40DA
end
MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA
@@ -4899,7 +4890,7 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
- map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5
+ map_script_2 0x4022, 0, S_FallDownHole
.2byte 0
GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
@@ -4909,24 +4900,24 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
copyvar 0x4022, 0x1
end
-GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
+S_FallDownHole:: @ 81C6BC5
lockall
- pause 20
- move 255, GraniteCave_B1F_Movement_1C6BF7
- waitmove 0
- playsfx 43
- pause 60
+ delay 20
+ applymovement 255, GraniteCave_B1F_Movement_1C6BF7
+ waitmovement 0
+ playse 43
+ delay 60
warphole UNDEFINED
waitstate
end
gUnknown_081C6BDE:: @ 81C6BDE
lockall
- pause 20
- move 255, GraniteCave_B1F_Movement_1C6BF7
- waitmove 0
- playsfx 43
- pause 60
+ delay 20
+ applymovement 255, GraniteCave_B1F_Movement_1C6BF7
+ waitmovement 0
+ playse 43
+ delay 60
special sp13F_fall_to_last_warp
waitstate
end
@@ -4958,9 +4949,9 @@ gUnknown_081C6C02:: @ 81C6C02
@ 81C6C1D
lockall
- braillemsg Underwater_SealedChamber_Braille_1C533D
+ braillemessage Underwater_SealedChamber_Braille_1C533D
waitbutton
- hidebox 0, 0, 29, 19
+ erasebox 0, 0, 29, 19
releaseall
end
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index 91c3dcca8..497408299 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -1,34 +1,34 @@
-CuttableTreeScript:: @ 81B0DCC
+S_CuttableTree:: @ 81B0DCC
lockall
checkflag 2055
- jumpif 0, CannotUseCut
- checkattack MOVE_CUT
+ goto_if 0, CannotUseCut
+ checkpokemove MOVE_CUT
compare RESULT, 6
- jumpeq CannotUseCut
- setanimation 0, RESULT
- bufferpartypoke 0, RESULT
- bufferattack 1, MOVE_CUT
+ goto_if_eq CannotUseCut
+ setfieldeffect 0, RESULT
+ getpartypokename 0, RESULT
+ getmovename 1, MOVE_CUT
msgbox UseCutPromptText, 5
compare RESULT, 0
- jumpeq Cut_ChoseNo
+ goto_if_eq Cut_ChoseNo
msgbox UsedCutRockSmashText, 4
- closebutton
- doanimation 2
+ closemessage
+ dofieldeffect 2
waitstate
- jump DoTreeCutMovement
+ goto DoTreeCutMovement
end
-UseCutScript:: @ 81B0E16
+S_UseCut:: @ 81B0E16
lockall
- doanimation 2
+ dofieldeffect 2
waitstate
- jump DoTreeCutMovement
+ goto DoTreeCutMovement
end
DoTreeCutMovement: @ 81B0E21
- move LAST_TALKED, TreeCutMovement @ tree cut animation
- waitmove 0
- disappear LAST_TALKED @ tree disappears
+ applymovement LAST_TALKED, TreeCutMovement @ tree cut animation
+ waitmovement 0
+ removeobject LAST_TALKED @ tree disappears
releaseall
end
@@ -42,7 +42,7 @@ CannotUseCut: @ 81B0E32
end
Cut_ChoseNo: @ 81B0E3C
- closebutton
+ closemessage
releaseall
end
@@ -59,43 +59,43 @@ CannotUseCutText: @ 81B0E8E
.string "Der ZERSCHNEIDER kann hier eingesetzt\n"
.string "werden.$"
-BreakableRockScript:: @ 81B0EB7
+S_BreakableRock:: @ 81B0EB7
lockall
checkflag 2057
- jumpif 0, CannotUseRockSmash
- checkattack MOVE_ROCK_SMASH
+ goto_if 0, CannotUseRockSmash
+ checkpokemove MOVE_ROCK_SMASH
compare RESULT, 6
- jumpeq CannotUseRockSmash
- setanimation 0, RESULT
- bufferpartypoke 0, RESULT
- bufferattack 1, MOVE_ROCK_SMASH
+ goto_if_eq CannotUseRockSmash
+ setfieldeffect 0, RESULT
+ getpartypokename 0, RESULT
+ getmovename 1, MOVE_ROCK_SMASH
msgbox UseRockSmashPromptText, 5
compare RESULT, 0
- jumpeq RockSmash_ChoseNo
+ goto_if_eq RockSmash_ChoseNo
msgbox UsedCutRockSmashText, 4
- closebutton
- doanimation 37
+ closemessage
+ dofieldeffect 37
waitstate
- jump DoRockSmashMovement
+ goto DoRockSmashMovement
end
-UseRockSmashScript:: @ 81B0F01
+S_UseRockSmash:: @ 81B0F01
lockall
- doanimation 37
+ dofieldeffect 37
waitstate
- jump DoRockSmashMovement
+ goto DoRockSmashMovement
end
DoRockSmashMovement: @ 81B0F0C
- move LAST_TALKED, RockSmashMovement
- waitmove 0
- disappear LAST_TALKED
- specialval RESULT, sub_810F5BC
+ applymovement LAST_TALKED, RockSmashMovement
+ waitmovement 0
+ removeobject LAST_TALKED
+ specialvar RESULT, sub_810F5BC
compare RESULT, 1
- jumpeq DoRockSmashMovement_Done
- special RockSmashWildEncounter
+ goto_if_eq DoRockSmashMovement_Done
+ special ScrSpecial_RockSmashWildEncounter
compare RESULT, 0
- jumpeq DoRockSmashMovement_Done
+ goto_if_eq DoRockSmashMovement_Done
waitstate
releaseall
end
@@ -114,7 +114,7 @@ CannotUseRockSmash: @ 81B0F3E
end
RockSmash_ChoseNo: @ 81B0F48
- closebutton
+ closemessage
releaseall
end
@@ -126,30 +126,30 @@ CannotUseRockSmashText: @ 81B0F90
.string "Ein großer Felsen. Ein POKéMON könnte\n"
.string "ihn vielleicht zertrümmern.$"
-PushableBoulderScript:: @ 81B0FCB
+S_PushableBoulder:: @ 81B0FCB
lockall
checkflag 2058
- jumpif 0, CannotUseStrength
+ goto_if 0, CannotUseStrength
checkflag 2089
- jumpeq AlreadyUsedStrength
- checkattack 70
+ goto_if_eq AlreadyUsedStrength
+ checkpokemove 70
compare RESULT, 6
- jumpeq CannotUseStrength
- setanimation 0, RESULT
+ goto_if_eq CannotUseStrength
+ setfieldeffect 0, RESULT
msgbox UseStrengthPromptText, 5
compare RESULT, 0
- jumpeq Strength_ChoseNo
- closebutton
- doanimation 40
+ goto_if_eq Strength_ChoseNo
+ closemessage
+ dofieldeffect 40
waitstate
- jump UsedStrength
+ goto UsedStrength
end
-UseStrengthScript:: @ 81B100E
+S_UseStrength:: @ 81B100E
lockall
- doanimation 40
+ dofieldeffect 40
waitstate
- jump UsedStrength
+ goto UsedStrength
end
UsedStrength: @ 81B1019
@@ -169,7 +169,7 @@ AlreadyUsedStrength: @ 81B1030
end
Strength_ChoseNo: @ 81B103A
- closebutton
+ closemessage
releaseall
end
@@ -191,21 +191,21 @@ AlreadyUsedStrengthText: @ 81B1127
.string "STÄRKE ermöglicht es, Felsen zu\n"
.string "bewegen.$"
-UseWaterfallScript:: @ 81B115A
+S_UseWaterfall:: @ 81B115A
lockall
- checkattack MOVE_WATERFALL
+ checkpokemove MOVE_WATERFALL
compare RESULT, 6
- jumpeq Waterfall_NoMonKnows
- bufferpartypoke 0, RESULT
- setanimation 0, RESULT
+ goto_if_eq Waterfall_NoMonKnows
+ getpartypokename 0, RESULT
+ setfieldeffect 0, RESULT
msgbox UseWaterfallPromptText, 5
compare RESULT, 0
- jumpeq Waterfall_Done
+ goto_if_eq Waterfall_Done
msgbox UsedWaterfallText, 4
- doanimation 43
- jump Waterfall_Done
+ dofieldeffect 43
+ goto Waterfall_Done
-CannotUseWaterfallScript:: @ 81B1194
+S_CannotUseWaterfall:: @ 81B1194
lockall
Waterfall_NoMonKnows: @ 81B1195
msgbox CannotUseWaterfallText, 4
@@ -226,18 +226,18 @@ UsedWaterfallText: @ 81B120D
UseDiveScript:: @ 81B1220
lockall
- checkattack MOVE_DIVE
+ checkpokemove MOVE_DIVE
compare RESULT, 6
- jumpeq CannotUseDive
- bufferpartypoke 0, RESULT
- setanimation 0, RESULT
- setanimation 1, 1
+ goto_if_eq CannotUseDive
+ getpartypokename 0, RESULT
+ setfieldeffect 0, RESULT
+ setfieldeffect 1, 1
msgbox UseDivePromptText, 5
compare RESULT, 0
- jumpeq Dive_Done
+ goto_if_eq Dive_Done
msgbox UsedDiveText, 4
- doanimation 44
- jump Dive_Done
+ dofieldeffect 44
+ goto Dive_Done
lockall
CannotUseDive: @ 81B125F
@@ -247,25 +247,25 @@ Dive_Done: @ 81B1267
releaseall
end
-UnderwaterUseDiveScript:: @ 81B1269
+S_UseDiveUnderwater:: @ 81B1269
lockall
- checkattack MOVE_DIVE
+ checkpokemove MOVE_DIVE
compare RESULT, 6
- jumpeq UnderwaterCannotUseDive
- bufferpartypoke 0, RESULT
- setanimation 0, RESULT
- setanimation 1, 1
+ goto_if_eq UnderwaterCannotUseDive
+ getpartypokename 0, RESULT
+ setfieldeffect 0, RESULT
+ setfieldeffect 1, 1
msgbox UnderwaterUseDivePromptText, 5
compare RESULT, 0
- jumpeq UnderwaterDive_Done
+ goto_if_eq UnderwaterDive_Done
msgbox UsedDiveText, 4
- doanimation 44
- jump UnderwaterDive_Done
+ dofieldeffect 44
+ goto UnderwaterDive_Done
UnderwaterCannotUseDive: @ 81B12A7
lockall
msgbox UnderwaterCannotUseDiveText, 4
- jump UnderwaterDive_Done
+ goto UnderwaterDive_Done
@ not used
SurfacingBlocked: @ 81B12B5
diff --git a/data-de/text/bard.inc b/data-de/text/bard.inc
index 089741d00..dbfb7d400 100644
--- a/data-de/text/bard.inc
+++ b/data-de/text/bard.inc
@@ -1,20 +1,20 @@
-UnknownString_81B0A83: @ 81B0A83
+gTextBard_BardTesting: @ 81B0A83
.string "BARDEN Test.$"
-MauvilleCity_PokemonCenter_1F_Text_1B0A91:: @ 81B0A91
+gTextBard_HiImTheBard:: @ 81B0A91
.string "Hallo, ich bin der BARDE.\n"
.string "Möchtest du meinem Lied lauschen?$"
-MauvilleCity_PokemonCenter_1F_Text_1B0AC3:: @ 81B0AC3
+gTextBard_OhYouveLeftMe:: @ 81B0AC3
.string "Oh...\n"
.string "Du überlässt mich meinem Blues?$"
-MauvilleCity_PokemonCenter_1F_Text_1B0AED:: @ 81B0AED
+gTextBard_OhWhatAMovingSong:: @ 81B0AED
.string "Hach, was für ein bewegendes Lied...\n"
.string "Ich wünschte, ich könnte es für\l"
.string "andere spielen...$"
-MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
+gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C
.string "So?\n"
.string "Wie fandest du mein Lied?\p"
.string "Ich bin noch nicht ganz zufrieden mit\n"
@@ -22,17 +22,17 @@ MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
.string "Hast du nicht Lust, den Text für mich\n"
.string "neu zu schreiben?$"
-MauvilleCity_PokemonCenter_1F_Text_1B0BA6:: @ 81B0BA6
+gTextBard_OhYouveLeftMe2:: @ 81B0BA6
.string "Oh... Und wieder werde ich meinem\n"
.string "Blues überlassen.$"
-MauvilleCity_PokemonCenter_1F_Text_1B0BD0:: @ 81B0BD0
+gTextBard_ThankYouKindly:: @ 81B0BD0
.string "Vielen herzlichen Dank!\n"
.string "Ich möchte für dich singen.$"
-MauvilleCity_PokemonCenter_1F_Text_1B0BFA:: @ 81B0BFA
+gTextBard_WasThatHowYouWanted:: @ 81B0BFA
.string "Hast du dir dein Lied so vorgestellt?$"
-MauvilleCity_PokemonCenter_1F_Text_1B0C23:: @ 81B0C23
+gTextBard_OkayThatsIt:: @ 81B0C23
.string "Okay! Das ist es! Dieses Lied werde\n"
.string "ich nun für eine Weile singen.$"
diff --git a/data-de/text/giddy.inc b/data-de/text/giddy.inc
index 6e1a46883..8bc5bebda 100644
--- a/data-de/text/giddy.inc
+++ b/data-de/text/giddy.inc
@@ -1,16 +1,16 @@
-MauvilleCity_PokemonCenter_1F_Text_1B092A:: @ 81B092A
+gTextGiddy_Introduction:: @ 81B092A
.string "Ich bin MÄRCHEN-MAN! Ich habe eine sehr\n"
.string "geistreiche Geschichte für dich!\p"
.string "Soll ich sie dir erzählen?$"
-MauvilleCity_PokemonCenter_1F_Text_1B097C:: @ 81B097C
+gTextGiddy_YouveDeflatedMe:: @ 81B097C
.string "Oh...\n"
.string "Du hast mir die Luft rausgelassen...$"
-MauvilleCity_PokemonCenter_1F_Text_1B0998:: @ 81B0998
+gTextGiddy_AlsoIWasThinking:: @ 81B0998
.string "Und ich war in Gedanken vertieft...$"
-MauvilleCity_PokemonCenter_1F_Text_1B09B0:: @ 81B09B0
+gTextGiddy_ByeBye:: @ 81B09B0
.string "Das wäre alles, glaube ich...\p"
.string "Wir sollten bald wieder ein Schwätzchen\n"
.string "halten! Tschüss!$"
diff --git a/data-de/text/hipster.inc b/data-de/text/hipster.inc
index c315b523d..8801b05fd 100644
--- a/data-de/text/hipster.inc
+++ b/data-de/text/hipster.inc
@@ -1,18 +1,18 @@
-MauvilleCity_PokemonCenter_1F_Text_1B0C5B:: @ 81B0C5B
+gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B
.string "Hey, yo! Man nennt mich TRENDWIG. Ich\n"
.string "zeige dir, was hip ist und abgeht.$"
-MauvilleCity_PokemonCenter_1F_Text_1B0CA7:: @ 81B0CA7
+gTextHipster_TaughtYouAlready:: @ 81B0CA7
.string "Aber, hey, ich habe dir doch schon ge-\n"
.string "zeigt, was hip ist und abgeht.\p"
.string "Ich will das auch anderen mitteilen.$"
-MauvilleCity_PokemonCenter_1F_Text_1B0D11:: @ 81B0D11
+gTextHipster_YouAlreadyKnowALot:: @ 81B0D11
.string "Aber, hey, ich habe dir doch schon ge-\n"
.string "zeigt, was hip ist und abgeht.\p"
.string "Ich habe nichts mehr in petto.$"
-MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75
+gTextHipster_HaveYouHeardAbout:: @ 81B0D75
.string "Hast du schon von\n"
.string "“{STR_VAR_1}” gehört?\p"
.string "Was das heißt? Ähäm...\n"
diff --git a/data-de/text/storyteller.inc b/data-de/text/storyteller.inc
index ee2068766..abcc8a4a8 100644
--- a/data-de/text/storyteller.inc
+++ b/data-de/text/storyteller.inc
@@ -1,25 +1,25 @@
-MauvilleCity_PokemonCenter_1F_Text_1AECC6:: @ 81AECC6
+gTextStoryteller_Introduction:: @ 81AECC6
.string "Ich bin der GESCHICHTENERZÄHLER.\n"
.string "Ich erzähle dir die Geschichten von\l"
.string "legendären TRAINERN.\p"
.string "Soll ich dir etwas erzählen?$"
-MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D
+gTextStoryteller_OhIFeelStifled:: @ 81AED1D
.string "Oh...\n"
.string "Keiner mag mich...$"
-MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35
+gTextStoryteller_WhichTale:: @ 81AED35
.string "Ich kenne viele dieser Legenden.\n"
.string "Welche möchtest du hören?$"
-MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70
+gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70
.string "Aber ich weiß nichts über legendäre\n"
.string "TRAINER. Also habe ich keine Ge-\l"
.string "schichte auf Lager.\p"
.string "Wo findet man wohl einen TRAINER, der\n"
.string "einer lebenden Legende gleicht?$"
-MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
+gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8
.string "Was ist?\n"
.string "Du... Du...\p"
.string "{STR_VAR_2}\n"
@@ -27,39 +27,39 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
.string "Das ist einfach großartig!\n"
.string "Die Geburt einer neuen Legende!$"
-MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50
+gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50
.string "Ich überlege, ob es nicht noch andere\n"
.string "TRAINER gibt, die mir beeindruckende\l"
.string "Geschichten erzählen können.$"
-MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4
+gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4
.string "Bist du ein TRAINER?\p"
.string "Dann sag mir, ob du Geschichten\n"
.string "für mich hast, die legendär sind?$"
-MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A
+gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A
.string "Übrigens... Möchtest du eine weitere\n"
.string "legendäre Geschichte hören?$"
-MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49
+gTextStoryteller_ImNotSatisfied:: @ 81AEF49
.string "Hmm...\n"
.string "Ich bin nicht zufrieden...\p"
.string "Ich wünschte, du würdest mir Neuig-\n"
.string "keiten erzählen, die den Titel Legende\l"
.string "verdienen.$"
-MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
+gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5
.string "Ich wollte, mehr Leute würden sich für\n"
.string "meine epischen Geschichten über\l"
.string "legendäre TRAINER interessieren.$"
-UnknownString_81AEFFC:: @ 81AEFFC
+gTextStoryteller_Story1Title:: @ 81AEFFC
.string "Der speicherfreudige TRAINER$"
-UnknownString_81AF013:: @ 81AF013
+gTextStoryteller_Story1Action:: @ 81AF013
.string "Hast das Spiel gespeichert?$"
-UnknownString_81AF022:: @ 81AF022
+gTextStoryteller_Story1Text:: @ 81AF022
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat das Spiel\n"
@@ -67,13 +67,13 @@ UnknownString_81AF022:: @ 81AF022
.string "Einen vorsichtigeren TRAINER als\n"
.string "{STR_VAR_3} wird man nicht finden!$"
-UnknownString_81AF0A3:: @ 81AF0A3
+gTextStoryteller_Story2Title:: @ 81AF0A3
.string "Der TRAINER als Trendsetter$"
-UnknownString_81AF0BB:: @ 81AF0BB
+gTextStoryteller_Story2Action:: @ 81AF0BB
.string "Hast Trends gesetzt?$"
-UnknownString_81AF0CA:: @ 81AF0CA
+gTextStoryteller_Story2Text:: @ 81AF0CA
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -81,13 +81,13 @@ UnknownString_81AF0CA:: @ 81AF0CA
.string "{STR_VAR_3} setzt den Trend für alle - in\n"
.string "der ganzen HOENN-Region!$"
-UnknownString_81AF149:: @ 81AF149
+gTextStoryteller_Story3Title:: @ 81AF149
.string "Der BEEREN pflanzende TRAINER$"
-UnknownString_81AF164:: @ 81AF164
+gTextStoryteller_Story3Action:: @ 81AF164
.string "Hast BEEREN gepflanzt?$"
-UnknownString_81AF174:: @ 81AF174
+gTextStoryteller_Story3Text:: @ 81AF174
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -95,13 +95,13 @@ UnknownString_81AF174:: @ 81AF174
.string "{STR_VAR_3} ist ein legendärer Lieb-\n"
.string "haber von BEEREN!$"
-UnknownString_81AF1E5:: @ 81AF1E5
+gTextStoryteller_Story4Title:: @ 81AF1E5
.string "Der RAD verrückte TRAINER$"
-UnknownString_81AF1FD:: @ 81AF1FD
+gTextStoryteller_Story4Action:: @ 81AF1FD
.string "Hast RÄDER getauscht?$"
-UnknownString_81AF20A:: @ 81AF20A
+gTextStoryteller_Story4Text:: @ 81AF20A
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -109,13 +109,13 @@ UnknownString_81AF20A:: @ 81AF20A
.string "{STR_VAR_3} ist ein TRAINER, dessen\n"
.string "Passion das RADfahren ist!$"
-UnknownString_81AF281:: @ 81AF281
+gTextStoryteller_Story5Title:: @ 81AF281
.string "Der Interviews gebende TRAINER$"
-UnknownString_81AF299:: @ 81AF299
+gTextStoryteller_Story5Action:: @ 81AF299
.string "Hast Interviews gegeben?$"
-UnknownString_81AF2A9:: @ 81AF2A9
+gTextStoryteller_Story5Text:: @ 81AF2A9
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER wurde {STR_VAR_1}-mal\n"
@@ -123,13 +123,13 @@ UnknownString_81AF2A9:: @ 81AF2A9
.string "{STR_VAR_3} ist ein TRAINER, der überall\n"
.string "Aufmerksamkeit erregt!$"
-UnknownString_81AF32C:: @ 81AF32C
+gTextStoryteller_Story6Title:: @ 81AF32C
.string "Der kampfliebende TRAINER$"
-UnknownString_81AF345:: @ 81AF345
+gTextStoryteller_Story6Action:: @ 81AF345
.string "Hast oft gekämpft?$"
-UnknownString_81AF34D:: @ 81AF34D
+gTextStoryteller_Story6Text:: @ 81AF34D
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -137,13 +137,13 @@ UnknownString_81AF34D:: @ 81AF34D
.string "{STR_VAR_3} ist ein TRAINER, der zu\n"
.string "einem Kampf nicht nein sagt!$"
-UnknownString_81AF3D0:: @ 81AF3D0
+gTextStoryteller_Story7Title:: @ 81AF3D0
.string "Der POKéMON fangende TRAINER$"
-UnknownString_81AF3ED:: @ 81AF3ED
+gTextStoryteller_Story7Action:: @ 81AF3ED
.string "Hast POKéMON gefangen?$"
-UnknownString_81AF3FC:: @ 81AF3FC
+gTextStoryteller_Story7Text:: @ 81AF3FC
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -151,13 +151,13 @@ UnknownString_81AF3FC:: @ 81AF3FC
.string "{STR_VAR_3} ist ein legendärer Fänger\n"
.string "von POKéMON!$"
-UnknownString_81AF46D:: @ 81AF46D
+gTextStoryteller_Story8Title:: @ 81AF46D
.string "Der angelnde TRAINER$"
-UnknownString_81AF481:: @ 81AF481
+gTextStoryteller_Story8Action:: @ 81AF481
.string "Hast POKéMON mit einer ANGEL gefangen?$"
-UnknownString_81AF49B:: @ 81AF49B
+gTextStoryteller_Story8Text:: @ 81AF49B
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -165,13 +165,13 @@ UnknownString_81AF49B:: @ 81AF49B
.string "{STR_VAR_3} ist ein legendärer Angel-\n"
.string "experte!$"
-UnknownString_81AF511:: @ 81AF511
+gTextStoryteller_Story9Title:: @ 81AF511
.string "Der EIER wärmende TRAINER$"
-UnknownString_81AF529:: @ 81AF529
+gTextStoryteller_Story9Action:: @ 81AF529
.string "Hast EIER ausgebrütet?$"
-UnknownString_81AF536:: @ 81AF536
+gTextStoryteller_Story9Text:: @ 81AF536
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Es passierte {STR_VAR_1}-mal, dass der TRAINER\n"
@@ -179,13 +179,13 @@ UnknownString_81AF536:: @ 81AF536
.string "{STR_VAR_3} ist ein legendärer Pfleger\n"
.string "von EIERN!$"
-UnknownString_81AF5A9:: @ 81AF5A9
+gTextStoryteller_Story10Title:: @ 81AF5A9
.string "Der TRAINER der Entwicklungen$"
-UnknownString_81AF5BD:: @ 81AF5BD
+gTextStoryteller_Story10Action:: @ 81AF5BD
.string "Hast POKéMON sich entwickeln lassen?$"
-UnknownString_81AF5CD:: @ 81AF5CD
+gTextStoryteller_Story10Text:: @ 81AF5CD
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -193,13 +193,13 @@ UnknownString_81AF5CD:: @ 81AF5CD
.string "{STR_VAR_3} ist der ultimative Ent-\n"
.string "wickler von POKéMON!$"
-UnknownString_81AF63F:: @ 81AF63F
+gTextStoryteller_Story11Title:: @ 81AF63F
.string "Der PKMN-CENTER liebende TRAINER$"
-UnknownString_81AF661:: @ 81AF661
+gTextStoryteller_Story11Action:: @ 81AF661
.string "Gingst in ein POKéMON-CENTER?$"
-UnknownString_81AF676:: @ 81AF676
+gTextStoryteller_Story11Text:: @ 81AF676
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat POKéMON\n"
@@ -208,13 +208,13 @@ UnknownString_81AF676:: @ 81AF676
.string "Es gibt keinen größeren Fan der\n"
.string "POKéMON-CENTER als {STR_VAR_3}!$"
-UnknownString_81AF711:: @ 81AF711
+gTextStoryteller_Story12Title:: @ 81AF711
.string "Der gastfreundliche TRAINER$"
-UnknownString_81AF726:: @ 81AF726
+gTextStoryteller_Story12Action:: @ 81AF726
.string "POKéMON haben sich bei dir erholt?$"
-UnknownString_81AF73D:: @ 81AF73D
+gTextStoryteller_Story12Text:: @ 81AF73D
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat POKéMON\n"
@@ -223,13 +223,13 @@ UnknownString_81AF73D:: @ 81AF73D
.string "Kein TRAINER ist so gastfreundlich\n"
.string "wie {STR_VAR_3}!$"
-UnknownString_81AF7BF:: @ 81AF7BF
+gTextStoryteller_Story13Title:: @ 81AF7BF
.string "Der SAFARI liebende TRAINER$"
-UnknownString_81AF7D9:: @ 81AF7D9
+gTextStoryteller_Story13Action:: @ 81AF7D9
.string "Bist in die SAFARI-ZONE gegangen?$"
-UnknownString_81AF7F1:: @ 81AF7F1
+gTextStoryteller_Story13Text:: @ 81AF7F1
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal in die\n"
@@ -238,13 +238,13 @@ UnknownString_81AF7F1:: @ 81AF7F1
.string "wilde Seite in der SAFARI-ZONE zum\l"
.string "Vorschein kommt!$"
-UnknownString_81AF88A:: @ 81AF88A
+gTextStoryteller_Story14Title:: @ 81AF88A
.string "Der TRAINER als ZERSCHNEIDER$"
-UnknownString_81AF8A1:: @ 81AF8A1
+gTextStoryteller_Story14Action:: @ 81AF8A1
.string "Hast ZERSCHNEIDER eingesetzt?$"
-UnknownString_81AF8AA:: @ 81AF8AA
+gTextStoryteller_Story14Text:: @ 81AF8AA
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -252,13 +252,13 @@ UnknownString_81AF8AA:: @ 81AF8AA
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, etwas zu ZERSCHNEIDEN.$"
-UnknownString_81AF91B:: @ 81AF91B
+gTextStoryteller_Story15Title:: @ 81AF91B
.string "Der TRAINER als ZERTRÜMMERER$"
-UnknownString_81AF935:: @ 81AF935
+gTextStoryteller_Story15Action:: @ 81AF935
.string "Hast Felsen ZERTRÜMMERT?$"
-UnknownString_81AF943:: @ 81AF943
+gTextStoryteller_Story15Text:: @ 81AF943
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -266,13 +266,13 @@ UnknownString_81AF943:: @ 81AF943
.string "{STR_VAR_3} ist ein TRAINER, der keinen\n"
.string "Felsen unbeschädigt lassen kann.$"
-UnknownString_81AF9C8:: @ 81AF9C8
+gTextStoryteller_Story16Title:: @ 81AF9C8
.string "Der Umzüge liebende TRAINER$"
-UnknownString_81AF9E0:: @ 81AF9E0
+gTextStoryteller_Story16Action:: @ 81AF9E0
.string "Bist du mit der GEHEIMBASIS umgezogen?$"
-UnknownString_81AF9F6:: @ 81AF9F6
+gTextStoryteller_Story16Text:: @ 81AF9F6
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal mit\n"
@@ -280,13 +280,13 @@ UnknownString_81AF9F6:: @ 81AF9F6
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, sich ein neues Haus einzurichten.$"
-UnknownString_81AFA79:: @ 81AFA79
+gTextStoryteller_Story17Title:: @ 81AFA79
.string "Der PLATSCHER des TRAINERS$"
-UnknownString_81AFA92:: @ 81AFA92
+gTextStoryteller_Story17Action:: @ 81AFA92
.string "Hast PLATSCHER eingesetzt?$"
-UnknownString_81AFA9E:: @ 81AFA9E
+gTextStoryteller_Story17Text:: @ 81AFA9E
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -294,13 +294,13 @@ UnknownString_81AFA9E:: @ 81AFA9E
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, zu PLATSCHEN.$"
-UnknownString_81AFB17:: @ 81AFB17
+gTextStoryteller_Story18Title:: @ 81AFB17
.string "Der verbissene TRAINER$"
-UnknownString_81AFB2D:: @ 81AFB2D
+gTextStoryteller_Story18Action:: @ 81AFB2D
.string "Hast VERZWEIFLER angewendet?$"
-UnknownString_81AFB48:: @ 81AFB48
+gTextStoryteller_Story18Text:: @ 81AFB48
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat sich {STR_VAR_1}-mal\n"
@@ -308,13 +308,13 @@ UnknownString_81AFB48:: @ 81AFB48
.string "{STR_VAR_3}... Ein verbissener TRAINER,\n"
.string "der auch in der Not nicht aufgibt.$"
-UnknownString_81AFBD8:: @ 81AFBD8
+gTextStoryteller_Story19Title:: @ 81AFBD8
.string "Der König der EINARMIGEN BANDITEN$"
-UnknownString_81AFBE7:: @ 81AFBE7
+gTextStoryteller_Story19Action:: @ 81AFBE7
.string "Hast den EINARMIGEN BANDITEN besiegt?$"
-UnknownString_81AFC04:: @ 81AFC04
+gTextStoryteller_Story19Text:: @ 81AFC04
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -322,13 +322,13 @@ UnknownString_81AFC04:: @ 81AFC04
.string "{STR_VAR_3}... Ein TRAINER, der am\n"
.string "EINARMIGEN BANDITEN Glück hat.$"
-UnknownString_81AFC8A:: @ 81AFC8A
+gTextStoryteller_Story20Title:: @ 81AFC8A
.string "Der König des ROULETTES$"
-UnknownString_81AFC9D:: @ 81AFC9D
+gTextStoryteller_Story20Action:: @ 81AFC9D
.string "Hast in Folge beim ROULETTE gewonnen,$"
-UnknownString_81AFCBE:: @ 81AFCBE
+gTextStoryteller_Story20Text:: @ 81AFCBE
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal in Folge\n"
@@ -336,13 +336,13 @@ UnknownString_81AFCBE:: @ 81AFCBE
.string "{STR_VAR_3}... Ein TRAINER, dem die Kugel\n"
.string "beim ROULETTE gehorcht.$"
-UnknownString_81AFD44:: @ 81AFD44
+gTextStoryteller_Story21Title:: @ 81AFD44
.string "Der Herausforderer im DUELLTURM$"
-UnknownString_81AFD60:: @ 81AFD60
+gTextStoryteller_Story21Action:: @ 81AFD60
.string "Hast Gegner im DUELLTURM gefordert?$"
-UnknownString_81AFD80:: @ 81AFD80
+gTextStoryteller_Story21Text:: @ 81AFD80
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal Gegner\n"
@@ -350,13 +350,13 @@ UnknownString_81AFD80:: @ 81AFD80
.string "{STR_VAR_3}... Ein TRAINER, der im DUELL-\n"
.string "TURM nach Perfektion strebt.$"
-UnknownString_81AFE1D:: @ 81AFE1D
+gTextStoryteller_Story22Title:: @ 81AFE1D
.string "Der mixende TRAINER$"
-UnknownString_81AFE36:: @ 81AFE36
+gTextStoryteller_Story22Action:: @ 81AFE36
.string "Hast {POKEBLOCK} hergestellt?$"
-UnknownString_81AFE42:: @ 81AFE42
+gTextStoryteller_Story22Text:: @ 81AFE42
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -364,13 +364,13 @@ UnknownString_81AFE42:: @ 81AFE42
.string "Niemand bedient den BEERENMIXER\n"
.string "besser als {STR_VAR_3}.$"
-UnknownString_81AFEC2:: @ 81AFEC2
+gTextStoryteller_Story23Title:: @ 81AFEC2
.string "Der Fan der WETTBEWERBE$"
-UnknownString_81AFEDD:: @ 81AFEDD
+gTextStoryteller_Story23Action:: @ 81AFEDD
.string "Hast an WETTBEWERBEN teilgenommen?$"
-UnknownString_81AFEEE:: @ 81AFEEE
+gTextStoryteller_Story23Text:: @ 81AFEEE
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -378,13 +378,13 @@ UnknownString_81AFEEE:: @ 81AFEEE
.string "{STR_VAR_3} liebt es, anderen seine\n"
.string "POKéMON zu zeigen.$"
-UnknownString_81AFF68:: @ 81AFF68
+gTextStoryteller_Story24Title:: @ 81AFF68
.string "Der Meister der WETTBEWERBE$"
-UnknownString_81AFF7B:: @ 81AFF7B
+gTextStoryteller_Story24Action:: @ 81AFF7B
.string "Hast WETTBEWERBE gewonnen?$"
-UnknownString_81AFF88:: @ 81AFF88
+gTextStoryteller_Story24Text:: @ 81AFF88
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -392,26 +392,26 @@ UnknownString_81AFF88:: @ 81AFF88
.string "{STR_VAR_3} ist ein unvergleichlicher\n"
.string "Meister der WETTBEWERBE.$"
-UnknownString_81AFFFB:: @ 81AFFFB
+gTextStoryteller_Story25Title:: @ 81AFFFB
.string "Der glückliche Einkäufer$"
-UnknownString_81B000D:: @ 81B000D
+gTextStoryteller_Story25Action:: @ 81B000D
.string "Bist einkaufen gegangen?$"
-UnknownString_81B0015:: @ 81B0015
+gTextStoryteller_Story25Text:: @ 81B0015
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
.string "in einem Geschäft Items gekauft!\p"
.string "{STR_VAR_3} ein geborener Einkäufer.$"
-UnknownString_81B009D:: @ 81B009D
+gTextStoryteller_Story26Title:: @ 81B009D
.string "Der TRAINER, der Items findet$"
-UnknownString_81B00B6:: @ 81B00B6
+gTextStoryteller_Story26Action:: @ 81B00B6
.string "Hast den DETEKTOR eingesetzt?$"
-UnknownString_81B00C9:: @ 81B00C9
+gTextStoryteller_Story26Text:: @ 81B00C9
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -419,13 +419,13 @@ UnknownString_81B00C9:: @ 81B00C9
.string "{STR_VAR_3} liebt es, den Boden nach\n"
.string "verborgenen Items abzusuchen.$"
-UnknownString_81B014D:: @ 81B014D
+gTextStoryteller_Story27Title:: @ 81B014D
.string "Der regennasse TRAINER$"
-UnknownString_81B0165:: @ 81B0165
+gTextStoryteller_Story27Action:: @ 81B0165
.string "Wurdest nass geregnet?$"
-UnknownString_81B0173:: @ 81B0173
+gTextStoryteller_Story27Text:: @ 81B0173
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER wurde {STR_VAR_1}-mal\n"
@@ -433,13 +433,13 @@ UnknownString_81B0173:: @ 81B0173
.string "Das Charisma von {STR_VAR_3} zieht\n"
.string "sogar den Regen an.$"
-UnknownString_81B01E9:: @ 81B01E9
+gTextStoryteller_Story28Title:: @ 81B01E9
.string "Der passionierte POKéDEX-Leser$"
-UnknownString_81B0201:: @ 81B0201
+gTextStoryteller_Story28Action:: @ 81B0201
.string "Hast im POKéDEX nachgeschlagen?$"
-UnknownString_81B0213:: @ 81B0213
+gTextStoryteller_Story28Text:: @ 81B0213
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -447,13 +447,13 @@ UnknownString_81B0213:: @ 81B0213
.string "{STR_VAR_3} liebt es, alles über\n"
.string "POKéMON im POKéDEX nachzulesen.$"
-UnknownString_81B0290:: @ 81B0290
+gTextStoryteller_Story29Title:: @ 81B0290
.string "Der Sammler der BÄNDER$"
-UnknownString_81B02A5:: @ 81B02A5
+gTextStoryteller_Story29Action:: @ 81B02A5
.string "Hast BÄNDER erhalten?$"
-UnknownString_81B02B6:: @ 81B02B6
+gTextStoryteller_Story29Text:: @ 81B02B6
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -461,13 +461,13 @@ UnknownString_81B02B6:: @ 81B02B6
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, BÄNDER zu sammeln.$"
-UnknownString_81B0337:: @ 81B0337
+gTextStoryteller_Story30Title:: @ 81B0337
.string "Der springende TRAINER$"
-UnknownString_81B0351:: @ 81B0351
+gTextStoryteller_Story30Action:: @ 81B0351
.string "Bist Absätze heruntergesprungen?$"
-UnknownString_81B0364:: @ 81B0364
+gTextStoryteller_Story30Text:: @ 81B0364
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal\n"
@@ -476,26 +476,26 @@ UnknownString_81B0364:: @ 81B0364
.string "TRAINER {STR_VAR_3} einfach hinab-\l"
.string "springen.$"
-UnknownString_81B03E9:: @ 81B03E9
+gTextStoryteller_Story31Title:: @ 81B03E9
.string "Der legendäre Fernsehzuschauer$"
-UnknownString_81B0401:: @ 81B0401
+gTextStoryteller_Story31Action:: @ 81B0401
.string "Hast ferngeschaut?$"
-UnknownString_81B040C:: @ 81B040C
+gTextStoryteller_Story31Text:: @ 81B040C
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
.string "Fernsehen geschaut!\p"
.string "{STR_VAR_3} liebt es, fernzusehen.$"
-UnknownString_81B046E:: @ 81B046E
+gTextStoryteller_Story32Title:: @ 81B046E
.string "Der zeitbewusste TRAINER$"
-UnknownString_81B0489:: @ 81B0489
+gTextStoryteller_Story32Action:: @ 81B0489
.string "Hast nach der Uhrzeit gesehen?$"
-UnknownString_81B049A:: @ 81B049A
+gTextStoryteller_Story32Text:: @ 81B049A
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -503,13 +503,13 @@ UnknownString_81B049A:: @ 81B049A
.string "{STR_VAR_3} ist ein pünktlicher\n"
.string "TRAINER, der sich der Zeit bewusst ist.$"
-UnknownString_81B0523:: @ 81B0523
+gTextStoryteller_Story33Title:: @ 81B0523
.string "Der Zauberer der POKéMON-LOTTERIE$"
-UnknownString_81B053E:: @ 81B053E
+gTextStoryteller_Story33Action:: @ 81B053E
.string "Hast in der LOTTERIE gewonnen?$"
-UnknownString_81B0554:: @ 81B0554
+gTextStoryteller_Story33Text:: @ 81B0554
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -517,13 +517,13 @@ UnknownString_81B0554:: @ 81B0554
.string "TRAINER {STR_VAR_3} hat viele Freunde,\n"
.string "die mit ihm POKéMON tauschen.$"
-UnknownString_81B05D8:: @ 81B05D8
+gTextStoryteller_Story34Title:: @ 81B05D8
.string "Der TRAINER und die PENSION$"
-UnknownString_81B05F3:: @ 81B05F3
+gTextStoryteller_Story34Action:: @ 81B05F3
.string "Hast POKéMON in die PENSION gebracht?$"
-UnknownString_81B0610:: @ 81B0610
+gTextStoryteller_Story34Text:: @ 81B0610
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -532,13 +532,13 @@ UnknownString_81B0610:: @ 81B0610
.string "alles für die Entwicklung seiner\l"
.string "POKéMON tut.$"
-UnknownString_81B06A9:: @ 81B06A9
+gTextStoryteller_Story35Title:: @ 81B06A9
.string "Der SEILBAHN verrückte TRAINER$"
-UnknownString_81B06C6:: @ 81B06C6
+gTextStoryteller_Story35Action:: @ 81B06C6
.string "Bist mit der SEILBAHN gefahren?$"
-UnknownString_81B06D9:: @ 81B06D9
+gTextStoryteller_Story35Text:: @ 81B06D9
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal\n"
@@ -547,13 +547,13 @@ UnknownString_81B06D9:: @ 81B06D9
.string "TRAINER, der ständig rauf und runter\l"
.string "fährt.$"
-UnknownString_81B0763:: @ 81B0763
+gTextStoryteller_Story36Title:: @ 81B0763
.string "Der Liebhaber der Heißen Quellen$"
-UnknownString_81B0781:: @ 81B0781
+gTextStoryteller_Story36Action:: @ 81B0781
.string "Hast in den Heißen Quellen gebadet?$"
-UnknownString_81B0797:: @ 81B0797
+gTextStoryteller_Story36Text:: @ 81B0797
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
diff --git a/data-de/text/trader.inc b/data-de/text/trader.inc
index adf5d3aeb..dae453e8b 100644
--- a/data-de/text/trader.inc
+++ b/data-de/text/trader.inc
@@ -1,58 +1,58 @@
-MauvilleCity_PokemonCenter_1F_Text_1AE88F:: @ 81AE88F
+gTextTrader_Introduction:: @ 81AE88F
.string "Hallo! Ich bin der HÄNDLER. Möchtest\n"
.string "du Dekorationen mit mir tauschen?$"
-MauvilleCity_PokemonCenter_1F_Text_1AE8C6:: @ 81AE8C6
+gTextTrader_FeelUnwanted1:: @ 81AE8C6
.string "Oh...\n"
.string "Ich fühle mich überflüssig...$"
-MauvilleCity_PokemonCenter_1F_Text_1AE8DF:: @ 81AE8DF
+gTextTrader_TradedAlready:: @ 81AE8DF
.string "Aber wir beide haben doch bereits\n"
.string "Dekorationen ausgetauscht.$"
-MauvilleCity_PokemonCenter_1F_Text_1AE910:: @ 81AE910
+gTextTrader_MenuPrompt:: @ 81AE910
.string "Wenn du etwas Dekoratives siehst, das\n"
.string "du haben möchtest, lass es mich wissen.$"
-MauvilleCity_PokemonCenter_1F_Text_1AE950:: @ 81AE950
+gTextTrader_DontWantAnything:: @ 81AE950
.string "Du möchtest nichts haben?\n"
.string "Ich fühle mich so überflüssig...$"
-MauvilleCity_PokemonCenter_1F_Text_1AE97C:: @ 81AE97C
+gTextTrader_ItemOnceBelongedTo:: @ 81AE97C
.string "Das dekorative Item gehörte einst\n"
.string "{STR_VAR_1}.\p"
.string "Möchtest du es haben?$"
-MauvilleCity_PokemonCenter_1F_Text_1AE9B6:: @ 81AE9B6
+gTextTrader_YouDontHaveDecorations:: @ 81AE9B6
.string "Äh... Warte eine Sekunde. Du hast über-\n"
.string "haupt kein dekoratives Item!$"
-MauvilleCity_PokemonCenter_1F_Text_1AE9F8:: @ 81AE9F8
+gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8
.string "Okay, wähle die Dekoration aus, die du\n"
.string "mit mir tauschen willst.$"
-MauvilleCity_PokemonCenter_1F_Text_1AEA2B:: @ 81AEA2B
+gTextTrader_FeelUnwanted2:: @ 81AEA2B
.string "Du willst nicht mit mir tauschen?\n"
.string "Ich fühle mich überflüssig...$"
-MauvilleCity_PokemonCenter_1F_Text_1AEA57:: @ 81AEA57
+gTextTrader_NoRoomForThis:: @ 81AEA57
.string "Du hast keinen Platz mehr für eine/n\n"
.string "{STR_VAR_2}.$"
-MauvilleCity_PokemonCenter_1F_Text_1AEA9B:: @ 81AEA9B
+gTextTrader_SoWellTrade:: @ 81AEA9B
.string "Okay, dann lass uns tauschen:\n"
.string "{STR_VAR_3} gegen\l"
.string "{STR_VAR_2}!$"
-MauvilleCity_PokemonCenter_1F_Text_1AEAC3:: @ 81AEAC3
+gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3
.string "Dieses Dekorationsstück ist im Ge-\n"
.string "brauch. Das kannst du nicht tauschen.$"
-MauvilleCity_PokemonCenter_1F_Text_1AEAFB:: @ 81AEAFB
+gTextTrader_ThenWellTrade:: @ 81AEAFB
.string "Dann lass uns tauschen! Ich werde meine\n"
.string "Dekorationen auf deinen PC senden.$"
-MauvilleCity_PokemonCenter_1F_Text_1AEB31:: @ 81AEB31
+gTextTrader_ICantTradeThatOneAway:: @ 81AEB31
.string "Huups! Tut mir Leid!\n"
.string "Das ist ein ganz seltenes Stück!\l"
.string "Das kann ich nicht tauschen!\p"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 20:43:30 +0000