diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 8 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 14 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index a77d1d1e..4d1e26c2 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,10 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs - db 3 ; objects - object SPRITE_JESSIE, $a 8, 8, STAY, DOWN, 1 - object SPRITE_JAMES, $b, 8, STAY, DOWN, 2 - object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3 + db $3 ; objects + object SPRITE_JESSIE, $a, $8, STAY, DOWN, $1 + object SPRITE_JAMES, $b, $8, STAY, DOWN, $2 + object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $3 ; warp-to EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e93540d5..8b2d58e2 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -142,13 +142,13 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonHouse_h) db BANK(CeladonHotel_h) db BANK(LavenderPokecenter_h) - db $18 ; db BANK(PokemonTower1_h) - db $18 ; db BANK(PokemonTower2_h) - db $18 ; db BANK(PokemonTower3_h) - db $18 ; db BANK(PokemonTower4_h) - db $18 ; db BANK(PokemonTower5_h) - db $18 ; db BANK(PokemonTower6_h) - db $18 ; db BANK(PokemonTower7_h) + db BANK(PokemonTower1_h) + db BANK(PokemonTower2_h) + db BANK(PokemonTower3_h) + db BANK(PokemonTower4_h) + db BANK(PokemonTower5_h) + db BANK(PokemonTower6_h) + db BANK(PokemonTower7_h) db $07 ; db BANK(LavenderHouse1_h) db BANK(LavenderMart_h) db $07 ; db BANK(LavenderHouse2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5418152f..82fce791 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -142,13 +142,13 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonHouse_h dw CeladonHotel_h ;id=140 dw LavenderPokecenter_h - dw $4420 ; dw PokemonTower1_h - dw $44e7 ; dw PokemonTower2_h - dw $46af ; dw PokemonTower3_h - dw $47d9 ; dw PokemonTower4_h - dw $4915 ; dw PokemonTower5_h - dw $4ad2 ; dw PokemonTower6_h - dw $4ce8 ; dw PokemonTower7_h + dw PokemonTower1_h + dw PokemonTower2_h + dw PokemonTower3_h + dw PokemonTower4_h + dw PokemonTower5_h + dw PokemonTower6_h + dw PokemonTower7_h dw $51a4 ; dw LavenderHouse1_h dw LavenderMart_h ;id=150 dw $52aa ; dw LavenderHouse2_h |