Begin documenting Apprentice, merge with master

This commit is contained in:
GriffinR
2019-11-18 12:45:56 -05:00
186 changed files with 7809 additions and 7689 deletions

View File

@@ -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