Merge pull request #11 from PikalaxALT/master

MILESTONE: Finish disassembly

8 files changed, 166 insertions, 102 deletions

diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm
index 8cba618e..bae7eda5 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -9,12 +9,13 @@ SilphCo11Object: ; 0x62380 (size=72)
 
 	db $0 ; signs
 
-	db $5 ; objects
+	db $6 ; objects
 	object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person
 	object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person
 	object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2
-	object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29
+	object SPRITE_JAMES, $2, $8, STAY, UP, $4
 	object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28
+	object SPRITE_JESSIE, $3, $8, STAY, UP, $6
 
 	; warp-to
 	EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F
diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm
index c55711b4..0635e9a7 100755
--- a/data/mapObjects/unknowndungeon1.asm
+++ b/data/mapObjects/unknowndungeon1.asm
@@ -14,10 +14,11 @@ UnknownDungeon1Object: ; 0x74d15 (size=97)
 
 	db $0 ; signs
 
-	db $3 ; objects
-	object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE
-	object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER
-	object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET
+	db $4 ; objects
+	object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY
+	object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER
+	object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE
+	object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL
 
 	; warp-to
 	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18
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 04bee42f..eef36242 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -207,36 +207,36 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $01 ; unused
 	db $01 ; unused
 	db $01 ; unused
-	db $16 ; db BANK(SilphCo2_h)
-	db $16 ; db BANK(SilphCo3_h)
-	db $06 ; db BANK(SilphCo4_h)
-	db $06 ; db BANK(SilphCo5_h)
-	db $06 ; db BANK(SilphCo6_h)
-	db $14 ; db BANK(SilphCo7_h)
-	db $15 ; db BANK(SilphCo8_h)
-	db $14 ; db BANK(Mansion2_h)
-	db $14 ; db BANK(Mansion3_h)
-	db $14 ; db BANK(Mansion4_h)
-	db $11 ; db BANK(SafariZoneEast_h)
-	db $11 ; db BANK(SafariZoneNorth_h)
-	db $12 ; db BANK(SafariZoneWest_h)
-	db $11 ; db BANK(SafariZoneCenter_h)
-	db $11 ; 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 $1d ; db BANK(UnknownDungeon1_h)
-	db $07 ; db BANK(NameRater_h)
-	db $1d ; db BANK(CeruleanHouse2_h)
+	db BANK(SilphCo2_h)
+	db BANK(SilphCo3_h)
+	db BANK(SilphCo4_h)
+	db BANK(SilphCo5_h)
+	db BANK(SilphCo6_h)
+	db BANK(SilphCo7_h)
+	db BANK(SilphCo8_h)
+	db BANK(Mansion2_h)
+	db BANK(Mansion3_h)
+	db BANK(Mansion4_h)
+	db BANK(SafariZoneEast_h)
+	db BANK(SafariZoneNorth_h)
+	db BANK(SafariZoneWest_h)
+	db BANK(SafariZoneCenter_h)
+	db BANK(SafariZoneRestHouse1_h)
+	db BANK(SafariZoneSecretHouse_h)
+	db BANK(SafariZoneRestHouse2_h)
+	db BANK(SafariZoneRestHouse3_h)
+	db BANK(SafariZoneRestHouse4_h)
+	db BANK(UnknownDungeon2_h)
+	db BANK(UnknownDungeon3_h)
+	db BANK(UnknownDungeon1_h)
+	db BANK(NameRater_h)
+	db BANK(CeruleanHouse2_h)
 	db $01 ; unused
-	db $11 ; db BANK(RockTunnel2_h)
-	db $17 ; db BANK(SilphCo9_h)
-	db $16 ; db BANK(SilphCo10_h)
-	db $18 ; db BANK(SilphCo11_h)
-	db $11 ; db BANK(SilphCoElevator_h)
+	db BANK(RockTunnel2_h)
+	db BANK(SilphCo9_h)
+	db BANK(SilphCo10_h)
+	db BANK(SilphCo11_h)
+	db BANK(SilphCoElevator_h)
 	db $11 ; unused
 	db $11 ; unused
 	db BANK(TradeCenter_h)
@@ -245,7 +245,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $11 ; unused
 	db $11 ; unused
 	db $11 ; unused
