summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-02 14:19:19 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-02 14:19:19 -0400
commitf963d9019a6e728c7293783ca8ee6e10dd6c8876 (patch)
treebed667d85b9229b9c6781d56140ef968e7a052e9 /data
parent564b0c65f3d4b2da54c598457fbb9152b18d97e5 (diff)
Saffron Gym
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/saffrongym.asm2
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm
index 63676905..20d91991 100755
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/saffrongym.asm
@@ -38,7 +38,7 @@ SaffronGymObject: ; 0x5d259 (size=330)
db $0 ; signs
db $9 ; objects
- object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1
+ object SPRITE_LASS, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1
object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, OPP_CHANNELER, $16
object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, OPP_PSYCHIC_TR, $1
object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, OPP_CHANNELER, $17
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 026ae661..abd68b70 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -178,7 +178,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(CopycatsHouse1F_h)
db BANK(CopycatsHouse2F_h)
db BANK(FightingDojo_h)
- db $17 ; db BANK(SaffronGym_h)
+ db BANK(SaffronGym_h)
db $07 ; db BANK(SaffronHouse1_h)
db $17 ; db BANK(SaffronMart_h)
db $17 ; db BANK(SilphCo1_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 66f99bdf..0b85ed42 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -178,7 +178,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw CopycatsHouse1F_h
dw CopycatsHouse2F_h
dw FightingDojo_h
- dw $4ef7 ; dw SaffronGym_h
+ dw SaffronGym_h
dw $56db ; dw SaffronHouse1_h
dw $52f3 ; dw SaffronMart_h ;id=180
dw $5338 ; dw SilphCo1_h