diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-22 16:41:17 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-22 16:41:17 -0400 |
| commit | dbe2360ecd3eb11fd144168427e1323f5e1b2ec2 (patch) | |
| tree | d571d2f064c176a36951d3470d19053692f9e8eb /engine | |
| parent | 8daf8fe19c9e356df34ca8da3423618999d4405a (diff) | |
Miscellaneous cleanup
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 3 | ||||
| -rw-r--r-- | engine/overworld/events.asm | 1 | ||||
| -rw-r--r-- | engine/overworld/map_object_action.asm | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 654559b89..d176c60c4 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8448,9 +8448,6 @@ IsMobileBattle2: cp LINK_MOBILE ret -LINK_BATTLE_RECORD_LENGTH EQUS "(sLinkBattleRecord1End - sLinkBattleRecord1)" ; 18 -NUM_LINK_BATTLE_RECORDS EQUS "((sLinkBattleStatsEnd - sLinkBattleRecord) / LINK_BATTLE_RECORD_LENGTH)" ; 5 - _DisplayLinkRecord: ld a, BANK(sLinkBattleStats) call OpenSRAM diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 0bdab70d2..4118d0efd 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -804,7 +804,6 @@ PlayerMovementPointers: ld a, BANK(Script_ForcedMovement) ld hl, Script_ForcedMovement call CallScript -; ld a, -1 ld c, a scf ret diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index e44fdfeb0..7018bded8 100644 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm @@ -1,7 +1,7 @@ ObjectActionPairPointers: ; entries correspond to OBJECT_ACTION_* constants (see constants/map_object_constants.asm) -; normal action, frozen action table_width 2 + 2, ObjectActionPairPointers + ; normal action, frozen action dw SetFacingStanding, SetFacingStanding dw SetFacingStandAction, SetFacingCurrent dw SetFacingStepAction, SetFacingCurrent |