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

Merge master into doc-tower

Browse Source
This commit is contained in:
GriffinR
2019-12-17 21:17:46 -05:00
parent ddfa0c6298 f8cef9a6a8
commit 23f952b34e
145 changed files with 7875 additions and 10345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
data/event_scripts.s
View File

@@ -24,6 +24,7 @@
#include "constants/field_poison.h"
#include "constants/field_specials.h"
#include "constants/field_tasks.h"
#include "constants/field_weather.h"
#include "constants/flags.h"
#include "constants/frontier_util.h"
#include "constants/game_stat.h"
@@ -86,16 +87,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 +484,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"
@@ -720,9 +721,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
end
Common_ShowEasyChatScreen:: @ 8271E7C
fadescreen 1
fadescreen FADE_TO_BLACK
special ShowEasyChatScreen
fadescreen 0
fadescreen FADE_FROM_BLACK
return
Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
@@ -773,17 +774,17 @@ Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
return
Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
fadescreen 1
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
fadescreen 0
fadescreen FADE_FROM_BLACK
return
EventScript_RegionMap:: @ 827208F
lockall
msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT
fadescreen 1
fadescreen FADE_TO_BLACK
special FieldShowRegionMap
waitstate
releaseall
@@ -868,7 +869,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
.include "data/scripts/kecleon.inc"
Common_EventScript_NameReceivedPartyMon:: @ 82723DD
fadescreen 1
fadescreen FADE_TO_BLACK
special ChangePokemonNickname
waitstate
return
@@ -1045,16 +1046,16 @@ Common_EventScript_DirectCornerAttendant:: @ 8273767
end
Common_EventScript_RemoveStaticPokemon:: @ 827376D
fadescreenswapbuffers 1
fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
fadescreenswapbuffers FADE_FROM_BLACK
release
end
Common_EventScript_LegendaryFlewAway:: @ 8273776
fadescreenswapbuffers 1
fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
fadescreenswapbuffers FADE_FROM_BLACK
bufferspeciesname 0, VAR_0x8004
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
release