shithub: pokered

Download patch

ref: 8addeffe6fb5012113e695b17680734933076e8e
parent: a8133da3ee11a2f52e1b18170189260872f6bc7e
parent: df2a68d6de7a57aeae782efc7755abbcfb8005d6
author: Daniel Harding <33dannye@gmail.com>
date: Mon May 20 19:27:35 EDT 2019

Merge pull request #201 from SatoMew/master

Make Cerulean Cave labels consistent throughout the project

--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -25,7 +25,7 @@
 Music_IntroBattle::
 	audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3
 
-; Power Plant, Unknown Dungeon, Rocket HQ
+; Power Plant, Cerulean Cave, Rocket HQ
 Music_Dungeon1::
 	audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3
 
--- a/constants/hide_show_constants.asm
+++ b/constants/hide_show_constants.asm
@@ -14,7 +14,7 @@
 	const HS_CERULEAN_RIVAL                ; 05
 	const HS_CERULEAN_ROCKET               ; 06
 	const HS_CERULEAN_GUARD_1              ; 07
-	const HS_UNKNOWN_DUNGEON_GUY           ; 08
+	const HS_CERULEAN_CAVE_GUY             ; 08
 	const HS_CERULEAN_GUARD_2              ; 09
 	const HS_SAFFRON_CITY_1                ; 0A
 	const HS_SAFFRON_CITY_2                ; 0B
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -137,8 +137,8 @@
 	dw SilphCo5FHiddenObjects
 	dw SilphCo9FHiddenObjects
 	dw CopycatsHouse2FHiddenObjects
-	dw UnknownDungeon1HiddenObjects
-	dw UnknownDungeon3HiddenObjects
+	dw CeruleanCave1HiddenObjects
+	dw CeruleanCave3HiddenObjects
 	dw PowerPlantHiddenObjects
 	dw SeafoamIslands3HiddenObjects
 	dw SeafoamIslands5HiddenObjects
@@ -625,11 +625,11 @@
 	db $01,$01,NUGGET
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-UnknownDungeon1HiddenObjects:
+CeruleanCave1HiddenObjects:
 	db $0b,$0e,RARE_CANDY
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-UnknownDungeon3HiddenObjects:
+CeruleanCave3HiddenObjects:
 	db $03,$1b,ULTRA_BALL
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
--- /dev/null
+++ b/data/wildPokemon/ceruleancave1.asm
@@ -1,0 +1,18 @@
+DungeonMons1:
+	db $0A
+	db 46,GOLBAT
+	db 46,HYPNO
+	db 46,MAGNETON
+	db 49,DODRIO
+	db 49,VENOMOTH
+	IF DEF(_RED)
+		db 52,ARBOK
+	ENDC
+	IF DEF(_BLUE)
+		db 52,SANDSLASH
+	ENDC
+	db 49,KADABRA
+	db 52,PARASECT
+	db 53,RAICHU
+	db 53,DITTO
+	db $00
--- /dev/null
+++ b/data/wildPokemon/ceruleancave2.asm
@@ -1,0 +1,13 @@
+DungeonMons2:
+	db $0F
+	db 51,DODRIO
+	db 51,VENOMOTH
+	db 51,KADABRA
+	db 52,RHYDON
+	db 52,MAROWAK
+	db 52,ELECTRODE
+	db 56,CHANSEY
+	db 54,WIGGLYTUFF
+	db 55,DITTO
+	db 60,DITTO
+	db $00
--- /dev/null
+++ b/data/wildPokemon/ceruleancaveb1.asm
@@ -1,0 +1,18 @@
+DungeonMonsB1:
+	db $19
+	db 55,RHYDON
+	db 55,MAROWAK
+	db 55,ELECTRODE
+	db 64,CHANSEY
+	db 64,PARASECT
+	db 64,RAICHU
+	IF DEF(_RED)
+		db 57,ARBOK
+	ENDC
+	IF DEF(_BLUE)
+		db 57,SANDSLASH
+	ENDC
+	db 65,DITTO
+	db 63,DITTO
+	db 67,DITTO
+	db $00
--- a/data/wildPokemon/unknowndungeon1.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-DungeonMons1:
-	db $0A
-	db 46,GOLBAT
-	db 46,HYPNO
-	db 46,MAGNETON
-	db 49,DODRIO
-	db 49,VENOMOTH
-	IF DEF(_RED)
-		db 52,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 52,SANDSLASH
-	ENDC
-	db 49,KADABRA
-	db 52,PARASECT
-	db 53,RAICHU
-	db 53,DITTO
-	db $00
--- a/data/wildPokemon/unknowndungeon2.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-DungeonMons2:
-	db $0F
-	db 51,DODRIO
-	db 51,VENOMOTH
-	db 51,KADABRA
-	db 52,RHYDON
-	db 52,MAROWAK
-	db 52,ELECTRODE
-	db 56,CHANSEY
-	db 54,WIGGLYTUFF
-	db 55,DITTO
-	db 60,DITTO
-	db $00
--- a/data/wildPokemon/unknowndungeonb1.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-DungeonMonsB1:
-	db $19
-	db 55,RHYDON
-	db 55,MAROWAK
-	db 55,ELECTRODE
-	db 64,CHANSEY
-	db 64,PARASECT
-	db 64,RAICHU
-	IF DEF(_RED)
-		db 57,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 57,SANDSLASH
-	ENDC
-	db 65,DITTO
-	db 63,DITTO
-	db 67,DITTO
-	db $00
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -310,9 +310,9 @@
 INCLUDE "data/wildPokemon/mansion3.asm"
 INCLUDE "data/wildPokemon/mansionb1.asm"
 INCLUDE "data/wildPokemon/route21.asm"
-INCLUDE "data/wildPokemon/unknowndungeon1.asm"
-INCLUDE "data/wildPokemon/unknowndungeon2.asm"
-INCLUDE "data/wildPokemon/unknowndungeonb1.asm"
+INCLUDE "data/wildPokemon/ceruleancave1.asm"
+INCLUDE "data/wildPokemon/ceruleancave2.asm"
+INCLUDE "data/wildPokemon/ceruleancaveb1.asm"
 INCLUDE "data/wildPokemon/powerplant.asm"
 INCLUDE "data/wildPokemon/route23.asm"
 INCLUDE "data/wildPokemon/victoryroad2.asm"
--- a/scripts/HallOfFame.asm
+++ b/scripts/HallOfFame.asm
@@ -94,7 +94,7 @@
 	call DisplayTextID
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld a, HS_UNKNOWN_DUNGEON_GUY
+	ld a, HS_CERULEAN_CAVE_GUY
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, $2