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-12-15 02:00:00 -05:00
parent 6556b556dd 6967caefb2
commit 82f55f2381
49 changed files with 1845 additions and 1829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
data/event_scripts.s
View File

@@ -86,16 +86,16 @@ gSpecialVars:: @ 81DBA0C
.include "data/specials.inc"
gStdScripts:: @ 81DC2A0
.4byte Std_ObtainItem
.4byte Std_FindItem
.4byte Std_MsgboxNPC
.4byte Std_MsgboxSign
.4byte Std_MsgboxDefault
.4byte Std_MsgboxYesNo
.4byte Std_MsgboxAutoclose
.4byte Std_ObtainDecoration
.4byte Std_RegisteredInMatchCall
.4byte Std_MsgboxGetPoints
.4byte Std_ObtainItem @ STD_OBTAIN_ITEM
.4byte Std_FindItem @ STD_FIND_ITEM
.4byte Std_MsgboxNPC @ MSGBOX_NPC
.4byte Std_MsgboxSign @ MSGBOX_SIGN
.4byte Std_MsgboxDefault @ MSGBOX_DEFAULT
.4byte Std_MsgboxYesNo @ MSGBOX_YESNO
.4byte Std_MsgboxAutoclose @ MSGBOX_AUTOCLOSE
.4byte Std_ObtainDecoration @ STD_OBTAIN_DECORATION
.4byte Std_RegisteredInMatchCall @ STD_REGISTER_MATCH_CALL
.4byte Std_MsgboxGetPoints @ MSGBOX_GETPOINTS
.4byte Std_10
gStdScripts_End:: @ 81DC2CC
@@ -483,7 +483,7 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc"
.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc"
.include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc"
.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc"
.include "data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc"
.include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc"
.include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc"
.include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc"