Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #883 from GriffinRichards/fix-colossname 

Fix Battle Colosseum names
This commit is contained in:
huderlem 2019-11-08 17:24:05 -06:00 committed by GitHub
parent b38bc9a3a2 35ed8de51b
commit 906a1ec4ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/event_scripts.s
View File

@ -437,10 +437,10 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/AlteringCave/scripts.inc"
.include "data/maps/MeteorFalls_StevensCave/scripts.inc"
.include "data/scripts/shared_secret_base.inc"
.include "data/maps/SingleBattleColosseum/scripts.inc"
.include "data/maps/BattleColosseum2P/scripts.inc"
.include "data/maps/TradeCenter/scripts.inc"
.include "data/maps/RecordCorner/scripts.inc"
.include "data/maps/DoubleBattleColosseum/scripts.inc"
.include "data/maps/BattleColosseum4P/scripts.inc"
.include "data/maps/LinkContestRoom1/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc"
.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"

0
data/layouts/DoubleBattleColosseum/border.bin → data/layouts/BattleColosseum2P/border.bin
View File

0
data/layouts/SingleBattleColosseum/map.bin → data/layouts/BattleColosseum2P/map.bin
View File

0
data/layouts/SingleBattleColosseum/border.bin → data/layouts/BattleColosseum4P/border.bin
View File

0
data/layouts/DoubleBattleColosseum/map.bin → data/layouts/BattleColosseum4P/map.bin
View File

16
data/layouts/layouts.json
View File

@ -2202,14 +2202,14 @@
"blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin"
},
{
"id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
"name": "SingleBattleColosseum_Layout",
"id": "LAYOUT_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum2P_Layout",
"width": 14,
"height": 9,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub",
"border_filepath": "data/layouts/SingleBattleColosseum/border.bin",
"blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin"
"border_filepath": "data/layouts/BattleColosseum2P/border.bin",
"blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin"
},
{
"id": "LAYOUT_TRADE_CENTER",
@ -2232,14 +2232,14 @@
"blockdata_filepath": "data/layouts/RecordCorner/map.bin"
},
{
"id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
"name": "DoubleBattleColosseum_Layout",
"id": "LAYOUT_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum4P_Layout",
"width": 14,
"height": 9,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub",
"border_filepath": "data/layouts/DoubleBattleColosseum/border.bin",
"blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin"
"border_filepath": "data/layouts/BattleColosseum4P/border.bin",
"blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
},
{
"id": "LAYOUT_LINK_CONTEST_ROOM1",

12
data/maps/SingleBattleColosseum/map.json → data/maps/BattleColosseum2P/map.json
View File

@ -1,7 +1,7 @@
{
"id": "MAP_SINGLE_BATTLE_COLOSSEUM",
"name": "SingleBattleColosseum",
"layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
"id": "MAP_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum2P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
"music": "MUS_RAINBOW",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SingleBattleColosseum_EventScript_Attendant",
"script": "BattleColosseum2P_EventScript_Attendant",
"flag": "0"
}
],
@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "EventScript_SingleBattleColosseum_PlayerSpot0"
"script": "EventScript_BattleColosseum2P_PlayerSpot0"
},
{
"type": "trigger",
@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "EventScript_SingleBattleColosseum_PlayerSpot1"
"script": "EventScript_BattleColosseum2P_PlayerSpot1"
}
],
"bg_events": []

3
data/maps/BattleColosseum2P/scripts.inc Normal file
View File

@ -0,0 +1,3 @@
BattleColosseum2P_MapScripts:: @ 823B77D
.byte 0

14
data/maps/DoubleBattleColosseum/map.json → data/maps/BattleColosseum4P/map.json
View File

@ -1,7 +1,7 @@
{
"id": "MAP_DOUBLE_BATTLE_COLOSSEUM",
"name": "DoubleBattleColosseum",
"layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
"id": "MAP_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum4P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
"music": "MUS_RAINBOW",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
"script": "EventScript_BattleColosseum4P_PlayerSpot0"
},
{
"type": "trigger",
@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
"script": "EventScript_BattleColosseum4P_PlayerSpot2"
},
{
"type": "trigger",
@ -70,7 +70,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
"script": "EventScript_BattleColosseum4P_PlayerSpot1"
},
{
"type": "trigger",
@ -79,7 +79,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
"script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
"script": "EventScript_BattleColosseum4P_PlayerSpot3"
}
],
"bg_events": []

