diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
| commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /data/specials.inc | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
| parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) | |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'data/specials.inc')
| -rw-r--r-- | data/specials.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/specials.inc b/data/specials.inc index bb2065429..2728d98fc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -51,12 +51,12 @@ gSpecials:: def_special LoadPlayerParty def_special sub_80C5568 def_special sub_8083BDC - def_special FieldObjectInteractionGetBerryTreeData + def_special EventObjectInteractionGetBerryTreeData def_special Berry_FadeAndGoToBerryBagMenu - def_special FieldObjectInteractionPlantBerryTree - def_special FieldObjectInteractionPickBerryTree - def_special FieldObjectInteractionRemoveBerryTree - def_special FieldObjectInteractionWaterBerryTree + def_special EventObjectInteractionPlantBerryTree + def_special EventObjectInteractionPickBerryTree + def_special EventObjectInteractionRemoveBerryTree + def_special EventObjectInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special ScrSpecial_GetTrainerBattleMode @@ -187,7 +187,7 @@ gSpecials:: def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds + def_special GabbyAndTySetScriptVarsToEventObjectLocalIds def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -295,7 +295,7 @@ gSpecials:: def_special WaitWeather def_special BufferEReaderTrainerName def_special GetSlotMachineId - def_special player_get_direction_lower_nybble + def_special GetPlayerFacingDirection def_special FoundAbandonedShipRoom1Key def_special FoundAbandonedShipRoom2Key def_special FoundAbandonedShipRoom4Key @@ -337,7 +337,7 @@ gSpecials:: def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg - def_special sub_810F8FC + def_special TryInitBattleTowerAwardManEventObject def_special MoveSecretBase def_special LoadPlayerBag def_special sub_8081924 |