diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 14:53:06 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 14:53:06 -0400 |
| commit | 68b566d0b2656eee33b0be7d29b98583b6aadc4c (patch) | |
| tree | e5fa5586c35ec2d70810a95ac4e236cdeeffb649 /data | |
| parent | 76185838e2961efb0bb1eacdbf37a45e29ca1a52 (diff) | |
Route 15, 16, and 18 gates
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/route18gateupstairs.asm | 2 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 12 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index c611e0c3..93438044 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -9,7 +9,7 @@ Route18GateUpstairsObject: ; 0x499a4 (size=24) db $2, $6, $3 ; Route18GateUpstairsText3 db $1 ; objects - object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person + object SPRITE_COOK, $4, $2, WALK, $2, $1 ; person ; warp-to EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 322d2eb8..a552d9fa 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -184,14 +184,14 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SilphCo1_h) db BANK(SaffronPokecenter_h) db BANK(SaffronHouse2_h) - db $12 ; db BANK(Route15Gate_h) - db $12 ; db BANK(Route15GateUpstairs_h) - db $12 ; db BANK(Route16Gate_h) - db $12 ; db BANK(Route16GateUpstairs_h) + db BANK(Route15Gate_h) + db BANK(Route15GateUpstairs_h) + db BANK(Route16Gate_h) + db BANK(Route16GateUpstairs_h) db $07 ; db BANK(Route16House_h) db $15 ; db BANK(Route12House_h) - db $12 ; db BANK(Route18Gate_h) - db $12 ; db BANK(Route18GateUpstairs_h) + db BANK(Route18Gate_h) + db BANK(Route18GateUpstairs_h) db $11 ; db BANK(SeafoamIslands1_h) db $07 ; db BANK(Route22Gate_h) db $14 ; db BANK(VictoryRoad2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5fd190b6..49293c55 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -184,14 +184,14 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SilphCo1_h dw SaffronPokecenter_h dw SaffronHouse2_h - dw $558d ; dw Route15Gate_h - dw $55d5 ; dw Route15GateUpstairs_h - dw $5649 ; dw Route16Gate_h - dw $5796 ; dw Route16GateUpstairs_h + dw Route15Gate_h + dw Route15GateUpstairs_h + dw Route16Gate_h + dw Route16GateUpstairs_h dw $5ef6 ; dw Route16House_h dw $64a5 ; dw Route12House_h - dw $5801 ; dw Route18Gate_h ;id=190 - dw $5900 ; dw Route18GateUpstairs_h + dw Route18Gate_h ;id=190 + dw Route18GateUpstairs_h dw $487e ; dw SeafoamIslands1_h dw $5f81 ; dw Route22Gate_h dw $57cc ; dw VictoryRoad2_h |