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

make union room compile i guess

Browse Source
This commit is contained in:
DizzyEggg
2018-07-22 12:49:49 +02:00
parent 377280ac3b
commit c9d486a5d3
12 changed files with 1967 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/events/LilycoveCity_ContestLobby.inc
View File

@@ -32,7 +32,7 @@ LilycoveCity_ContestLobby_MapWarps: @ 853178C
warp_def 21, 1, 0, 1, LILYCOVE_CITY_CONTEST_HALL
LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055
bg_event 23, 5, 0, 0, 0, EventScript_PblockLink
bg_event 23, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293E1E
bg_event 23, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A753
bg_event 25, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A75A
@@ -41,7 +41,7 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
bg_event 3, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A73E
bg_event 5, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A745
bg_event 7, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A74C
bg_event 27, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293C3E
bg_event 27, 5, 0, 0, 0, EventScript_Pblock1_Ask
bg_event 27, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293D4D
bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784

16
data/scripts/pokeblocks.inc
View File

@@ -245,7 +245,7 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4
.string "But, I don’t have any to spare today.\n"
.string "Sorry about that.$"
EventScript_Pblock1_Ask: @ 8293C3E
EventScript_Pblock1_Ask:: @ 8293C3E
lockall
checkflag FLAG_0x340
goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB
@@ -332,7 +332,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43
releaseall
end
LilycoveCity_ContestLobby_EventScript_293D4D: @ 8293D4D
LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
lockall
setvar VAR_0x8009, 2
applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2
@@ -396,7 +396,7 @@ LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14
releaseall
end
LilycoveCity_ContestLobby_EventScript_293E1E: @ 8293E1E
LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
lockall
setvar VAR_0x8008, 15
setvar VAR_0x8009, 3
@@ -513,19 +513,19 @@ LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98
releaseall
end
LilycoveCity_ContestLobby_EventScript_293FA2: @ 8293FA2
LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2
msgbox LilycoveCity_ContestLobby_Text_2937F9, 2
end
LilycoveCity_ContestLobby_EventScript_293FAB: @ 8293FAB
LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB
msgbox LilycoveCity_ContestLobby_Text_293842, 2
end
LilycoveCity_ContestLobby_EventScript_293FB4: @ 8293FB4
LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4
msgbox LilycoveCity_ContestLobby_Text_29388F, 2
end
LilycoveCity_ContestLobby_EventScript_293FBD: @ 8293FBD
LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD
setvar VAR_0x8008, 15
goto LilycoveCity_ContestLobby_EventScript_293FC8
end
@@ -576,7 +576,7 @@ LilycoveCity_ContestLobby_Movement_294053: @ 8294053
step_28
step_end
EventScript_PblockLink: @ 8294055
EventScript_PblockLink:: @ 8294055
lockall
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 0