From df2a68d6de7a57aeae782efc7755abbcfb8005d6 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Mon, 8 Apr 2019 18:47:31 +0100 Subject: Replace the few instances of Unknown Dungeon with Cerulean Cave --- audio/headers/musicheaders3.asm | 2 +- constants/hide_show_constants.asm | 2 +- data/hidden_objects.asm | 8 ++++---- data/wildPokemon/ceruleancave1.asm | 18 ++++++++++++++++++ data/wildPokemon/ceruleancave2.asm | 13 +++++++++++++ data/wildPokemon/ceruleancaveb1.asm | 18 ++++++++++++++++++ data/wildPokemon/unknowndungeon1.asm | 18 ------------------ data/wildPokemon/unknowndungeon2.asm | 13 ------------- data/wildPokemon/unknowndungeonb1.asm | 18 ------------------ data/wild_mons.asm | 6 +++--- scripts/HallOfFame.asm | 2 +- 11 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 data/wildPokemon/ceruleancave1.asm create mode 100644 data/wildPokemon/ceruleancave2.asm create mode 100644 data/wildPokemon/ceruleancaveb1.asm delete mode 100755 data/wildPokemon/unknowndungeon1.asm delete mode 100755 data/wildPokemon/unknowndungeon2.asm delete mode 100755 data/wildPokemon/unknowndungeonb1.asm diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 90798882..03dd7777 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -25,7 +25,7 @@ Music_GameCorner:: 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 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index d2077629..805d16ec 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -14,7 +14,7 @@ const_value = 0 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 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index b1bfd844..737947a7 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -137,8 +137,8 @@ HiddenObjectPointers: dw SilphCo5FHiddenObjects dw SilphCo9FHiddenObjects dw CopycatsHouse2FHiddenObjects - dw UnknownDungeon1HiddenObjects - dw UnknownDungeon3HiddenObjects + dw CeruleanCave1HiddenObjects + dw CeruleanCave3HiddenObjects dw PowerPlantHiddenObjects dw SeafoamIslands3HiddenObjects dw SeafoamIslands5HiddenObjects @@ -625,11 +625,11 @@ CopycatsHouse2FHiddenObjects: 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 diff --git a/data/wildPokemon/ceruleancave1.asm b/data/wildPokemon/ceruleancave1.asm new file mode 100644 index 00000000..20e8643a --- /dev/null +++ b/data/wildPokemon/ceruleancave1.asm @@ -0,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 diff --git a/data/wildPokemon/ceruleancave2.asm b/data/wildPokemon/ceruleancave2.asm new file mode 100644 index 00000000..5afe55ac --- /dev/null +++ b/data/wildPokemon/ceruleancave2.asm @@ -0,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 diff --git a/data/wildPokemon/ceruleancaveb1.asm b/data/wildPokemon/ceruleancaveb1.asm new file mode 100644 index 00000000..245d5912 --- /dev/null +++ b/data/wildPokemon/ceruleancaveb1.asm @@ -0,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 diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm deleted file mode 100755 index 20e8643a..00000000 --- a/data/wildPokemon/unknowndungeon1.asm +++ /dev/null @@ -1,18 +0,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 diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm deleted file mode 100755 index 5afe55ac..00000000 --- a/data/wildPokemon/unknowndungeon2.asm +++ /dev/null @@ -1,13 +0,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 diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm deleted file mode 100755 index 245d5912..00000000 --- a/data/wildPokemon/unknowndungeonb1.asm +++ /dev/null @@ -1,18 +0,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 diff --git a/data/wild_mons.asm b/data/wild_mons.asm index a2c9d6b2..e089a582 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -310,9 +310,9 @@ INCLUDE "data/wildPokemon/mansion2.asm" 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" diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 511c9754..af424089 100755 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -94,7 +94,7 @@ HallofFameRoomScript1: 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 -- cgit v1.2.3