diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:11:20 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:11:20 -0500 |
| commit | ea8b1011d30c3f70f1da79553d8ed887b12596f2 (patch) | |
| tree | 2f24f71d69c7aaac48e8eccba906b79cace1fd71 /src/overworld.c | |
| parent | e92cc7752b5934d7501c5027057a6b7c52601bd7 (diff) | |
| parent | 5fff2f2234755af166612a4829d178408eb740bb (diff) | |
Merge master into fix-eventobj
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/overworld.c b/src/overworld.c index 81b8efa1b..0e5ed8165 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -89,16 +89,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_BattleColosseum4P_PlayerSpot0[]; -extern const u8 EventScript_BattleColosseum4P_PlayerSpot1[]; -extern const u8 EventScript_BattleColosseum4P_PlayerSpot2[]; -extern const u8 EventScript_BattleColosseum4P_PlayerSpot3[]; +extern const u8 EventScript_BattleColosseum_4P_PlayerSpot0[]; +extern const u8 EventScript_BattleColosseum_4P_PlayerSpot1[]; +extern const u8 EventScript_BattleColosseum_4P_PlayerSpot2[]; +extern const u8 EventScript_BattleColosseum_4P_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_BattleColosseum2P_PlayerSpot0[]; -extern const u8 EventScript_BattleColosseum2P_PlayerSpot1[]; +extern const u8 EventScript_BattleColosseum_2P_PlayerSpot0[]; +extern const u8 EventScript_BattleColosseum_2P_PlayerSpot1[]; extern const u8 EventScript_TradeCenter_Chair1[]; extern const u8 EventScript_TradeCenter_Chair0[]; extern const u8 EventScript_ConfirmLeaveTradeRoom[]; @@ -1580,7 +1580,7 @@ void CB2_LoadMap(void) ScriptContext1_Init(); ScriptContext2_Disable(); SetMainCallback1(NULL); - SetMainCallback2(c2_change_map); + SetMainCallback2(CB2_DoChangeMap); gMain.savedCallback = CB2_LoadMap2; } @@ -2782,13 +2782,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) // these event scripts runs. static u16 GetDirectionForEventScript(const u8 *script) { - if (script == EventScript_BattleColosseum4P_PlayerSpot0) + if (script == EventScript_BattleColosseum_4P_PlayerSpot0) return FACING_FORCED_RIGHT; - else if (script == EventScript_BattleColosseum4P_PlayerSpot1) + else if (script == EventScript_BattleColosseum_4P_PlayerSpot1) return FACING_FORCED_LEFT; - else if (script == EventScript_BattleColosseum4P_PlayerSpot2) + else if (script == EventScript_BattleColosseum_4P_PlayerSpot2) return FACING_FORCED_RIGHT; - else if (script == EventScript_BattleColosseum4P_PlayerSpot3) + else if (script == EventScript_BattleColosseum_4P_PlayerSpot3) return FACING_FORCED_LEFT; else if (script == EventScript_RecordCenter_Spot0) return FACING_FORCED_RIGHT; @@ -2798,9 +2798,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_BattleColosseum2P_PlayerSpot0) + else if (script == EventScript_BattleColosseum_2P_PlayerSpot0) return FACING_FORCED_RIGHT; - else if (script == EventScript_BattleColosseum2P_PlayerSpot1) + else if (script == EventScript_BattleColosseum_2P_PlayerSpot1) return FACING_FORCED_LEFT; else if (script == EventScript_TradeCenter_Chair0) return FACING_FORCED_RIGHT; |