Sync more with pokered

11 files changed, 31 insertions, 31 deletions

diff --git a/data/maps/headers/CeruleanMelaniesHouse.asm b/data/maps/headers/CeruleanMelaniesHouse.asm
new file mode 100755
index 00000000..7d7d2fd7
--- /dev/null
+++ b/data/maps/headers/CeruleanMelaniesHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanMelaniesHouse, CERULEAN_MELANIES_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm
deleted file mode 100755
index 20970b77..00000000
--- a/data/maps/headers/CeruleanTradeHouse.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-
-	map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0
-	end_map_header
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 74251978..39e8cab4 100755
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -65,7 +65,7 @@ MapHSPointers:
 	dw NoHS
 	dw MtMoonB2FHS
 	dw NoHS
-	dw CeruleanTradeHouseHS
+	dw CeruleanMelaniesHouseHS
 	dw NoHS
 	dw NoHS
 	dw NoHS
@@ -330,8 +330,8 @@ ViridianGymHS:
 	db VIRIDIAN_GYM, $0B, SHOW
 Museum1FHS:
 	db MUSEUM_1F, $05, SHOW
-CeruleanTradeHouseHS: ; bulbasaur adoption house
-	db CERULEAN_TRADE_HOUSE, $02, SHOW
+CeruleanMelaniesHouseHS:
+	db CERULEAN_MELANIES_HOUSE, $02, SHOW
 CeruleanCaveHS:
 	db CERULEAN_CAVE_1F, $01, SHOW
 	db CERULEAN_CAVE_1F, $02, SHOW
diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm
index bbc7e13c..f9a107e3 100644
--- a/data/maps/map_header_banks.asm
+++ b/data/maps/map_header_banks.asm
@@ -63,7 +63,7 @@ MapHeaderBanks::
 	db BANK(MtMoonB1F_h)
 	db BANK(MtMoonB2F_h)
 	db BANK(CeruleanTrashedHouse_h)
-	db BANK(CeruleanTradeHouse_h)
+	db BANK(CeruleanMelaniesHouse_h)
 	db BANK(CeruleanPokecenter_h)
 	db BANK(CeruleanGym_h)
 	db BANK(BikeShop_h)
diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm
index 25a814cf..cf02e5cc 100644
--- a/data/maps/map_header_pointers.asm
+++ b/data/maps/map_header_pointers.asm
@@ -63,7 +63,7 @@ MapHeaderPointers::
 	dw MtMoonB1F_h
 	dw MtMoonB2F_h
 	dw CeruleanTrashedHouse_h
-	dw CeruleanTradeHouse_h
+	dw CeruleanMelaniesHouse_h
 	dw CeruleanPokecenter_h
 	dw CeruleanGym_h
 	dw BikeShop_h
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index fae56fc1..2d155e25 100755
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -3,7 +3,7 @@ CeruleanCity_Object:
 
 	def_warps
 	warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
-	warp 13, 15, 0, CERULEAN_TRADE_HOUSE
+	warp 13, 15, 0, CERULEAN_MELANIES_HOUSE
 	warp 19, 17, 0, CERULEAN_POKECENTER
 	warp 30, 19, 0, CERULEAN_GYM
 	warp 13, 25, 0, BIKE_SHOP
diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanMelaniesHouse.asm
index a52548fe..cbd25533 100755
--- a/data/maps/objects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanMelaniesHouse.asm
@@ -1,4 +1,4 @@
-CeruleanTradeHouse_Object:
+CeruleanMelaniesHouse_Object:
 	db $a ; border block
 
 	def_warps
@@ -13,4 +13,4 @@ CeruleanTradeHouse_Object:
 	object SPRITE_ODDISH, 1, 4, STAY, NONE, 3 ; person
 	object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person
 
