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

Label used movement steps

Browse Source
This commit is contained in:
GriffinR
2020-01-09 00:15:41 -05:00
parent 16dc234d99
commit c39d295386
83 changed files with 3281 additions and 3272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/movement.inc
+92 -92
View File
@@ -6,71 +6,71 @@
.endm
enum_start 0
create_movement step_00
create_movement step_01
create_movement step_02
create_movement step_03
create_movement slow_step_down
create_movement slow_step_up
create_movement slow_step_left
create_movement slow_step_right
create_movement step_down
create_movement step_up
create_movement step_left
create_movement step_right
create_movement fast_step_down
create_movement fast_step_up
create_movement fast_step_left
create_movement fast_step_right
create_movement step_10
create_movement step_11
create_movement step_12
create_movement step_13
create_movement step_14
create_movement step_15
create_movement step_16
create_movement step_17
create_movement step_18
create_movement step_19
create_movement step_1a
create_movement step_1b
create_movement step_1c
create_movement step_1d
create_movement step_1e
create_movement step_1f
create_movement step_20
create_movement step_21
create_movement step_22
create_movement step_23
create_movement step_24
create_movement step_25
create_movement step_26
create_movement step_27
create_movement step_28
create_movement step_29
create_movement step_2a
create_movement step_2b
create_movement step_2c
create_movement step_2d
create_movement step_2e
create_movement step_2f
create_movement step_30
create_movement step_31
create_movement step_32
create_movement step_33
create_movement step_34
create_movement step_35
create_movement step_36
create_movement step_37
create_movement step_38
create_movement step_39
create_movement step_3a
create_movement step_3b
create_movement step_3c
create_movement step_3d
create_movement step_3e
create_movement step_3f
create_movement step_40
create_movement face_down
create_movement face_up
create_movement face_left
create_movement face_right
create_movement face_down_2 @ TODO: distinction between this and above set
create_movement face_up_2
create_movement face_left_2
create_movement face_right_2
create_movement walk_slowest_down
create_movement walk_slowest_up
create_movement walk_slowest_left
create_movement walk_slowest_right
create_movement walk_slow_down
create_movement walk_slow_up
create_movement walk_slow_left
create_movement walk_slow_right
create_movement walk_down
create_movement walk_up
create_movement walk_left
create_movement walk_right
create_movement jump_2_down
create_movement jump_2_up
create_movement jump_2_left
create_movement jump_2_right
create_movement delay_1
create_movement delay_2
create_movement delay_4
create_movement delay_8
create_movement delay_16
create_movement walk_fast_down
create_movement walk_fast_up
create_movement walk_fast_left
create_movement walk_fast_right
create_movement walk_in_place_slow_down
create_movement walk_in_place_slow_up
create_movement walk_in_place_slow_left
create_movement walk_in_place_slow_right
create_movement walk_in_place_down
create_movement walk_in_place_up
create_movement walk_in_place_left
create_movement walk_in_place_right
create_movement walk_in_place_fast_down
create_movement walk_in_place_fast_up
create_movement walk_in_place_fast_left
create_movement walk_in_place_fast_right
create_movement walk_in_place_fastest_down
create_movement walk_in_place_fastest_up
create_movement walk_in_place_fastest_left
create_movement walk_in_place_fastest_right
create_movement ride_water_current_down
create_movement ride_water_current_up
create_movement ride_water_current_left
create_movement ride_water_current_right
create_movement walk_fastest_down
create_movement walk_fastest_up
create_movement walk_fastest_left
create_movement walk_fastest_right
create_movement slide_down
create_movement slide_up
create_movement slide_left
create_movement slide_right
create_movement player_run_down
create_movement player_run_up
create_movement player_run_left
create_movement player_run_right
create_movement step_41
create_movement step_42
create_movement step_43
@@ -80,38 +80,38 @@
create_movement step_47
create_movement step_48
create_movement step_49
create_movement step_4a
create_movement step_4b
create_movement step_4c
create_movement step_4d
create_movement step_4e
create_movement step_4f
create_movement step_50
create_movement step_51
create_movement step_52
create_movement step_53
create_movement step_54
create_movement step_55
create_movement step_56
create_movement step_57
create_movement step_58
create_movement step_59
create_movement step_5a
create_movement step_5b
create_movement face_player
create_movement face_away_player
create_movement lock_facing_direction
create_movement unlock_facing_direction
create_movement jump_down
create_movement jump_up
create_movement jump_left
create_movement jump_right
create_movement jump_in_place_down
create_movement jump_in_place_up
create_movement jump_in_place_left
create_movement jump_in_place_right
create_movement jump_in_place_down_up
create_movement jump_in_place_up_down
create_movement jump_in_place_left_right
create_movement jump_in_place_right_left
create_movement face_original_direction
create_movement nurse_joy_bow
create_movement step_5c
create_movement step_5d
create_movement step_5e
create_movement step_5f
create_movement disable_anim
create_movement restore_anim
create_movement set_invisible
create_movement step_61
create_movement step_62
create_movement step_63
create_movement step_64
create_movement step_65
create_movement set_visible
create_movement emote_exclamation_mark
create_movement emote_question_mark
create_movement emote_x
create_movement emote_double_exclamation_mark
create_movement step_66
create_movement step_67
create_movement step_68
create_movement step_69
create_movement rock_smash_break
create_movement cut_tree
enum_start 0x91
create_movement step_91
data/event_scripts.s
+48 -125
View File
@@ -2050,7 +2050,7 @@ EventScript_1A74F2:: @ 81A74F2
return
EventScript_1A7506:: @ 81A7506
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75FE
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
waitmovement 0
playse SE_DOOR
call EventScript_1A7538
@@ -2059,7 +2059,7 @@ EventScript_1A7506:: @ 81A7506
return
EventScript_1A751F:: @ 81A751F
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75F3
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
waitmovement 0
setflag FLAG_TEMP_2
playse SE_KI_GASYAN
@@ -2083,7 +2083,7 @@ EventScript_1A754B:: @ 81A754B
end
EventScript_1A7563:: @ 81A7563
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75FE
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 4, 654, 1
@@ -2107,91 +2107,14 @@ EventScript_1A759C:: @ 81A759C
return
Movement_1A75D3:: @ 81A75D3
step_11
walk_up
step_end
EventScript_1A75D5:: @ 81A75D5
special Special_PokemonLeagueLightingEffect
return
Movement_1A75D9:: @ 81A75D9
step_63
step_end
Movement_1A75DB:: @ 81A75DB
step_62
step_end
Movement_1A75DD:: @ 81A75DD
step_1c
step_1c
step_1c
step_end
Movement_1A75E1:: @ 81A75E1
step_4a
step_end
Movement_1A75E3:: @ 81A75E3
step_4b
step_end
Movement_1A75E5:: @ 81A75E5
step_5a
step_end
Movement_1A75E7:: @ 81A75E7
step_2f
step_end
Movement_1A75E9:: @ 81A75E9
step_2e
step_end
Movement_1A75EB:: @ 81A75EB
step_30
step_end
Movement_1A75ED:: @ 81A75ED
step_2d
step_end
Movement_1A75EF:: @ 81A75EF
step_03
step_end
Movement_1A75F1:: @ 81A75F1
step_00
step_end
Movement_1A75F3:: @ 81A75F3
step_11
step_11
step_11
step_11
step_11
step_end
Movement_1A75F9:: @ 81A75F9
step_11
step_11
step_11
step_11
step_end
Movement_1A75FE:: @ 81A75FE
step_1c
step_1c
step_end
Movement_1A7601:: @ 81A7601
step_11
step_end
Movement_1A7603:: @ 81A7603
step_11
step_11
step_end
.include "data/scripts/movement.inc"
gUnknown_81A7606:: @ 81A7606
msgbox gUnknown_81C0DB0, MSGBOX_SIGN
@@ -2326,12 +2249,12 @@ gUnknown_81A7702:: @ 81A7702
end
EventScript_1A774D:: @ 81A774D
applymovement VAR_0x8008, Movement_1A75F1
applymovement VAR_0x8008, Movement_FaceDown
waitmovement 0
playse SE_PIN
applymovement VAR_0x8008, Movement_1A75DB
applymovement VAR_0x8008, Movement_ExclamationMark
waitmovement 0
applymovement VAR_0x8008, Movement_1A75DD
applymovement VAR_0x8008, Movement_Delay48
waitmovement 0
msgbox Text_1A62D3
setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
@@ -2348,7 +2271,7 @@ EventScript_1A778A:: @ 81A778A
end
EventScript_1A778C:: @ 81A778C
applymovement VAR_0x8008, Movement_1A75F1
applymovement VAR_0x8008, Movement_FaceDown
waitmovement 0
msgbox Text_1A6265
releaseall
@@ -2509,7 +2432,7 @@ EventScript_1A795F:: @ 81A795F
EventScript_1A796E:: @ 81A796E
textcolor 0
applymovement VAR_0x8009, Movement_1A75E7
applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft
waitmovement 0
switch VAR_0x4001
case 1, EventScript_1A79D8
@@ -2576,7 +2499,7 @@ EventScript_1A7A50:: @ 81A7A50
msgbox Text_1A5776
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7
applymovement VAR_0x8009, Movement_1A75ED
applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown
waitmovement 0
releaseall
end
@@ -2589,7 +2512,7 @@ EventScript_1A7A77:: @ 81A7A77
closemessage
waitse
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7
applymovement VAR_0x8009, Movement_1A75ED
applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown
waitmovement 0
releaseall
end
@@ -2611,7 +2534,7 @@ EventScript_1A7AA8:: @ 81A7AA8
end
Movement_1A7AB7:: @ 81A7AB7
step_10
walk_down
step_end
EventScript_1A7AB9:: @ 81A7AB9
@@ -2853,16 +2776,16 @@ EventScript_1A8025:: @ 81A8025
EventScript_1A80FE:: @ 81A80FE
lockall
applymovement VAR_0x8004, Movement_1A75E7
applymovement VAR_0x8004, Movement_WalkInPlaceFastestLeft
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_1A75E9
applymovement VAR_0x8004, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_1A75EB
applymovement VAR_0x8004, Movement_WalkInPlaceFastestRight
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_1A75ED
applymovement VAR_0x8004, Movement_WalkInPlaceFastestDown
waitmovement 0
delay 20
releaseall
@@ -3682,7 +3605,7 @@ EventScript_1A8DCF:: @ 81A8DCF
EventScript_MomHeal:: @ 81A8DD8
lockall
textcolor 1
applymovement 1, Movement_1A75ED
applymovement 1, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox Text_1A5FDF
call EventScript_FadeOut_Heal_FadeIn
@@ -3893,14 +3816,14 @@ EventScript_1A90F6:: @ 81A90F6
EventScript_1A9108:: @ 81A9108
closemessage
applymovement 6, Movement_1A75E5
applymovement 6, Movement_FaceOriginalDirection
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A911C
waitmovement 0
releaseall
end
Movement_1A911C:: @ 81A911C
step_11
walk_up
step_end
EventScript_1A911E:: @ 81A911E
@@ -4231,12 +4154,12 @@ FourIsland_House2_EventScript_1B2938:: @ 81B2938
EventScript_1B2951:: @ 81B2951
setflag FLAG_MET_STICKER_LADY
msgbox gUnknown_81B1EB3
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
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
compare VAR_0x8008, 0
goto_if eq, EventScript_1B2B8E
@@ -4248,7 +4171,7 @@ EventScript_1B2993:: @ 81B2993
end
EventScript_1B2994:: @ 81B2994
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
special sub_8110AB4
compare VAR_RESULT, 2
@@ -5331,9 +5254,9 @@ EventScript_1C508F::
EventScript_1C50C2:
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 3, Movement_1A75DB
applymovement 3, Movement_ExclamationMark
waitmovement 0
applymovement 3, Movement_1A75DD
applymovement 3, Movement_Delay48
waitmovement 0
setvar VAR_0x400E, 1
applymovement 3, Movement_1C5541
@@ -5373,9 +5296,9 @@ EventScript_1C515C:: @ 81C515C
EventScript_1C5182:
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 4, Movement_1A75DB
applymovement 4, Movement_ExclamationMark
waitmovement 0
applymovement 4, Movement_1A75DD
applymovement 4, Movement_Delay48
waitmovement 0
applymovement 4, Movement_1C5546
waitmovement 0
@@ -5384,9 +5307,9 @@ EventScript_1C5182:
EventScript_1C51AD:: @ 81C51AD
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 2, Movement_1A75DB
applymovement 2, Movement_ExclamationMark
waitmovement 0
applymovement 2, Movement_1A75DD
applymovement 2, Movement_Delay48
waitmovement 0
applymovement 2, Movement_1C5549
waitmovement 0
@@ -5395,9 +5318,9 @@ EventScript_1C51AD:: @ 81C51AD
EventScript_1C51D8:: @ 81C51D8
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 3, Movement_1A75DB
applymovement 3, Movement_ExclamationMark
waitmovement 0
applymovement 3, Movement_1A75DD
applymovement 3, Movement_Delay48
waitmovement 0
applymovement 3, Movement_1C5542
waitmovement 0
@@ -5592,9 +5515,9 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4
goto_if ne, EventScript_1C5528
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 2, Movement_1A75DB
applymovement 2, Movement_ExclamationMark
waitmovement 0
applymovement 2, Movement_1A75DD
applymovement 2, Movement_Delay48
goto EventScript_1C551B
SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA
@@ -5612,9 +5535,9 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
goto_if ne, EventScript_1C5528
setvar VAR_0x8004, 19
special sub_815D9E8
applymovement 5, Movement_1A75DB
applymovement 5, Movement_ExclamationMark
waitmovement 0
applymovement 5, Movement_1A75DD
applymovement 5, Movement_Delay48
EventScript_1C551B:
waitmovement 0
setvar VAR_0x400F, 1
@@ -5631,33 +5554,33 @@ EventScript_1C5528:: @ 81C5528
end
Movement_1C5541:
step_12
walk_left
Movement_1C5542:: @ 81C5542
step_12
step_12
walk_left
walk_left
Movement_1C5544:
step_12
walk_left
step_end
Movement_1C5546:: @ 81C5546
step_11
step_11
walk_up
walk_up
step_end
Movement_1C5549:: @ 81C5549
step_10
step_10
walk_down
walk_down
step_end
Movement_1C554C:: @ 81C554C
step_13
walk_right
Movement_1C554D:
step_11
step_00
walk_up
face_down
step_end
Movement_1C5550:: @ 81C5550
step_00
face_down
step_end
EventScript_1C5550:: @ 81C5552
data/maps/BirthIsland_Exterior/scripts.inc
+7 -7
View File
@@ -118,11 +118,11 @@ EventScript_165348:: @ 8165348
end
Movement_165353:: @ 8165353
step_down
step_down
step_down
step_down
step_down
step_down
step_down
walk_slowest_down
walk_slowest_down
walk_slowest_down
walk_slowest_down
walk_slowest_down
walk_slowest_down
walk_slowest_down
step_end
data/maps/CeladonCity/scripts.inc
+2 -2
View File
@@ -33,7 +33,7 @@ CeladonCity_EventScript_166CC5:: @ 8166CC5
faceplayer
msgbox gUnknown_818001B
closemessage
applymovement 2, Movement_1A75E5
applymovement 2, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -46,7 +46,7 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC
msgbox gUnknown_8180075
closemessage
waitmoncry
applymovement 3, Movement_1A75E5
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/CeladonCity_GameCorner/scripts.inc
+15 -15
View File
@@ -114,7 +114,7 @@ CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA
EventScript_16C7CA:: @ 816C7CA
closemessage
applymovement VAR_LAST_TALKED, Movement_1A75E5
applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -453,23 +453,23 @@ EventScript_16CB3F:: @ 816CB3F
return
Movement_16CB4A:: @ 816CB4A
step_10
step_13
step_13
step_11
step_13
step_13
step_13
step_13
walk_down
walk_right
walk_right
walk_up
walk_right
walk_right
walk_right
walk_right
step_end
Movement_16CB53:: @ 816CB53
step_13
step_13
step_13
step_13
step_13
step_13
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
step_end
CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A
data/maps/CeruleanCity/scripts.inc
+61 -61
View File
@@ -97,75 +97,75 @@ EventScript_1665B5:: @ 81665B5
return
Movement_1665C7:: @ 81665C7
step_1c
step_1b
step_30
step_1c
step_2d
delay_16
delay_8
walk_in_place_fastest_right
delay_16
walk_in_place_fastest_down
step_end
Movement_1665CD:: @ 81665CD
step_1c
step_1b
step_2f
step_1c
step_2d
delay_16
delay_8
walk_in_place_fastest_left
delay_16
walk_in_place_fastest_down
step_end
Movement_1665D3:: @ 81665D3
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_1665D9:: @ 81665D9
step_13
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_1c
step_1c
step_12
step_11
step_11
step_11
step_11
step_11
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
delay_16
delay_16
walk_left
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_1665EA:: @ 81665EA
step_12
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_1c
step_1c
step_13
step_11
step_11
step_11
step_11
step_11
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
delay_16
delay_16
walk_right
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_1665FB:: @ 81665FB
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
CeruleanCity_EventScript_166603:: @ 8166603
@@ -207,9 +207,9 @@ EventScript_166677:: @ 8166677
CeruleanCity_EventScript_166683:: @ 8166683
lockall
setvar VAR_0x4001, 0
applymovement 2, Movement_1A75E9
applymovement 2, Movement_WalkInPlaceFastestUp
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
goto EventScript_1666C3
end
@@ -217,9 +217,9 @@ CeruleanCity_EventScript_166683:: @ 8166683
CeruleanCity_EventScript_1666A3:: @ 81666A3
lockall
setvar VAR_0x4001, 1
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
goto EventScript_1666C3
end
@@ -238,7 +238,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7
faceplayer
msgbox gUnknown_817F0F1
closemessage
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -274,7 +274,7 @@ CeruleanCity_EventScript_166738:: @ 8166738
faceplayer
msgbox gUnknown_817F2CF
closemessage
applymovement 11, Movement_1A75E5
applymovement 11, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -292,7 +292,7 @@ CeruleanCity_EventScript_16674F:: @ 816674F
waitmessage
delay 40
playse SE_PIN
applymovement 5, Movement_1A75D9
applymovement 5, Movement_QuestionMark
waitmovement 0
delay 30
compare VAR_0x8008, 0
data/maps/CeruleanCity_House4/scripts.inc
+5 -5
View File
@@ -49,7 +49,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89
end
EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_8192CD5
release
@@ -74,7 +74,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9
end
EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_8192EC5
release
@@ -82,11 +82,11 @@ EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23
playse SE_PIN
applymovement 1, Movement_1A75DB
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
applymovement 1, Movement_1A75DD
applymovement 1, Movement_Delay48
waitmovement 0
return
data/maps/CinnabarIsland/scripts.inc
+67 -67
View File
@@ -82,12 +82,12 @@ EventScript_166FA0:: @ 8166FA0
end
Movement_166FC6:: @ 8166FC6
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
EventScript_166FCD:: @ 8166FCD
@@ -98,9 +98,9 @@ EventScript_166FCD:: @ 8166FCD
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_16703D
playse SE_PIN
applymovement 3, Movement_1A75DB
applymovement 3, Movement_ExclamationMark
waitmovement 0
applymovement 3, Movement_1A75DD
applymovement 3, Movement_Delay48
waitmovement 0
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167048
@@ -115,12 +115,12 @@ EventScript_166FCD:: @ 8166FCD
end
EventScript_167032:: @ 8167032
applymovement 3, Movement_1A75E9
applymovement 3, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_16703D:: @ 816703D
applymovement 3, Movement_1A75E7
applymovement 3, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -132,7 +132,7 @@ EventScript_167048:: @ 8167048
EventScript_167053:: @ 8167053
applymovement 3, Movement_1671A6
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -162,13 +162,13 @@ EventScript_1670A0:: @ 81670A0
return
Movement_1670AB:: @ 81670AB
step_13
step_10
step_10
step_10
step_10
step_10
step_10
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
EventScript_1670B3:: @ 81670B3
@@ -184,19 +184,19 @@ EventScript_1670B3:: @ 81670B3
return
Movement_1670DB:: @ 81670DB
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
Movement_1670DE:: @ 81670DE
step_1c
step_12
step_2e
delay_16
walk_left
walk_in_place_fastest_up
step_end
Movement_1670E2:: @ 81670E2
step_11
step_1a
walk_up
delay_4
set_invisible
step_end
@@ -254,79 +254,79 @@ EventScript_167183:: @ 8167183
return
Movement_167195:: @ 8167195
step_1c
step_1c
step_1f
step_1f
step_12
step_left
step_left
delay_16
delay_16
walk_fast_left
walk_fast_left
walk_left
walk_slowest_left
walk_slowest_left
step_end
Movement_16719D:: @ 816719D
step_13
step_10
step_10
step_13
step_1a
walk_right
walk_down
walk_down
walk_right
delay_4
set_invisible
step_end
Movement_1671A4:: @ 81671A4
step_11
walk_up
step_end
Movement_1671A6:: @ 81671A6
step_12
step_12
step_12
walk_left
walk_left
walk_left
step_end
Movement_1671AA:: @ 81671AA
step_1c
step_1c
step_1b
step_30
delay_16
delay_16
delay_8
walk_in_place_fastest_right
step_end
Movement_1671AF:: @ 81671AF
step_13
step_13
step_13
step_13
step_13
step_13
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
step_end
Movement_1671B6:: @ 81671B6
step_13
step_1a
walk_right
delay_4
set_invisible
step_end
Movement_1671BA:: @ 81671BA
step_10
step_13
step_10
step_10
step_30
step_1a
step_13
step_1a
walk_down
walk_right
walk_down
walk_down
walk_in_place_fastest_right
delay_4
walk_right
delay_4
set_invisible
step_end
Movement_1671C4:: @ 81671C4
step_13
step_1a
step_13
step_1a
walk_right
delay_4
walk_right
delay_4
set_invisible
step_end
CinnabarIsland_EventScript_1671CA:: @ 81671CA
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
msgbox gUnknown_8180B20
@@ -337,7 +337,7 @@ CinnabarIsland_EventScript_1671CA:: @ 81671CA
end
Movement_1671ED:: @ 81671ED
step_10
walk_down
step_end
CinnabarIsland_EventScript_1671EF:: @ 81671EF
data/maps/CinnabarIsland_Gym/scripts.inc
+34 -34
View File
@@ -289,24 +289,24 @@ EventScript_16DC7A:: @ 816DC7A
end
EventScript_16DCB4:: @ 816DCB4
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 1, Movement_16DCD8
waitmovement 0
return
EventScript_16DCC6:: @ 816DCC6
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 1, Movement_16DCDB
waitmovement 0
return
Movement_16DCD8:: @ 816DCD8
step_12
step_12
walk_left
walk_left
step_end
Movement_16DCDB:: @ 816DCDB
step_12
walk_left
step_end
CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD
@@ -380,21 +380,21 @@ EventScript_16DD9D:: @ 816DD9D
return
Movement_16DDAF:: @ 816DDAF
step_11
step_11
step_12
walk_up
walk_up
walk_left
step_end
Movement_16DDB3:: @ 816DDB3
step_11
step_11
step_2f
walk_up
walk_up
walk_in_place_fastest_left
step_end
Movement_16DDB7:: @ 816DDB7
step_1c
step_1c
step_30
delay_16
delay_16
walk_in_place_fastest_right
step_end
CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB
@@ -456,24 +456,24 @@ EventScript_16DE2F:: @ 816DE2F
end
EventScript_16DE69:: @ 816DE69
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 4, Movement_16DE8D
waitmovement 0
return
EventScript_16DE7B:: @ 816DE7B
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 4, Movement_16DE90
waitmovement 0
return
Movement_16DE8D:: @ 816DE8D
step_12
step_12
walk_left
walk_left
step_end
Movement_16DE90:: @ 816DE90
step_12
walk_left
step_end
CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92
@@ -535,24 +535,24 @@ EventScript_16DF06:: @ 816DF06
end
EventScript_16DF40:: @ 816DF40
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 5, Movement_16DF64
waitmovement 0
return
EventScript_16DF52:: @ 816DF52
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 5, Movement_16DF67
waitmovement 0
return
Movement_16DF64:: @ 816DF64
step_12
step_12
walk_left
walk_left
step_end
Movement_16DF67:: @ 816DF67
step_12
walk_left
step_end
CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69
@@ -614,24 +614,24 @@ EventScript_16DFDD:: @ 816DFDD
end
EventScript_16E017:: @ 816E017
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 6, Movement_16E03B
waitmovement 0
return
EventScript_16E029:: @ 816E029
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 6, Movement_16E03E
waitmovement 0
return
Movement_16E03B:: @ 816E03B
step_12
step_12
walk_left
walk_left
step_end
Movement_16E03E:: @ 816E03E
step_12
walk_left
step_end
CinnabarIsland_Gym_EventScript_16E040:: @ 816E040
@@ -693,24 +693,24 @@ EventScript_16E0B4:: @ 816E0B4
end
EventScript_16E0EE:: @ 816E0EE
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 7, Movement_16E112
waitmovement 0
return
EventScript_16E100:: @ 816E100
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 7, Movement_16E115
waitmovement 0
return
Movement_16E112:: @ 816E112
step_12
step_12
walk_left
walk_left
step_end
Movement_16E115:: @ 816E115
step_12
walk_left
step_end
EventScript_16E117:: @ 816E117
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+49 -49
View File
@@ -77,68 +77,68 @@ EventScript_16E9A5:: @ 816E9A5
end
Movement_16E9AF:: @ 816E9AF
step_12
step_12
step_12
step_12
step_10
step_10
step_10
step_1b
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
walk_down
delay_8
set_invisible
step_end
Movement_16E9B9:: @ 816E9B9
step_10
step_12
step_12
step_12
step_12
step_10
step_10
step_1c
step_10
walk_down
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
delay_16
walk_down
step_end
Movement_16E9C3:: @ 816E9C3
step_11
step_12
step_12
step_10
step_12
step_12
step_10
step_10
step_10
step_1b
walk_up
walk_left
walk_left
walk_down
walk_left
walk_left
walk_down
walk_down
walk_down
delay_8
set_invisible
step_end
Movement_16E9CF:: @ 816E9CF
step_1c
step_1c
step_1c
step_02
step_1c
step_12
step_12
step_12
step_10
step_10
step_1b
step_10
step_1b
delay_16
delay_16
delay_16
face_left
delay_16
walk_left
walk_left
walk_left
walk_down
walk_down
delay_8
walk_down
delay_8
set_invisible
step_end
Movement_16E9DE:: @ 816E9DE
step_12
step_12
step_12
step_12
step_12
step_10
step_10
step_1c
step_10
walk_left
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
delay_16
walk_down
step_end
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+9 -9
View File
@@ -51,16 +51,16 @@ EventScript_164CB6:: @ 8164CB6
end
Movement_164CC0:: @ 8164CC0
step_12
step_1c
step_13
step_1c
step_2e
step_1c
step_2d
walk_left
delay_16
walk_right
delay_16
walk_in_place_fastest_up
delay_16
walk_in_place_fastest_down
step_end
Movement_164CC8:: @ 8164CC8
step_10
step_10
walk_down
walk_down
step_end
data/maps/FiveIsland_MemorialPillar/scripts.inc
+5 -5
View File
@@ -9,11 +9,11 @@ FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
goto_if TRUE, EventScript_168A22
msgbox gUnknown_818B02E
closemessage
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
delay 45
msgbox gUnknown_818B03C
applymovement 1, Movement_1A75E9
applymovement 1, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_818B05E
release
@@ -61,10 +61,10 @@ EventScript_168A9B:: @ 8168A9B
removeitem ITEM_LEMONADE, 1
msgbox gUnknown_818B13E
closemessage
applymovement 1, Movement_1A75EB
applymovement 1, Movement_WalkInPlaceFastestRight
waitmovement 0
delay 45
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
textcolor 0
msgbox gUnknown_818B171
@@ -77,7 +77,7 @@ EventScript_168A9B:: @ 8168A9B
EventScript_168AE8:: @ 8168AE8
msgbox gUnknown_818B219
applymovement 1, Movement_1A75E9
applymovement 1, Movement_WalkInPlaceFastestUp
waitmovement 0
setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
return
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+2 -2
View File
@@ -20,7 +20,7 @@ EventScript_168808:: @ 8168808
textcolor 1
msgbox gUnknown_818A7DB
closemessage
applymovement 8, Movement_1A75E9
applymovement 8, Movement_WalkInPlaceFastestUp
waitmovement 0
opendoor 39, 8
waitdooranim
@@ -35,7 +35,7 @@ EventScript_168808:: @ 8168808
end
Movement_168841:: @ 8168841
step_11
walk_up
set_invisible
step_end
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+22 -22
View File
@@ -45,7 +45,7 @@ EventScript_171F34:: @ 8171F34
waitmovement 0
textcolor 0
msgbox gUnknown_81A450B
applymovement 1, Movement_1A75E9
applymovement 1, Movement_WalkInPlaceFastestUp
waitmovement 0
textcolor 1
msgbox gUnknown_81A4521
@@ -71,25 +71,25 @@ EventScript_171F34:: @ 8171F34
end
EventScript_171FCD:: @ 8171FCD
applymovement 1, Movement_1A75ED
applymovement 1, Movement_WalkInPlaceFastestDown
applymovement 2, Movement_17204D
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_171FE9:: @ 8171FE9
applymovement 2, Movement_172055
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_171FFE:: @ 8171FFE
applymovement 1, Movement_1A75E7
applymovement 1, Movement_WalkInPlaceFastestLeft
applymovement 2, Movement_172059
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
@@ -114,34 +114,34 @@ EventScript_172043:: @ 8172043
end
Movement_17204D:: @ 817204D
step_12
step_12
step_12
step_10
step_10
step_10
step_30
walk_left
walk_left
walk_left
walk_down
walk_down
walk_down
walk_in_place_fastest_right
step_end
Movement_172055:: @ 8172055
step_12
step_12
step_2d
walk_left
walk_left
walk_in_place_fastest_down
step_end
Movement_172059:: @ 8172059
step_12
step_12
step_12
step_10
walk_left
walk_left
walk_left
walk_down
step_end
Movement_17205E:: @ 817205E
step_11
walk_up
step_end
Movement_172060:: @ 8172060
step_25
walk_in_place_down
step_end
FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+11 -11
View File
@@ -36,7 +36,7 @@ FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78
FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
lockall
applymovement 4, Movement_1A75E7
applymovement 4, Movement_WalkInPlaceFastestLeft
waitmovement 0
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
releaseall
@@ -95,7 +95,7 @@ EventScript_16402F:: @ 816402F
end
EventScript_164065:: @ 8164065
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -143,7 +143,7 @@ EventScript_1640A2:: @ 81640A2
EventScript_16412E:: @ 816412E
compare VAR_0x8004, 27
goto_if eq, EventScript_1A77A9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -158,27 +158,27 @@ EventScript_16414F:: @ 816414F
return
EventScript_16415A:: @ 816415A
applymovement 3, Movement_1A75E9
applymovement 3, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_164165:: @ 8164165
applymovement 3, Movement_1A75E7
applymovement 3, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_164170:: @ 8164170
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
return
Movement_16417B:: @ 816417B
step_13
step_13
step_2e
walk_right
walk_right
walk_in_place_fastest_up
step_end
Movement_16417F:: @ 816417F
step_13
step_2e
walk_right
walk_in_place_fastest_up
step_end
data/maps/FourIsland/scripts.inc
+12 -12
View File
@@ -29,12 +29,12 @@ FourIsland_OnFrame:: @ 8167CE2
EventScript_167CEC:: @ 8167CEC
lockall
textcolor 0
applymovement 10, Movement_1A75ED
applymovement 10, Movement_WalkInPlaceFastestDown
waitmovement 0
playbgm MUS_RIVAL1, 0
applymovement 10, Movement_1A75DB
applymovement 10, Movement_ExclamationMark
waitmovement 0
applymovement 10, Movement_1A75DD
applymovement 10, Movement_Delay48
waitmovement 0
delay 25
applymovement 10, Movement_167D49
@@ -53,21 +53,21 @@ EventScript_167CEC:: @ 8167CEC
end
Movement_167D49:: @ 8167D49
step_13
step_13
step_10
step_10
walk_right
walk_right
walk_down
walk_down
step_end
Movement_167D4E:: @ 8167D4E
step_1c
step_1a
step_10
delay_16
delay_4
walk_down
step_end
Movement_167D52:: @ 8167D52
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
FourIsland_EventScript_167D55:: @ 8167D55
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+64 -64
View File
@@ -21,19 +21,19 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
msgbox gUnknown_817B0B9
closemessage
playse SE_PIN
applymovement 3, Movement_1A75DB
applymovement 3, Movement_ExclamationMark
waitmovement 0
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
applymovement 3, Movement_1A75DD
applymovement 3, Movement_Delay48
waitmovement 0
textcolor 1
msgbox gUnknown_817B109
closemessage
applymovement 3, Movement_1A75EB
applymovement 3, Movement_WalkInPlaceFastestRight
waitmovement 0
delay 18
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
delay 35
applymovement 4, Movement_163F11
@@ -77,7 +77,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
delay 50
applymovement 3, Movement_163F23
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
textcolor 1
msgbox gUnknown_817B457
@@ -88,103 +88,103 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
end
Movement_163EDD:: @ 8163EDD
step_11
step_11
step_13
step_11
walk_up
walk_up
walk_right
walk_up
step_end
Movement_163EE2:: @ 8163EE2
step_1c
step_2f
step_1c
step_1c
step_2d
delay_16
walk_in_place_fastest_left
delay_16
delay_16
walk_in_place_fastest_down
step_end
Movement_163EE8:: @ 8163EE8
step_25
walk_in_place_down
step_end
gUnknown_163EEA:: @ 8163EEA
step_4c
step_13
step_4d
lock_facing_direction
walk_right
unlock_facing_direction
step_end
Movement_163EEE:: @ 8163EEE
step_29
walk_in_place_fast_down
step_end
Movement_163EF0:: @ 8163EF0
step_13
step_10
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
walk_right
walk_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
step_end
Movement_163EFA:: @ 8163EFA
step_1c
step_12
step_10
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
delay_16
walk_left
walk_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
step_end
Movement_163F05:: @ 8163F05
step_1c
step_10
step_1c
step_10
step_20
step_20
step_1d
step_1d
step_1d
step_1d
step_1d
delay_16
walk_down
delay_16
walk_down
walk_fast_right
walk_fast_right
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
step_end
Movement_163F11:: @ 8163F11
step_1c
step_1b
step_30
delay_16
delay_8
walk_in_place_fastest_right
step_end
Movement_163F15:: @ 8163F15
step_12
step_12
walk_left
walk_left
step_end
Movement_163F18:: @ 8163F18
step_12
step_11
walk_left
walk_up
step_end
Movement_163F1B:: @ 8163F1B
step_26
walk_in_place_up
step_end
Movement_163F1D:: @ 8163F1D
step_1b
step_30
step_1c
step_1c
step_2d
delay_8
walk_in_place_fastest_right
delay_16
delay_16
walk_in_place_fastest_down
step_end
Movement_163F23:: @ 8163F23
step_13
walk_right
step_end
FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25
data/maps/FourIsland_PokemonDayCare/scripts.inc
+18 -18
View File
@@ -161,25 +161,25 @@ EventScript_171B67:: @ 8171B67
end
Movement_171B71:: @ 8171B71
step_1c
step_1c
step_03
step_1c
step_1c
step_02
step_1c
step_1c
step_01
step_up
delay_16
delay_16
face_right
delay_16
delay_16
face_left
delay_16
delay_16
face_up
walk_slowest_up
set_invisible
step_1c
step_1c
step_1c
step_1c
step_1c
step_00
step_61
step_down
delay_16
delay_16
delay_16
delay_16
delay_16
face_down
set_visible
walk_slowest_down
step_end
EventScript_171B85:: @ 8171B85
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+17 -17
View File
@@ -59,22 +59,22 @@ EventScript_16D345:: @ 816D345
end
Movement_16D362:: @ 816D362
step_10
step_10
walk_down
walk_down
step_end
Movement_16D365:: @ 816D365
step_11
walk_up
step_end
Movement_16D367:: @ 816D367
step_10
step_10
walk_down
walk_down
step_end
Movement_16D36A:: @ 816D36A
step_10
step_1b
walk_down
delay_8
step_end
FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D
@@ -98,7 +98,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385
EventScript_16D391:: @ 816D391
textcolor 0
msgbox gUnknown_8197C6B
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
showmoneybox 0, 0, 0
msgbox gUnknown_8197C87, MSGBOX_YESNO
@@ -176,24 +176,24 @@ EventScript_16D49A:: @ 816D49A
end
Movement_16D4AA:: @ 816D4AA
step_10
walk_down
step_end
Movement_16D4AC:: @ 816D4AC
step_11
step_11
walk_up
walk_up
step_end
Movement_16D4AF:: @ 816D4AF
step_11
step_12
step_11
walk_up
walk_left
walk_up
step_end
Movement_16D4B3:: @ 816D4B3
step_11
step_13
step_11
walk_up
walk_right
walk_up
step_end
FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7
data/maps/IndigoPlateau_Exterior/scripts.inc
+66 -66
View File
@@ -83,103 +83,103 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
end
Movement_167311:: @ 8167311
step_3d
step_3d
step_3d
step_3d
step_3d
step_3d
player_run_down
player_run_down
player_run_down
player_run_down
player_run_down
player_run_down
step_end
Movement_167318:: @ 8167318
step_10
step_10
walk_down
walk_down
step_end
Movement_16731B:: @ 816731B
step_1c
step_1a
step_2d
delay_16
delay_4
walk_in_place_fastest_down
step_end
Movement_16731F:: @ 816731F
step_1b
step_30
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_2d
delay_8
walk_in_place_fastest_right
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
walk_in_place_fastest_down
step_end
Movement_16732E:: @ 816732E
step_13
step_1c
step_10
step_10
step_1c
step_1c
walk_right
delay_16
walk_down
walk_down
delay_16
delay_16
step_end
Movement_167335:: @ 8167335
step_2d
walk_in_place_fastest_down
step_end
Movement_167337:: @ 8167337
step_03
step_4c
step_12
step_4d
face_right
lock_facing_direction
walk_left
unlock_facing_direction
step_end
Movement_16733C:: @ 816733C
step_2e
walk_in_place_fastest_up
step_end
Movement_16733E:: @ 816733E
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
step_end
Movement_167346:: @ 8167346
step_1d
walk_fast_down
step_end
Movement_167348:: @ 8167348
step_2f
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_2d
step_1c
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_in_place_fastest_left
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
walk_in_place_fastest_down
delay_16
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_16735D:: @ 816735D
step_10
walk_down
step_end
data/maps/MtEmber_Exterior/scripts.inc
+7 -7
View File
@@ -39,7 +39,7 @@ EventScript_16399E:: @ 816399E
end
EventScript_1639A8:: @ 81639A8
applymovement 2, Movement_1A75E1
applymovement 2, Movement_FacePlayer
waitmovement 0
playbgm MUS_ROCKET, 0
msgbox gUnknown_817AA06
@@ -69,7 +69,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0
goto_if eq, EventScript_163A25
msgbox gUnknown_817A88C
closemessage
applymovement 3, Movement_1A75E5
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -96,18 +96,18 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
message Text_17A8EE
waitmessage
playse SE_PIN
applymovement 3, Movement_1A75D9
applymovement 3, Movement_QuestionMark
waitmovement 0
waitbuttonpress
msgbox gUnknown_817A970
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
applymovement 2, Movement_1A75DB
applymovement 2, Movement_ExclamationMark
waitmovement 0
applymovement 2, Movement_1A75DD
applymovement 2, Movement_Delay48
waitmovement 0
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
call EventScript_163960
msgbox gUnknown_817A9E1
data/maps/MtMoon_B2F/scripts.inc
+8 -8
View File
@@ -14,7 +14,7 @@ EventScript_1606A9:: @ 81606A9
MtMoon_B2F_EventScript_1606B0:: @ 81606B0
lockall
applymovement 3, Movement_1A75EB
applymovement 3, Movement_WalkInPlaceFastestRight
waitmovement 0
call EventScript_1606DD
releaseall
@@ -80,10 +80,10 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
end
Movement_16077A:: @ 816077A
step_13
step_11
step_11
step_11
walk_right
walk_up
walk_up
walk_up
step_end
MtMoon_B2F_EventScript_16077F:: @ 816077F
@@ -117,9 +117,9 @@ EventScript_1607DE:: @ 81607DE
end
Movement_1607E0:: @ 81607E0
step_11
step_11
step_11
walk_up
walk_up
walk_up
step_end
MtMoon_B2F_EventScript_1607E4:: @ 81607E4
data/maps/NavelRock_Summit/scripts.inc
+22 -22
View File
@@ -96,35 +96,35 @@ EventScript_1650C2:: @ 81650C2
end
Movement_1650CD:: @ 81650CD
step_11
step_11
step_11
walk_up
walk_up
walk_up
step_end
Movement_1650D1:: @ 81650D1
step_1c
step_1c
step_10
step_10
step_10
delay_16
delay_16
walk_down
walk_down
walk_down
step_end
Movement_1650D7:: @ 81650D7
step_10
step_10
step_10
step_10
step_10
step_25
step_1c
step_1c
walk_down
walk_down
walk_down
walk_down
walk_down
walk_in_place_down
delay_16
delay_16
step_end
Movement_1650E0:: @ 81650E0
step_1c
step_1c
step_25
step_25
step_25
step_25
delay_16
delay_16
walk_in_place_down
walk_in_place_down
walk_in_place_down
walk_in_place_down
step_end
data/maps/OneIsland/scripts.inc
+28 -28
View File
@@ -36,47 +36,47 @@ EventScript_16749D:: @ 816749D
end
Movement_1674F4:: @ 81674F4
step_11
step_11
step_11
step_11
step_11
step_13
step_13
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_up
walk_right
walk_right
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_167501:: @ 8167501
step_11
step_11
walk_up
walk_up
set_invisible
step_end
Movement_167505:: @ 8167505
step_11
walk_up
step_end
Movement_167507:: @ 8167507
step_11
step_11
step_11
step_11
step_13
step_13
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_right
walk_right
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_167514:: @ 8167514
step_11
walk_up
set_invisible
step_end
data/maps/OneIsland_Harbor/scripts.inc
+3 -3
View File
@@ -27,9 +27,9 @@ EventScript_17139C:: @ 817139C
end
Movement_1713B9:: @ 81713B9
step_11
step_11
step_11
walk_up
walk_up
walk_up
step_end
OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+86 -86
View File
@@ -65,48 +65,48 @@ EventScript_170CB1:: @ 8170CB1
applymovement 2, Movement_170E86
waitmovement 0
msgbox gUnknown_81A0CDE
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
playse SE_PIN
applymovement 3, Movement_1A75DB
applymovement 3, Movement_ExclamationMark
waitmovement 0
applymovement 3, Movement_1A75E7
applymovement 3, Movement_WalkInPlaceFastestLeft
waitmovement 0
applymovement 3, Movement_1A75DD
applymovement 3, Movement_Delay48
waitmovement 0
msgbox gUnknown_81A0CF7
msgbox gUnknown_81A0D27
applymovement 2, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement 2, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81A0D72
applymovement 2, Movement_1A75EB
applymovement 2, Movement_WalkInPlaceFastestRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_170E34
checkflag FLAG_SYS_GAME_CLEAR
call_if FALSE, EventScript_170E3D
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A0E17
msgbox gUnknown_81A0E90
applymovement 3, Movement_1A75E7
applymovement 3, Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox gUnknown_81A0ECC
closemessage
applymovement 2, Movement_1A75E9
applymovement 2, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81A0F40
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81A0FB1
giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
additem ITEM_METEORITE, 1
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A1113
additem ITEM_TRI_PASS, 1
@@ -119,9 +119,9 @@ EventScript_170CB1:: @ 8170CB1
setflag FLAG_SYS_SEVII_MAP_123
msgbox gUnknown_81A1230
closemessage
applymovement 2, Movement_1A75E9
applymovement 2, Movement_WalkInPlaceFastestUp
waitmovement 0
applymovement 3, Movement_1A75E9
applymovement 3, Movement_WalkInPlaceFastestUp
waitmovement 0
setflag FLAG_SYS_PC_STORAGE_DISABLED
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
@@ -153,34 +153,34 @@ EventScript_170E58:: @ 8170E58
return
Movement_170E7D:: @ 8170E7D
step_11
step_11
step_13
step_13
step_13
step_13
step_13
step_2e
walk_up
walk_up
walk_right
walk_right
walk_right
walk_right
walk_right
walk_in_place_fastest_up
step_end
Movement_170E86:: @ 8170E86
step_11
step_13
step_13
step_13
step_13
step_13
step_11
step_30
walk_up
walk_right
walk_right
walk_right
walk_right
walk_right
walk_up
walk_in_place_fastest_right
step_end
Movement_170E8F:: @ 8170E8F
step_11
walk_up
step_end
Movement_170E91:: @ 8170E91
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
@@ -199,7 +199,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
end
EventScript_170EB1:: @ 8170EB1
applymovement 2, Movement_1A75E1
applymovement 2, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81A128C
release
@@ -227,7 +227,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
goto_if eq, EventScript_171134
msgbox gUnknown_81A1321
closemessage
applymovement 3, Movement_1A75E5
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -289,7 +289,7 @@ EventScript_170FA5:: @ 8170FA5
call EventScript_170C36
special DrawWholeMapView
msgbox gUnknown_81A1D59
applymovement 3, Movement_1A75E1
applymovement 3, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81A1D7D
special sub_810B82C
@@ -321,7 +321,7 @@ EventScript_171044:: @ 8171044
call EventScript_170C22
special DrawWholeMapView
delay 30
applymovement 3, Movement_1A75E1
applymovement 3, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81A19AA, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -363,10 +363,10 @@ EventScript_1710F2:: @ 81710F2
EventScript_1710FC:: @ 81710FC
msgbox gUnknown_81A169B
applymovement 3, Movement_1A75E9
applymovement 3, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81A1723
applymovement 3, Movement_1A75E1
applymovement 3, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81A17DF
setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1
@@ -380,17 +380,17 @@ EventScript_171134:: @ 8171134
end
Movement_17113E:: @ 817113E
step_26
step_1b
step_26
walk_in_place_up
delay_8
walk_in_place_up
step_end
Movement_171142:: @ 8171142
step_2e
step_26
step_1c
step_26
step_26
walk_in_place_fastest_up
walk_in_place_up
delay_16
walk_in_place_up
walk_in_place_up
step_end
OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148
@@ -462,7 +462,7 @@ OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE
EventScript_1711DA:: @ 81711DA
textcolor 0
playse SE_PIN
applymovement 2, Movement_1A75DB
applymovement 2, Movement_ExclamationMark
waitmovement 0
msgbox gUnknown_81A13B8
closemessage
@@ -476,30 +476,30 @@ EventScript_1711DA:: @ 81711DA
call_if eq, EventScript_171305
delay 10
msgbox gUnknown_81A13CB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A1431
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
applymovement 3, Movement_1A75E9
applymovement 3, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81A1470
msgbox gUnknown_81A14E1
closemessage
applymovement 2, Movement_1A75E7
applymovement 2, Movement_WalkInPlaceFastestLeft
waitmovement 0
delay 10
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
delay 15
msgbox gUnknown_81A14FB
closemessage
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
delay 15
applymovement 3, Movement_1A75E7
applymovement 3, Movement_WalkInPlaceFastestLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A1574
closemessage
@@ -538,53 +538,53 @@ EventScript_171305:: @ 8171305
return
Movement_171310:: @ 8171310
step_13
step_10
step_30
walk_right
walk_down
walk_in_place_fastest_right
step_end
Movement_171314:: @ 8171314
step_13
walk_right
step_end
Movement_171316:: @ 8171316
step_13
step_11
step_30
walk_right
walk_up
walk_in_place_fastest_right
step_end
Movement_17131A:: @ 817131A
step_13
step_11
step_11
step_30
walk_right
walk_up
walk_up
walk_in_place_fastest_right
step_end
Movement_17131F:: @ 817131F
step_1c
step_1c
step_1a
step_2f
delay_16
delay_16
delay_4
walk_in_place_fastest_left
step_end
Movement_171324:: @ 8171324
step_29
walk_in_place_fast_down
step_end
Movement_171326:: @ 8171326
step_12
step_12
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
step_end
Movement_17132D:: @ 817132D
step_12
step_12
step_12
step_12
step_12
step_10
walk_left
walk_left
walk_left
walk_left
walk_left
walk_down
step_end
data/maps/PalletTown/scripts.inc
+169 -169
View File
@@ -102,73 +102,73 @@ EventScript_1655A1:: @ 81655A1
end
Movement_1655AF:: @ 81655AF
step_12
step_12
step_12
step_11
step_11
step_11
step_11
step_11
step_12
step_12
step_12
step_12
step_12
step_2e
walk_left
walk_left
walk_left
walk_up
walk_up
walk_up
walk_up
walk_up
walk_left
walk_left
walk_left
walk_left
walk_left
walk_in_place_fastest_up
step_end
Movement_1655BE:: @ 81655BE
step_13
step_13
step_13
step_13
step_13
step_10
step_10
step_10
step_10
step_10
step_13
step_13
step_13
walk_right
walk_right
walk_right
walk_right
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_right
walk_right
step_end
Movement_1655CC:: @ 81655CC
step_13
step_13
step_13
step_13
step_13
step_10
step_10
step_10
step_10
step_10
step_13
step_13
step_13
step_13
step_13
step_2e
walk_right
walk_right
walk_right
walk_right
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_in_place_fastest_up
step_end
Movement_1655DD:: @ 81655DD
step_10
step_13
step_13
step_13
step_13
step_13
step_10
step_10
step_10
step_10
step_10
step_13
step_13
step_13
step_13
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_right
walk_right
walk_right
step_end
PalletTown_EventScript_1655ED:: @ 81655ED
@@ -192,10 +192,10 @@ EventScript_165605:: @ 8165605
waitmessage
delay 85
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75DB
applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark
waitmovement 0
delay 30
addobject 3
@@ -251,124 +251,124 @@ EventScript_1656E0:: @ 81656E0
return
Movement_1656F2:: @ 81656F2
step_11
step_11
step_13
step_11
step_11
step_13
step_11
step_11
walk_up
walk_up
walk_right
walk_up
walk_up
walk_right
walk_up
walk_up
step_end
Movement_1656FB:: @ 81656FB
step_13
step_11
step_11
step_13
step_11
step_11
step_13
step_11
step_11
walk_right
walk_up
walk_up
walk_right
walk_up
walk_up
walk_right
walk_up
walk_up
step_end
Movement_165705:: @ 8165705
step_10
step_12
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_13
step_13
step_13
step_13
step_13
step_2e
walk_down
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_in_place_fastest_up
step_end
Movement_165719:: @ 8165719
step_10
step_12
step_12
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_13
step_13
step_13
step_13
step_13
step_2e
walk_down
walk_left
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_in_place_fastest_up
step_end
Movement_16572E:: @ 816572E
step_11
walk_up
set_invisible
step_end
Movement_165731:: @ 8165731
step_10
step_10
step_12
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_13
step_13
step_13
step_13
walk_down
walk_down
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_right
walk_right
walk_right
step_end
Movement_165744:: @ 8165744
step_10
step_10
step_12
step_12
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_13
step_13
step_13
step_13
walk_down
walk_down
walk_left
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_right
walk_right
walk_right
step_end
Movement_165758:: @ 8165758
step_13
step_11
walk_right
walk_up
set_invisible
step_end
@@ -383,12 +383,12 @@ PalletTown_EventScript_16575C:: @ 816575C
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_165801
msgbox gUnknown_81B1C8B
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
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_81B1C9F
closemessage
@@ -412,34 +412,34 @@ EventScript_1657E2:: @ 81657E2
return
EventScript_1657ED:: @ 81657ED
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_817D7C8
release
end
EventScript_165801:: @ 8165801
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81B1CAF
release
end
EventScript_165815:: @ 8165815
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81B1CEC
release
end
Movement_165829:: @ 8165829
step_13
step_2f
walk_right
walk_in_place_fastest_left
step_end
Movement_16582C:: @ 816582C
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
PalletTown_EventScript_16582F:: @ 816582F
@@ -474,8 +474,8 @@ PalletTown_EventScript_16586B:: @ 816586B
PalletTown_EventScript_16587B:: @ 816587B
lockall
applymovement 1, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement 1, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
call EventScript_165894
releaseall
@@ -498,7 +498,7 @@ EventScript_165894:: @ 8165894
return
EventScript_1658C2:: @ 81658C2
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
call EventScript_165894
release
data/maps/PalletTown_GarysHouse/scripts.inc
+3 -3
View File
@@ -34,7 +34,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
goto_if ge, EventScript_168DAF
msgbox gUnknown_818D58C
closemessage
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -145,12 +145,12 @@ EventScript_168EF6:: @ 8168EF6
checkitemspace ITEM_TOWN_MAP, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_168F4F
applymovement 1, Movement_1A75EB
applymovement 1, Movement_WalkInPlaceFastestRight
waitmovement 0
removeobject 2
setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
delay 15
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
delay 12
additem ITEM_TOWN_MAP, 1
data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09
compare VAR_RESULT, 1
call_if eq, EventScript_168C41
closemessage
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+254 -254
View File
@@ -147,7 +147,7 @@ EventScript_169194:: @ 8169194
setobjectxyperm 8, 6, 10
addobject 8
playbgm MUS_RIVAL1, 0
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
applymovement 8, Movement_169B9D
waitmovement 0
@@ -157,18 +157,18 @@ EventScript_1691BB:: @ 81691BB
setobjectxyperm 8, 6, 10
addobject 8
playbgm MUS_RIVAL1, 0
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement 8, Movement_169B9D
waitmovement 0
return
EventScript_1691DB:: @ 81691DB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_1691E6:: @ 81691E6
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -196,19 +196,19 @@ EventScript_169227:: @ 8169227
return
Movement_169232:: @ 8169232
step_11
step_12
step_2e
step_1c
step_1a
walk_up
walk_left
walk_in_place_fastest_up
delay_16
delay_4
step_end
Movement_169238:: @ 8169238
step_12
step_12
step_11
step_1c
step_1a
walk_left
walk_left
walk_up
delay_16
delay_4
step_end
EventScript_16923E:: @ 816923E
@@ -222,7 +222,7 @@ EventScript_16923E:: @ 816923E
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7
waitmovement 0
applymovement 8, Movement_1A75E9
applymovement 8, Movement_WalkInPlaceFastestUp
waitmovement 0
clearflag FLAG_SPECIAL_FLAG_0x4001
savebgm SE_STOP
@@ -242,34 +242,34 @@ EventScript_16923E:: @ 816923E
end
Movement_1692B0:: @ 81692B0
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_1692B7:: @ 81692B7
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_1692C0:: @ 81692C0
step_26
step_26
walk_in_place_up
walk_in_place_up
step_end
PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3
lockall
textcolor 0
applymovement 4, Movement_1A75F1
applymovement 4, Movement_FaceDown
waitmovement 0
msgbox gUnknown_818E177
closemessage
@@ -279,7 +279,7 @@ PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3
end
Movement_1692E5:: @ 81692E5
step_11
walk_up
step_end
PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7
@@ -303,13 +303,13 @@ PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF
EventScript_16930B:: @ 816930B
textcolor 0
playbgm MUS_RIVAL1, 0
applymovement 8, Movement_1A75ED
applymovement 8, Movement_WalkInPlaceFastestDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_818DDA4
closemessage
applymovement 4, Movement_1A75F1
applymovement 4, Movement_FaceDown
waitmovement 0
compare VAR_STARTER_MON, 0
goto_if eq, EventScript_1693D2
@@ -352,27 +352,27 @@ EventScript_1693AC:: @ 81693AC
end
Movement_1693C0:: @ 81693C0
step_12
step_12
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
step_end
Movement_1693C7:: @ 81693C7
step_12
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_left
walk_down
walk_down
step_end
Movement_1693CD:: @ 81693CD
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_down
walk_down
step_end
EventScript_1693D2:: @ 81693D2
@@ -408,30 +408,30 @@ EventScript_169424:: @ 8169424
end
Movement_169438:: @ 8169438
step_12
step_12
step_12
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
step_end
Movement_169440:: @ 8169440
step_12
step_12
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
step_end
Movement_169447:: @ 8169447
step_12
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_left
walk_down
walk_down
step_end
EventScript_16944D:: @ 816944D
@@ -467,24 +467,24 @@ EventScript_16949F:: @ 816949F
end
Movement_1694B3:: @ 81694B3
step_12
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_left
walk_down
walk_down
step_end
Movement_1694B9:: @ 81694B9
step_12
step_12
step_10
step_10
walk_left
walk_left
walk_down
walk_down
step_end
Movement_1694BE:: @ 81694BE
step_12
step_10
step_10
walk_left
walk_down
walk_down
step_end
EventScript_1694C2:: @ 81694C2
@@ -525,50 +525,50 @@ EventScript_169528:: @ 8169528
return
Movement_16953A:: @ 816953A
step_13
step_10
step_10
step_10
step_10
step_10
step_1b
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
delay_8
step_end
Movement_169542:: @ 8169542
step_12
step_10
step_10
step_10
step_10
step_10
step_1b
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
delay_8
step_end
Movement_16954A:: @ 816954A
step_13
step_10
step_10
step_10
step_12
step_10
step_10
step_1b
walk_right
walk_down
walk_down
walk_down
walk_left
walk_down
walk_down
delay_8
step_end
Movement_169553:: @ 8169553
step_1c
step_1b
step_30
step_1c
step_2d
delay_16
delay_8
walk_in_place_fastest_right
delay_16
walk_in_place_fastest_down
step_end
Movement_169559:: @ 8169559
step_1c
step_1b
step_2f
step_1c
step_2d
delay_16
delay_8
walk_in_place_fastest_left
delay_16
walk_in_place_fastest_down
step_end
PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
@@ -658,9 +658,9 @@ EventScript_16961E:: @ 816961E
closemessage
delay 30
playse SE_PIN
applymovement 4, Movement_1A75DB
applymovement 4, Movement_ExclamationMark
waitmovement 0
applymovement 4, Movement_1A75DD
applymovement 4, Movement_Delay48
waitmovement 0
compare VAR_FACING, 1
call_if eq, EventScript_169ADD
@@ -685,7 +685,7 @@ EventScript_16961E:: @ 816961E
delay 40
msgbox gUnknown_818E5C5
closemessage
applymovement 4, Movement_1A75E9
applymovement 4, Movement_WalkInPlaceFastestUp
waitmovement 0
removeobject 9
delay 10
@@ -767,19 +767,19 @@ EventScript_16986D:: @ 816986D
return
Movement_169878:: @ 8169878
step_1c
step_1b
step_30
delay_16
delay_8
walk_in_place_fastest_right
step_end
Movement_16987C:: @ 816987C
step_13
step_10
walk_right
walk_down
step_end
Movement_16987F:: @ 816987F
step_10
step_13
walk_down
walk_right
step_end
EventScript_169882:: @ 8169882
@@ -806,30 +806,30 @@ EventScript_1698B8:: @ 81698B8
return
Movement_1698C3:: @ 81698C3
step_1c
step_1b
step_2e
delay_16
delay_8
walk_in_place_fastest_up
step_end
Movement_1698C7:: @ 81698C7
step_1c
step_1b
step_2f
delay_16
delay_8
walk_in_place_fastest_left
step_end
Movement_1698CB:: @ 81698CB
step_11
step_12
step_1c
step_2d
walk_up
walk_left
delay_16
walk_in_place_fastest_down
step_end
Movement_1698D0:: @ 81698D0
step_12
step_12
step_11
step_1c
step_30
walk_left
walk_left
walk_up
delay_16
walk_in_place_fastest_right
step_end
EventScript_1698D6:: @ 81698D6
@@ -864,7 +864,7 @@ EventScript_169913:: @ 8169913
call_if eq, EventScript_16997A
compare VAR_FACING, 3
call_if eq, EventScript_169985
applymovement 4, Movement_1A75E1
applymovement 4, Movement_FacePlayer
waitmovement 0
closemessage
delay 70
@@ -894,77 +894,77 @@ EventScript_169985:: @ 8169985
return
Movement_169990:: @ 8169990
step_25
step_29
step_25
step_25
step_29
step_25
walk_in_place_down
walk_in_place_fast_down
walk_in_place_down
walk_in_place_down
walk_in_place_fast_down
walk_in_place_down
step_end
Movement_169997:: @ 8169997
step_26
step_2a
step_26
step_26
step_2a
step_26
walk_in_place_up
walk_in_place_fast_up
walk_in_place_up
walk_in_place_up
walk_in_place_fast_up
walk_in_place_up
step_end
Movement_16999E:: @ 816999E
step_27
step_2b
step_27
step_27
step_2b
step_27
walk_in_place_left
walk_in_place_fast_left
walk_in_place_left
walk_in_place_left
walk_in_place_fast_left
walk_in_place_left
step_end
Movement_1699A5:: @ 81699A5
step_28
step_2c
step_28
step_28
step_2c
step_28
walk_in_place_right
walk_in_place_fast_right
walk_in_place_right
walk_in_place_right
walk_in_place_fast_right
walk_in_place_right
step_end
Movement_1699AC:: @ 81699AC
step_12
step_2d
step_1b
step_30
step_1b
step_2e
step_1b
step_2f
step_1b
step_2d
step_1b
step_13
step_13
step_2e
step_1b
step_2f
step_1b
step_2d
step_1b
step_30
step_1b
step_2e
step_1b
step_12
walk_left
walk_in_place_fastest_down
delay_8
walk_in_place_fastest_right
delay_8
walk_in_place_fastest_up
delay_8
walk_in_place_fastest_left
delay_8
walk_in_place_fastest_down
delay_8
walk_right
walk_right
walk_in_place_fastest_up
delay_8
walk_in_place_fastest_left
delay_8
walk_in_place_fastest_down
delay_8
walk_in_place_fastest_right
delay_8
walk_in_place_fastest_up
delay_8
walk_left
step_end
Movement_1699C5:
step_11
step_10
step_10
step_25
step_11
step_1c
step_1c
step_1c
walk_up
walk_down
walk_down
walk_in_place_down
walk_up
delay_16
delay_16
delay_16
step_end
EventScript_1699CE:: @ 81699CE
@@ -1033,7 +1033,7 @@ EventScript_169A82:: @ 8169A82
EventScript_169A9E:: @ 8169A9E
setobjectxyperm 8, 6, 10
addobject 8
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
applymovement 8, Movement_169B9D
waitmovement 0
@@ -1042,52 +1042,52 @@ EventScript_169A9E:: @ 8169A9E
EventScript_169AC1:: @ 8169AC1
setobjectxyperm 8, 6, 10
addobject 8
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement 8, Movement_169B9D
waitmovement 0
return
EventScript_169ADD:: @ 8169ADD
applymovement 4, Movement_1A75E1
applymovement 4, Movement_FacePlayer
waitmovement 0
delay 15
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_169AF5:: @ 8169AF5
applymovement 4, Movement_1A75E1
applymovement 4, Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement 4, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement 4, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_169B14:: @ 8169B14
applymovement 4, Movement_1A75E1
applymovement 4, Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 4, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement 4, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_169B33:: @ 8169B33
applymovement 8, Movement_1A75E1
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement 8, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_169B45:: @ 8169B45
applymovement 8, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement 8, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_169B57:: @ 8169B57
applymovement 8, Movement_1A75E1
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement 8, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -1103,42 +1103,42 @@ EventScript_169B7B:: @ 8169B7B
return
EventScript_169B86:: @ 8169B86
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
Movement_169B91:: @ 8169B91
step_1a
step_2d
delay_4
walk_in_place_fastest_down
step_end
Movement_169B94:: @ 8169B94
step_2d
step_1c
step_1c
step_1c
step_1c
step_1c
step_1b
step_2f
walk_in_place_fastest_down
delay_16
delay_16
delay_16
delay_16
delay_16
delay_8
walk_in_place_fastest_left
step_end
Movement_169B9D:: @ 8169B9D
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_169BA4:: @ 8169BA4
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
.equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_0x4001
@@ -1162,7 +1162,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
end
EventScript_169BE1:: @ 8169BE1
applymovement 4, Movement_1A75EF
applymovement 4, Movement_FaceRight
waitmovement 0
drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3
textcolor 0
@@ -1279,31 +1279,31 @@ EventScript_169D5C:: @ 8169D5C
return
Movement_RivalWalksToCharmander:: @ 8169D62
step_10
step_10
step_13
step_13
step_13
step_13
step_13
step_11
walk_down
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_up
step_end
Movement_RivalWalksToBulbasaur:: @ 8169D6B
step_10
step_13
step_13
step_13
step_13
step_2e
walk_down
walk_right
walk_right
walk_right
walk_right
walk_in_place_fastest_up
step_end
Movement_RivalWalksToSquirtle:: @ 8169D72
step_10
step_13
step_13
step_13
step_2e
walk_down
walk_right
walk_right
walk_right
walk_in_place_fastest_up
step_end
PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
data/maps/PewterCity/scripts.inc
+1096 -1096
View File
File diff suppressed because it is too large Load Diff
data/maps/PewterCity_House1/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ PewterCity_House1_EventScript_16A736:: @ 816A736
lock
faceplayer
call EventScript_16A749
applymovement 3, Movement_1A75E5
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/PewterCity_Museum_1F/scripts.inc
+15 -15
View File
@@ -24,14 +24,14 @@ EventScript_16A348:: @ 816A348
EventScript_16A367:: @ 816A367
msgbox gUnknown_81905B1
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
EventScript_16A37B:: @ 816A37B
msgbox gUnknown_8190627
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -39,7 +39,7 @@ EventScript_16A37B:: @ 816A37B
PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F
lockall
setvar VAR_0x4001, 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
goto EventScript_16A3D1
end
@@ -47,7 +47,7 @@ PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F
PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5
lockall
setvar VAR_0x4001, 1
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
goto EventScript_16A3D1
end
@@ -55,7 +55,7 @@ PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5
PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB
lockall
setvar VAR_0x4001, 2
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
goto EventScript_16A3D1
end
@@ -120,25 +120,25 @@ EventScript_16A476:: @ 816A476
end
Movement_16A48E:: @ 816A48E
step_10
walk_down
step_end
Movement_16A490:: @ 816A490
step_13
step_13
step_1b
step_28
walk_right
walk_right
delay_8
walk_in_place_right
step_end
Movement_16A495:: @ 816A495
step_13
step_1b
step_28
walk_right
delay_8
walk_in_place_right
step_end
Movement_16A499:: @ 816A499
step_1b
step_28
delay_8
walk_in_place_right
step_end
PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+3 -3
View File
@@ -115,16 +115,16 @@ EventScript_1627B0:: @ 81627B0
end
EventScript_1627EF:: @ 81627EF
applymovement 1, Movement_1A75E7
applymovement 1, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_1627FA:: @ 81627FA
applymovement 1, Movement_1A75EB
applymovement 1, Movement_WalkInPlaceFastestRight
waitmovement 0
return
EventScript_162805:: @ 8162805
applymovement 1, Movement_1A75ED
applymovement 1, Movement_WalkInPlaceFastestDown
waitmovement 0
return
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+64 -64
View File
@@ -90,12 +90,12 @@ EventScript_162B76:: @ 8162B76
specialvar VAR_RESULT, ScrSpecial_GetStarter
getspeciesname 0, VAR_RESULT
msgbox gUnknown_8178FCF
applymovement 2, Movement_1A75EB
applymovement 1, Movement_1A75E7
applymovement 2, Movement_WalkInPlaceFastestRight
applymovement 1, Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox gUnknown_817908F
closemessage
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
delay 20
msgbox gUnknown_81791A3
@@ -166,82 +166,82 @@ EventScript_162CFC:: @ 8162CFC
return
Movement_162D07:: @ 8162D07
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_162D12:: @ 8162D12
step_1c
step_12
step_11
step_11
step_11
step_13
step_11
step_11
step_11
step_11
step_1b
delay_16
walk_left
walk_up
walk_up
walk_up
walk_right
walk_up
walk_up
walk_up
walk_up
delay_8
set_invisible
step_end
Movement_162D1F:: @ 8162D1F
step_1b
step_2d
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_2f
delay_8
walk_in_place_fastest_down
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
walk_in_place_fastest_left
step_end
Movement_162D2A:: @ 8162D2A
step_1c
step_1c
step_11
step_11
step_11
step_11
step_11
step_12
step_11
step_11
step_2d
step_1c
delay_16
delay_16
walk_up
walk_up
walk_up
walk_up
walk_up
walk_left
walk_up
walk_up
walk_in_place_fastest_down
delay_16
step_end
Movement_162D37:: @ 8162D37
step_11
step_11
step_13
step_11
step_11
step_11
step_11
step_1b
walk_up
walk_up
walk_right
walk_up
walk_up
walk_up
walk_up
delay_8
set_invisible
step_end
Movement_162D41:: @ 8162D41
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_2f
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
walk_in_place_fastest_left
step_end
data/maps/PokemonLeague_HallOfFame/scripts.inc
+12 -12
View File
@@ -20,14 +20,14 @@ EventScript_162D70:: @ 8162D70
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD
waitmovement 0
applymovement 1, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 1, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
delay 18
msgbox gUnknown_817922F
closemessage
applymovement 1, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement 1, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
dofieldeffect 62
@@ -43,12 +43,12 @@ EventScript_162D70:: @ 8162D70
end
Movement_162DCD:: @ 8162DCD
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
data/maps/PokemonLeague_LancesRoom/scripts.inc
+38 -38
View File
@@ -62,40 +62,40 @@ EventScript_1629A8:: @ 81629A8
return
Movement_1629F1:: @ 81629F1
step_11
step_11
step_12
step_12
step_12
step_12
step_12
step_12
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_12
step_12
step_12
step_12
step_12
step_12
step_12
step_12
step_12
step_12
step_12
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
@@ -164,11 +164,11 @@ EventScript_162AD1:: @ 8162AD1
return
Movement_162ADC:: @ 8162ADC
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
Movement_162ADF:: @ 8162ADF
step_13
step_2f
walk_right
walk_in_place_fastest_left
step_end
data/maps/PokemonTower_2F/scripts.inc
+22 -22
View File
@@ -24,9 +24,9 @@ EventScript_1632A7:: @ 81632A7
call_if eq, EventScript_163339
compare VAR_0x4001, 1
call_if eq, EventScript_16334B
applymovement 1, Movement_1A75DB
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement 1, Movement_1A75DD
applymovement 1, Movement_Delay48
waitmovement 0
msgbox gUnknown_8179CFF
setvar VAR_LAST_TALKED, 1
@@ -52,14 +52,14 @@ EventScript_1632A7:: @ 81632A7
end
EventScript_163339:: @ 8163339
applymovement 1, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement 1, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_16334B:: @ 816334B
applymovement 1, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement 1, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
@@ -86,23 +86,23 @@ EventScript_163389:: @ 8163389
return
Movement_163394:: @ 8163394
step_10
step_13
step_13
step_10
step_10
step_10
step_10
step_30
walk_down
walk_right
walk_right
walk_down
walk_down
walk_down
walk_down
walk_in_place_fastest_right
step_end
Movement_16339D:: @ 816339D
step_13
step_13
step_10
step_10
step_10
step_10
step_10
step_30
walk_right
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_in_place_fastest_right
step_end
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -32,7 +32,7 @@ EventScript_1634F5:: @ 81634F5
end
Movement_163512:: @ 8163512
step_11
walk_up
step_end
PokemonTower_6F_EventScript_163514:: @ 8163514
data/maps/PokemonTower_7F/scripts.inc
+72 -72
View File
@@ -61,45 +61,45 @@ EventScript_163616:: @ 8163616
end
Movement_16361B:: @ 816361B
step_10
step_13
step_10
step_10
step_10
step_13
step_10
step_10
walk_down
walk_right
walk_down
walk_down
walk_down
walk_right
walk_down
walk_down
step_end
Movement_163624:: @ 8163624
step_10
step_10
step_10
step_10
step_13
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_right
walk_down
walk_down
step_end
Movement_16362C:: @ 816362C
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_163633:: @ 8163633
step_13
step_10
step_10
step_10
step_10
step_13
step_10
step_10
step_2f
walk_right
walk_down
walk_down
walk_down
walk_down
walk_right
walk_down
walk_down
walk_in_place_fastest_left
step_end
PokemonTower_7F_EventScript_16363D:: @ 816363D
@@ -139,33 +139,33 @@ EventScript_1636B9:: @ 81636B9
end
Movement_1636BE:: @ 81636BE
step_10
step_10
step_10
step_12
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_left
walk_down
walk_down
walk_down
step_end
Movement_1636C6:: @ 81636C6
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_1636CD:: @ 81636CD
step_12
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_left
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
PokemonTower_7F_EventScript_1636D6:: @ 81636D6
@@ -208,31 +208,31 @@ EventScript_16374A:: @ 816374A
end
Movement_16374C:: @ 816374C
step_10
step_10
step_10
step_10
step_10
step_13
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_right
walk_down
step_end
Movement_163754:: @ 8163754
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_16375B:: @ 816375B
step_13
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
data/maps/Route16_NorthEntrance_1F/scripts.inc
+12 -12
View File
@@ -50,7 +50,7 @@ EventScript_170220:: @ 8170220
textcolor 0
msgbox gUnknown_819F9CC
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
compare VAR_0x8008, 1
@@ -89,29 +89,29 @@ EventScript_17029A:: @ 817029A
return
Movement_1702A5:: @ 81702A5
step_11
walk_up
step_end
Movement_1702A7:: @ 81702A7
step_11
step_11
walk_up
walk_up
step_end
Movement_1702AA:: @ 81702AA
step_11
step_11
step_11
walk_up
walk_up
walk_up
step_end
Movement_1702AE:: @ 81702AE
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
step_end
Movement_1702B3:: @ 81702B3
step_13
walk_right
step_end
Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5
data/maps/Route18_EastEntrance_1F/scripts.inc
+12 -12
View File
@@ -50,7 +50,7 @@ EventScript_1703D6:: @ 81703D6
textcolor 0
msgbox gUnknown_819FD60
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
compare VAR_0x8008, 1
@@ -89,27 +89,27 @@ EventScript_170450:: @ 8170450
return
Movement_17045B:: @ 817045B
step_11
walk_up
step_end
Movement_17045D:: @ 817045D
step_11
step_11
walk_up
walk_up
step_end
Movement_170460:: @ 8170460
step_11
step_11
step_11
walk_up
walk_up
walk_up
step_end
Movement_170464:: @ 8170464
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
step_end
Movement_170469:: @ 8170469
step_13
walk_right
step_end
data/maps/Route22/scripts.inc
+62 -62
View File
@@ -95,76 +95,76 @@ EventScript_1683A5:: @ 81683A5
return
Movement_1683B0:: @ 8
step_13
step_13
step_13
step_13
step_13
step_13
step_13
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
step_end
Movement_1683B8:: @ 81683B8
step_10
step_13
step_13
step_13
step_13
step_13
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_1683C5:: @ 81683C5
step_13
step_13
step_13
step_13
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_right
walk_right
walk_right
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_1683D1:: @ 81683D1
step_13
step_13
step_13
step_13
step_13
step_13
step_13
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
step_end
Movement_1683D9:: @ 81683D9
step_13
step_13
step_13
step_13
step_13
step_13
step_13
step_13
step_2d
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
walk_in_place_fastest_down
step_end
Movement_1683E3:: @ 81683E3
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1c
step_1b
step_2e
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_16
delay_8
walk_in_place_fastest_up
step_end
Route22_EventScript_1683ED:: @ 81683ED
@@ -247,13 +247,13 @@ EventScript_1684CF:: @ 81684CF
return
Movement_1684DA:: @ 81684DA
step_12
step_12
step_12
step_12
step_12
step_12
step_12
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
step_end
Route22_EventScript_1684E2:: @ 81684E2
data/maps/Route24/scripts.inc
+6 -6
View File
@@ -42,7 +42,7 @@ EventScript_168678:: @ 8168678
call_if eq, EventScript_1686FD
compare VAR_0x4001, 1
call_if eq, EventScript_168708
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox gUnknown_8188C3C
checkitemspace ITEM_NUGGET, 1
@@ -71,7 +71,7 @@ EventScript_1686FD:: @ 81686FD
return
EventScript_168708:: @ 8168708
applymovement 1, Movement_1A75E7
applymovement 1, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -91,14 +91,14 @@ EventScript_168733:: @ 8168733
return
Movement_16873E:: @ 816873E
step_12
walk_left
step_end
Movement_168740:: @ 8168740
step_13
step_2f
walk_right
walk_in_place_fastest_left
step_end
Movement_168743:: @ 8168743
step_10
walk_down
step_end
data/maps/Route25_SeaCottage/scripts.inc
+25 -25
View File
@@ -139,20 +139,20 @@ EventScript_1706C8:: @ 81706C8
end
Movement_1706D2:: @ 81706D2
step_11
step_11
walk_up
walk_up
step_end
Movement_1706D5:: @ 81706D5
step_13
step_11
step_11
step_12
step_2e
walk_right
walk_up
walk_up
walk_left
walk_in_place_fastest_up
step_end
Movement_1706DB:: @ 81706DB
step_11
walk_up
step_end
Route25_SeaCottage_EventScript_1706DD:: @ 81706DD
@@ -225,19 +225,19 @@ EventScript_1707B6:: @ 81707B6
return
Movement_1707BE:: @ 81707BE
step_11
step_11
step_13
step_13
walk_up
walk_up
walk_right
walk_right
step_end
Movement_1707C3:: @ 81707C3
step_1c
step_1c
step_10
step_10
step_12
step_12
delay_16
delay_16
walk_down
walk_down
walk_left
walk_left
step_end
EventScript_1707CA:: @ 81707CA
@@ -299,14 +299,14 @@ EventScript_17087F:: @ 817087F
end
Movement_170881:: @ 8170881
step_13
step_13
step_13
step_13
step_10
step_10
walk_right
walk_right
walk_right
walk_right
walk_down
walk_down
step_end
Movement_170888:: @ 8170888
step_10
walk_down
step_end
data/maps/Route5_SouthEntrance/scripts.inc
+6 -6
View File
@@ -25,7 +25,7 @@ Route5_SouthEntrance_EventScript_16F922:: @ 816F922
EventScript_16F92E:: @ 816F92E
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16F958
@@ -71,18 +71,18 @@ EventScript_16F9B2:: @ 816F9B2
return
Movement_16F9BD:: @ 816F9BD
step_12
walk_left
step_end
Movement_16F9BF:: @ 816F9BF
step_12
step_12
walk_left
walk_left
step_end
Movement_16F9C2:: @ 816F9C2
step_27
walk_in_place_left
step_end
Movement_16F9C4:: @ 816F9C4
step_11
walk_up
step_end
data/maps/Route6_NorthEntrance/scripts.inc
+6 -6
View File
@@ -25,7 +25,7 @@ Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8
EventScript_16F9F4:: @ 816F9F4
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16FA1E
@@ -71,18 +71,18 @@ EventScript_16FA78:: @ 816FA78
return
Movement_16FA83:: @ 816FA83
step_13
step_13
walk_right
walk_right
step_end
Movement_16FA86:: @ 816FA86
step_13
walk_right
step_end
Movement_16FA88:: @ 816FA88
step_28
walk_in_place_right
step_end
Movement_16FA8A:: @ 816FA8A
step_10
walk_down
step_end
data/maps/Route7_EastEntrance/scripts.inc
+6 -6
View File
@@ -25,7 +25,7 @@ Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF
EventScript_16FABB:: @ 816FABB
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16FAE5
@@ -71,18 +71,18 @@ EventScript_16FB3F:: @ 816FB3F
return
Movement_16FB4A:: @ 816FB4A
step_11
walk_up
step_end
Movement_16FB4C:: @ 816FB4C
step_11
step_11
walk_up
walk_up
step_end
Movement_16FB4F:: @ 816FB4F
step_26
walk_in_place_up
step_end
Movement_16FB51:: @ 816FB51
step_12
walk_left
step_end
data/maps/Route8_WestEntrance/scripts.inc
+6 -6
View File
@@ -25,7 +25,7 @@ Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
EventScript_16FB81:: @ 816FB81
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16FBAB
@@ -81,18 +81,18 @@ EventScript_16FC1B:: @ 816FC1B
return
Movement_16FC26:: @ 816FC26
step_11
walk_up
step_end
Movement_16FC28:: @ 816FC28
step_11
step_11
walk_up
walk_up
step_end
Movement_16FC2B:: @ 816FC2B
step_26
walk_in_place_up
step_end
Movement_16FC2D:: @ 816FC2D
step_13
walk_right
step_end
data/maps/SSAnne_2F_Corridor/scripts.inc
+47 -47
View File
@@ -32,7 +32,7 @@ EventScript_160903:: @ 8160903
playbgm MUS_RIVAL1, 0
addobject 1
delay 10
applymovement 1, Movement_1A75ED
applymovement 1, Movement_WalkInPlaceFastestDown
waitmovement 0
delay 20
compare VAR_0x4001, 0
@@ -110,73 +110,73 @@ EventScript_160A13:: @ 8160A13
return
Movement_160A1E:: @ 8160A1E
step_1c
step_1c
step_1c
step_1c
step_2f
delay_16
delay_16
delay_16
delay_16
walk_in_place_fastest_left
step_end
Movement_160A24:: @ 8160A24
step_1c
step_1c
step_1c
step_1c
step_2f
delay_16
delay_16
delay_16
delay_16
walk_in_place_fastest_left
step_end
Movement_160A2A:: @ 8160A2A
step_10
step_10
step_10
walk_down
walk_down
walk_down
step_end
Movement_160A2E:: @ 8160A2E
step_10
step_10
step_10
step_10
step_30
walk_down
walk_down
walk_down
walk_down
walk_in_place_fastest_right
step_end
Movement_160A34:: @ 8160A34
step_10
step_10
step_10
step_10
step_13
step_1a
walk_down
walk_down
walk_down
walk_down
walk_right
delay_4
step_end
Movement_160A3B:: @ 8160A3B
step_13
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_right
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_160A44:: @ 8160A44
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
Movement_160A4C:: @ 8160A4C
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54
data/maps/SSAnne_CaptainsOffice/scripts.inc
+3 -3
View File
@@ -13,7 +13,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
waitfanfare
call EventScript_1A6675
delay 50
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81736A6
additem ITEM_HM01, 1
@@ -27,13 +27,13 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
EventScript_160BA0:: @ 8160BA0
msgbox gUnknown_81738C3
closemessage
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
EventScript_160BB5:: @ 8160BB5
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_8173831
release
data/maps/SSAnne_Exterior/scripts.inc
+19 -19
View File
@@ -38,30 +38,30 @@ EventScript_1608A1:: @ 81608A1
return
EventScript_1608AC:: @ 81608AC
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
Movement_1608B7:: @ 81608B7
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
step_11
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
Movement_1608C1:: @ 81608C1
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
step_10
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
walk_down
step_end
data/maps/SaffronCity/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ SaffronCity_EventScript_1673B9:: @ 81673B9
lock
checkflag FLAG_RESCUED_MR_FUJI
goto_if TRUE, EventScript_1673D7
applymovement 6, Movement_1A75E1
applymovement 6, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81812CA
release
data/maps/SaffronCity_Dojo/scripts.inc
+4 -4
View File
@@ -4,7 +4,7 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB
SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement 5, Movement_1A75E7
applymovement 5, Movement_WalkInPlaceFastestLeft
waitmovement 0
releaseall
end
@@ -12,7 +12,7 @@ SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC
SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement 5, Movement_1A75EB
applymovement 5, Movement_WalkInPlaceFastestRight
waitmovement 0
releaseall
end
@@ -24,7 +24,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
goto_if TRUE, EventScript_16EC3C
drawmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_0x4001, SPECIES_HITMONLEE
applymovement 5, Movement_1A75E9
applymovement 5, Movement_WalkInPlaceFastestUp
waitmovement 0
textcolor 0
msgbox gUnknown_819B44E, MSGBOX_YESNO
@@ -47,7 +47,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
goto_if TRUE, EventScript_16EC3C
drawmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_0x4001, SPECIES_HITMONCHAN
applymovement 5, Movement_1A75E9
applymovement 5, Movement_WalkInPlaceFastestUp
waitmovement 0
textcolor 0
msgbox gUnknown_819B49E, MSGBOX_YESNO
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+31 -31
View File
@@ -10,18 +10,18 @@ SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA
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 OBJ_EVENT_ID_PLAYER, 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,45 +29,45 @@ 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_OnTransition:: @ 816F144
data/maps/SeafoamIslands_B3F/scripts.inc
+25 -25
View File
@@ -72,32 +72,32 @@ EventScript_16300C:: @ 816300C
end
Movement_163013:: @ 8163013
step_1d
step_1d
step_1d
step_1d
step_20
step_20
step_20
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
step_end
Movement_163021:: @ 8163021
step_1d
step_1d
step_1d
step_1d
step_20
step_20
step_1d
step_1d
step_1d
step_1d
step_1d
step_1d
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_right
walk_fast_right
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
walk_fast_down
step_end
data/maps/SeafoamIslands_B4F/scripts.inc
+19 -19
View File
@@ -87,9 +87,9 @@ EventScript_16310B:: @ 816310B
end
Movement_16311D:: @ 816311D
step_1e
step_1e
step_1e
walk_fast_up
walk_fast_up
walk_fast_up
step_end
EventScript_163121:: @ 8163121
@@ -131,24 +131,24 @@ EventScript_163185:: @ 8163185
end
Movement_16318C:: @ 816318C
step_11
step_11
step_11
step_13
step_13
step_13
step_13
step_11
walk_up
walk_up
walk_up
walk_right
walk_right
walk_right
walk_right
walk_up
step_end
Movement_163195:: @ 8163195
step_11
step_11
step_11
step_13
step_13
step_13
step_11
walk_up
walk_up
walk_up
walk_right
walk_right
walk_right
walk_up
step_end
SeafoamIslands_B4F_EventScript_16319D:: @ 816319D
@@ -159,7 +159,7 @@ SeafoamIslands_B4F_EventScript_16319D:: @ 816319D
end
Movement_1631AA:: @ 81631AA
step_11
walk_up
step_end
SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
data/maps/SevenIsland_House_Room1/scripts.inc
+17 -17
View File
@@ -37,7 +37,7 @@ EventScript_1708E9:: @ 1708E9
applymovement 1, Movement_170955
waitmovement 0
moveobjectoffscreen 1
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
call_if eq, EventScript_170938
@@ -63,12 +63,12 @@ EventScript_17094A:: @ 817094A
return
Movement_170953:: @ 8170953
step_10
walk_down
step_end
Movement_170955:: @ 8170955
step_13
step_2d
walk_right
walk_in_place_fastest_down
step_end
SevenIsland_House_Room1_EventScript_170958:: @ 8170958
@@ -151,31 +151,31 @@ EventScript_170A51:: @ 8170A51
return
Movement_170A63:: @ 8170A63
step_1c
step_11
step_11
delay_16
walk_up
walk_up
step_end
Movement_170A67:: @ 8170A67
step_1c
step_13
step_11
delay_16
walk_right
walk_up
step_end
Movement_170A6B:: @ 8170A6B
step_1c
step_12
step_11
delay_16
walk_left
walk_up
step_end
Movement_170A6F:: @ 8170A6F
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
Movement_170A72:: @ 8170A72
step_13
step_2f
walk_right
walk_in_place_fastest_left
step_end
SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75
data/maps/SevenIsland_House_Room2/scripts.inc
+12 -12
View File
@@ -59,19 +59,19 @@ EventScript_170B17:: @ 8170B17
return
Movement_170B22:: @ 8170B22
step_10
step_10
step_10
step_13
step_13
walk_down
walk_down
walk_down
walk_right
walk_right
step_end
Movement_170B28:: @ 8170B28
step_12
step_12
step_11
step_11
step_11
step_11
step_1b
walk_left
walk_left
walk_up
walk_up
walk_up
walk_up
delay_8
step_end
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+19 -19
View File
@@ -10,7 +10,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
waitmovement 0
fadedefaultbgm
delay 30
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81A4D72
textcolor 3
@@ -35,12 +35,12 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
end
EventScript_172206:: @ 8172206
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_172211:: @ 8172211
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81A4D72
release
@@ -53,22 +53,22 @@ EventScript_172225:: @ 8172225
end
Movement_172231:: @ 8172231
step_25
step_1c
step_25
step_1c
step_25
step_1c
step_25
step_1c
step_30
step_1a
step_2e
step_1a
step_2f
step_1a
step_2d
step_1a
walk_in_place_down
delay_16
walk_in_place_down
delay_16
walk_in_place_down
delay_16
walk_in_place_down
delay_16
walk_in_place_fastest_right
delay_4
walk_in_place_fastest_up
delay_4
walk_in_place_fastest_left
delay_4
walk_in_place_fastest_down
delay_4
step_end
SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242
data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+6 -6
View File
@@ -72,10 +72,10 @@ EventScript_164BD8:: @ 8164BD8
return
Movement_164BE5:: @ 8164BE5
step_2d
step_1c
step_10
step_13
step_13
step_10
walk_in_place_fastest_down
delay_16
walk_down
walk_right
walk_right
walk_down
step_end
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+4 -4
View File
@@ -61,8 +61,8 @@ EventScript_1648C8:: @ 81648C8
end
Movement_1648EA:: @ 81648EA
step_10
step_10
walk_down
walk_down
step_end
EventScript_1648ED:: @ 81648ED
@@ -212,11 +212,11 @@ EventScript_164ABF:: @ 8164ABF
end
Movement_164AD4:: @ 8164AD4
step_03
face_right
step_end
Movement_164AD6:: @ 8164AD6
step_10
walk_down
step_end
SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
data/maps/SilphCo_11F/scripts.inc
+15 -15
View File
@@ -67,7 +67,7 @@ EventScript_161E9F:: @ 8161E9F
EventScript_161EA0:: @ 8161EA0
textcolor 0
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
delay 25
msgbox gUnknown_8177108
@@ -103,26 +103,26 @@ EventScript_161F12:: @ 8161F12
return
Movement_161F1D:: @ 8161F1D
step_10
step_10
step_10
step_10
step_2f
walk_down
walk_down
walk_down
walk_down
walk_in_place_fastest_left
step_end
Movement_161F23:: @ 8161F23
step_10
step_10
step_10
walk_down
walk_down
walk_down
step_end
Movement_161F27:: @ 8161F27
step_1c
step_1c
step_1c
step_1b
step_1a
step_30
delay_16
delay_16
delay_16
delay_8
delay_4
walk_in_place_fastest_right
step_end
EventScript_161F2E:: @ 8161F2E
data/maps/SilphCo_7F/scripts.inc
+17 -17
View File
@@ -40,10 +40,10 @@ EventScript_1619D3:: @ 81619D3
EventScript_1619D4:: @ 81619D4
textcolor 0
playbgm MUS_RIVAL1, 0
applymovement 1, Movement_1A75DB
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement 1, Movement_1A75DD
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement 1, Movement_Delay48
waitmovement 0
msgbox gUnknown_8176710
compare VAR_0x4001, 0
@@ -105,26 +105,26 @@ EventScript_161AAC:: @ 8161AAC
return
Movement_161AB7:: @ 8161AB7
step_11
walk_up
step_end
Movement_161AB9:: @ 8161AB9
step_13
step_13
step_13
step_11
step_1c
walk_right
walk_right
walk_right
walk_up
delay_16
step_end
Movement_161ABF:: @ 8161ABF
step_12
step_11
step_11
step_13
step_13
step_13
step_13
step_1c
walk_left
walk_up
walk_up
walk_right
walk_right
walk_right
walk_right
delay_16
step_end
SilphCo_7F_EventScript_161AC8:: @ 8161AC8
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+49 -49
View File
@@ -76,22 +76,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
end
EventScript_1642F9:: @ 81642F9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_164304:: @ 8164304
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_16430F:: @ 816430F
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_16431A:: @ 816431A
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -118,28 +118,28 @@ EventScript_164346:: @ 8164346
EventScript_164351:: @ 8164351
applymovement 2, Movement_1643F5
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_164366:: @ 8164366
applymovement 2, Movement_1643F5
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_16437B:: @ 816437B
applymovement 2, Movement_1643F7
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
EventScript_164390:: @ 8164390
applymovement 2, Movement_1643F7
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -168,71 +168,71 @@ EventScript_1643DB:: @ 81643DB
return
Movement_1643ED:: @ 81643ED
step_11
step_11
step_30
walk_up
walk_up
walk_in_place_fastest_right
step_end
Movement_1643F1:: @ 81643F1
step_13
step_13
step_2e
walk_right
walk_right
walk_in_place_fastest_up
step_end
Movement_1643F5:: @ 81643F5
step_13
walk_right
step_end
Movement_1643F7:: @ 81643F7
step_11
walk_up
step_end
Movement_1643F9:: @ 81643F9
step_1e
step_20
step_20
step_20
step_1d
step_20
step_20
walk_fast_up
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_down
walk_fast_right
walk_fast_right
step_end
Movement_164401:: @ 8164401
step_1d
step_20
step_20
step_20
step_1e
step_20
step_20
walk_fast_down
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_up
walk_fast_right
walk_fast_right
step_end
Movement_164409:: @ 8164409
step_20
step_20
step_20
step_20
step_1e
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_right
walk_fast_up
step_end
Movement_16440F:: @ 816440F
step_00
step_5e
step_39
step_39
step_39
step_39
step_39
step_39
step_39
step_39
step_39
step_5f
face_down
disable_anim
slide_down
slide_down
slide_down
slide_down
slide_down
slide_down
slide_down
slide_down
slide_down
restore_anim
step_end
Movement_16441C:: @ 816441C
step_1c
step_30
delay_16
walk_in_place_fastest_right
step_end
SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+12 -12
View File
@@ -21,12 +21,12 @@ SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D
EventScript_171D97:: @ 8171D97
lockall
textcolor 0
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
playbgm MUS_RIVAL1, 0
applymovement 2, Movement_1A75DB
applymovement 2, Movement_ExclamationMark
waitmovement 0
applymovement 2, Movement_1A75DD
applymovement 2, Movement_Delay48
waitmovement 0
delay 25
applymovement 2, Movement_171DF9
@@ -46,21 +46,21 @@ EventScript_171D97:: @ 8171D97
end
Movement_171DF9:: @ 8171DF9
step_13
step_13
step_10
step_10
walk_right
walk_right
walk_down
walk_down
step_end
Movement_171DFE:: @ 8171DFE
step_1c
step_1a
step_10
delay_16
delay_4
walk_down
step_end
Movement_171E02:: @ 8171E02
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05
data/maps/SixIsland_RuinValley/scripts.inc
+2 -2
View File
@@ -14,10 +14,10 @@ EventScript_168B63:: @ 8168B63
SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D
lock
msgbox gUnknown_818BD47
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_818BD7A
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/ThreeIsland/scripts.inc
+44 -44
View File
@@ -38,14 +38,14 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5
end
EventScript_167806:: @ 8167806
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81827F1
release
end
EventScript_16781A:: @ 816781A
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_818275A
checkitemspace ITEM_FULL_RESTORE, 1
@@ -101,22 +101,22 @@ EventScript_16786F:: @ 816786F
return
EventScript_167931:: @ 8167931
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_16793C:: @ 816793C
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75ED
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
EventScript_167947:: @ 8167947
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_167952:: @ 8167952
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -144,7 +144,7 @@ ThreeIsland_EventScript_167989:: @ 8167989
end
EventScript_1679A1:: @ 81679A1
applymovement 2, Movement_1A75E1
applymovement 2, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_8182823
release
@@ -173,11 +173,11 @@ ThreeIsland_EventScript_1679B5:: @ 81679B5
end
Movement_167A19:: @ 8167A19
step_27
walk_in_place_left
step_end
Movement_167A1B:: @ 8167A1B
step_28
walk_in_place_right
step_end
ThreeIsland_EventScript_167A1D:: @ 8167A1D
@@ -212,12 +212,12 @@ ThreeIsland_EventScript_167A4D:: @ 8167A4D
EventScript_167A59:: @ 8167A59
textcolor 0
applymovement 5, Movement_1A75ED
applymovement 5, Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
applymovement 5, Movement_1A75DB
applymovement 5, Movement_ExclamationMark
waitmovement 0
applymovement 5, Movement_1A75DD
applymovement 5, Movement_Delay48
waitmovement 0
applymovement 5, Movement_167C57
waitmovement 0
@@ -248,10 +248,10 @@ EventScript_167A59:: @ 8167A59
msgbox gUnknown_8182582
setvar VAR_LAST_TALKED, 4
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_3, 0, Text_1825D4
applymovement 4, Movement_1A75E7
applymovement 4, Movement_WalkInPlaceFastestLeft
waitmovement 0
applymovement 6, Movement_1A75ED
applymovement 8, Movement_1A75ED
applymovement 6, Movement_WalkInPlaceFastestDown
applymovement 8, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81825E2
closemessage
@@ -286,33 +286,33 @@ EventScript_167A59:: @ 8167A59
end
EventScript_167BC6:: @ 8167BC6
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement 3, Movement_167C5E
waitmovement 0
return
EventScript_167BD8:: @ 8167BD8
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement 3, Movement_167C62
waitmovement 0
return
EventScript_167BEA:: @ 8167BEA
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement 3, Movement_167C64
applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68
waitmovement 0
return
EventScript_167C03:: @ 8167C03
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68
applymovement 3, Movement_167C6C
waitmovement 0
return
EventScript_167C1C:: @ 8167C1C
applymovement 4, Movement_1A75ED
applymovement 4, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68
applymovement 3, Movement_167C71
waitmovement 0
@@ -330,57 +330,57 @@ EventScript_167C35:: @ 8167C35
end
Movement_167C55:: @ 8167C55
step_10
walk_down
step_end
Movement_167C57:: @ 8167C57
step_10
walk_down
step_end
Movement_167C59:: @ 8167C59
step_11
step_2f
walk_up
walk_in_place_fastest_left
step_end
Movement_167C5C:: @ 8167C5C
step_25
walk_in_place_down
step_end
Movement_167C5E:: @ 8167C5E
step_10
step_12
step_2d
walk_down
walk_left
walk_in_place_fastest_down
step_end
Movement_167C62:: @ 8167C62
step_10
walk_down
step_end
Movement_167C64:: @ 8167C64
step_10
step_10
step_30
walk_down
walk_down
walk_in_place_fastest_right
step_end
Movement_167C68:: @ 8167C68
step_1c
step_1c
step_2f
delay_16
delay_16
walk_in_place_fastest_left
step_end
Movement_167C6C:: @ 8167C6C
step_10
step_10
step_13
step_30
walk_down
walk_down
walk_right
walk_in_place_fastest_right
step_end
Movement_167C71:: @ 8167C71
step_10
step_10
step_13
step_13
step_30
walk_down
walk_down
walk_right
walk_right
walk_in_place_fastest_right
step_end
ThreeIsland_EventScript_167C77:: @ 8167C77
data/maps/ThreeIsland_BerryForest/scripts.inc
+7 -7
View File
@@ -12,7 +12,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
faceplayer
msgbox gUnknown_817ADD6
playse SE_PIN
applymovement 1, Movement_1A75DB
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement 1, Movement_163D22
waitmovement 0
@@ -26,7 +26,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
dowildbattle
special sub_8112364
applymovement 1, Movement_1A75E1
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_817AEE1
giveitem ITEM_IAPAPA_BERRY
@@ -49,11 +49,11 @@ EventScript_163D19:: @ 8163D19
return
Movement_163D22:: @ 8163D22
step_2f
step_1c
step_30
step_1b
step_2f
walk_in_place_fastest_left
delay_16
walk_in_place_fastest_right
delay_8
walk_in_place_fastest_left
step_end
ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28
data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+1 -1
View File
@@ -31,7 +31,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
goto_if eq, EventScript_164D90
msgbox gUnknown_817D13B
closemessage
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+24 -24
View File
@@ -40,7 +40,7 @@ EventScript_171435:: @ 8171435
special Special_BufferBigGuyOrBigGirlString
msgbox gUnknown_81A2931
closemessage
applymovement 3, Movement_1A75ED
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
releaseall
@@ -53,16 +53,16 @@ EventScript_17145F:: @ 817145F
waitmovement 0
msgbox gUnknown_81A2408
closemessage
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
applymovement 1, Movement_171527
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox gUnknown_81A2465
closemessage
@@ -75,12 +75,12 @@ EventScript_17145F:: @ 817145F
applymovement 2, Movement_17152F
waitmovement 0
msgbox gUnknown_81A259A
applymovement 2, Movement_1A75EB
applymovement 2, Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox gUnknown_81A2658
msgbox gUnknown_81A26D5
closemessage
applymovement 2, Movement_1A75ED
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_KAIDAN
removeobject 2
@@ -94,32 +94,32 @@ EventScript_17145F:: @ 817145F
end
Movement_171520:: @ 8171520
step_12
step_13
step_13
step_1b
step_2e
step_1c
walk_left
walk_right
walk_right
delay_8
walk_in_place_fastest_up
delay_16
step_end
Movement_171527:: @ 8171527
step_10
step_10
step_10
step_2f
walk_down
walk_down
walk_down
walk_in_place_fastest_left
step_end
Movement_17152C:: @ 817152C
step_12
step_30
walk_left
walk_in_place_fastest_right
step_end
Movement_17152F:: @ 817152F
step_2f
step_1b
step_30
step_1b
step_2e
walk_in_place_fastest_left
delay_8
walk_in_place_fastest_right
delay_8
walk_in_place_fastest_up
step_end
TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535
data/maps/VermilionCity/scripts.inc
+4 -4
View File
@@ -16,8 +16,8 @@ EventScript_1668F1:: @ 81668F1
end
Movement_166903:: @ 8166903
step_11
step_11
walk_up
walk_up
step_end
VermilionCity_OnTransition:: @ 8166906
@@ -206,8 +206,8 @@ VermilionCity_EventScript_166B98:: @ 8166B98
EventScript_166BA0:: @ 8166BA0
textcolor 0
applymovement 6, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement 6, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
compare VAR_MAP_SCENE_VERMILION_CITY, 3
goto_if eq, EventScript_166BED
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+4 -4
View File
@@ -57,7 +57,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528
goto_if TRUE, EventScript_16B54B
msgbox gUnknown_81944CC
closemessage
applymovement 5, Movement_1A75E5
applymovement 5, Movement_FaceOriginalDirection
waitmovement 0
setflag FLAG_TEMP_2
release
@@ -66,7 +66,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528
EventScript_16B54B:: @ 816B54B
msgbox gUnknown_8194518
closemessage
applymovement 5, Movement_1A75E5
applymovement 5, Movement_FaceOriginalDirection
waitmovement 0
clearflag FLAG_TEMP_3
release
@@ -79,7 +79,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563
goto_if TRUE, EventScript_16B586
msgbox gUnknown_819446F
closemessage
applymovement 6, Movement_1A75E5
applymovement 6, Movement_FaceOriginalDirection
waitmovement 0
setflag FLAG_TEMP_3
release
@@ -88,7 +88,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563
EventScript_16B586:: @ 816B586
msgbox gUnknown_819449C
closemessage
applymovement 6, Movement_1A75E5
applymovement 6, Movement_FaceOriginalDirection
waitmovement 0
clearflag FLAG_TEMP_2
release
data/maps/ViridianCity/scripts.inc
+9 -9
View File
@@ -49,7 +49,7 @@ EventScript_165931:: @ 8165931
ViridianCity_EventScript_16596D:: @ 816596D
lockall
textcolor 3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
msgbox gUnknown_817E2F5
@@ -60,7 +60,7 @@ ViridianCity_EventScript_16596D:: @ 816596D
end
Movement_165992:: @ 8165992
step_14
jump_2_down
step_end
ViridianCity_EventScript_165994:: @ 8165994
@@ -94,7 +94,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA
goto_if eq, EventScript_1659EC
msgbox gUnknown_817DB39
closemessage
applymovement 3, Movement_1A75E5
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -194,7 +194,7 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4
EventScript_165ADB:: @ 8165ADB
msgbox gUnknown_817DC4E
closemessage
applymovement 5, Movement_1A75E5
applymovement 5, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -214,15 +214,15 @@ ViridianCity_EventScript_165AF6:: @ 8165AF6
end
Movement_165B0E:: @ 8165B0E
step_10
walk_down
step_end
ViridianCity_EventScript_165B10:: @ 8165B10
lockall
textcolor 0
applymovement 4, Movement_1A75E7
applymovement 4, Movement_WalkInPlaceFastestLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75EB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
call EventScript_165B4C
release
@@ -231,9 +231,9 @@ ViridianCity_EventScript_165B10:: @ 8165B10
ViridianCity_EventScript_165B2E:: @ 8165B2E
lockall
textcolor 0
applymovement 4, Movement_1A75EB
applymovement 4, Movement_WalkInPlaceFastestRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E7
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
call EventScript_165B4C
release
data/maps/ViridianCity_House2/scripts.inc
+3 -3
View File
@@ -6,7 +6,7 @@ ViridianCity_House2_EventScript_16A07D:: @ 816A07D
faceplayer
msgbox gUnknown_818FC00
closemessage
applymovement 2, Movement_1A75E9
applymovement 2, Movement_WalkInPlaceFastestUp
waitmovement 0
release
end
@@ -16,7 +16,7 @@ ViridianCity_House2_EventScript_16A094:: @ 816A094
faceplayer
msgbox gUnknown_818FC2B
closemessage
applymovement 1, Movement_1A75E5
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -36,7 +36,7 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB
compare VAR_RESULT, 0
goto_if eq, EventScript_16A11B
msgbox gUnknown_818FE5C
applymovement 2, Movement_1A75E9
applymovement 2, Movement_WalkInPlaceFastestUp
waitmovement 0
textcolor 1
msgbox gUnknown_818FF28
data/maps/ViridianCity_Mart/scripts.inc
+11 -11
View File
@@ -20,7 +20,7 @@ ViridianCity_Mart_OnFrame:: @ 816A1FB
EventScript_16A205:: @ 816A205
lockall
textcolor 0
applymovement 1, Movement_1A75ED
applymovement 1, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_819021A
closemessage
@@ -36,19 +36,19 @@ EventScript_16A205:: @ 816A205
end
Movement_16A25C:: @ 816A25C
step_11
step_11
step_11
step_11
step_2f
walk_up
walk_up
walk_up
walk_up
walk_in_place_fastest_left
step_end
Movement_16A262:: @ 816A262
step_1c
step_1c
step_1c
step_1c
step_30
delay_16
delay_16
delay_16
delay_16
walk_in_place_fastest_right
step_end
ViridianCity_Mart_EventScript_16A268:: @ 816A268
data/scripts/cable_club.inc
+21 -21
View File
@@ -195,7 +195,7 @@ CableClub_EventScript_PlayerExitLinkRoom:: @ 81BB40A
CableClub_EventScript_Tutorial:: @ 81BB415
lockall
textcolor 1
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81BD898
closemessage
@@ -208,8 +208,8 @@ CableClub_EventScript_Tutorial:: @ 81BB415
end
Movement_1BB447:: @ 81BB447
step_11
step_11
walk_up
walk_up
step_end
EventScript_1BB44A:: @ 81BB44A
@@ -556,51 +556,51 @@ EventScript_1BB881:: @ 81BB881
end
Movement_1BB88B:: @ 81BB88B
step_00
face_down
step_end
Movement_1BB88D:: @ 81BB88D
step_03
face_right
step_end
Movement_1BB88F:: @ 81BB88F
step_02
face_left
step_end
Movement_1BB891:: @ 81BB891
step_10
step_10
walk_down
walk_down
step_end
Movement_1BB894:: @ 81BB894
step_13
step_11
step_11
walk_right
walk_up
walk_up
step_end
Movement_1BB898:: @ 81BB898
step_12
step_11
step_11
walk_left
walk_up
walk_up
step_end
Movement_1BB89C:: @ 81BB89C
step_11
walk_up
step_end
Movement_1BB89E:: @ 81BB89E
step_02
face_left
step_end
Movement_1BB8A0:: @ 81BB8A0
step_03
face_right
step_end
Movement_1BB8A2:: @ 81BB8A2
step_12
step_11
step_11
step_11
walk_left
walk_up
walk_up
walk_up
step_end
gUnknown_81BB8A7:: @ 81BB8A7
data/scripts/field_moves.inc
+2 -2
View File
@@ -36,7 +36,7 @@ EventScript_1BDF76:: @ 81BDF76
end
Movement_1BDF85:: @ 81BDF85
step_69
cut_tree
step_end
EventScript_1BDF87:: @ 81BDF87
@@ -107,7 +107,7 @@ EventScript_1BE08D:: @ 81BE08D
end
Movement_1BE08F:: @ 81BE08F
step_68
rock_smash_break
step_end
EventScript_1BE091:: @ 81BE091
data/scripts/move_tutors.inc
+4 -4
View File
@@ -582,17 +582,17 @@ EventScript_1C4F37:: @ 81C4F37
return
Movement_1C4F4C:: @ 81C4F4C
step_52
jump_in_place_down
step_end
Movement_1C4F4E:: @ 81C4F4E
step_53
jump_in_place_up
step_end
Movement_1C4F50:: @ 81C4F50
step_54
jump_in_place_left
step_end
Movement_1C4F52:: @ 81C4F52
step_55
jump_in_place_right
step_end
data/scripts/movement.inc
+82
View File
@@ -0,0 +1,82 @@
Movement_QuestionMark:: @ 81A75D9
emote_question_mark
step_end
Movement_ExclamationMark:: @ 81A75DB
emote_exclamation_mark
step_end
Movement_Delay48:: @ 81A75DD
delay_16
delay_16
delay_16
step_end
Movement_FacePlayer:: @ 81A75E1
face_player
step_end
@ Unused
Movement_FaceAwayPlayer:: @ 81A75E3
face_away_player
step_end
Movement_FaceOriginalDirection:: @ 81A75E5
face_original_direction
step_end
Movement_WalkInPlaceFastestLeft:: @ 81A75E7
walk_in_place_fastest_left
step_end
Movement_WalkInPlaceFastestUp:: @ 81A75E9
walk_in_place_fastest_up
step_end
Movement_WalkInPlaceFastestRight:: @ 81A75EB
walk_in_place_fastest_right
step_end
Movement_WalkInPlaceFastestDown:: @ 81A75ED
walk_in_place_fastest_down
step_end
Movement_FaceRight:: @ 81A75EF
face_right
step_end
Movement_FaceDown:: @ 81A75F1
face_down
step_end
Movement_WalkUp5:: @ 81A75F3
walk_up
walk_up
walk_up
walk_up
walk_up
step_end
@ Unused
Movement_WalkUp4:: @ 81A75F9
walk_up
walk_up
walk_up
walk_up
step_end
Movement_Delay32:: @ 81A75FE
delay_16
delay_16
step_end
@ Unused
Movement_WalkUp:: @ 81A7601
walk_up
step_end
@ Unused
Movement_WalkUp2:: @ 81A7603
walk_up
walk_up
step_end
data/scripts/pkmn_center_nurse.inc
+4 -4
View File
@@ -21,11 +21,11 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8
end
EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
applymovement VAR_LAST_TALKED, Movement_1A75E7
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_LAST_TALKED, Movement_1A75ED
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown
waitmovement 0
special sp000_heal_pokemon
return
@@ -67,6 +67,6 @@ EventScript_PkmnCenterNurse_Goodbye:: @ 81A6663
return
Movement_1A666C:: @ 81A666C
step_5b
step_1a
nurse_joy_bow
delay_4
step_end
include/constants/movement_commands.h
+96 -92
View File
@@ -3,71 +3,71 @@
enum
{
step_00,
step_01,
step_02,
step_03,
slow_step_down,
slow_step_up,
slow_step_left,
slow_step_right,
step_down,
step_up,
step_left,
step_right,
fast_step_down,
fast_step_up,
fast_step_left,
fast_step_right,
step_10,
step_11,
step_12,
step_13,
step_14,
step_15,
step_16,
step_17,
step_18,
step_19,
step_1a,
step_1b,
step_1c,
step_1d,
step_1e,
step_1f,
step_20,
step_21,
step_22,
step_23,
step_24,
step_25,
step_26,
step_27,
step_28,
step_29,
step_2a,
step_2b,
step_2c,
step_2d,
step_2e,
step_2f,
step_30,
step_31,
step_32,
step_33,
step_34,
step_35,
step_36,
step_37,
step_38,
step_39,
step_3a,
step_3b,
step_3c,
step_3d,
step_3e,
step_3f,
step_40,
face_down,
face_up,
face_left,
face_right,
face_down_2,
face_up_2,
face_left_2,
face_right_2,
walk_slowest_down,
walk_slowest_up,
walk_slowest_left,
walk_slowest_right,
walk_slow_down,
walk_slow_up,
walk_slow_left,
walk_slow_right,
walk_down,
walk_up,
walk_left,
walk_right,
jump_2_down,
jump_2_up,
jump_2_left,
jump_2_right,
delay_1,
delay_2,
delay_4,
delay_8,
delay_16,
walk_fast_down,
walk_fast_up,
walk_fast_left,
walk_fast_right,
walk_in_place_slow_down,
walk_in_place_slow_up,
walk_in_place_slow_left,
walk_in_place_slow_right,
walk_in_place_down,
walk_in_place_up,
walk_in_place_left,
walk_in_place_right,
walk_in_place_fast_down,
walk_in_place_fast_up,
walk_in_place_fast_left,
walk_in_place_fast_right,
walk_in_place_fastest_down,
walk_in_place_fastest_up,
walk_in_place_fastest_left,
walk_in_place_fastest_right,
ride_water_current_down,
ride_water_current_up,
ride_water_current_left,
ride_water_current_right,
walk_fastest_down,
walk_fastest_up,
walk_fastest_left,
walk_fastest_right,
slide_down,
slide_up,
slide_left,
slide_right,
player_run_down,
player_run_up,
player_run_left,
player_run_right,
step_41,
step_42,
step_43,
@@ -77,34 +77,38 @@ enum
step_47,
step_48,
step_49,
step_4a,
step_4b,
step_4c,
step_4d,
step_4e,
step_4f,
step_50,
step_51,
step_52,
step_53,
step_54,
step_55,
step_56,
step_57,
step_58,
step_59,
step_5a,
step_5b,
step_5c,
step_5d,
step_5e,
step_5f,
face_player,
face_away_player,
lock_facing_direction,
unlock_facing_direction,
jump_down,
jump_up,
jump_left,
jump_right,
jump_in_place_down,
jump_in_place_up,
jump_in_place_left,
jump_in_place_right,
jump_in_place_down_up,
jump_in_place_up_down,
jump_in_place_left_right,
jump_in_place_right_left,
face_original_direction,
nurse_joy_bow,
enable_jump_landing_ground_effect,
disable_jump_landing_ground_effect,
disable_anim,
restore_anim,
set_invisible,
step_61,
step_62,
step_63,
step_64,
step_65,
set_visible,
emote_exclamation_mark,
emote_question_mark,
emote_x,
emote_double_exclamation_mark,
step_66,
step_67,
rock_smash_break,
cut_tree,
step_91 = 0x91,
step_92,
src/vs_seeker.c
+11 -11
View File
@@ -547,25 +547,25 @@ static const VsSeekerData sVsSeekerData[] = {
};
static const u8 gUnknown_8453F5C[] = {
step_1c,
step_1c,
step_1c,
delay_16,
delay_16,
delay_16,
step_end
};
static const u8 gUnknown_8453F60[] = {
step_62,
emote_exclamation_mark,
step_end
};
static const u8 sMovementScript_TrainerNoRematch[] = {
step_64,
emote_x,
step_end
};
static const u8 gUnknown_8453F64[] = {
step_2d,
step_65,
static const u8 sMovementScript_TrainerRematch[] = {
walk_in_place_fastest_down,
emote_double_exclamation_mark,
step_end
};
@@ -963,7 +963,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
{
gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[vsSeekerIdx].localId] = r7;
npc_coords_shift_still(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].objectEventId]);
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F64);
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerRematch);
sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = r8;
sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetRunningBehaviorFromGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId);
sVsSeeker->numRematchableTrainers++;
@@ -1127,7 +1127,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
"\tbl npc_coords_shift_still\n"
"\tldr r0, [r6]\n"
"\tadds r0, r5\n"
"\tldr r1, _0810CB60 @ =gUnknown_8453F64\n"
"\tldr r1, _0810CB60 @ =sMovementScript_TrainerRematch\n"
"\tbl StartTrainerObjectMovementScript\n"
"\tldr r2, [r6]\n"
"\tmov r3, r10\n"
@@ -1197,7 +1197,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
"_0810CB54: .4byte gSaveBlock1Ptr\n"
"_0810CB58: .4byte 0x0000063a\n"
"_0810CB5C: .4byte gObjectEvents\n"
"_0810CB60: .4byte gUnknown_8453F64\n"
"_0810CB60: .4byte sMovementScript_TrainerRematch\n"
"_0810CB64: .4byte 0x00000431\n"
"_0810CB68: .4byte sVsSeeker\n"
"_0810CB6C: .4byte 0x00000801\n"