diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-14 18:22:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 18:22:35 -0500 |
| commit | 26962b7725ffc5df719a0eea9442735b9dc04b5c (patch) | |
| tree | 4c9e4215bd686793e82ec3df20f7ed8829d1c40a /data/event_scripts.s | |
| parent | 9b9b14ad0a711288446f9ba863eb0e3fe956ddd4 (diff) | |
| parent | bb23128b77a01d3c39b11aef978acf437ae71974 (diff) | |
Merge pull request #830 from GriffinRichards/doc-inc
Document some .incs split from event_scripts
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 0c0279a89..4d09dfe96 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,7 @@ #include "constants/global.h" #include "constants/battle.h" +#include "constants/battle_pike.h" +#include "constants/battle_pyramid.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/berry.h" @@ -11,6 +13,7 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" +#include "constants/field_poison.h" #include "constants/field_specials.h" #include "constants/flags.h" #include "constants/game_stat.h" @@ -23,6 +26,7 @@ #include "constants/maps.h" #include "constants/metatile_labels.h" #include "constants/moves.h" +#include "constants/party_menu.h" #include "constants/pokemon.h" #include "constants/script_menu.h" #include "constants/secret_bases.h" @@ -902,7 +906,7 @@ EventScript_PickItemUp:: @ 8271C3A waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_if_eq EventScript_271C86 @@ -1298,7 +1302,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 |