Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-09-13 13:05:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Route 19

Browse Source
This commit is contained in:
pikalaxalt
2016-05-27 18:33:42 -04:00
parent d9e7b91cb3
commit 7caa8c4be0
5 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/mapObjects/route19.asm
View File

@@ -9,13 +9,16 @@ Route19Object: ; 0x54e9a (size=87)
db $a ; objects
object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2
object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3
object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7
object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c
object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d
object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8
object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e
object SPRITE_BLACK_HAIR_BOY_1, $09, $07, STAY, RIGHT, $1, OPP_SWIMMER, $2
object SPRITE_BLACK_HAIR_BOY_1, $0c, $09, STAY, LEFT, $2, OPP_SWIMMER, $3
object SPRITE_SWIMMER, $0d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4
object SPRITE_SWIMMER, $04, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5
object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6
object SPRITE_SWIMMER, $09, $0d, STAY, DOWN, $6, OPP_SWIMMER, $7
object SPRITE_SWIMMER, $08, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c
object SPRITE_SWIMMER, $0b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d
object SPRITE_SWIMMER, $09, $2a, STAY, UP, $9, OPP_SWIMMER, $8
object SPRITE_SWIMMER, $0a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e
; warp-to
EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE

2
data/map_header_banks.asm
View File

@@ -30,7 +30,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db $16 ; db BANK(Route16_h) ; ROUTE_16
db $15 ; db BANK(Route17_h) ; ROUTE_17
db $16 ; db BANK(Route18_h) ; ROUTE_18
db $15 ; db BANK(Route19_h) ; ROUTE_19
db BANK(Route19_h) ; ROUTE_19
db BANK(Route20_h) ; ROUTE_20
db BANK(Route21_h) ; ROUTE_21
db BANK(Route22_h) ; ROUTE_22

2
data/map_header_pointers.asm
View File

@@ -30,7 +30,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw $4ada ; dw Route16_h
dw $4b28 ; dw Route17_h
dw $4c38 ; dw Route18_h
dw $4e80 ; dw Route19_h
dw Route19_h
dw Route20_h
dw Route21_h
dw Route22_h

11
main.asm
View File

@@ -256,10 +256,10 @@ INCLUDE "data/mapHeaders/vermilioncity.asm"
INCLUDE "data/mapObjects/vermilioncity.asm"
VermilionCityBlocks: INCBIN "maps/vermilioncity.blk"
dr $18bb3,$18dfa ; headers, objects, blocks
dr $18bb3,$18c92 ; headers, objects, blocks
; INCLUDE "data/mapHeaders/fuchsiacity.asm"
; INCLUDE "data/mapObjects/fuchsiacity.asm"
; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
INCLUDE "scripts/pallettown.asm"
@@ -856,7 +856,9 @@ INCBIN "maps/route5.blk"
dr $5468e,$54706
Route9Blocks: ; 54706
INCBIN "maps/route9.blk"
dr $54814,$54f01
dr $54814,$54e80
INCLUDE "data/mapHeaders/route19.asm"
INCLUDE "data/mapObjects/route19.asm"
Route19Blocks:
INCBIN "maps/route19.blk"
INCLUDE "data/mapHeaders/route21.asm"
@@ -871,7 +873,8 @@ INCLUDE "scripts/route2.asm"
INCLUDE "scripts/route3.asm"
INCLUDE "scripts/route4.asm"
INCLUDE "scripts/route5.asm"
dr $556d0,$55edb
dr $556d0,$55d58
INCLUDE "scripts/route19.asm"
INCLUDE "scripts/route21.asm"
dr $56054,$56714

30
scripts/route19.asm
View File

@@ -37,7 +37,7 @@ Route19TrainerHeader0: ; 55d73 (15:5d73)
Route19TrainerHeader1: ; 55d7f (15:5d7f)
dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1
db ($3 << 4) ; trainer's view range
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1
dw Route19BattleText2 ; TextBeforeBattle
dw Route19AfterBattleText2 ; TextAfterBattle
@@ -121,60 +121,52 @@ Route19TrainerHeader9: ; 55ddf (15:5ddf)
Route19Text1: ; 55dec (15:5dec)
TX_ASM
ld hl, Route19TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text2: ; 55df6 (15:5df6)
TX_ASM
ld hl, Route19TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text3: ; 55e00 (15:5e00)
TX_ASM
ld hl, Route19TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text4: ; 55e0a (15:5e0a)
TX_ASM
ld hl, Route19TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text5: ; 55e14 (15:5e14)
TX_ASM
ld hl, Route19TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text6: ; 55e1e (15:5e1e)
TX_ASM
ld hl, Route19TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text7: ; 55e28 (15:5e28)
TX_ASM
ld hl, Route19TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text8: ; 55e32 (15:5e32)
TX_ASM
ld hl, Route19TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text9: ; 55e3c (15:5e3c)
TX_ASM
ld hl, Route19TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
jr Route19_TalkToTrainer
Route19Text10: ; 55e46 (15:5e46)
TX_ASM
ld hl, Route19TrainerHeader9
Route19_TalkToTrainer:
call TalkToTrainer
jp TextScriptEnd