Skip to content

Minor fix in Makefile, add one PIKACHU_SPRITE_INDEX #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dannye merged 1 commit into from
Nov 22, 2025
Merged

Minor fix in Makefile, add one PIKACHU_SPRITE_INDEX #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/VictoryRoad3F.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down