summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdata/mapObjects/unknowndungeon2.asm9
-rwxr-xr-xdata/mapObjects/unknowndungeon3.asm8
-rw-r--r--data/map_header_banks.asm20
-rw-r--r--data/map_header_pointers.asm22
-rwxr-xr-xmain.asm57
-rw-r--r--maps/unknowndungeon1.blk5
-rw-r--r--maps/unknowndungeon2.blk10
-rw-r--r--maps/unknowndungeon3.blk3
-rwxr-xr-xscripts/unknowndungeon2.asm1
-rwxr-xr-xscripts/unknowndungeon3.asm2
10 files changed, 101 insertions, 36 deletions
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm
index e5ebca56..88cc6ba0 100755
--- a/data/mapObjects/unknowndungeon2.asm
+++ b/data/mapObjects/unknowndungeon2.asm
@@ -11,10 +11,11 @@ UnknownDungeon2Object: ; 0x45e14 (size=73)
db $0 ; signs
- db $3 ; objects
- object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP
- object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL
- object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE
+ db $4 ; objects
+ object SPRITE_BALL, $0, $b, STAY, NONE, $1, RARE_CANDY
+ object SPRITE_BALL, $10, $7, STAY, NONE, $2, ULTRA_BALL
+ object SPRITE_BALL, $13, $b, STAY, NONE, $3, MAX_REVIVE
+ object SPRITE_BALL, $1b, $9, STAY, NONE, $4, FULL_RESTORE
; warp-to
EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1
diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm
index 8b733e6b..cb2d8f83 100755
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/unknowndungeon3.asm
@@ -6,10 +6,12 @@ UnknownDungeon3Object: ; 0x45f36 (size=34)
db $0 ; signs
- db $3 ; objects
+ db $5 ; objects
object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70
- object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL
- object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE
+ object SPRITE_BALL, $1a, $1, STAY, NONE, $2, ULTRA_BALL
+ object SPRITE_BALL, $2, $d, STAY, NONE, $3, ULTRA_BALL
+ object SPRITE_BALL, $3, $d, STAY, NONE, $4, MAX_REVIVE
+ object SPRITE_BALL, $f, $3, STAY, NONE, $5, MAX_ELIXER
; warp-to
EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 728b8675..ab536b39 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -217,22 +217,22 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(Mansion2_h)
db BANK(Mansion3_h)
db BANK(Mansion4_h)
- db $11 ; db BANK(SafariZoneEast_h)
- db $11 ; db BANK(SafariZoneNorth_h)
+ db BANK(SafariZoneEast_h)
+ db BANK(SafariZoneNorth_h)
db $12 ; db BANK(SafariZoneWest_h)
- db $11 ; db BANK(SafariZoneCenter_h)
- db $11 ; db BANK(SafariZoneRestHouse1_h)
+ db BANK(SafariZoneCenter_h)
+ db BANK(SafariZoneRestHouse1_h)
db $12 ; db BANK(SafariZoneSecretHouse_h)
- db $11 ; db BANK(SafariZoneRestHouse2_h)
- db $11 ; db BANK(SafariZoneRestHouse3_h)
- db $11 ; db BANK(SafariZoneRestHouse4_h)
- db $11 ; db BANK(UnknownDungeon2_h)
- db $11 ; db BANK(UnknownDungeon3_h)
+ db BANK(SafariZoneRestHouse2_h)
+ db BANK(SafariZoneRestHouse3_h)
+ db BANK(SafariZoneRestHouse4_h)
+ db BANK(UnknownDungeon2_h)
+ db BANK(UnknownDungeon3_h)
db $1d ; db BANK(UnknownDungeon1_h)
db BANK(NameRater_h)
db $1d ; db BANK(CeruleanHouse2_h)
db $01 ; unused
- db $11 ; db BANK(RockTunnel2_h)
+ db BANK(RockTunnel2_h)
db BANK(SilphCo9_h)
db BANK(SilphCo10_h)
db $18 ; db BANK(SilphCo11_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 5b224ec3..d476cd56 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -217,22 +217,22 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw Mansion2_h
dw Mansion3_h
dw Mansion4_h
- dw $5ab3 ; dw SafariZoneEast_h
- dw $5bf3 ; dw SafariZoneNorth_h
+ dw SafariZoneEast_h
+ dw SafariZoneNorth_h
dw $635a ; dw SafariZoneWest_h
- dw $5dfa ; dw SafariZoneCenter_h ;220
- dw $5f35 ; dw SafariZoneRestHouse1_h
+ dw SafariZoneCenter_h ;220
+ dw SafariZoneRestHouse1_h
dw $64bc ; dw SafariZoneSecretHouse_h
- dw $5f72 ; dw SafariZoneRestHouse2_h
- dw $5fbd ; dw SafariZoneRestHouse3_h
- dw $6008 ; dw SafariZoneRestHouse4_h
- dw $6053 ; dw UnknownDungeon2_h
- dw $6141 ; dw UnknownDungeon3_h
+ dw SafariZoneRestHouse2_h
+ dw SafariZoneRestHouse3_h
+ dw SafariZoneRestHouse4_h
+ dw UnknownDungeon2_h
+ dw UnknownDungeon3_h
dw $453d ; dw UnknownDungeon1_h
dw NameRater_h
dw $4643 ; dw CeruleanHouse2_h
- dw $5649 ; dw Route16Gate_h ; unused
- dw $624e ; dw RockTunnel2_h
+ dw Route16Gate_h ; unused
+ dw RockTunnel2_h
dw SilphCo9_h
dw SilphCo10_h
dw $6105 ; dw SilphCo11_h
diff --git a/main.asm b/main.asm
index 1aaf8e29..9bf78bc9 100755
--- a/main.asm
+++ b/main.asm
@@ -858,7 +858,10 @@ INCLUDE "data/mapHeaders/lavendertown.asm"
INCLUDE "data/mapObjects/lavendertown.asm"
LavenderTownBlocks: INCBIN "maps/lavendertown.blk"
ViridianPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk"
- dr $440fb,$4410b
+SafariZoneRestHouse1Blocks:
+SafariZoneRestHouse2Blocks:
+SafariZoneRestHouse3Blocks:
+SafariZoneRestHouse4Blocks: INCBIN "maps/safarizoneresthouse1.blk"
INCLUDE "scripts/lavendertown.asm"
@@ -922,7 +925,57 @@ INCLUDE "data/mapHeaders/rockethideoutelevator.asm"
INCLUDE "scripts/rockethideoutelevator.asm"
INCLUDE "data/mapObjects/rockethideoutelevator.asm"
RocketHideoutElevatorBlocks: INCBIN "maps/rockethideoutelevator.blk"
- dr $45a08,$46578
+
+INCLUDE "data/mapHeaders/silphcoelevator.asm"
+INCLUDE "scripts/silphcoelevator.asm"
+INCLUDE "data/mapObjects/silphcoelevator.asm"
+SilphCoElevatorBlocks: INCBIN "maps/silphcoelevator.blk"
+
+INCLUDE "data/mapHeaders/safarizoneeast.asm"
+INCLUDE "scripts/safarizoneeast.asm"
+INCLUDE "data/mapObjects/safarizoneeast.asm"
+SafariZoneEastBlocks: INCBIN "maps/safarizoneeast.blk"
+
+INCLUDE "data/mapHeaders/safarizonenorth.asm"
+INCLUDE "scripts/safarizonenorth.asm"
+INCLUDE "data/mapObjects/safarizonenorth.asm"
+SafariZoneNorthBlocks: INCBIN "maps/safarizonenorth.blk"
+
+INCLUDE "data/mapHeaders/safarizonecenter.asm"
+INCLUDE "scripts/safarizonecenter.asm"
+INCLUDE "data/mapObjects/safarizonecenter.asm"
+SafariZoneCenterBlocks: INCBIN "maps/safarizonecenter.blk"
+
+INCLUDE "data/mapHeaders/safarizoneresthouse1.asm"
+INCLUDE "scripts/safarizoneresthouse1.asm"
+INCLUDE "data/mapObjects/safarizoneresthouse1.asm"
+
+INCLUDE "data/mapHeaders/safarizoneresthouse2.asm"
+INCLUDE "scripts/safarizoneresthouse2.asm"
+INCLUDE "data/mapObjects/safarizoneresthouse2.asm"
+
+INCLUDE "data/mapHeaders/safarizoneresthouse3.asm"
+INCLUDE "scripts/safarizoneresthouse3.asm"
+INCLUDE "data/mapObjects/safarizoneresthouse3.asm"
+
+INCLUDE "data/mapHeaders/safarizoneresthouse4.asm"
+INCLUDE "scripts/safarizoneresthouse4.asm"
+INCLUDE "data/mapObjects/safarizoneresthouse4.asm"
+
+INCLUDE "data/mapHeaders/unknowndungeon2.asm"
+INCLUDE "scripts/unknowndungeon2.asm"
+INCLUDE "data/mapObjects/unknowndungeon2.asm"
+UnknownDungeon2Blocks: INCBIN "maps/unknowndungeon2.blk"
+
+INCLUDE "data/mapHeaders/unknowndungeon3.asm"
+INCLUDE "scripts/unknowndungeon3.asm"
+INCLUDE "data/mapObjects/unknowndungeon3.asm"
+UnknownDungeon3Blocks: INCBIN "maps/unknowndungeon3.blk"
+
+INCLUDE "data/mapHeaders/rocktunnel2.asm"
+INCLUDE "scripts/rocktunnel2.asm"
+INCLUDE "data/mapObjects/rocktunnel2.asm"
+RockTunnel2Blocks: INCBIN "maps/rocktunnel2.blk"
INCLUDE "data/mapHeaders/seafoamislands2.asm"
INCLUDE "scripts/seafoamislands2.asm"
diff --git a/maps/unknowndungeon1.blk b/maps/unknowndungeon1.blk
index 574613af..7cc9d4d5 100644
--- a/maps/unknowndungeon1.blk
+++ b/maps/unknowndungeon1.blk
@@ -1,2 +1,3 @@
- "||b -}f N_vvvvvvvv#vvvvr}|qvv,-Xv=,vtfvvvfvf+}_ "vv-
- } "$ \ No newline at end of file
+ "b ^|bz qmf_fX
+z'n  n>}MMt "__ ">nzr fvvv_r " 
+^t "vv "_ "_Onnvvvvvvvvvvvv$L \ No newline at end of file
diff --git a/maps/unknowndungeon2.blk b/maps/unknowndungeon2.blk
index 6eb27eee..f82b5aed 100644
--- a/maps/unknowndungeon2.blk
+++ b/maps/unknowndungeon2.blk
@@ -1,3 +1,7 @@
-}( ((  
- 
-}( #  (      }    \ No newline at end of file
+  ( ((   }
+   (# }( 
+  }
+}
+
+ 
+  \ No newline at end of file
diff --git a/maps/unknowndungeon3.blk b/maps/unknowndungeon3.blk
index 858f0529..581ade79 100644
--- a/maps/unknowndungeon3.blk
+++ b/maps/unknowndungeon3.blk
@@ -1 +1,2 @@
-,--Nr02a}f D+,v "pfvvv} fXfvv^tvvtvv)   "vvvSvvvv \ No newline at end of file
+  n z " rf- j[o  "nrfaX rO "}
+ Qmn } "__rv "m v}vvv) r "vvQr)Svvvvvvvvvvvvr \ No newline at end of file
diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm
index f3cbb6a5..2bf9fdb4 100755
--- a/scripts/unknowndungeon2.asm
+++ b/scripts/unknowndungeon2.asm
@@ -5,3 +5,4 @@ UnknownDungeon2TextPointers: ; 45e0e (11:5e0e)
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
+ dw PickUpItemText
diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm
index 42459766..265df358 100755
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/unknowndungeon3.asm
@@ -16,6 +16,8 @@ UnknownDungeon3TextPointers: ; 45f09 (11:5f09)
dw UnknownDungeon3Text1
dw PickUpItemText
dw PickUpItemText
+ dw PickUpItemText
+ dw PickUpItemText
UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f)
UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 18:26:11 +0000