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

Merge master into ObjEvent rename

Browse Source
This commit is contained in:
GriffinR
2019-11-25 20:00:04 -05:00
parent 4c52cf9ed1 6efa51f8ad
commit f559fa3fe2
144 changed files with 8322 additions and 8521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/event_scripts.s
View File

@@ -1,4 +1,5 @@
#include "constants/global.h"
#include "constants/apprentice.h"
#include "constants/battle.h"
#include "constants/battle_frontier.h"
#include "constants/battle_pike.h"
@@ -503,9 +504,9 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/BattleFrontier_BattlePikeLobby/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc"
.include "data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc"
.include "data/maps/BattleFrontier_RankingHall/scripts.inc"
.include "data/maps/BattleFrontier_Lounge1/scripts.inc"
.include "data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc"
@@ -1111,6 +1112,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
.include "data/scripts/lilycove_lady.inc"
.include "data/text/match_call.inc"
.include "data/scripts/apprentice.inc"
.include "data/text/apprentice.inc"
.include "data/text/battle_dome.inc"
.include "data/scripts/battle_pike.inc"
.include "data/text/blend_master.inc"