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

Fix Battle Colosseum names

Browse Source
This commit is contained in:
GriffinR
2019-11-07 12:37:11 -05:00
parent 1475c4d8da
commit 35ed8de51b
21 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/field_specials.c
View File

@@ -3998,10 +3998,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

@@ -1470,7 +1470,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:
@@ -1479,7 +1479,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:
@@ -1488,7 +1488,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: