diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-22 16:41:10 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-22 16:41:10 -0400 |
| commit | ea59f5ee474e1ee56a303feef44dc7e9f30db21d (patch) | |
| tree | 98894d5ed8a8804a13f4dd51dc07bb4df87998ef /engine | |
| parent | b4ee57c480cf937ccd68495e7f4a56b3edbeddd8 (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 f644f6bd..3749b421 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8058,9 +8058,6 @@ ShowLinkBattleParticipantsAfterEnd: .Draw: db " DRAW@" -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 375dc424..b8110001 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -792,7 +792,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 d055e7c3..060c0d26 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 |