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

Clean up mistakes and bad formatting

Browse Source
This commit is contained in:
Phlosioneer
2019-02-18 01:03:44 -05:00
parent 327de0283d
commit 08579edbcd
19 changed files with 159 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/event_scripts.s
View File

@@ -1157,12 +1157,12 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
setvar VAR_0x40D3, 1
return
gEventScript_WhiteOut:: @ 8271857
EventScript_WhiteOut:: @ 8271857
call EverGrandeCity_HallOfFame_EventScript_2718CC
goto gEventScript_ResetMrBriney
goto EventScript_ResetMrBriney
end
gEventScript_ResetMrBriney:: @ 8271862
EventScript_ResetMrBriney:: @ 8271862
compare VAR_0x4096, 1
goto_if_eq EventScript_MoveMrBrineyToHouse
compare VAR_0x4096, 2
@@ -1610,7 +1610,7 @@ EventScript_271D5E:: @ 8271D5E
goto EventScript_271D89
EventScript_271D83:: @ 8271D83
special EventScript_RecordMixingPlayerSpotTriggered
special RecordMixingPlayerSpotTriggered
waitstate
lock
faceplayer

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

@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_DoubleBattleColosseum_PlayerSpot0"
"script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_DoubleBattleColosseum_PlayerSpot2"
"script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
},
{
"type": "trigger",
@@ -70,7 +70,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_DoubleBattleColosseum_PlayerSpot1"
"script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
},
{
"type": "trigger",
@@ -79,7 +79,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_DoubleBattleColosseum_PlayerSpot3"
"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 EventScript_ChooseHalfPartyForBattle
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": "gEventScript_RecordCenter_Spot0"
"script": "EventScript_RecordCenter_Spot0"
},
{
"type": "trigger",
@@ -75,7 +75,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_RecordCenter_Spot2"
"script": "EventScript_RecordCenter_Spot2"
},
{
"type": "trigger",
@@ -84,7 +84,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_RecordCenter_Spot1"
"script": "EventScript_RecordCenter_Spot1"
},
{
"type": "trigger",
@@ -93,7 +93,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_RecordCenter_Spot3"
"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": "gEventScript_SingleBattleColosseum_PlayerSpot0"
"script": "EventScript_SingleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_SingleBattleColosseum_PlayerSpot1"
"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 EventScript_ChooseHalfPartyForBattle
special ChooseHalfPartyForBattle
waitstate
return

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

@@ -53,7 +53,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_TradeCenter_Chair0"
"script": "EventScript_TradeCenter_Chair0"
},
{
"comment": "This is trade seat #2.",
@@ -63,7 +63,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "gEventScript_TradeCenter_Chair1"
"script": "EventScript_TradeCenter_Chair1"
}
],
"bg_events": []

86
data/scripts/cable_club.inc
View File

@@ -791,118 +791,118 @@ EventScript_CableBoxResults:: @ 8277365
releaseall
end
gEventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0
special EventScript_ColosseumPlayerSpotTriggered
special ColosseumPlayerSpotTriggered
waitstate
end
gEventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1
special EventScript_ColosseumPlayerSpotTriggered
special ColosseumPlayerSpotTriggered
waitstate
end
gEventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
fadescreen 1
special EventScript_ChooseHalfPartyForBattle
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 0
special EventScript_ColosseumPlayerSpotTriggered
special ColosseumPlayerSpotTriggered
waitstate
end
gEventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
fadescreen 1
special EventScript_ChooseHalfPartyForBattle
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 1
special EventScript_ColosseumPlayerSpotTriggered
special ColosseumPlayerSpotTriggered
waitstate
end
gEventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
fadescreen 1
special EventScript_ChooseHalfPartyForBattle
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 2
special EventScript_ColosseumPlayerSpotTriggered
special ColosseumPlayerSpotTriggered
waitstate
end
gEventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
fadescreen 1
special EventScript_ChooseHalfPartyForBattle
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 3
special EventScript_ColosseumPlayerSpotTriggered
special ColosseumPlayerSpotTriggered
waitstate
end
gEventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
end
gEventScript_TradeCenter_Chair0:: @ 82773F5
EventScript_TradeCenter_Chair0:: @ 82773F5
setvar VAR_0x8005, 0
special EventScript_PlayerEnteredTradeSeat
special PlayerEnteredTradeSeat
waitstate
end
gEventScript_TradeCenter_Chair1:: @ 82773FF
EventScript_TradeCenter_Chair1:: @ 82773FF
setvar VAR_0x8005, 1
special EventScript_PlayerEnteredTradeSeat
special PlayerEnteredTradeSeat
waitstate
end
/* Never used */
gEventScript_TradeCenter_Chair2:: @ 8277409
EventScript_TradeCenter_Chair2:: @ 8277409
setvar VAR_0x8005, 2
special EventScript_PlayerEnteredTradeSeat
special PlayerEnteredTradeSeat
waitstate
end
/* Never used */
gEventScript_TradeCenter_Chair3:: @ 8277413
EventScript_TradeCenter_Chair3:: @ 8277413
setvar VAR_0x8005, 3
special EventScript_PlayerEnteredTradeSeat
special PlayerEnteredTradeSeat
waitstate
end
gEventScript_RecordCenter_Spot0:: @ 827741D
EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
special EventScript_RecordMixingPlayerSpotTriggered
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
gEventScript_RecordCenter_Spot1:: @ 8277432
EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
special EventScript_RecordMixingPlayerSpotTriggered
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
gEventScript_RecordCenter_Spot2:: @ 8277447
EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
special EventScript_RecordMixingPlayerSpotTriggered
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
gEventScript_RecordCenter_Spot3:: @ 827745C
EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
special EventScript_RecordMixingPlayerSpotTriggered
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
@@ -969,22 +969,22 @@ RecordCorner_EventScript_2774E0:: @ 82774E0
closemessage
end
gEventScript_ConfirmLeaveTradeRoom:: @ 82774EF
EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq gEventScript_TerminateLink
goto_if_eq EventScript_TerminateLink
erasebox 0, 0, 29, 19
releaseall
end
gEventScript_TerminateLink:: @ 8277509
EventScript_TerminateLink:: @ 8277509
messageautoscroll Text_TerminateLinkPleaseWait
waitmessage
special EventScript_ExitLinkRoom
special ExitLinkRoom
end
gEventScript_DoLinkRoomExit:: @ 8277513
special EventScript_CleanupLinkRoomState
EventScript_DoLinkRoomExit:: @ 8277513
special CleanupLinkRoomState
special sub_80AF9F8
waitstate
end

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 EventScript_CleanupLinkRoomState
def_special EventScript_ExitLinkRoom
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 EventScript_RecordMixingPlayerSpotTriggered
def_special RecordMixingPlayerSpotTriggered
def_special sub_80B2DA4
def_special sub_80B2E4C
def_special sub_80B2E74
def_special sub_80B2EA8
def_special CloseLink
def_special EventScript_ColosseumPlayerSpotTriggered
def_special EventScript_PlayerEnteredTradeSeat
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 EventScript_ChooseHalfPartyForBattle
def_special ChooseHalfPartyForBattle
def_special sp02A_crash_sound
def_special EventObjectInteractionGetBerryTreeData
def_special EventObjectInteractionGetBerryName