-	def_warps_to CERULEAN_TRADE_HOUSE
+	def_warps_to CERULEAN_MELANIES_HOUSE
diff --git a/data/maps/songs.asm b/data/maps/songs.asm
index afafe3b3..4305fc2f 100644
--- a/data/maps/songs.asm
+++ b/data/maps/songs.asm
@@ -62,7 +62,7 @@ MapSongBanks::
 	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F
 	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_MELANIES_HOUSE
 	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER
 	db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP
diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm
index a0582416..161ad9fe 100755
--- a/data/sgb/sgb_packets.asm
+++ b/data/sgb/sgb_packets.asm
@@ -86,9 +86,9 @@ BlkPacket_Slots:
 
 BlkPacket_Titlescreen:
 	ATTR_BLK 3
-	ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07
-	ATTR_BLK_DATA %011, 2,2,0, 00,08, 19,17
-	ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08
+	ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo, version text: pal 0
+	ATTR_BLK_DATA %011, 2,2,0, 00,08, 19,17 ; pikachu, copyright text: pal 2
+	ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08 ; pika bubble: pal 0
 	ds 12, 0
 
 BlkPacket_NidorinoIntro:
@@ -111,16 +111,16 @@ BlkPacket_PartyMenu:
 
 BlkPacket_TrainerCard:
 	ATTR_BLK 10
-	ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13
-	ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13
-	ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13
-	ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12
-	ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,13
-	ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,13
-	ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16
-	ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16
-	ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16
-	ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16
+	ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge
+	ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge
+	ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 ; Thunder Badge
+	ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 ; Rainbow Badge
+	ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,13 ; Rainbow Badge
+	ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,13 ; Rainbow Badge
+	ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 ; Soul Badge
+	ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 ; Marsh Badge
+	ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 ; Volcano Badge
+	ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 ; Earth Badge
 	ds 2, 0
 
 BlkPacket_GameFreakIntro:
@@ -181,7 +181,7 @@ DataSnd_728b1:
 	db  $E0                 ; cpx #$8c (1)
 
 DataSnd_728c1:
-	DATA_SND $847, $0, 11 ; 728c1 (1c:68c1)
+	DATA_SND $847, $0, 11
 	db  $C4                 ; cmp #$c4 (2)
 	db  $D0, $16            ; bne +$16
 	db  $A5                 ; lda dp
@@ -191,7 +191,7 @@ DataSnd_728c1:
 	db  $A2, $28            ; ldx #$28
 
 DataSnd_728d1:
-	DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1)
+	DATA_SND $83c, $0, 11
 	db  $F0, $12            ; beq +$12
 	db  $A5                 ; lda dp
 	db  $C9, $C9            ; cmp #$c9
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index f1e5b68d..1616a34e 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -933,7 +933,7 @@ _UseNextMonText::
 	text "Use next #MON?"
 	done
 
-_Sony1WinText::
+_Rival1WinText::
 	text "<RIVAL>: Yeah! Am"
 	line "I great or what?"
 	prompt
diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm
index 9008be86..a3c7a657 100644
--- a/data/trainers/ai_pointers.asm
+++ b/data/trainers/ai_pointers.asm
@@ -27,7 +27,7 @@ TrainerAIPointers:
 	dbw 3, GenericAI
 	dbw 3, GenericAI
 	dbw 2, BlackbeltAI ; blackbelt
-	dbw 3, GenericAI
+	dbw 3, GenericAI ; rival1
 	dbw 3, GenericAI
 	dbw 1, GenericAI ; chief
 	dbw 3, GenericAI
@@ -44,8 +44,8 @@ TrainerAIPointers:
 	dbw 2, BlaineAI ; blaine
 	dbw 1, SabrinaAI ; sabrina
 	dbw 3, GenericAI
-	dbw 1, Sony2AI ; sony2
-	dbw 1, Sony3AI ; sony3
+	dbw 1, Rival2AI ; rival2
+	dbw 1, Rival3AI ; rival3
 	dbw 2, LoreleiAI ; lorelei
 	dbw 3, GenericAI
 	dbw 2, AgathaAI ; agatha