Skip to content

Commit 13595cd

Browse files
committed
Merge commit 'db31e5a438a41ae2f1b731f5700a6356fc00135f'
2 parents 59571b7 + db31e5a commit 13595cd

File tree

296 files changed

+2762
-2704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+2762
-2704
lines changed

INSTALL.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Linux
22

3-
sudo apt-get install make gcc bison git python python-setuptools
4-
sudo easy_install pypng
3+
sudo apt-get install make gcc bison git python python-pip
4+
sudo pip install pypng
55

6-
git clone git://github.com/bentley/rgbds.git
6+
git clone https://github.com/bentley/rgbds
77
cd rgbds
88
sudo make install
99
cd ..
@@ -23,12 +23,12 @@ To build them individually:
2323

2424
# Mac
2525

26-
In the shell, run:
26+
In **Terminal**, run:
2727

2828
xcode-select --install
2929
sudo easy_install pypng
3030

31-
git clone git://github.com/bentley/rgbds.git
31+
git clone https://github.com/bentley/rgbds
3232
cd rgbds
3333
sudo make install
3434
cd ..

Makefile

+42-59
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,10 @@
1-
# Build Red/Blue. Yellow is WIP.
2-
roms := pokered.gbc pokeblue.gbc
3-
4-
5-
.PHONY: all clean red blue yellow compare
6-
7-
all: $(roms)
8-
red: pokered.gbc
9-
blue: pokeblue.gbc
10-
yellow: pokeyellow.gbc
11-
12-
versions := red blue yellow
13-
14-
15-
# Header options for rgbfix.
16-
dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03
17-
cgb_opt = -cjsv -k 01 -l 0x33 -m 0x1b -p 0 -r 03
18-
19-
red_opt = $(dmg_opt) -t "POKEMON RED"
20-
blue_opt = $(dmg_opt) -t "POKEMON BLUE"
21-
yellow_opt = $(cgb_opt) -t "POKEMON YELLOW"
22-
23-
24-
25-
# If your default python is 3, you may want to change this to python27.
1+
# python 2.7
262
PYTHON := python
273

284
# md5sum -c is used to compare rom hashes. The options may vary across platforms.
295
MD5 := md5sum -c --quiet
306

317

32-
# The compare target is a shortcut to check that the build matches the original roms exactly.
33-
# This is for contributors to make sure a change didn't affect the contents of the rom.
34-
# More thorough comparison can be made by diffing the output of hexdump -C against both roms.
35-
compare: red blue
36-
@$(MD5) roms.md5
37-
38-
398
# Clear the default suffixes.
409
.SUFFIXES:
4110
.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic
@@ -46,16 +15,19 @@ compare: red blue
4615
# Suppress annoying intermediate file deletion messages.
4716
.PRECIOUS: %.2bpp
4817

49-
# Filepath shortcuts to avoid overly long recipes.
18+
.PHONY: all clean red blue compare
19+
20+
5021
poketools := extras/pokemontools
5122
gfx := $(PYTHON) $(poketools)/gfx.py
52-
pic := $(PYTHON) $(poketools)/pic.py
23+
2bpp := $(gfx) 2bpp
24+
1bpp := $(gfx) 1bpp
25+
pic := $(PYTHON) $(poketools)/pic.py compress
5326
includes := $(PYTHON) $(poketools)/scan_includes.py
5427

28+
versions := red blue
5529

56-
57-
# Collect file dependencies for objects in red/, blue/ and yellow/.
58-
# These aren't provided by rgbds by default, so we have to look for file includes ourselves.
30+
# Collect file dependencies for objects in red/ and blue/.
5931
$(foreach ver, $(versions), \
6032
$(eval $(ver)_asm := $(shell find $(ver) -iname '*.asm')) \
6133
$(eval $(ver)_obj := $($(ver)_asm:.asm=.o)) \
@@ -66,32 +38,43 @@ $(foreach obj, $(all_obj), \
6638
)
6739

6840

69-
# Image files are added to a queue to reduce build time. They're converted when building parent objects.
70-
%.png: ;
71-
%.2bpp: %.png ; $(eval 2bppq += $<) @rm -f $@
72-
%.1bpp: %.png ; $(eval 1bppq += $<) @rm -f $@
73-
%.pic: %.2bpp ; $(eval picq += $<) @rm -f $@
41+
roms := pokered.gbc pokeblue.gbc
7442

75-
# Assemble source files into objects.
76-
# Queue payloads are here. These are made silent since there may be hundreds of targets.
77-
# Use rgbasm -h to use halts without nops.
78-
$(all_obj): $$*.asm $$($$*_dep)
79-
@$(gfx) 2bpp $(2bppq); $(eval 2bppq :=)
80-
@$(gfx) 1bpp $(1bppq); $(eval 1bppq :=)
81-
@$(pic) compress $(picq); $(eval picq :=)
82-
rgbasm -h -o $@ $*.asm
43+
all: $(roms)
44+
red: pokered.gbc
45+
blue: pokeblue.gbc
8346

47+
# For contributors to make sure a change didn't affect the contents of the rom.
48+
compare: red blue
49+
@$(MD5) roms.md5
8450

85-
# Link objects together to build a rom.
51+
clean:
52+
rm -f $(roms) $(all_obj) $(roms:.gbc=.sym)
53+
find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} +
8654

