Merge branch 'master' into constants-fade

This commit is contained in:
GriffinR
2019-12-17 19:11:51 -05:00
committed by GitHub
45 changed files with 2801 additions and 2658 deletions
@@ -1003,11 +1003,12 @@ BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641
.string "you have earned this fabulous prize!\p"
.string "$"
SlateportCity_BattleTentLobby_Text_23F68C: @ 823F68C
BattleFrontier_BattleTowerLobby_Text_ReceivedPrize: @ 823F68C
.string "{PLAYER} received the prize\n"
.string "{STR_VAR_1}.$"
SlateportCity_BattleTentLobby_Text_23F6A6: @ 823F6A6
@ Unused
BattleFrontier_BattleTowerLobby_Text_BagFullMakeRoom: @ 823F6A6
.string "Oh, your BAG appears to be full.\p"
.string "Please make room in your BAG, then come\n"
.string "see me.$"