dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync Colosseum map names

Browse Source
This commit is contained in:
GriffinR
2020-01-13 21:27:06 -05:00
committed by huderlem
parent 172e1aafa8
commit 8c560386ed
15 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/overworld.s
+12 -12
View File
@@ -6837,16 +6837,16 @@ _08058122:
sub_805812C: @ 805812C sub_805812C: @ 805812C
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, _08058178 @ =BattleColosseum4P_EventScript_PlayerSpot0 ldr r0, _08058178 @ =BattleColosseum_4P_EventScript_PlayerSpot0
cmp r1, r0 cmp r1, r0
beq _08058172 beq _08058172
ldr r0, _0805817C @ =BattleColosseum4P_EventScript_PlayerSpot1 ldr r0, _0805817C @ =BattleColosseum_4P_EventScript_PlayerSpot1
cmp r1, r0 cmp r1, r0
beq _080581B4 beq _080581B4
ldr r0, _08058180 @ =BattleColosseum4P_EventScript_PlayerSpot2 ldr r0, _08058180 @ =BattleColosseum_4P_EventScript_PlayerSpot2
cmp r1, r0 cmp r1, r0
beq _08058172 beq _08058172
ldr r0, _08058184 @ =BattleColosseum4P_EventScript_PlayerSpot3 ldr r0, _08058184 @ =BattleColosseum_4P_EventScript_PlayerSpot3
cmp r1, r0 cmp r1, r0
beq _080581B4 beq _080581B4
ldr r0, _08058188 @ =RecordCenter_EventScript_Spot ldr r0, _08058188 @ =RecordCenter_EventScript_Spot
@@ -6861,10 +6861,10 @@ sub_805812C: @ 805812C
ldr r0, _08058194 @ =RecordCenter_EventScript_Spot ldr r0, _08058194 @ =RecordCenter_EventScript_Spot
cmp r1, r0 cmp r1, r0
beq _080581B4 beq _080581B4
ldr r0, _08058198 @ =BattleColosseum2P_EventScript_PlayerSpot0 ldr r0, _08058198 @ =BattleColosseum_2P_EventScript_PlayerSpot0
cmp r1, r0 cmp r1, r0
beq _08058172 beq _08058172
ldr r0, _0805819C @ =BattleColosseum2P_EventScript_PlayerSpot1 ldr r0, _0805819C @ =BattleColosseum_2P_EventScript_PlayerSpot1
cmp r1, r0 cmp r1, r0
beq _080581B4 beq _080581B4
ldr r0, _080581A0 @ =TradeCenter_EventScript_Chair0 ldr r0, _080581A0 @ =TradeCenter_EventScript_Chair0
@@ -6874,16 +6874,16 @@ _08058172:
movs r0, 0xA movs r0, 0xA
b _080581B6 b _080581B6
.align 2, 0 .align 2, 0
_08058178: .4byte BattleColosseum4P_EventScript_PlayerSpot0 _08058178: .4byte BattleColosseum_4P_EventScript_PlayerSpot0
_0805817C: .4byte BattleColosseum4P_EventScript_PlayerSpot1 _0805817C: .4byte BattleColosseum_4P_EventScript_PlayerSpot1
_08058180: .4byte BattleColosseum4P_EventScript_PlayerSpot2 _08058180: .4byte BattleColosseum_4P_EventScript_PlayerSpot2
_08058184: .4byte BattleColosseum4P_EventScript_PlayerSpot3 _08058184: .4byte BattleColosseum_4P_EventScript_PlayerSpot3
_08058188: .4byte RecordCenter_EventScript_Spot _08058188: .4byte RecordCenter_EventScript_Spot
_0805818C: .4byte RecordCenter_EventScript_Spot _0805818C: .4byte RecordCenter_EventScript_Spot
_08058190: .4byte RecordCenter_EventScript_Spot _08058190: .4byte RecordCenter_EventScript_Spot
_08058194: .4byte RecordCenter_EventScript_Spot _08058194: .4byte RecordCenter_EventScript_Spot
_08058198: .4byte BattleColosseum2P_EventScript_PlayerSpot0 _08058198: .4byte BattleColosseum_2P_EventScript_PlayerSpot0
_0805819C: .4byte BattleColosseum2P_EventScript_PlayerSpot1 _0805819C: .4byte BattleColosseum_2P_EventScript_PlayerSpot1
_080581A0: .4byte TradeCenter_EventScript_Chair0 _080581A0: .4byte TradeCenter_EventScript_Chair0
_080581A4: _080581A4:
ldr r0, _080581B0 @ =TradeCenter_EventScript_Chair1 ldr r0, _080581B0 @ =TradeCenter_EventScript_Chair1
data/event_scripts.s
+2 -2
View File
@@ -74,10 +74,10 @@ gStdScripts:: @ 8160450
.4byte Std_ReceivedItem .4byte Std_ReceivedItem
gStdScriptsEnd:: gStdScriptsEnd::
.include "data/maps/BattleColosseum2P/scripts.inc" .include "data/maps/BattleColosseum_2P/scripts.inc"
.include "data/maps/TradeCenter/scripts.inc" .include "data/maps/TradeCenter/scripts.inc"
.include "data/maps/RecordCenter/scripts.inc" .include "data/maps/RecordCenter/scripts.inc"
.include "data/maps/BattleColosseum4P/scripts.inc" .include "data/maps/BattleColosseum_4P/scripts.inc"
.include "data/maps/UnionRoom/scripts.inc" .include "data/maps/UnionRoom/scripts.inc"
.include "data/maps/ViridianForest/scripts.inc" .include "data/maps/ViridianForest/scripts.inc"
.include "data/maps/MtMoon_1F/scripts.inc" .include "data/maps/MtMoon_1F/scripts.inc"
data/layouts/BattleColosseum2P/border.bin → data/layouts/BattleColosseum_2P/border.bin
View File
data/layouts/BattleColosseum2P/map.bin → data/layouts/BattleColosseum_2P/map.bin
View File
data/layouts/BattleColosseum4P/border.bin → data/layouts/BattleColosseum_4P/border.bin
View File
data/layouts/BattleColosseum4P/map.bin → data/layouts/BattleColosseum_4P/map.bin
View File
data/layouts/layouts.json
+6 -6
View File
@@ -434,15 +434,15 @@
}, },
{ {
"id": "LAYOUT_BATTLE_COLOSSEUM_2P", "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum2P_Layout", "name": "BattleColosseum_2P_Layout",
"width": 14, "width": 14,
"height": 9, "height": 9,
"border_width": 2, "border_width": 2,
"border_height": 2, "border_height": 2,
"primary_tileset": "gTileset_82D4BB4", "primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44", "secondary_tileset": "gTileset_82D4C44",
"border_filepath": "data/layouts/BattleColosseum2P/border.bin", "border_filepath": "data/layouts/BattleColosseum_2P/border.bin",
"blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin" "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin"
}, },
{ {
"id": "LAYOUT_TRADE_CENTER", "id": "LAYOUT_TRADE_CENTER",
@@ -470,15 +470,15 @@
}, },
{ {
"id": "LAYOUT_BATTLE_COLOSSEUM_4P", "id": "LAYOUT_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum4P_Layout", "name": "BattleColosseum_4P_Layout",
"width": 14, "width": 14,
"height": 9, "height": 9,
"border_width": 2, "border_width": 2,
"border_height": 2, "border_height": 2,
"primary_tileset": "gTileset_82D4BB4", "primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44", "secondary_tileset": "gTileset_82D4C44",
"border_filepath": "data/layouts/BattleColosseum4P/border.bin", "border_filepath": "data/layouts/BattleColosseum_4P/border.bin",
"blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin" "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin"
}, },
{ {
"id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", "id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
data/maps/BattleColosseum2P/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
BattleColosseum2P_MapScripts:: @ 8160478
.byte 0
data/maps/BattleColosseum4P/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
BattleColosseum4P_MapScripts:: @ 816047B
.byte 0
data/maps/BattleColosseum2P/map.json → data/maps/BattleColosseum_2P/map.json
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"id": "MAP_BATTLE_COLOSSEUM_2P", "id": "MAP_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum2P", "name": "BattleColosseum_2P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_2P", "layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
"music": "MUS_POKECEN", "music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA", "region_map_section": "MAPSEC_SPECIAL_AREA",
@@ -23,7 +23,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "BattleColosseum2P_EventScript_Attendant", "script": "BattleColosseum_2P_EventScript_Attendant",
"flag": "0" "flag": "0"
} }
], ],
@@ -51,7 +51,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": 0, "var_value": 0,
"script": "BattleColosseum2P_EventScript_PlayerSpot0" "script": "BattleColosseum_2P_EventScript_PlayerSpot0"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -60,7 +60,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": 0, "var_value": 0,
"script": "BattleColosseum2P_EventScript_PlayerSpot1" "script": "BattleColosseum_2P_EventScript_PlayerSpot1"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/BattleColosseum_2P/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
BattleColosseum_2P_MapScripts:: @ 8160478
.byte 0
data/maps/BattleColosseum4P/map.json → data/maps/BattleColosseum_4P/map.json
+5 -5
View File
@@ -1,6 +1,6 @@
{ {
"id": "MAP_BATTLE_COLOSSEUM_4P", "id": "MAP_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum4P", "name": "BattleColosseum_4P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_4P", "layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
"music": "MUS_POKECEN", "music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA", "region_map_section": "MAPSEC_SPECIAL_AREA",
@@ -51,7 +51,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": 0, "var_value": 0,
"script": "BattleColosseum4P_EventScript_PlayerSpot0" "script": "BattleColosseum_4P_EventScript_PlayerSpot0"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -60,7 +60,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": 0, "var_value": 0,
"script": "BattleColosseum4P_EventScript_PlayerSpot2" "script": "BattleColosseum_4P_EventScript_PlayerSpot2"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -69,7 +69,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": 0, "var_value": 0,
"script": "BattleColosseum4P_EventScript_PlayerSpot1" "script": "BattleColosseum_4P_EventScript_PlayerSpot1"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -78,7 +78,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": 0, "var_value": 0,
"script": "BattleColosseum4P_EventScript_PlayerSpot3" "script": "BattleColosseum_4P_EventScript_PlayerSpot3"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/BattleColosseum_4P/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
BattleColosseum_4P_MapScripts:: @ 816047B
.byte 0
data/maps/map_groups.json
+2 -2
View File
@@ -45,10 +45,10 @@
"gMapGroup42" "gMapGroup42"
], ],
"gMapGroup0": [ "gMapGroup0": [
"BattleColosseum2P", "BattleColosseum_2P",
"TradeCenter", "TradeCenter",
"RecordCenter", "RecordCenter",
"BattleColosseum4P", "BattleColosseum_4P",
"UnionRoom" "UnionRoom"
], ],
"gMapGroup1": [ "gMapGroup1": [
data/scripts/cable_club.inc
+12 -12
View File
@@ -610,69 +610,69 @@ CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7
releaseall releaseall
end end
BattleColosseum2P_EventScript_PlayerSpot0:: @ 81BB8C3 BattleColosseum_2P_EventScript_PlayerSpot0:: @ 81BB8C3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
textcolor 3 textcolor 3
special EnterColosseumPlayerSpot special EnterColosseumPlayerSpot
waitstate waitstate
end end
BattleColosseum2P_EventScript_PlayerSpot1:: @ 81BB8CF BattleColosseum_2P_EventScript_PlayerSpot1:: @ 81BB8CF
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
textcolor 3 textcolor 3
special EnterColosseumPlayerSpot special EnterColosseumPlayerSpot
waitstate waitstate
end end
BattleColosseum4P_EventScript_PlayerSpot0:: @ 81BB8DB BattleColosseum_4P_EventScript_PlayerSpot0:: @ 81BB8DB
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
textcolor 3 textcolor 3
special EnterColosseumPlayerSpot special EnterColosseumPlayerSpot
waitstate waitstate
end end
BattleColosseum4P_EventScript_PlayerSpot1:: @ 81BB8F8 BattleColosseum_4P_EventScript_PlayerSpot1:: @ 81BB8F8
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
textcolor 3 textcolor 3
special EnterColosseumPlayerSpot special EnterColosseumPlayerSpot
waitstate waitstate
end end
BattleColosseum4P_EventScript_PlayerSpot2:: @ 81BB915 BattleColosseum_4P_EventScript_PlayerSpot2:: @ 81BB915
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
textcolor 3 textcolor 3
special EnterColosseumPlayerSpot special EnterColosseumPlayerSpot
waitstate waitstate
end end
BattleColosseum4P_EventScript_PlayerSpot3:: @ 81BB932 BattleColosseum_4P_EventScript_PlayerSpot3:: @ 81BB932
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
textcolor 3 textcolor 3
special EnterColosseumPlayerSpot special EnterColosseumPlayerSpot
waitstate waitstate
end end
BattleColosseum4P_EventScript_CancelSpotTrigger:: @ 81BB94F BattleColosseum_4P_EventScript_CancelSpotTrigger:: @ 81BB94F
end end
TradeCenter_EventScript_Chair0:: @ 81BB950 TradeCenter_EventScript_Chair0:: @ 81BB950
@@ -731,7 +731,7 @@ CableClub_EventScript_TooBusyToNotice:: @ 81BB9A3
closemessage closemessage
end end
BattleColosseum2P_EventScript_Attendant:: @ 81BB9AF BattleColosseum_2P_EventScript_Attendant:: @ 81BB9AF
textcolor 3 textcolor 3
special Script_FacePlayer special Script_FacePlayer
msgbox Text_TakeSeatStartBattle msgbox Text_TakeSeatStartBattle