87-
# Make a symfile for debugging. Add the mapfile back in
88-
link = rgblink -n poke$*.sym
8955

90-
poke%.gbc: $$(%_obj)
91-
$(link) -o $@ $^
92-
rgbfix $($*_opt) $@
56+
# Don't fix halts.
57+
asm_opt = -h
9358

59+
# Make a symfile for debugging.
60+
link_opt = -n poke$*.sym
9461

95-
clean:
96-
rm -f $(roms) $(all_obj) poke*.sym
97-
find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} +
62+
# Header options for rgbfix.
63+
dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03
64+
red_opt = $(dmg_opt) -t "POKEMON RED"
65+
blue_opt = $(dmg_opt) -t "POKEMON BLUE"
66+
67+
68+
%.png: ;
69+
%.2bpp: %.png ; @$(2bpp) $<
70+
%.1bpp: %.png ; @$(1bpp) $<
71+
%.pic: %.2bpp ; @$(pic) $<
72+
73+
# Assemble source files into objects.
74+
$(all_obj): $$*.asm $$($$*_dep)
75+
rgbasm $(asm_opt) -o $@ $*.asm
76+
77+
# Link objects to produce a rom.
78+
poke%.gbc: $$(%_obj)
79+
rgblink $(link_opt) -o $@ $^
80+
rgbfix $($*_opt) $@

constants/item_constants.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ const_value = 1
6161
const FULL_HEAL ; $34
6262
const REVIVE ; $35
6363
const MAX_REVIVE ; $36
64-
const GUARD_SPEC_ ; $37
64+
const GUARD_SPEC ; $37
6565
const SUPER_REPEL ; $38
6666
const MAX_REPEL ; $39
6767
const DIRE_HIT ; $3A
6868
const COIN ; $3B unused?
6969
const FRESH_WATER ; $3C
7070
const SODA_POP ; $3D
7171
const LEMONADE ; $3E
72-
const S_S__TICKET ; $3F
72+
const S_S_TICKET ; $3F
7373
const GOLD_TEETH ; $40
7474
const X_ATTACK ; $41
7575
const X_DEFEND ; $42

constants/pokedex_constants.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const_value = 1
8282
const DEX_SLOWBRO ; 80
8383
const DEX_MAGNEMITE ; 81
8484
const DEX_MAGNETON ; 82
85-
const DEX_FARFETCH_D ; 83
85+
const DEX_FARFETCHD ; 83
8686
const DEX_DODUO ; 84
8787
const DEX_DODRIO ; 85
8888
const DEX_SEEL ; 86

constants/pokemon_constants.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const_value = 1
8282
const SLOWBRO ; 80
8383
const MAGNEMITE ; 81
8484
const MAGNETON ; 82
85-
const FARFETCH_D ; 83
85+
const FARFETCHD ; 83
8686
const DODUO ; 84
8787
const DODRIO ; 85
8888
const SEEL ; 86

constants/special_ai_constants.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Give special AI values their own constants to avoid confusion on special trainers
22
AI_FULL_HEAL EQU BROCK
33
AI_X_DEFEND EQU MISTY
4-
AI_X_SPEED EQU LT__SURGE
4+
AI_X_SPEED EQU LT_SURGE
55
AI_X_ATTACK EQU KOGA
66
AI_POTION EQU SONY2
77
AI_SUPER_POTION EQU ERIKA

constants/trainer_constants.asm

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const_value = 1
1010
trainer_const BUG_CATCHER ; $02
1111
trainer_const LASS ; $03
1212
trainer_const SAILOR ; $04
13-
trainer_const JR__TRAINER_M ; $05
14-
trainer_const JR__TRAINER_F ; $06
13+
trainer_const JR_TRAINER_M ; $05
14+
trainer_const JR_TRAINER_F ; $06
1515
trainer_const POKEMANIAC ; $07
1616
trainer_const SUPER_NERD ; $08
1717
trainer_const HIKER ; $09
@@ -41,7 +41,7 @@ const_value = 1
4141
trainer_const BRUNO ; $21
4242
trainer_const BROCK ; $22
4343
trainer_const MISTY ; $23
44-
trainer_const LT__SURGE ; $24
44+
trainer_const LT_SURGE ; $24
4545
trainer_const ERIKA ; $25
4646
trainer_const KOGA ; $26
4747
trainer_const BLAINE ; $27

data/baseStats/farfetchd.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FarfetchdBaseStats: ; 38cd6 (e:4cd6)
2-
db DEX_FARFETCH_D ; pokedex id
2+
db DEX_FARFETCHD ; pokedex id
33
db 52 ; base hp
44
db 65 ; base attack
55
db 55 ; base defense

data/breeding_list.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ db SLOWPOKE ; Slowpoke
8282
db SLOWPOKE ; Slowbro
8383
db MAGNEMITE ; Magnemite
8484
db MAGNEMITE ; Magneton
85-
db FARFETCH_D ; Farfetch'd
85+
db FARFETCHD ; Farfetch'd
8686
db DODUO ; Doduo
8787
db DODUO ; Dodrio
8888
db SEEL ; Seel

