diff options
| author | Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> | 2025-11-22 18:13:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-22 11:13:55 -0600 |
| commit | 451b494284b7b292d6153404f749fcde0ec69b88 (patch) | |
| tree | f38416b631a5c41100b0149ca0a201eed105e6dd | |
| parent | Fix tools/unnamed.py (diff) | |
| download | pokeyellow-451b494284b7b292d6153404f749fcde0ec69b88.tar.gz pokeyellow-451b494284b7b292d6153404f749fcde0ec69b88.tar.xz pokeyellow-451b494284b7b292d6153404f749fcde0ec69b88.zip | |
Minor fix in Makefile, add one `PIKACHU_SPRITE_INDEX` (#141)
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/VictoryRoad3F.asm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index e22e2bbb..ded45371 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 @@ -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 ec042e48..fc148c0d 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] |