diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/rockethideout4.asm | 4 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 10 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 16 | ||||
| -rwxr-xr-x | data/tileset_headers.asm | 52 |
4 files changed, 41 insertions, 41 deletions
diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 5441f9cd..616f5a75 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -10,8 +10,8 @@ RocketHideout4Object: ; 0x455f1 (size=95) db $9 ; objects object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, OPP_GIOVANNI, $1 - object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, OPP_ROCKET, $10 - object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, OPP_ROCKET, $11 + object SPRITE_JAMES, $19, $a, STAY, DOWN, $2 + object SPRITE_JESSIE, $18, $a, STAY, DOWN, $3 object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, OPP_ROCKET, $12 object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 532c9c85..04bee42f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -199,11 +199,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(VermilionHouse3_h) db BANK(DiglettsCave_h) db BANK(VictoryRoad3_h) - db $11 ; db BANK(RocketHideout1_h) - db $11 ; db BANK(RocketHideout2_h) - db $11 ; db BANK(RocketHideout3_h) - db $11 ; db BANK(RocketHideout4_h) - db $11 ; db BANK(RocketHideoutElevator_h) + db BANK(RocketHideout1_h) + db BANK(RocketHideout2_h) + db BANK(RocketHideout3_h) + db BANK(RocketHideout4_h) + db BANK(RocketHideoutElevator_h) db $01 ; unused db $01 ; unused db $01 ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 23b17f2f..501724af 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -199,14 +199,14 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw VermilionHouse3_h dw DiglettsCave_h dw VictoryRoad3_h - dw $4c5e ; dw RocketHideout1_h - dw $4ebb ; dw RocketHideout2_h ;200 - dw $52b9 ; dw RocketHideout3_h - dw $54f1 ; dw RocketHideout4_h - dw $5958 ; dw RocketHideoutElevator_h - dw $5958 ; dw RocketHideoutElevator_h ; unused - dw $5958 ; dw RocketHideoutElevator_h ; unused - dw $5958 ; dw RocketHideoutElevator_h ; unused + dw RocketHideout1_h + dw RocketHideout2_h ;200 + dw RocketHideout3_h + dw RocketHideout4_h + dw RocketHideoutElevator_h + dw RocketHideoutElevator_h ; unused + dw RocketHideoutElevator_h ; unused + dw RocketHideoutElevator_h ; unused dw $5c80 ; dw SilphCo2_h dw $5eea ; dw SilphCo3_h dw $5e09 ; dw SilphCo4_h diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index c21474f8..d6c6a2c9 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,28 +1,28 @@ Tilesets: ; c558 (3:4558) - dr $c558,$c684 + ; dr $c558,$c684 - ;tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR - ;tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR - ;tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE - ;tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR - ;tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR - ;tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR - ;tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR - ;tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR - ;tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR - ;tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE - ;tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE - ;tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR - ;tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE - ;tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR - ;tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR - ;tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE - ;tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE - ;tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR
\ No newline at end of file + tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR + tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR + tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE + tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR + tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR + tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR + tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR + tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR + tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR + tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE + tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE + tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR + tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE + tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR + tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR + tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE + tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE + tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR |