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

Merge pull request #551 from Phlosioneer/multiplayer-stuff

Browse Source 
Document overworld.c and link stuff in general
This commit is contained in:
huderlem
2019-03-01 08:43:55 -06:00
committed by GitHub
parent da0687987d 459fd93b59
commit 3b04cfa437
42 changed files with 774 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/event_scripts.s
View File

@@ -1146,19 +1146,19 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
EventScript_WhiteOut:: @ 8271857
call EverGrandeCity_HallOfFame_EventScript_2718CC
goto EventScript_271862
goto EventScript_ResetMrBriney
end
EventScript_271862:: @ 8271862
EventScript_ResetMrBriney:: @ 8271862
compare VAR_BRINEY_LOCATION, 1
goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884
goto_if_eq EventScript_MoveMrBrineyToHouse
compare VAR_BRINEY_LOCATION, 2
goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A
goto_if_eq EventScript_MoveMrBrineyToDewford
compare VAR_BRINEY_LOCATION, 3
goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3
goto_if_eq EventScript_MoveMrBrineyToRoute108
end
EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
EventScript_MoveMrBrineyToHouse:: @ 8271884
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
@@ -1168,7 +1168,7 @@ EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
end
EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
EventScript_MoveMrBrineyToDewford:: @ 827189A
setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
@@ -1179,7 +1179,7 @@ EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
end
EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3
EventScript_MoveMrBrineyToRoute108:: @ 82718B3
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -1597,7 +1597,7 @@ EventScript_271D5E:: @ 8271D5E
goto EventScript_271D89
EventScript_271D83:: @ 8271D83
special sub_80E6BE8
special RecordMixingPlayerSpotTriggered
waitstate
lock
faceplayer

10
data/io_reg.s
View File

@@ -24,11 +24,11 @@ gUnref_82EC784:: @ 82EC784
.4byte 0x02000100
.4byte 0x08000400
gUnknown_82EC7C4:: @ 82EC7C4
.2byte 0x0100
.2byte 0x0200
.2byte 0x0400
.2byte 0x0800
gOverworldBackgroundLayerFlags:: @ 82EC7C4
.2byte 0x0100 /* BLDCNT_TGT2_BG0 */
.2byte 0x0200 /* BLDCNT_TGT2_BG1 */
.2byte 0x0400 /* BLDCNT_TGT2_BG2 */
.2byte 0x0800 /* BLDCNT_TGT2_BG3 */
gUnknown_82EC7CC:: @ 82EC7CC
.2byte 0x0001

8
data/maps/DoubleBattleColosseum/map.json
View File

@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_08277388"
"script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_082773BE"
"script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
},
{
"type": "trigger",
@@ -70,7 +70,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_082773A3"
"script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
},
{
"type": "trigger",
@@ -79,7 +79,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_082773D9"
"script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
}
],
"bg_events": []

2
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
waitmovement 0
special SavePlayerParty
fadescreen 1
special sub_80F9438
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032

8
data/maps/RecordCorner/map.json
View File

@@ -66,7 +66,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_0827741D"
"script": "EventScript_RecordCenter_Spot0"
},
{
"type": "trigger",
@@ -75,7 +75,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_08277447"
"script": "EventScript_RecordCenter_Spot2"
},
{
"type": "trigger",
@@ -84,7 +84,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_08277432"
"script": "EventScript_RecordCenter_Spot1"
},
{
"type": "trigger",
@@ -93,7 +93,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_0827745C"
"script": "EventScript_RecordCenter_Spot3"
}
],
"bg_events": []

4
data/maps/SingleBattleColosseum/map.json
View File

@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_08277374"
"script": "EventScript_SingleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_0827737E"
"script": "EventScript_SingleBattleColosseum_PlayerSpot1"
}
],
"bg_events": []

2
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
View File

@@ -129,7 +129,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT
fadescreen 1
special sub_80F9438
special ChooseHalfPartyForBattle
waitstate
return

4
data/maps/TradeCenter/map.json
View File

@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_082773F5"
"script": "EventScript_TradeCenter_Chair0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "gUnknown_082773FF"
"script": "EventScript_TradeCenter_Chair1"
}
],
"bg_events": []

102
data/scripts/cable_club.inc
View File

