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

Merge branch 'master' into doc-inc2

Browse Source
This commit is contained in:
GriffinR
2019-10-14 19:25:10 -04:00
committed by GitHub
parent 30ef494163 26962b7725
commit 928cdf2531
144 changed files with 1290 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+6 -2
View File
@@ -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"
@@ -903,7 +907,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
@@ -1299,7 +1303,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