dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #822 from GriffinRichards/document-fieldspecials

Browse Source 
Document a few field specials
This commit is contained in:
PikalaxALT
2019-10-02 09:22:09 -04:00
committed by GitHub
parent 9317d114a9 9aed405851
commit 0d13a85855
19 changed files with 203 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+5 -5
View File
@@ -1753,11 +1753,11 @@ EventScript_27229B:: @ 827229B
end end
EventScript_2722A7:: @ 82722A7 EventScript_2722A7:: @ 82722A7
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
releaseall releaseall
end end
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
.byte 0 .byte 0
BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
special sub_8139980 special OffsetCameraForBattle
end end
BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+2 -2
View File
@@ -329,8 +329,8 @@ BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49
BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49 BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49
BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49 BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49
BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49 BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49
playse 267 playse SE_CURTAIN
special sub_813B880 special CloseBattlePikeCurtain
waitstate waitstate
waitse waitse
return return
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+1 -1
View File
@@ -36,7 +36,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
special sub_8139980 special OffsetCameraForBattle
end end
BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2 BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2
data/maps/JaggedPass/scripts.inc
+10 -10
View File
@@ -42,19 +42,19 @@ JaggedPass_EventScript_2306A8:: @ 82306A8
JaggedPass_EventScript_2306BB:: @ 82306BB JaggedPass_EventScript_2306BB:: @ 82306BB
lockall lockall
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 16 setvar VAR_0x8006, 16 @ num shakes
setvar VAR_0x8007, 3 setvar VAR_0x8007, 3 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
playse SE_KOUKA_M playse SE_KOUKA_M
setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1 setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1
data/maps/MagmaHideout_4F/scripts.inc
+10 -10
View File
@@ -29,21 +29,21 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
waitmovement 0 waitmovement 0
special sub_80B058C special sub_80B058C
waitstate waitstate
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 1, MagmaHideout_4F_Movement_23A67D applymovement 1, MagmaHideout_4F_Movement_23A67D
waitmovement 0 waitmovement 0
removeobject 1 removeobject 1
delay 4 delay 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2 @ vertical pan
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
delay 30 delay 30
applymovement 6, MagmaHideout_4F_Movement_23A680 applymovement 6, MagmaHideout_4F_Movement_23A680
data/maps/MirageTower_4F/scripts.inc
+5 -5
View File
@@ -44,11 +44,11 @@ MirageTower_4F_EventScript_23ADC0:: @ 823ADC0
end end
MirageTower_4F_EventScript_23ADCA:: @ 823ADCA MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 32 setvar VAR_0x8006, 32 @ num shakes
setvar VAR_0x8007, 2 setvar VAR_0x8007, 2 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
special DoMirageTowerCeilingCrumble special DoMirageTowerCeilingCrumble
waitstate waitstate
data/maps/NavelRock_Bottom/scripts.inc
+10 -10
View File
@@ -34,18 +34,18 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
waitse waitse
delay 20 delay 20
playse SE_T_AME_E playse SE_T_AME_E
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0 @ vertical pan
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3 @ horizontal pan
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4 @ num shakes
setvar VAR_0x8007, 2 setvar VAR_0x8007, 2 @ shake delay
special sub_8139560 special ShakeCamera
delay 30 delay 30
playse SE_T_AME_E playse SE_T_AME_E
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0 @ vertical pan
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3 @ horizontal pan
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4 @ num shakes
setvar VAR_0x8007, 2 setvar VAR_0x8007, 2 @ shake delay
special sub_8139560 special ShakeCamera
delay 30 delay 30
delay 50 delay 50
waitse waitse
data/maps/NavelRock_Top/scripts.inc
+6 -6
View File
@@ -35,9 +35,9 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
lockall lockall
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
special SpawnCameraObject special SpawnCameraObject
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3 @ num loops
setvar VAR_0x8005, 35 setvar VAR_0x8005, 35 @ delay
special sub_813B80C special LoopWingFlapSE
applymovement 1, NavelRock_Top_Movement_269243 applymovement 1, NavelRock_Top_Movement_269243
applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230 applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230
waitmovement 0 waitmovement 0
@@ -49,9 +49,9 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
delay 30 delay 30
waitmoncry waitmoncry
delay 60 delay 60
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3 @ num loops
setvar VAR_0x8005, 35 setvar VAR_0x8005, 35 @ delay
special sub_813B80C special LoopWingFlapSE
applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269234 applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269234
applymovement 1, NavelRock_Top_Movement_26923A applymovement 1, NavelRock_Top_Movement_26923A
waitmovement 0 waitmovement 0
data/maps/PetalburgWoods/scripts.inc
+2 -2
View File
@@ -281,8 +281,8 @@ PetalburgWoods_EventScript_22E284:: @ 822E284
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq PetalburgWoods_EventScript_22E31B goto_if_eq PetalburgWoods_EventScript_22E31B
setvar VAR_0x8004, 621 setvar VAR_0x8004, TRAINER_JAMES_1
specialvar VAR_RESULT, sub_813B4E0 specialvar VAR_RESULT, IsTrainerRegistered
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq PetalburgWoods_EventScript_22E2EF goto_if_eq PetalburgWoods_EventScript_22E2EF
msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT
data/maps/Route102/scripts.inc
+2 -2
View File
@@ -22,8 +22,8 @@ Route102_EventScript_1EC105:: @ 81EC105
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route102_EventScript_1EC19C goto_if_eq Route102_EventScript_1EC19C
setvar VAR_0x8004, 318 setvar VAR_0x8004, TRAINER_CALVIN_1
specialvar VAR_RESULT, sub_813B4E0 specialvar VAR_RESULT, IsTrainerRegistered
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route102_EventScript_1EC170 goto_if_eq Route102_EventScript_1EC170
msgbox Route102_Text_2945AC, MSGBOX_DEFAULT msgbox Route102_Text_2945AC, MSGBOX_DEFAULT
data/maps/Route104/scripts.inc
+6 -6
View File
@@ -870,8 +870,8 @@ Route104_EventScript_1ED38D:: @ 81ED38D
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route104_EventScript_1ED424 goto_if_eq Route104_EventScript_1ED424
setvar VAR_0x8004, 604 setvar VAR_0x8004, TRAINER_HALEY_1
specialvar VAR_RESULT, sub_813B4E0 specialvar VAR_RESULT, IsTrainerRegistered
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route104_EventScript_1ED3F8 goto_if_eq Route104_EventScript_1ED3F8
msgbox Route104_Text_295689, MSGBOX_DEFAULT msgbox Route104_Text_295689, MSGBOX_DEFAULT
@@ -913,8 +913,8 @@ Route104_EventScript_1ED43B:: @ 81ED43B
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route104_EventScript_1ED4D2 goto_if_eq Route104_EventScript_1ED4D2
setvar VAR_0x8004, 136 setvar VAR_0x8004, TRAINER_WINSTON_1
specialvar VAR_RESULT, sub_813B4E0 specialvar VAR_RESULT, IsTrainerRegistered
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route104_EventScript_1ED4A6 goto_if_eq Route104_EventScript_1ED4A6
msgbox Route104_Text_2958C1, MSGBOX_DEFAULT msgbox Route104_Text_2958C1, MSGBOX_DEFAULT
@@ -956,8 +956,8 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route104_EventScript_1ED580 goto_if_eq Route104_EventScript_1ED580
setvar VAR_0x8004, 114 setvar VAR_0x8004, TRAINER_CINDY_1
specialvar VAR_RESULT, sub_813B4E0 specialvar VAR_RESULT, IsTrainerRegistered
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route104_EventScript_1ED554 goto_if_eq Route104_EventScript_1ED554
msgbox Route104_Text_295AC3, MSGBOX_DEFAULT msgbox Route104_Text_295AC3, MSGBOX_DEFAULT
data/maps/Route116/scripts.inc
+4 -4
View File
@@ -258,8 +258,8 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route116_EventScript_1F2F4E goto_if_eq Route116_EventScript_1F2F4E
setvar VAR_0x8004, 273 setvar VAR_0x8004, TRAINER_JERRY_1
specialvar VAR_RESULT, sub_813B4E0 specialvar VAR_RESULT, IsTrainerRegistered
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route116_EventScript_1F2F22 goto_if_eq Route116_EventScript_1F2F22
msgbox Route116_Text_29BD92, MSGBOX_DEFAULT msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
@@ -311,8 +311,8 @@ Route116_EventScript_1F2F93:: @ 81F2F93
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route116_EventScript_1F302A goto_if_eq Route116_EventScript_1F302A
setvar VAR_0x8004, 280 setvar VAR_0x8004, TRAINER_KAREN_1
specialvar VAR_RESULT, sub_813B4E0 specialvar VAR_RESULT, IsTrainerRegistered
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route116_EventScript_1F2FFE goto_if_eq Route116_EventScript_1F2FFE
msgbox Route116_Text_29C010, MSGBOX_DEFAULT msgbox Route116_Text_29C010, MSGBOX_DEFAULT
data/maps/SeafloorCavern_Room9/scripts.inc
+10 -10
View File
@@ -59,21 +59,21 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
waitmovement 0 waitmovement 0
special sub_80B058C special sub_80B058C
waitstate waitstate
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 1, SeafloorCavern_Room9_Movement_23504B applymovement 1, SeafloorCavern_Room9_Movement_23504B
waitmovement 0 waitmovement 0
removeobject 1 removeobject 1
delay 4 delay 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2 @ vertical pan
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
delay 30 delay 30
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
data/maps/SkyPillar_Outside/scripts.inc
+10 -10
View File
@@ -41,11 +41,11 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 3 setvar VAR_0x8007, 3 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
delay 40 delay 40
msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT
@@ -53,11 +53,11 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB
applymovement 1, SkyPillar_Outside_Movement_2393DE applymovement 1, SkyPillar_Outside_Movement_2393DE
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3 @ horizontal pan
setvar VAR_0x8006, 20 setvar VAR_0x8006, 20 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
delay 20 delay 20
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceLeft
data/maps/SkyPillar_Top/scripts.inc
+10 -10
View File
@@ -104,19 +104,19 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_RAYQUAZA, 2 playmoncry SPECIES_RAYQUAZA, 2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 3 setvar VAR_0x8007, 3 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
waitse waitse
playmoncry SPECIES_RAYQUAZA, 2 playmoncry SPECIES_RAYQUAZA, 2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
waitmoncry waitmoncry
applymovement 1, SkyPillar_Top_Movement_23984B applymovement 1, SkyPillar_Top_Movement_23984B
data/maps/SootopolisCity/scripts.inc
+50 -50
View File
@@ -228,11 +228,11 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 10, SootopolisCity_Movement_1E5BB8
applymovement 9, SootopolisCity_Movement_1E5BE5 applymovement 9, SootopolisCity_Movement_1E5BE5
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0 applymovement 9, SootopolisCity_Movement_1E5BF0
@@ -242,11 +242,11 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
applymovement 10, SootopolisCity_Movement_1E5BC2 applymovement 10, SootopolisCity_Movement_1E5BC2
applymovement 9, SootopolisCity_Movement_1E5BDD applymovement 9, SootopolisCity_Movement_1E5BDD
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0 applymovement 9, SootopolisCity_Movement_1E5BF0
@@ -256,11 +256,11 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 10, SootopolisCity_Movement_1E5BB8
applymovement 9, SootopolisCity_Movement_1E5BE5 applymovement 9, SootopolisCity_Movement_1E5BE5
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0 applymovement 9, SootopolisCity_Movement_1E5BF0
@@ -328,11 +328,11 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 10, SootopolisCity_Movement_1E5BB8
applymovement 9, SootopolisCity_Movement_1E5BE5 applymovement 9, SootopolisCity_Movement_1E5BE5
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0 applymovement 9, SootopolisCity_Movement_1E5BF0
@@ -342,11 +342,11 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
applymovement 10, SootopolisCity_Movement_1E5BC2 applymovement 10, SootopolisCity_Movement_1E5BC2
applymovement 9, SootopolisCity_Movement_1E5BDD applymovement 9, SootopolisCity_Movement_1E5BDD
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0 applymovement 9, SootopolisCity_Movement_1E5BF0
@@ -356,11 +356,11 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 10, SootopolisCity_Movement_1E5BB8
applymovement 9, SootopolisCity_Movement_1E5BE5 applymovement 9, SootopolisCity_Movement_1E5BE5
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0 applymovement 9, SootopolisCity_Movement_1E5BF0
@@ -517,19 +517,19 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_RAYQUAZA, 2 playmoncry SPECIES_RAYQUAZA, 2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 3 setvar VAR_0x8007, 3 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
waitse waitse
playmoncry SPECIES_RAYQUAZA, 2 playmoncry SPECIES_RAYQUAZA, 2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
waitmoncry waitmoncry
setweather WEATHER_NONE setweather WEATHER_NONE
@@ -570,19 +570,19 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_RAYQUAZA, 2 playmoncry SPECIES_RAYQUAZA, 2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 3 setvar VAR_0x8007, 3 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
waitse waitse
playmoncry SPECIES_RAYQUAZA, 2 playmoncry SPECIES_RAYQUAZA, 2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2 @ horizontal pan
setvar VAR_0x8006, 8 setvar VAR_0x8006, 8 @ num shakes
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5 @ shake delay
special sub_8139560 special ShakeCamera
waitstate waitstate
waitmoncry waitmoncry
setweather WEATHER_NONE setweather WEATHER_NONE
data/specials.inc
+5 -5
View File
@@ -320,7 +320,7 @@ gSpecials:: @ 81DBA64
def_special GetShieldToyTVDecorationInfo def_special GetShieldToyTVDecorationInfo
def_special IsPokerusInParty def_special IsPokerusInParty
def_special SetSootopolisGymCrackedIceMetatiles def_special SetSootopolisGymCrackedIceMetatiles
def_special sub_8139560 def_special ShakeCamera
def_special StartGroudonKyogreBattle def_special StartGroudonKyogreBattle
def_special BattleSetup_StartLegendaryBattle def_special BattleSetup_StartLegendaryBattle
def_special StartRegiBattle def_special StartRegiBattle
@@ -414,7 +414,7 @@ gSpecials:: @ 81DBA64
def_special GetContestLadyMonSpecies def_special GetContestLadyMonSpecies
def_special GetContestLadyCategory def_special GetContestLadyCategory
def_special PutLilycoveContestLadyShowOnTheAir def_special PutLilycoveContestLadyShowOnTheAir
def_special sub_813B880 def_special CloseBattlePikeCurtain
def_special CallApprenticeFunction def_special CallApprenticeFunction
def_special ShouldTryGetTrainerScript def_special ShouldTryGetTrainerScript
def_special ShowMapNamePopup def_special ShowMapNamePopup
@@ -440,7 +440,7 @@ gSpecials:: @ 81DBA64
def_special sub_802E3C4 def_special sub_802E3C4
def_special sub_8027A5C def_special sub_8027A5C
def_special sub_8027AAC def_special sub_8027AAC
def_special sub_8139980 def_special OffsetCameraForBattle
def_special GetDeptStoreDefaultFloorChoice def_special GetDeptStoreDefaultFloorChoice
def_special BufferVarsForIVRater def_special BufferVarsForIVRater
def_special sub_80F905C def_special sub_80F905C
@@ -505,7 +505,7 @@ gSpecials:: @ 81DBA64
def_special sub_80A08CC def_special sub_80A08CC
def_special Unused_SetWeatherSunny def_special Unused_SetWeatherSunny
def_special sub_81AFDA0 def_special sub_81AFDA0
def_special sub_813B4E0 def_special IsTrainerRegistered
def_special ShouldDoBrailleRegicePuzzle def_special ShouldDoBrailleRegicePuzzle
def_special EnableNationalPokedex def_special EnableNationalPokedex
def_special ScriptMenu_CreateLilycoveSSTidalMultichoice def_special ScriptMenu_CreateLilycoveSSTidalMultichoice
@@ -517,7 +517,7 @@ gSpecials:: @ 81DBA64
def_special sub_813B534 def_special sub_813B534
def_special CallTrainerHillFunction def_special CallTrainerHillFunction
def_special Script_DoRayquazaScene @ Listed twice def_special Script_DoRayquazaScene @ Listed twice
def_special sub_813B80C def_special LoopWingFlapSE
def_special sub_81D4BEC def_special sub_81D4BEC
def_special sub_80224D0 def_special sub_80224D0
def_special TryBufferWaldaPhrase def_special TryBufferWaldaPhrase
src/field_specials.c
+54 -36
View File
@@ -103,8 +103,8 @@ static void PCTurnOnEffect_1(s16, s8, s8);
static void PCTurnOffEffect(void); static void PCTurnOffEffect(void);
static void Task_LotteryCornerComputerEffect(u8); static void Task_LotteryCornerComputerEffect(u8);
static void LotteryCornerComputerEffect(struct Task *); static void LotteryCornerComputerEffect(struct Task *);
static void sub_81395BC(u8 taskId); static void Task_ShakeCamera(u8 taskId);
static void sub_8139620(u8 taskId); static void StopCameraShake(u8 taskId);
static void Task_MoveElevator(u8 taskId); static void Task_MoveElevator(u8 taskId);
static void MoveElevatorWindowLights(u16 floorDelta, bool8 descending); static void MoveElevatorWindowLights(u16 floorDelta, bool8 descending);
static void Task_MoveElevatorWindowLights(u8 taskId); static void Task_MoveElevatorWindowLights(u8 taskId);
@@ -126,8 +126,8 @@ static void Task_DeoxysRockInteraction(u8 taskId);
static void ChangeDeoxysRockLevel(u8 a0); static void ChangeDeoxysRockLevel(u8 a0);
static void WaitForDeoxysRockMovement(u8 taskId); static void WaitForDeoxysRockMovement(u8 taskId);
static void sub_813B57C(u8 taskId); static void sub_813B57C(u8 taskId);
static void sub_813B824(u8 taskId); static void Task_LoopWingFlapSE(u8 taskId);
static void _fwalk(u8 taskId); static void Task_CloseBattlePikeCurtain(u8 taskId);
static u8 sub_813BF44(void); static u8 sub_813BF44(void);
static void sub_813BD84(void); static void sub_813BD84(void);
static u16 sub_813BB74(void); static u16 sub_813BB74(void);
@@ -1493,44 +1493,56 @@ bool8 IsPokerusInParty(void)
return TRUE; return TRUE;
} }
void sub_8139560(void) #define horizontalPan data[0]
#define delayCounter data[1]
#define numShakes data[2]
#define delay data[3]
#define verticalPan data[4]
void ShakeCamera(void)
{ {
u8 taskId = CreateTask(sub_81395BC, 9); u8 taskId = CreateTask(Task_ShakeCamera, 9);
gTasks[taskId].data[0] = gSpecialVar_0x8005; gTasks[taskId].horizontalPan = gSpecialVar_0x8005;
gTasks[taskId].data[1] = 0; gTasks[taskId].delayCounter = 0;
gTasks[taskId].data[2] = gSpecialVar_0x8006; gTasks[taskId].numShakes = gSpecialVar_0x8006;
gTasks[taskId].data[3] = gSpecialVar_0x8007; gTasks[taskId].delay = gSpecialVar_0x8007;
gTasks[taskId].data[4] = gSpecialVar_0x8004; gTasks[taskId].verticalPan = gSpecialVar_0x8004;
SetCameraPanningCallback(NULL); SetCameraPanningCallback(NULL);
PlaySE(SE_W070); PlaySE(SE_W070);
} }
static void sub_81395BC(u8 taskId) static void Task_ShakeCamera(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
data[1]++; delayCounter++;
if (data[1] % data[3] == 0) if (delayCounter % delay == 0)
{ {
data[1] = 0; delayCounter = 0;
data[2]--; numShakes--;
data[0] = -data[0]; horizontalPan = -horizontalPan;
data[4] = -data[4]; verticalPan = -verticalPan;
SetCameraPanning(data[0], data[4]); SetCameraPanning(horizontalPan, verticalPan);
if (data[2] == 0) if (numShakes == 0)
{ {
sub_8139620(taskId); StopCameraShake(taskId);
InstallCameraPanAheadCallback(); InstallCameraPanAheadCallback();
} }
} }
} }
static void sub_8139620(u8 taskId) static void StopCameraShake(u8 taskId)
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
#undef horizontalPan
#undef delayCounter
#undef numShakes
#undef delay
#undef verticalPan
bool8 FoundBlackGlasses(void) bool8 FoundBlackGlasses(void)
{ {
return FlagGet(FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES); return FlagGet(FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES);
@@ -1699,7 +1711,7 @@ bool8 InMultiBattleRoom(void)
return FALSE; return FALSE;
} }
void sub_8139980(void) void OffsetCameraForBattle(void)
{ {
SetCameraPanningCallback(NULL); SetCameraPanningCallback(NULL);
SetCameraPanning(8, 0); SetCameraPanning(8, 0);
@@ -3713,7 +3725,7 @@ u32 GetMartEmployeeObjectEventId(void)
return 1; return 1;
} }
bool32 sub_813B4E0(void) bool32 IsTrainerRegistered(void)
{ {
int index = GetRematchIdxByTrainerIdx(gSpecialVar_0x8004); int index = GetRematchIdxByTrainerIdx(gSpecialVar_0x8004);
if (index >= 0) if (index >= 0)
@@ -3889,40 +3901,46 @@ void Script_DoRayquazaScene(void)
} }
} }
void sub_813B80C(void) #define playCount data[0]
#define delay data[1]
void LoopWingFlapSE(void)
{ {
CreateTask(sub_813B824, 8); CreateTask(Task_LoopWingFlapSE, 8);
PlaySE(SE_W017); PlaySE(SE_W017);
} }
static void sub_813B824(u8 taskId) static void Task_LoopWingFlapSE(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
data[1]++; delay++;
if (data[1] == gSpecialVar_0x8005) if (delay == gSpecialVar_0x8005)
{ {
data[0]++; playCount++;
data[1] = 0; delay = 0;
PlaySE(SE_W017); PlaySE(SE_W017);
} }
if (data[0] == gSpecialVar_0x8004 - 1) if (playCount == gSpecialVar_0x8004 - 1)
{ {
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
void sub_813B880(void) #undef playCount
#undef delay
void CloseBattlePikeCurtain(void)
{ {
u8 taskId = CreateTask(_fwalk, 8); u8 taskId = CreateTask(Task_CloseBattlePikeCurtain, 8);
gTasks[taskId].data[0] = 4; gTasks[taskId].data[0] = 4;
gTasks[taskId].data[1] = 4; gTasks[taskId].data[1] = 4;
gTasks[taskId].data[2] = 4; gTasks[taskId].data[2] = 4;
gTasks[taskId].data[3] = 0; gTasks[taskId].data[3] = 0;
} }
static void _fwalk(u8 taskId) static void Task_CloseBattlePikeCurtain(u8 taskId)
{ {
u8 x, y; u8 x, y;
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
@@ -3934,7 +3952,7 @@ static void _fwalk(u8 taskId)
{ {
for (x = 0; x < 3; x++) for (x = 0; x < 3; x++)
{ {
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + x + 6, gSaveBlock1Ptr->pos.y + y + 4, x + 0x201 + y * 8 + data[3] * 32); MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + x + 6, gSaveBlock1Ptr->pos.y + y + 4, x + 513 + y * 8 + data[3] * 32);
} }
} }
DrawWholeMapView(); DrawWholeMapView();