@@ -791,116 +791,118 @@ EventScript_CableBoxResults:: @ 8277365
releaseall
end
gUnknown_08277374:: @ 8277374
EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0
special sub_80B3968
special ColosseumPlayerSpotTriggered
waitstate
end
gUnknown_0827737E:: @ 827737E
EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1
special sub_80B3968
special ColosseumPlayerSpotTriggered
waitstate
end
gUnknown_08277388:: @ 8277388
EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
fadescreen 1
special sub_80F9438
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq DoubleBattleColosseum_EventScript_2773F4
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 0
special sub_80B3968
special ColosseumPlayerSpotTriggered
waitstate
end
gUnknown_082773A3:: @ 82773A3
EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
fadescreen 1
special sub_80F9438
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq DoubleBattleColosseum_EventScript_2773F4
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 1
special sub_80B3968
special ColosseumPlayerSpotTriggered
waitstate
end
gUnknown_082773BE:: @ 82773BE
EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
fadescreen 1
special sub_80F9438
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq DoubleBattleColosseum_EventScript_2773F4
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 2
special sub_80B3968
special ColosseumPlayerSpotTriggered
waitstate
end
gUnknown_082773D9:: @ 82773D9
EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
fadescreen 1
special sub_80F9438
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq DoubleBattleColosseum_EventScript_2773F4
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 3
special sub_80B3968
special ColosseumPlayerSpotTriggered
waitstate
end
DoubleBattleColosseum_EventScript_2773F4:: @ 82773F4
EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
end
gUnknown_082773F5:: @ 82773F5
EventScript_TradeCenter_Chair0:: @ 82773F5
setvar VAR_0x8005, 0
special sub_80B3924
special PlayerEnteredTradeSeat
waitstate
end
gUnknown_082773FF:: @ 82773FF
EventScript_TradeCenter_Chair1:: @ 82773FF
setvar VAR_0x8005, 1
special sub_80B3924
special PlayerEnteredTradeSeat
waitstate
end
gUnknown_08277409:: @ 8277409
/* Never used */
EventScript_TradeCenter_Chair2:: @ 8277409
setvar VAR_0x8005, 2
special sub_80B3924
special PlayerEnteredTradeSeat
waitstate
end
gUnknown_08277413:: @ 8277413
/* Never used */
EventScript_TradeCenter_Chair3:: @ 8277413
setvar VAR_0x8005, 3
special sub_80B3924
special PlayerEnteredTradeSeat
waitstate
end
gUnknown_0827741D:: @ 827741D
EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
special sub_80E6BE8
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
gUnknown_08277432:: @ 8277432
EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
special sub_80E6BE8
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
gUnknown_08277447:: @ 8277447
EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
special sub_80E6BE8
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
gUnknown_0827745C:: @ 827745C
EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
special sub_80E6BE8
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
@@ -914,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471
releaseall
end
EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E
gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E
msgbox Text_278452, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D
gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D
msgbox Text_27847B, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
EventScript_TradeRoom_TooBusyToNotice:: @ 827749C
gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C
msgbox Text_27842E, MSGBOX_DEFAULT
closemessage
end
@@ -967,22 +969,22 @@ RecordCorner_EventScript_2774E0:: @ 82774E0
closemessage
end
gUnknown_082774EF:: @ 82774EF
msgbox Text_2783A8, MSGBOX_YESNO
EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq gUnknown_08277509
goto_if_eq EventScript_TerminateLink
erasebox 0, 0, 29, 19
releaseall
end
gUnknown_08277509:: @ 8277509
messageautoscroll Text_2783E9
EventScript_TerminateLink:: @ 8277509
messageautoscroll Text_TerminateLinkPleaseWait
waitmessage
special sub_80B371C
special ExitLinkRoom
end
EventScript_277513:: @ 8277513
special sub_80B36EC
EventScript_DoLinkRoomExit:: @ 8277513
special CleanupLinkRoomState
special sub_80AF9F8
waitstate
end
@@ -1736,11 +1738,11 @@ OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372
.string "Please confirm the number of\n"
.string "players and start again.$"
Text_2783A8: @ 82783A8
Text_TerminateLinkConfirmation: @ 82783A8
.string "The link will be terminated if you\n"
.string "leave the room. Is that okay?$"
Text_2783E9: @ 82783E9
Text_TerminateLinkPleaseWait: @ 82783E9
.string "Terminating link…\n"
.string "You will be escorted out of\l"
.string "the room. Please wait.$"

12
data/specials.inc
View File

@@ -12,8 +12,8 @@ gSpecials:: @ 81DBA64
def_special SetCableClubWarp
def_special sub_80AF948
def_special sub_80AF9F8
def_special sub_80B36EC
def_special sub_80B371C
def_special CleanupLinkRoomState
def_special ExitLinkRoom
def_special sub_80E8E18
def_special sub_80E8BC8
def_special sub_80E9068
@@ -35,14 +35,14 @@ gSpecials:: @ 81DBA64
def_special sub_80E91F8
def_special sub_80EA30C
def_special DoSecretBasePCTurnOffEffect
def_special sub_80E6BE8
def_special RecordMixingPlayerSpotTriggered
def_special sub_80B2DA4
def_special sub_80B2E4C
def_special sub_80B2E74
def_special sub_80B2EA8
def_special CloseLink
def_special sub_80B3968
def_special sub_80B3924
def_special ColosseumPlayerSpotTriggered
def_special PlayerEnteredTradeSeat
def_special nullsub_37
def_special sub_80B3254
def_special sub_80B2FD8
@@ -50,7 +50,7 @@ gSpecials:: @ 81DBA64
def_special SpawnLinkPartnerEventObject
def_special SavePlayerParty
def_special LoadPlayerParty
def_special sub_80F9438
def_special ChooseHalfPartyForBattle
def_special sp02A_crash_sound
def_special EventObjectInteractionGetBerryTreeData
def_special EventObjectInteractionGetBerryName