summaryrefslogtreecommitdiff
path: root/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc')
-rw-r--r--data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc222
1 files changed, 111 insertions, 111 deletions
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
index 426226422..ad839b0ad 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
@@ -1,27 +1,27 @@
SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF
- map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA
- map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame
+ map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition
.byte 0
-SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA
+SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA
map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4
.2byte 0
EventScript_16F0D4:: @ 816F0D4
lockall
textcolor 1
- applymovement 1, Movement_1A75ED
+ applymovement 1, Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
- applymovement 1, Movement_1A75DB
+ applymovement 1, Movement_ExclamationMark
waitmovement 0
- applymovement 1, Movement_1A75DD
+ applymovement 1, Movement_Delay48
waitmovement 0
msgbox gUnknown_819C22B
closemessage
applymovement 1, Movement_16F124
waitmovement 0
- applymovement 255, Movement_1A75EB
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox gUnknown_819C235
setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
@@ -29,88 +29,88 @@ EventScript_16F0D4:: @ 816F0D4
end
Movement_16F124:: @ 816F124
- step_1c
- step_1b
- step_10
- step_1c
- step_10
- step_1b
- step_12
+ delay_16
+ delay_8
+ walk_down
+ delay_16
+ walk_down
+ delay_8
+ walk_left
step_end
Movement_16F12C:: @ 816F12C
- step_1b
- step_2d
- step_10
- step_10
- step_10
- step_12
- step_12
+ delay_8
+ walk_in_place_fastest_down
+ walk_down
+ walk_down
+ walk_down
+ walk_left
+ walk_left
step_end
Movement_16F134:: @ 816F134
- step_1f
- step_1f
- step_1d
- step_1d
- step_1f
- step_1d
+ walk_fast_left
+ walk_fast_left
+ walk_fast_down
+ walk_fast_down
+ walk_fast_left
+ walk_fast_down
step_end
Movement_16F13B:: @ 816F13B
- step_10
- step_30
+ walk_down
+ walk_in_place_fastest_right
step_end
Movement_16F13E:: @ 816F13E
- step_55
- step_1e
- step_1e
- step_20
- step_2d
+ jump_in_place_right
+ walk_fast_up
+ walk_fast_up
+ walk_fast_right
+ walk_in_place_fastest_down
step_end
-SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144
- compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1
- goto_if eq, EventScript_16F267
- compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
- goto_if eq, EventScript_16F15B
+SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
+ compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1
+ goto_if_eq EventScript_16F267
+ compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
+ goto_if_eq EventScript_16F15B
end
EventScript_16F15B:: @ 816F15B
special UpdateMovedSaffronFanClubMembers
setvar VAR_0x8004, 0
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F207
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F207
setvar VAR_0x8004, 1
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F213
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F213
setvar VAR_0x8004, 2
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F21F
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F21F
setvar VAR_0x8004, 3
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F22B
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F22B
setvar VAR_0x8004, 4
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F237
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F237
setvar VAR_0x8004, 5
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F243
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F243
setvar VAR_0x8004, 6
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F24F
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F24F
setvar VAR_0x8004, 7
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 0
- call_if eq, EventScript_16F25B
+ compare VAR_RESULT, 0
+ call_if_eq EventScript_16F25B
end
EventScript_16F207:: @ 816F207
@@ -166,22 +166,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
faceplayer
setvar VAR_0x8004, 0
special BufferStreakTrainerText
- compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
- goto_if eq, EventScript_16F2EE
+ compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+ goto_if_eq EventScript_16F2EE
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F2C0
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F2C0
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F2E4
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F2E4
msgbox gUnknown_819C420
release
end
EventScript_16F2C0:: @ 816F2C0
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F2DA
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F2DA
msgbox gUnknown_819C390
release
end
@@ -206,22 +206,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
faceplayer
setvar VAR_0x8004, 3
special BufferStreakTrainerText
- compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
- goto_if eq, EventScript_16F365
+ compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+ goto_if_eq EventScript_16F365
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F337
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F337
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F35B
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F35B
msgbox gUnknown_819CBD3
release
end
EventScript_16F337:: @ 816F337
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F351
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F351
msgbox gUnknown_819CB32
release
end
@@ -246,22 +246,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
faceplayer
setvar VAR_0x8004, 1
special BufferStreakTrainerText
- compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
- goto_if eq, EventScript_16F3DC
+ compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+ goto_if_eq EventScript_16F3DC
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F3AE
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F3AE
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F3D2
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F3D2
msgbox gUnknown_819C6BA
release
end
EventScript_16F3AE:: @ 816F3AE
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F3C8
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F3C8
msgbox gUnknown_819C5A9
release
end
@@ -286,22 +286,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
faceplayer
setvar VAR_0x8004, 2
special BufferStreakTrainerText
- compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
- goto_if eq, EventScript_16F453
+ compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
+ goto_if_eq EventScript_16F453
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F425
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F425
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F449
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F449
msgbox gUnknown_819C986
release
end
EventScript_16F425:: @ 816F425
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F43F
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F43F
msgbox gUnknown_819C81E
release
end
@@ -327,19 +327,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
setvar VAR_0x8004, 5
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F491
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F491
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F4B5
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F4B5
msgbox gUnknown_819D01F
release
end
EventScript_16F491:: @ 816F491
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F4AB
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F4AB
msgbox gUnknown_819CEDF
release
end
@@ -360,19 +360,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
setvar VAR_0x8004, 4
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F4F3
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F4F3
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F517
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F517
msgbox gUnknown_819CDDA
release
end
EventScript_16F4F3:: @ 816F4F3
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F50D
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F50D
msgbox gUnknown_819CCF3
release
end
@@ -393,19 +393,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
setvar VAR_0x8004, 6
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F555
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F555
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F579
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F579
msgbox gUnknown_819D1AE
release
end
EventScript_16F555:: @ 816F555
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F56F
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F56F
msgbox gUnknown_819D0E3
release
end
@@ -426,19 +426,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
setvar VAR_0x8004, 7
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F5B7
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F5B7
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 7
- goto_if eq, EventScript_16F5DB
+ compare VAR_RESULT, 7
+ goto_if_eq EventScript_16F5DB
msgbox gUnknown_819D3D2
release
end
EventScript_16F5B7:: @ 816F5B7
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16F5D1
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16F5D1
msgbox gUnknown_819D2B4
release
end