diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-18 12:45:56 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-18 12:47:10 -0500 |
| commit | a486c8affd35bec6e3b71c8c1bfbaba2dc94ec4b (patch) | |
| tree | 062ac919817dbfa142929167da4e131c2dc58d49 /data/event_scripts.s | |
| parent | fc3783b7395b25d290ec650d79fbdc80518046cd (diff) | |
| parent | 5393b42f7ccfd10986a9a253e29ce54fae847a78 (diff) | |
Begin documenting Apprentice, merge with master
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 29483bf90..9f0e27ce6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,10 +1,11 @@ #include "constants/global.h" #include "constants/apprentice.h" #include "constants/battle.h" +#include "constants/battle_frontier.h" #include "constants/battle_pike.h" #include "constants/battle_pyramid.h" -#include "constants/battle_frontier.h" #include "constants/battle_setup.h" +#include "constants/battle_tower.h" #include "constants/berry.h" #include "constants/cable_club.h" #include "constants/coins.h" @@ -89,7 +90,7 @@ gStdScripts:: @ 81DC2A0 .4byte Std_MsgboxAutoclose .4byte Std_ObtainDecoration .4byte Std_RegisteredInMatchCall - .4byte Std_9 + .4byte Std_MsgboxGetPoints .4byte Std_10 gStdScripts_End:: @ 81DC2CC @@ -508,7 +509,7 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc" .include "data/maps/BattleFrontier_RankingHall/scripts.inc" .include "data/maps/BattleFrontier_Lounge1/scripts.inc" - .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc" + .include "data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc" .include "data/maps/BattleFrontier_Lounge2/scripts.inc" .include "data/maps/BattleFrontier_Lounge3/scripts.inc" .include "data/maps/BattleFrontier_Lounge4/scripts.inc" @@ -608,7 +609,7 @@ Std_MsgboxYesNo: @ 8271332 yesnobox 20, 8 return -Std_9: @ 827133C +Std_MsgboxGetPoints: @ 827133C message 0x0 playfanfare MUS_ME_POINTGET waitfanfare |