data/evos_moves.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ Mon082_EvosMoves: ; 3b485 (e:7485)
19711971
db 0
19721972
19731973
Mon083_EvosMoves: ; 3b4e3 (e:74e3)
1974-
;FARFETCH_D
1974+
;FARFETCHD
19751975
;Evolutions
19761976
db 0
19771977
;Learnset

data/item_prices.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ ItemPrices: ; 4608 (1:4608)
5353
money 600 ; FULL_HEAL
5454
money 1500 ; REVIVE
5555
money 4000 ; MAX_REVIVE
56-
money 700 ; GUARD_SPEC_
56+
money 700 ; GUARD_SPEC
5757
money 500 ; SUPER_REPEL
5858
money 700 ; MAX_REPEL
5959
money 650 ; DIRE_HIT
6060
money 10 ; COIN
6161
money 200 ; FRESH_WATER
6262
money 300 ; SODA_POP
6363
money 350 ; LEMONADE
64-
money 0 ; S_S__TICKET
64+
money 0 ; S_S_TICKET
6565
money 0 ; GOLD_TEETH
6666
money 500 ; X_ATTACK
6767
money 550 ; X_DEFEND

data/mapObjects/celadongym.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CeladonGymObject: ; 0x48b30 (size=84)
1111
object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1
1212
object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11
1313
object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1
14-
object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR__TRAINER_F, $b
14+
object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR_TRAINER_F, $b
1515
object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2
1616
object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12
1717
object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3

data/mapObjects/pewtergym.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PewterGymObject: ; 0x5c52e (size=42)
99

1010
db $3 ; objects
1111
object SPRITE_BROCK, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1
12-
object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR__TRAINER_M, $1
12+
object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1
1313
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person
1414

1515
; warp-to

data/mapObjects/rocktunnel1.asm

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ RockTunnel1Object: ; 0x445f6 (size=127)
1919
object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d
2020
object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e
2121
object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7
22-
object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11
23-
object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12
24-
object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13
22+
object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR_TRAINER_F, $11
23+
object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR_TRAINER_F, $12
24+
object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13
2525

2626
; warp-to
2727
EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f

data/mapObjects/rocktunnel2.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ RockTunnel2Object: ; 0x4613d (size=100)
1010
db $0 ; signs
1111

1212
db $8 ; objects
13-
object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR__TRAINER_F, $9
13+
object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR_TRAINER_F, $9
1414
object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9
1515
object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3
1616
object SPRITE_LASS, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4
1717
object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a
18-
object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR__TRAINER_F, $a
18+
object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR_TRAINER_F, $a
1919
object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b
2020
object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5
2121

data/mapObjects/route10.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Route10Object: ; 0x582f6 (size=96)
1717
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1
1818
object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7
1919
object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2
20-
object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR__TRAINER_F, $7
20+
object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR_TRAINER_F, $7
2121
object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8
22-
object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR__TRAINER_F, $8
22+
object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8
2323

2424
; warp-to
2525
EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER

data/mapObjects/route12.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Route12Object: ; 0x5869a (size=118)
1515
object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person
1616
object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3
1717
object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4
18-
object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR__TRAINER_M, $9
18+
object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR_TRAINER_M, $9
1919
object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2
2020
object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5
2121
object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6

data/mapObjects/route13.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Route13Object: ; 0x5482e (size=93)
1010

1111
db $a ; objects
1212
object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1
13-
object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR__TRAINER_F, $c
14-
object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR__TRAINER_F, $d
15-
object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR__TRAINER_F, $e
16-
object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR__TRAINER_F, $f
13+
object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR_TRAINER_F, $c
14+
object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR_TRAINER_F, $d
15+
object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR_TRAINER_F, $e
16+
object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR_TRAINER_F, $f
1717
object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2
1818
object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4
1919
object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5

data/mapObjects/route15.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ Route15Object: ; 0x5894e (size=126)
1111
db $9, $27, $c ; Route15Text12
1212

1313
db $b ; objects
14-
object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR__TRAINER_F, $14
15-
object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR__TRAINER_F, $15
14+
object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14
15+
object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15
1616
object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6
1717
object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7
1818
object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9
1919
object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a
2020
object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3
2121
object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4
22-
object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR__TRAINER_F, $16
23-
object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR__TRAINER_F, $17
22+
object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16
23+
object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17
2424
object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20
2525

2626
; warp-to

data/mapObjects/route24.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Route24Object: ; 0x506a4 (size=67)
77

88
db $8 ; objects
99
object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6
10-
object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR__TRAINER_M, $A
11-
object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR__TRAINER_M, $3
10+
object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $A
11+
object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3
1212
object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7
1313
object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4
1414
object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8

data/mapObjects/route25.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Route25Object: ; 0x507b2 (size=94)
1010
db $a ; objects
1111
object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5
1212
object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6
13-
object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2
13+
object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR_TRAINER_M, $2
1414
object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9
1515
object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7
1616
object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a

0 commit comments

Comments
 (0)