summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/fuchsiagym.asm2
-rw-r--r--data/map_header_banks.asm8
-rw-r--r--data/map_header_pointers.asm8
3 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm
index ded17031..c7fc3799 100755
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/fuchsiagym.asm
@@ -8,7 +8,7 @@ FuchsiaGymObject: ; 0x75658 (size=82)
db $0 ; signs
db $8 ; objects
- object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1
+ object SPRITE_LAPRAS_GIVER, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1
object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7
object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3
object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 83716936..4ae6db8a 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -155,10 +155,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(FuchsiaMart_h)
db BANK(FuchsiaHouse1_h)
db BANK(FuchsiaPokecenter_h)
- db $1d ; db BANK(FuchsiaHouse2_h)
- db $1d ; db BANK(SafariZoneEntrance_h)
- db $1d ; db BANK(FuchsiaGym_h)
- db $1d ; db BANK(FuchsiaMeetingRoom_h)
+ db BANK(FuchsiaHouse2_h)
+ db BANK(SafariZoneEntrance_h)
+ db BANK(FuchsiaGym_h)
+ db BANK(FuchsiaMeetingRoom_h)
db $11 ; db BANK(SeafoamIslands2_h)
db $11 ; db BANK(SeafoamIslands3_h)
db $11 ; db BANK(SeafoamIslands4_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 866ccb8a..f1ca177b 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -155,10 +155,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw FuchsiaMart_h
dw FuchsiaHouse1_h
dw FuchsiaPokecenter_h
- dw $4902 ; dw FuchsiaHouse2_h
- dw $4a1a ; dw SafariZoneEntrance_h
- dw $4bd9 ; dw FuchsiaGym_h
- dw $4e7f ; dw FuchsiaMeetingRoom_h
+ dw FuchsiaHouse2_h
+ dw SafariZoneEntrance_h
+ dw FuchsiaGym_h
+ dw FuchsiaMeetingRoom_h
dw $6578 ; dw SeafoamIslands2_h
dw $66b4 ; dw SeafoamIslands3_h ;id=160
dw $67f0 ; dw SeafoamIslands4_h