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

Fix Colosseum name porymap issue

Browse Source
This commit is contained in:
GriffinR
2020-01-13 21:13:33 -05:00
committed by huderlem
parent 736f3bbbe0
commit 22931846d6
16 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+2 -2
View File
@@ -447,10 +447,10 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/AlteringCave/scripts.inc" .include "data/maps/AlteringCave/scripts.inc"
.include "data/maps/MeteorFalls_StevensCave/scripts.inc" .include "data/maps/MeteorFalls_StevensCave/scripts.inc"
.include "data/scripts/shared_secret_base.inc" .include "data/scripts/shared_secret_base.inc"
.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/RecordCorner/scripts.inc" .include "data/maps/RecordCorner/scripts.inc"
.include "data/maps/BattleColosseum4P/scripts.inc" .include "data/maps/BattleColosseum_4P/scripts.inc"
.include "data/maps/ContestHall/scripts.inc" .include "data/maps/ContestHall/scripts.inc"
.include "data/maps/InsideOfTruck/scripts.inc" .include "data/maps/InsideOfTruck/scripts.inc"
.include "data/maps/SSTidalCorridor/scripts.inc" .include "data/maps/SSTidalCorridor/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
@@ -2203,13 +2203,13 @@
}, },
{ {
"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,
"primary_tileset": "gTileset_Building", "primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub", "secondary_tileset": "gTileset_CableClub",
"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",
@@ -2233,13 +2233,13 @@
}, },
{ {
"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,
"primary_tileset": "gTileset_Building", "primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub", "secondary_tileset": "gTileset_CableClub",
"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_CONTEST_HALL", "id": "LAYOUT_CONTEST_HALL",
data/maps/BattleColosseum2P/scripts.inc
-3
View File
@@ -1,3 +0,0 @@
BattleColosseum2P_MapScripts:: @ 823B77D
.byte 0
data/maps/BattleColosseum4P/scripts.inc
-3
View File
@@ -1,3 +0,0 @@
BattleColosseum4P_MapScripts:: @ 823B780
.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_RAINBOW", "music": "MUS_RAINBOW",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
@@ -24,7 +24,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"
} }
], ],
@@ -52,7 +52,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "EventScript_BattleColosseum2P_PlayerSpot0" "script": "EventScript_BattleColosseum_2P_PlayerSpot0"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "EventScript_BattleColosseum2P_PlayerSpot1" "script": "EventScript_BattleColosseum_2P_PlayerSpot1"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/BattleColosseum_2P/scripts.inc
+3
View File
@@ -0,0 +1,3 @@
BattleColosseum_2P_MapScripts:: @ 823B77D
.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_RAINBOW", "music": "MUS_RAINBOW",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
@@ -52,7 +52,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "EventScript_BattleColosseum4P_PlayerSpot0" "script": "EventScript_BattleColosseum_4P_PlayerSpot0"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "EventScript_BattleColosseum4P_PlayerSpot2" "script": "EventScript_BattleColosseum_4P_PlayerSpot2"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -70,7 +70,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "EventScript_BattleColosseum4P_PlayerSpot1" "script": "EventScript_BattleColosseum_4P_PlayerSpot1"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -79,7 +79,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "EventScript_BattleColosseum4P_PlayerSpot3" "script": "EventScript_BattleColosseum_4P_PlayerSpot3"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/BattleColosseum_4P/scripts.inc
+3
View File
@@ -0,0 +1,3 @@
BattleColosseum_4P_MapScripts:: @ 823B780
.byte 0
data/maps/map_groups.json
+2 -2
View File
@@ -456,10 +456,10 @@
"SecretBase_YellowCave4", "SecretBase_YellowCave4",
"SecretBase_Tree4", "SecretBase_Tree4",
"SecretBase_Shrub4", "SecretBase_Shrub4",
"BattleColosseum2P", "BattleColosseum_2P",
"TradeCenter", "TradeCenter",
"RecordCorner", "RecordCorner",
"BattleColosseum4P", "BattleColosseum_4P",
"ContestHall", "ContestHall",
"UnknownLinkContestRoom_25_29", "UnknownLinkContestRoom_25_29",
"UnknownLinkContestRoom_25_30", "UnknownLinkContestRoom_25_30",
data/scripts/cable_club.inc
+13 -13
View File
@@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365
releaseall releaseall
end end
EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374 EventScript_BattleColosseum_2P_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered special ColosseumPlayerSpotTriggered
waitstate waitstate
end end
EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E EventScript_BattleColosseum_2P_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered special ColosseumPlayerSpotTriggered
waitstate waitstate
end end
EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 EventScript_BattleColosseum_4P_PlayerSpot0:: @ 8277388
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 EventScript_BattleColosseum4P_CancelSpotTrigger goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered special ColosseumPlayerSpotTriggered
waitstate waitstate
end end
EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 EventScript_BattleColosseum_4P_PlayerSpot1:: @ 82773A3
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 EventScript_BattleColosseum4P_CancelSpotTrigger goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered special ColosseumPlayerSpotTriggered
waitstate waitstate
end end
EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE EventScript_BattleColosseum_4P_PlayerSpot2:: @ 82773BE
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 EventScript_BattleColosseum4P_CancelSpotTrigger goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special ColosseumPlayerSpotTriggered special ColosseumPlayerSpotTriggered
waitstate waitstate
end end
EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9 EventScript_BattleColosseum_4P_PlayerSpot3:: @ 82773D9
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 EventScript_BattleColosseum4P_CancelSpotTrigger goto_if_eq EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special ColosseumPlayerSpotTriggered special ColosseumPlayerSpotTriggered
waitstate waitstate
end end
EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4 EventScript_BattleColosseum_4P_CancelSpotTrigger:: @ 82773F4
end end
EventScript_TradeCenter_Chair0:: @ 82773F5 EventScript_TradeCenter_Chair0:: @ 82773F5
@@ -855,9 +855,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C
closemessage closemessage
end end
BattleColosseum2P_EventScript_Attendant:: @ 82774A6 BattleColosseum_2P_EventScript_Attendant:: @ 82774A6
special Script_FacePlayer special Script_FacePlayer
msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT msgbox BattleColosseum_2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
special Script_ClearHeldMovement special Script_ClearHeldMovement
closemessage closemessage
end end
data/text/cable_club.inc
+1 -1
View File
@@ -123,7 +123,7 @@ CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B
.string "TRAINER CARD!\p" .string "TRAINER CARD!\p"
.string "It's a {STR_VAR_2} card!$" .string "It's a {STR_VAR_2} card!$"
BattleColosseum2P_Text_TakePlaceStartBattle: @ 82784B4 BattleColosseum_2P_Text_TakePlaceStartBattle: @ 82784B4
.string "Please take your place and start\n" .string "Please take your place and start\n"
.string "your battle.$" .string "your battle.$"
src/overworld.c
+12 -12
View File
@@ -89,16 +89,16 @@ extern const u8 EventScript_DoLinkRoomExit[];
extern const u8 CableClub_EventScript_TooBusyToNotice[]; extern const u8 CableClub_EventScript_TooBusyToNotice[];
extern const u8 CableClub_EventScript_ReadTrainerCard[]; extern const u8 CableClub_EventScript_ReadTrainerCard[];
extern const u8 CableClub_EventScript_ReadTrainerCardColored[]; extern const u8 CableClub_EventScript_ReadTrainerCardColored[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot0[]; extern const u8 EventScript_BattleColosseum_4P_PlayerSpot0[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot1[]; extern const u8 EventScript_BattleColosseum_4P_PlayerSpot1[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot2[]; extern const u8 EventScript_BattleColosseum_4P_PlayerSpot2[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot3[]; extern const u8 EventScript_BattleColosseum_4P_PlayerSpot3[];
extern const u8 EventScript_RecordCenter_Spot0[]; extern const u8 EventScript_RecordCenter_Spot0[];
extern const u8 EventScript_RecordCenter_Spot1[]; extern const u8 EventScript_RecordCenter_Spot1[];
extern const u8 EventScript_RecordCenter_Spot2[]; extern const u8 EventScript_RecordCenter_Spot2[];
extern const u8 EventScript_RecordCenter_Spot3[]; extern const u8 EventScript_RecordCenter_Spot3[];
extern const u8 EventScript_BattleColosseum2P_PlayerSpot0[]; extern const u8 EventScript_BattleColosseum_2P_PlayerSpot0[];
extern const u8 EventScript_BattleColosseum2P_PlayerSpot1[]; extern const u8 EventScript_BattleColosseum_2P_PlayerSpot1[];
extern const u8 EventScript_TradeCenter_Chair1[]; extern const u8 EventScript_TradeCenter_Chair1[];
extern const u8 EventScript_TradeCenter_Chair0[]; extern const u8 EventScript_TradeCenter_Chair0[];
extern const u8 EventScript_ConfirmLeaveTradeRoom[]; extern const u8 EventScript_ConfirmLeaveTradeRoom[];
@@ -2782,13 +2782,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player)
// these event scripts runs. // these event scripts runs.
static u16 GetDirectionForEventScript(const u8 *script) static u16 GetDirectionForEventScript(const u8 *script)
{ {
if (script == EventScript_BattleColosseum4P_PlayerSpot0) if (script == EventScript_BattleColosseum_4P_PlayerSpot0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == EventScript_BattleColosseum4P_PlayerSpot1) else if (script == EventScript_BattleColosseum_4P_PlayerSpot1)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == EventScript_BattleColosseum4P_PlayerSpot2) else if (script == EventScript_BattleColosseum_4P_PlayerSpot2)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == EventScript_BattleColosseum4P_PlayerSpot3) else if (script == EventScript_BattleColosseum_4P_PlayerSpot3)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == EventScript_RecordCenter_Spot0) else if (script == EventScript_RecordCenter_Spot0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
@@ -2798,9 +2798,9 @@ static u16 GetDirectionForEventScript(const u8 *script)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == EventScript_RecordCenter_Spot3) else if (script == EventScript_RecordCenter_Spot3)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == EventScript_BattleColosseum2P_PlayerSpot0) else if (script == EventScript_BattleColosseum_2P_PlayerSpot0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == EventScript_BattleColosseum2P_PlayerSpot1) else if (script == EventScript_BattleColosseum_2P_PlayerSpot1)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == EventScript_TradeCenter_Chair0) else if (script == EventScript_TradeCenter_Chair0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;