-	db $1d ; db BANK(Lorelei_h)
-	db $1d ; db BANK(Bruno_h)
-	db $1d ; db BANK(Agatha_h)
+	db BANK(Lorelei_h)
+	db BANK(Bruno_h)
+	db BANK(Agatha_h)
 	db BANK(BeachHouse_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 501724af..730038f3 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -207,45 +207,45 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	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
-	dw $6035 ; dw SilphCo5_h ;210
-	dw $62a7 ; dw SilphCo6_h
-	dw $5b97 ; dw SilphCo7_h
-	dw $652a ; dw SilphCo8_h
-	dw $5ff5 ; dw Mansion2_h
-	dw $620b ; dw Mansion3_h
-	dw $63d6 ; dw Mansion4_h
-	dw $5ab3 ; dw SafariZoneEast_h
-	dw $5bf3 ; dw SafariZoneNorth_h
-	dw $635a ; dw SafariZoneWest_h
-	dw $5dfa ; dw SafariZoneCenter_h ;220
-	dw $5f35 ; 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 $453d ; dw UnknownDungeon1_h
-	dw $530e ; dw NameRater_h
-	dw $4643 ; dw CeruleanHouse2_h
-	dw $5649 ; dw Route16Gate_h ; unused
-	dw $624e ; dw RockTunnel2_h
-	dw $56ba ; dw SilphCo9_h
-	dw $60c8 ; dw SilphCo10_h
-	dw $6105 ; dw SilphCo11_h
-	dw $5a08 ; dw SilphCoElevator_h
-	dw $5c80 ; dw SilphCo2_h ; unused
-	dw $5c80 ; dw SilphCo2_h ; unused
+	dw SilphCo2_h
+	dw SilphCo3_h
+	dw SilphCo4_h
+	dw SilphCo5_h ;210
+	dw SilphCo6_h
+	dw SilphCo7_h
+	dw SilphCo8_h
+	dw Mansion2_h
+	dw Mansion3_h
+	dw Mansion4_h
+	dw SafariZoneEast_h
+	dw SafariZoneNorth_h
+	dw SafariZoneWest_h
+	dw SafariZoneCenter_h ;220
+	dw SafariZoneRestHouse1_h
+	dw SafariZoneSecretHouse_h
+	dw SafariZoneRestHouse2_h
+	dw SafariZoneRestHouse3_h
+	dw SafariZoneRestHouse4_h
+	dw UnknownDungeon2_h
+	dw UnknownDungeon3_h
+	dw UnknownDungeon1_h
+	dw NameRater_h
+	dw CeruleanHouse2_h
+	dw Route16Gate_h ; unused
+	dw RockTunnel2_h
+	dw SilphCo9_h
+	dw SilphCo10_h
+	dw SilphCo11_h
+	dw SilphCoElevator_h
+	dw SilphCo2_h ; unused
+	dw SilphCo2_h ; unused
 	dw TradeCenter_h
 	dw Colosseum_h
-	dw $5c80 ; dw SilphCo2_h ; unused
-	dw $5c80 ; dw SilphCo2_h ; unused
-	dw $5c80 ; dw SilphCo2_h ; unused
-	dw $5c80 ; dw SilphCo2_h ; unused
-	dw $59ef ; dw Lorelei_h
-	dw $5b4a ; dw Bruno_h
-	dw $5ca1 ; dw Agatha_h ;247
+	dw SilphCo2_h ; unused
+	dw SilphCo2_h ; unused
+	dw SilphCo2_h ; unused
+	dw SilphCo2_h ; unused
+	dw Lorelei_h
+	dw Bruno_h
+	dw Agatha_h ;247
 	dw BeachHouse_h
diff --git a/data/sgb_border.asm b/data/sgb_border.asm
index 401a55e9..694f97b6 100755
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,29 +1,87 @@
 BorderPalettes: ; 72c39 (1c:6c39)
-	dr $72c39,$734b9
-	;INCBIN "gfx/tilemaps/sgbborder.map"
+	INCBIN "gfx/tilemaps/sgbborder.map"
 
-	;ds $100
+	ds $100
 
-	;RGB 30,29,29 ; PAL_SGB1
-	;RGB 25,22,25
-	;RGB 25,17,21
-	;RGB 24,14,12
+	RGB 24,  6,  6
+	RGB 31, 25,  9
+	RGB 25, 10, 10
+	RGB  0,  0,  0
 
-	;ds $18
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
 
-	;RGB 30,29,29 ; PAL_SGB2
-	;RGB 22,31,16
-	;RGB 27,20,6
-	;RGB 15,15,15
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
 
-	;ds $18
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
 
-	;RGB 30,29,29 ; PAL_SGB3
-	;RGB 31,31,17
-	;RGB 18,21,29
-	;RGB 15,15,15
+	RGB 18, 24, 18
+	RGB 25, 10, 10
+	RGB 15, 25, 15
+	RGB  0,  0,  0
 
-	;ds $18
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 18,  6, 31
+	RGB 31, 25,  9
+	RGB 15, 25, 15
+	RGB  0,  0,  0
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 12, 31,  6
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
+	RGB 31, 31, 25
 
 SGBBorderGraphics: ; 734b9 (1c:74b9)
 	INCBIN "gfx/pokemon_yellow.t6.2bpp"
diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm
index 865f14d8..5223f435 100755
--- a/data/town_map_entries.asm
+++ b/data/town_map_entries.asm
@@ -98,4 +98,5 @@ InternalMapEntries: ; 7140b (1c:540b)
 	IMAP ROCK_TUNNEL_2,             $E,$3,RockTunnelName
 	IMAP SILPH_CO_ELEVATOR,         $A,$5,SilphCoName
 	IMAP AGATHAS_ROOM,              $0,$2,PokemonLeagueName
+	IMAP BEACH_HOUSE,               $6,$F,Route19Name
 	db $FF