From ea59f5ee474e1ee56a303feef44dc7e9f30db21d Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Mar 2021 16:41:10 -0400 Subject: Miscellaneous cleanup --- engine/battle/core.asm | 3 --- engine/overworld/events.asm | 1 - engine/overworld/map_object_action.asm | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'engine') 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 -- cgit v1.2.3