diff options
author | SatoMew <SatoMew@users.noreply.github.com> | 2019-04-08 18:47:31 +0100 |
---|---|---|
committer | SatoMew <SatoMew@users.noreply.github.com> | 2019-04-08 18:47:31 +0100 |
commit | df2a68d6de7a57aeae782efc7755abbcfb8005d6 (patch) | |
tree | bf0058d6fe559328d01c12dff76af9b21a759244 | |
parent | 725b86ebbec23bd1f53fd60bf0201c904fee951d (diff) |
Replace the few instances of Unknown Dungeon with Cerulean Cave
-rwxr-xr-x | audio/headers/musicheaders3.asm | 2 | ||||
-rwxr-xr-x | constants/hide_show_constants.asm | 2 | ||||
-rwxr-xr-x | data/hidden_objects.asm | 8 | ||||
-rw-r--r--[-rwxr-xr-x] | data/wildPokemon/ceruleancave1.asm (renamed from data/wildPokemon/unknowndungeon1.asm) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | data/wildPokemon/ceruleancave2.asm (renamed from data/wildPokemon/unknowndungeon2.asm) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | data/wildPokemon/ceruleancaveb1.asm (renamed from data/wildPokemon/unknowndungeonb1.asm) | 0 | ||||
-rwxr-xr-x | data/wild_mons.asm | 6 | ||||
-rwxr-xr-x | scripts/HallOfFame.asm | 2 |
8 files changed, 10 insertions, 10 deletions
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/unknowndungeon1.asm b/data/wildPokemon/ceruleancave1.asm index 20e8643a..20e8643a 100755..100644 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/ceruleancave1.asm diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/ceruleancave2.asm index 5afe55ac..5afe55ac 100755..100644 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/ceruleancave2.asm diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/ceruleancaveb1.asm index 245d5912..245d5912 100755..100644 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/ceruleancaveb1.asm 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 |