diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-07-24 18:48:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 18:48:23 -0700 |
| commit | c47aac3538286c50221f5183b2fee5089a057b55 (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /data/maps | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
| parent | 1e9143e0b22bc72cb77866e10817bc509064842a (diff) | |
Merge pull request #260 from DizzyEggg/decompile_union_room
Decompile part of union room
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/LilycoveCity_ContestLobby/events.inc | 4 | ||||
| -rw-r--r-- | data/maps/LilycoveCity_ContestLobby/scripts.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index 67f644529..be94bfb7b 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -32,7 +32,7 @@ LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_294055 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A @@ -41,7 +41,7 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745 bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C - bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293C3E + bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 9d37c58ed..956766395 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -877,7 +877,7 @@ LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0 return LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 - message LilycoveCity_ContestLobby_Text_27C1EA + message Text_DecideLinkLeader waitmessage multichoice 16, 6, 81, 0 switch VAR_RESULT |