From dc8677aa1c1ef9ef8cc3fb217641ae6619a3dae6 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:59:12 -0400 Subject: Route 9 incl. AJ fight --- data/mapObjects/route9.asm | 2 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 79d0d5ed..6a759608 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -8,7 +8,7 @@ Route9Object: ; 0x546a8 (size=86) db $a ; objects object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_YOUNGSTER, $e object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8 object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6 object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 338bd71c..3268cdf8 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -20,7 +20,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route6_h) ; ROUTE_6 db BANK(Route7_h) ; ROUTE_7 db $16 ; db BANK(Route8_h) ; ROUTE_8 - db $15 ; db BANK(Route9_h) ; ROUTE_9 + db BANK(Route9_h) ; ROUTE_9 db BANK(Route10_h) ; ROUTE_10 db BANK(Route11_h) ; ROUTE_11 db BANK(Route12_h) ; ROUTE_12 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5359721f..70fa7aa0 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -20,7 +20,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route6_h dw Route7_h dw $412d ; dw Route8_h - dw $468e ; dw Route9_h + dw Route9_h dw Route10_h dw Route11_h dw Route12_h -- cgit v1.2.3