From 99f5e555dc60fe9691b2681a9aa712f2a4d3ae28 Mon Sep 17 00:00:00 2001 From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> Date: Sat, 22 Nov 2025 12:07:07 +0100 Subject: [PATCH] Minor fix in Makefile, add one `PIKACHU_SPRITE_INDEX` --- .gitattributes | 1 + Makefile | 2 +- scripts/VictoryRoad3F.asm | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index e22e2bbbb..ded45371d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,6 +6,7 @@ *.asm text # Denote all files that are truly binary and should not be modified. +*.bin binary *.png binary *.2bpp binary *.1bpp binary diff --git a/Makefile b/Makefile index fdd39c601..8e15a00e2 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ pokeyellow.gbc: RGBLINKFLAGS += -p 0x00 pokeyellow_debug.gbc: RGBLINKFLAGS += -p 0xff pokeyellow_vc.gbc: RGBLINKFLAGS += -p 0x00 -RGBFIXFLAGS += -cjsv -k 01 -l 0x33 -m MBC5+RAM+BATTERY -p 0 -r 03 -t "POKEMON YELLOW" +RGBFIXFLAGS += -cjsv -k 01 -l 0x33 -m MBC5+RAM+BATTERY -r 03 -t "POKEMON YELLOW" pokeyellow.gbc: RGBFIXFLAGS += -p 0x00 pokeyellow_debug.gbc: RGBFIXFLAGS += -p 0xff pokeyellow_vc.gbc: RGBFIXFLAGS += -p 0x00 diff --git a/scripts/VictoryRoad3F.asm b/scripts/VictoryRoad3F.asm index ec042e48d..fc148c0d8 100644 --- a/scripts/VictoryRoad3F.asm +++ b/scripts/VictoryRoad3F.asm @@ -38,7 +38,7 @@ VictoryRoad3FDefaultScript: cp $1 jr nz, .handle_hole ldh a, [hSpriteIndex] - cp $f ; Pikachu + cp PIKACHU_SPRITE_INDEX jp z, .check_switch_hole ld hl, wCurrentMapScriptFlags set BIT_CUR_MAP_LOADED_1, [hl]