Merge branch 'master' into fix-eventobj
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
|
||||
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
|
||||
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
|
||||
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_OnFrame
|
||||
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_OnWarp
|
||||
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
|
||||
.byte 0
|
||||
|
||||
MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
|
||||
MossdeepCity_GameCorner_1F_OnWarp: @ 8224B37
|
||||
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
|
||||
.2byte 0
|
||||
|
||||
MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
|
||||
MossdeepCity_GameCorner_1F_OnFrame: @ 8224B41
|
||||
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
|
||||
.2byte 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user