diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 11:38:27 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 11:38:27 -0400 |
commit | c104a1481ae0db0f4f3f3b730ffa4e34274d0cdb (patch) | |
tree | e5cf5f273c248ea5f69c6e0bc93ef4f51d9b0115 /data | |
parent | 9a815ac80ae7b31ca21c6f17e7705002f5f2b646 (diff) |
Cinnabar Gym
Diffstat (limited to 'data')
-rwxr-xr-x | data/mapObjects/cinnabargym.asm | 2 | ||||
-rw-r--r-- | data/map_header_banks.asm | 2 | ||||
-rw-r--r-- | data/map_header_pointers.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index d9b69192..2b9f34cb 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -8,7 +8,7 @@ CinnabarGymObject: ; 0x75acc (size=90) db $0 ; signs db $9 ; objects - object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 + object SPRITE_MR_MASTERBALL, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9 object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4 object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 7a6b7cf4..7f48a4cc 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -166,7 +166,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(VermilionHouse2_h) db BANK(FuchsiaHouse3_h) db BANK(Mansion1_h) - db $1d ; db BANK(CinnabarGym_h) + db BANK(CinnabarGym_h) db $1d ; db BANK(Lab1_h) db $1d ; db BANK(Lab2_h) db $1d ; db BANK(Lab3_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index b73fd43c..038a1f0f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -166,7 +166,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw VermilionHouse2_h dw FuchsiaHouse3_h dw Mansion1_h - dw $4ee6 ; dw CinnabarGym_h + dw CinnabarGym_h dw $53fb ; dw Lab1_h dw $5490 ; dw Lab2_h dw $54f6 ; dw Lab3_h |