3
data/maps/BattleColosseum4P/scripts.inc Normal file
View File

@ -0,0 +1,3 @@
BattleColosseum4P_MapScripts:: @ 823B780
.byte 0

3
data/maps/DoubleBattleColosseum/scripts.inc
View File

@ -1,3 +0,0 @@
DoubleBattleColosseum_MapScripts:: @ 823B780
.byte 0

3
data/maps/SingleBattleColosseum/scripts.inc
View File

@ -1,3 +0,0 @@
SingleBattleColosseum_MapScripts:: @ 823B77D
.byte 0

4
data/maps/map_groups.json
View File

@ -456,10 +456,10 @@
"SecretBase_YellowCave4",
"SecretBase_Tree4",
"SecretBase_Shrub4",
"SingleBattleColosseum",
"BattleColosseum2P",
"TradeCenter",
"RecordCorner",
"DoubleBattleColosseum",
"BattleColosseum4P",
"LinkContestRoom1",
"UnknownLinkContestRoom_25_29",
"UnknownLinkContestRoom_25_30",

34
data/scripts/cable_club.inc
View File

@ -388,9 +388,9 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
waitdooranim
release
compare VAR_0x8004, USING_MULTI_BATTLE
goto_if_eq CableClub_EventScript_WarpToDoubleColosseum
goto_if_eq CableClub_EventScript_WarpTo4PColosseum
special SetCableClubWarp
warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
special sub_80AF948
waitstate
end
@ -401,9 +401,9 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
waitmovement 0
return
CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036
CableClub_EventScript_WarpTo4PColosseum:: @ 8277036
special SetCableClubWarp
warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
special sub_80AF948
waitstate
end
@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365
releaseall
end
EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 2
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9
fadescreen 1
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
setvar VAR_0x8005, 3
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4
end
EventScript_TradeCenter_Chair0:: @ 82773F5
@ -854,9 +854,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C
closemessage
end
SingleBattleColosseum_EventScript_Attendant:: @ 82774A6
BattleColosseum2P_EventScript_Attendant:: @ 82774A6
special Script_FacePlayer
msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
special Script_ClearHeldMovement
closemessage
end

2
data/text/cable_club.inc
View File

@ -123,7 +123,7 @@ CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B
.string "TRAINER CARD!\p"
.string "It's a {STR_VAR_2} card!$"
SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4
BattleColosseum2P_Text_TakePlaceStartBattle: @ 82784B4
.string "Please take your place and start\n"
.string "your battle.$"

4
include/constants/layouts.h
View File

@ -221,10 +221,10 @@
#define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218
#define LAYOUT_SECRET_BASE_TREE4 219
#define LAYOUT_SECRET_BASE_SHRUB4 220
#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221
#define LAYOUT_BATTLE_COLOSSEUM_2P 221
#define LAYOUT_TRADE_CENTER 222
#define LAYOUT_RECORD_CORNER 223
#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224
#define LAYOUT_BATTLE_COLOSSEUM_4P 224
#define LAYOUT_LINK_CONTEST_ROOM1 225
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227

4
include/constants/map_groups.h
View File

@ -422,10 +422,10 @@
#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8))
#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8))
#define MAP_BATTLE_COLOSSEUM_2P (24 | (25 << 8))
#define MAP_TRADE_CENTER (25 | (25 << 8))
#define MAP_RECORD_CORNER (26 | (25 << 8))
#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8))
#define MAP_BATTLE_COLOSSEUM_4P (27 | (25 << 8))
#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))

4
src/field_specials.c
View File

@ -4000,10 +4000,10 @@ bool8 InPokemonCenter(void)
MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F,
MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
MAP_SINGLE_BATTLE_COLOSSEUM,
MAP_BATTLE_COLOSSEUM_2P,
MAP_TRADE_CENTER,
MAP_RECORD_CORNER,
MAP_DOUBLE_BATTLE_COLOSSEUM,
MAP_BATTLE_COLOSSEUM_4P,
0xFFFF
};

24
src/overworld.c
View File

@ -88,16 +88,16 @@ extern const u8 EventScript_DoLinkRoomExit[];
extern const u8 CableClub_EventScript_TooBusyToNotice[];
extern const u8 CableClub_EventScript_ReadTrainerCard[];
extern const u8 CableClub_EventScript_ReadTrainerCardColored[];
extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[];
extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[];
extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[];
extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot3[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot0[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot1[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot2[];
extern const u8 EventScript_BattleColosseum4P_PlayerSpot3[];
extern const u8 EventScript_RecordCenter_Spot0[];
extern const u8 EventScript_RecordCenter_Spot1[];
extern const u8 EventScript_RecordCenter_Spot2[];
extern const u8 EventScript_RecordCenter_Spot3[];
extern const u8 EventScript_SingleBattleColosseum_PlayerSpot0[];
extern const u8 EventScript_SingleBattleColosseum_PlayerSpot1[];
extern const u8 EventScript_BattleColosseum2P_PlayerSpot0[];
extern const u8 EventScript_BattleColosseum2P_PlayerSpot1[];
extern const u8 EventScript_TradeCenter_Chair1[];
extern const u8 EventScript_TradeCenter_Chair0[];
extern const u8 EventScript_ConfirmLeaveTradeRoom[];
@ -2781,13 +2781,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player)
// these event scripts runs.
static u16 GetDirectionForEventScript(const u8 *script)
{
if (script == EventScript_DoubleBattleColosseum_PlayerSpot0)
if (script == EventScript_BattleColosseum4P_PlayerSpot0)
return FACING_FORCED_RIGHT;
else if (script == EventScript_DoubleBattleColosseum_PlayerSpot1)
else if (script == EventScript_BattleColosseum4P_PlayerSpot1)
return FACING_FORCED_LEFT;
else if (script == EventScript_DoubleBattleColosseum_PlayerSpot2)
else if (script == EventScript_BattleColosseum4P_PlayerSpot2)
return FACING_FORCED_RIGHT;
else if (script == EventScript_DoubleBattleColosseum_PlayerSpot3)
else if (script == EventScript_BattleColosseum4P_PlayerSpot3)
return FACING_FORCED_LEFT;
else if (script == EventScript_RecordCenter_Spot0)
return FACING_FORCED_RIGHT;
@ -2797,9 +2797,9 @@ static u16 GetDirectionForEventScript(const u8 *script)
return FACING_FORCED_RIGHT;
else if (script == EventScript_RecordCenter_Spot3)
return FACING_FORCED_LEFT;
else if (script == EventScript_SingleBattleColosseum_PlayerSpot0)
else if (script == EventScript_BattleColosseum2P_PlayerSpot0)
return FACING_FORCED_RIGHT;
else if (script == EventScript_SingleBattleColosseum_PlayerSpot1)
else if (script == EventScript_BattleColosseum2P_PlayerSpot1)
return FACING_FORCED_LEFT;
else if (script == EventScript_TradeCenter_Chair0)
return FACING_FORCED_RIGHT;

4
src/save_location.c
View File

@ -52,10 +52,10 @@ static const u16 sSaveLocationPokeCenterList[] =
MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F,
MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F,
MAP_SINGLE_BATTLE_COLOSSEUM,
MAP_BATTLE_COLOSSEUM_2P,
MAP_TRADE_CENTER,
MAP_RECORD_CORNER,
MAP_DOUBLE_BATTLE_COLOSSEUM,
MAP_BATTLE_COLOSSEUM_4P,
0xFFFF,
};

6
src/union_room.c
View File

@ -1471,7 +1471,7 @@ void sub_801440C(u8 taskId)
HealPlayerParty();
SavePlayerParty();
LoadPlayerBag();
sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_SINGLE_BATTLE);
sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE);
SetMainCallback2(sub_8014384);
break;
case 2:
@ -1480,7 +1480,7 @@ void sub_801440C(u8 taskId)
SavePlayerParty();
LoadPlayerBag();
sub_80143E4(gBlockSendBuffer, TRUE);
sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_DOUBLE_BATTLE);
sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE);
SetMainCallback2(sub_8014384);
break;
case 3:
@ -1489,7 +1489,7 @@ void sub_801440C(u8 taskId)
SavePlayerParty();
LoadPlayerBag();
sub_80143E4(gBlockSendBuffer, TRUE);
sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, USING_MULTI_BATTLE);
sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE);
SetMainCallback2(sub_8014384);
break;
case 4: