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

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
parent db8a5c6c2b f8cef9a6a8
commit 949509aade
82 changed files with 3472 additions and 6562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+5 -4
View File
@@ -166,7 +166,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT
fadescreen 1
fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -367,7 +367,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB
compare VAR_RESULT, 3
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1
fadescreen FADE_TO_BLACK
dome_showresultstree
waitstate
end
@@ -540,11 +540,12 @@ BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D
.string "Here is your prize for your Battle\n"
.string "Tournament victory.$"
VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554
BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554
.string "{PLAYER} received the prize\n"
.string "{STR_VAR_1}.$"
VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E
@ Unused
BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom: @ 824A56E
.string "Oh, your BAG appears to be full.\p"
.string "Please make room in your BAG, then come\n"
.string "see me.$"