From 86cc17d200b5d7e8b853170d6611409852468220 Mon Sep 17 00:00:00 2001 From: Forest Belton Date: Thu, 30 Sep 2021 13:23:33 -0400 Subject: [PATCH] Fix horizontal movement --- gbsdk/rules.mk | 2 +- src/player.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gbsdk/rules.mk b/gbsdk/rules.mk index a04ec36..2a31427 100644 --- a/gbsdk/rules.mk +++ b/gbsdk/rules.mk @@ -145,7 +145,7 @@ $(BUILD)/level/%.h $(BUILD)/level/%.c: level/%.png level/%_coll.png @mkdir -p $(BUILD)/level @cp $< $(BUILD)/level/ @cp $(shell dirname $<)/$(shell basename -s .png $<)_coll.png $(BUILD)/level/ - @python3 scripts/generate_map.py --compress 1 "$(BUILD)/$<" + @python3 scripts/generate_map.py "$(BUILD)/$<" $(BUILD)/assets/%.oam.2bpp: assets/%.oam.png @echo Converting $< diff --git a/src/player.c b/src/player.c index aec08c5..d840c51 100644 --- a/src/player.c +++ b/src/player.c @@ -42,7 +42,7 @@ void player_update(void) { } } - if ((joypad_state & PAD_RIGHT) && PLAYER.x + TILE_WIDTH * 2 > SCRN_X) { + if ((joypad_state & PAD_RIGHT) && PLAYER.x + TILE_WIDTH * 2 < SCRN_X) { PLAYER.dir = DIR_RIGHT; PLAYER.x += PLAYER_SPEED; if (player_bg_collides()) {