From 78cb19fe7a422eb56993a7dc7bb63984ef611a1b Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 20 Jan 2021 16:38:44 -0500 Subject: [PATCH] tfv: fix ca65 complaints about negative constants --- demos/Makefile | 2 +- demos/another_myst/ootw_graphics/Makefile | 6 +++--- games/tfv/rotozoom.s | 2 +- games/tfv/tfv_overworld.s | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demos/Makefile b/demos/Makefile index 07a21742..0f797849 100644 --- a/demos/Makefile +++ b/demos/Makefile @@ -10,7 +10,7 @@ all: cd mode7_demo && make cd seasons && make cd shapetable_party && make - cd vertical_scroll && make +# cd vertical_scroll && make cd xmas_2018 && make cd xmas_2019 && make diff --git a/demos/another_myst/ootw_graphics/Makefile b/demos/another_myst/ootw_graphics/Makefile index e73caf1d..762211d7 100644 --- a/demos/another_myst/ootw_graphics/Makefile +++ b/demos/another_myst/ootw_graphics/Makefile @@ -1,7 +1,7 @@ -include ../../Makefile.inc +include ../../../Makefile.inc -PNG2RLE = ../../gr-utils/png2rle -PNG2LZ4 = ../../gr-utils/png2lz4 +PNG2RLE = ../../../utils/gr-utils/png2rle +PNG2LZ4 = ../../../utils/gr-utils/png2lz4 all: ootw_c16_end.inc logo.inc diff --git a/games/tfv/rotozoom.s b/games/tfv/rotozoom.s index cc8c1e9d..94189582 100644 --- a/games/tfv/rotozoom.s +++ b/games/tfv/rotozoom.s @@ -93,7 +93,7 @@ rotozoom: ; cca = -20*ca; - lda #-20 ; 2 + lda #<(-20) ; 2 sta NUM1H ; 3 lda #0 ; 2 sta NUM1L ; 3 diff --git a/games/tfv/tfv_overworld.s b/games/tfv/tfv_overworld.s index 68b054a1..a39ee1ee 100644 --- a/games/tfv/tfv_overworld.s +++ b/games/tfv/tfv_overworld.s @@ -98,8 +98,8 @@ worldmap_handle_left: left_turn: lda HERO_STATE - and #~HERO_DIRECTION ; change direction to left (0) - and #~HERO_ODD ; stand (not walk) if changing + and #<(~HERO_DIRECTION) ; change direction to left (0) + and #<(~HERO_ODD) ; stand (not walk) if changing sta HERO_STATE jmp done_handle_left ; skip ahead @@ -120,7 +120,7 @@ worldmap_handle_right: right_turn: lda HERO_STATE ora #HERO_DIRECTION ; change direction to right (1) - and #~HERO_ODD ; change to standing + and #<(~HERO_ODD) ; change to standing sta HERO_STATE jmp done_handle_right ; skip ahead