diff options
| -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 | ||||
| -rwxr-xr-x | main.asm | 35 |
4 files changed, 45 insertions, 16 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 @@ -891,9 +891,14 @@ Route7Blocks: INCBIN "maps/route7.blk" ; 48051 MtMoonPokecenterBlocks: RockTunnelPokecenterBlocks: CeladonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" -Route11GateBlocks: INCBIN "maps/route11gate.blk" +Route11GateBlocks: +Route15GateBlocks: +Route18GateBlocks: INCBIN "maps/route11gate.blk" Route11GateUpstairsBlocks: -Route12GateUpstairsBlocks: INCBIN "maps/route11gateupstairs.blk" +Route12GateUpstairsBlocks: +Route15GateUpstairsBlocks: +Route16GateUpstairsBlocks: +Route18GateUpstairsBlocks: INCBIN "maps/route11gateupstairs.blk" INCLUDE "scripts/route7.asm" INCLUDE "data/mapHeaders/redshouse1f.asm" @@ -1004,7 +1009,31 @@ Route12GateBlocks: INCBIN "maps/route12gate.blk" INCLUDE "data/mapHeaders/route12gateupstairs.asm" INCLUDE "scripts/route12gateupstairs.asm" INCLUDE "data/mapObjects/route12gateupstairs.asm" - dr $4958d,$49953 + +INCLUDE "data/mapHeaders/route15gate.asm" +INCLUDE "scripts/route15gate.asm" +INCLUDE "data/mapObjects/route15gate.asm" + +INCLUDE "data/mapHeaders/route15gateupstairs.asm" +INCLUDE "scripts/route15gateupstairs.asm" +INCLUDE "data/mapObjects/route15gateupstairs.asm" + +INCLUDE "data/mapHeaders/route16gate.asm" +INCLUDE "scripts/route16gate.asm" +INCLUDE "data/mapObjects/route16gate.asm" +Route16GateBlocks: INCBIN "maps/route16gate.blk" + +INCLUDE "data/mapHeaders/route16gateupstairs.asm" +INCLUDE "scripts/route16gateupstairs.asm" +INCLUDE "data/mapObjects/route16gateupstairs.asm" + +INCLUDE "data/mapHeaders/route18gate.asm" +INCLUDE "scripts/route18gate.asm" +INCLUDE "data/mapObjects/route18gate.asm" + +INCLUDE "data/mapHeaders/route18gateupstairs.asm" +INCLUDE "scripts/route18gateupstairs.asm" +INCLUDE "data/mapObjects/route18gateupstairs.asm" INCLUDE "data/mapHeaders/mtmoon1.asm" INCLUDE "scripts/mtmoon1.asm" |