thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-12 16:24:52 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokered

Browse source
This commit is contained in:
Rangi 2019-07-07 00:44:30 -04:00
parent f99a715fae 8addeffe6f
commit 092be231cc
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/headers/musicheaders3.asm
View file

@ -25,7 +25,7 @@ Music_GameCorner::
Music_IntroBattle:: Music_IntroBattle::
audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3 audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3
; Power Plant, Unknown Dungeon, Rocket HQ ; Power Plant, Cerulean Cave, Rocket HQ
Music_Dungeon1:: Music_Dungeon1::
audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3 audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3

2
constants/hide_show_constants.asm
View file

@ -14,7 +14,7 @@ const_value = 0
const HS_CERULEAN_RIVAL ; 05 const HS_CERULEAN_RIVAL ; 05
const HS_CERULEAN_ROCKET ; 06 const HS_CERULEAN_ROCKET ; 06
const HS_CERULEAN_GUARD_1 ; 07 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_CERULEAN_GUARD_2 ; 09
const HS_SAFFRON_CITY_1 ; 0A const HS_SAFFRON_CITY_1 ; 0A
const HS_SAFFRON_CITY_2 ; 0B const HS_SAFFRON_CITY_2 ; 0B

8
data/hidden_objects.asm
View file

@ -137,8 +137,8 @@ HiddenObjectPointers:
dw SilphCo5FHiddenObjects dw SilphCo5FHiddenObjects
dw SilphCo9FHiddenObjects dw SilphCo9FHiddenObjects
dw CopycatsHouse2FHiddenObjects dw CopycatsHouse2FHiddenObjects
dw UnknownDungeon1HiddenObjects dw CeruleanCave1HiddenObjects
dw UnknownDungeon3HiddenObjects dw CeruleanCave3HiddenObjects
dw PowerPlantHiddenObjects dw PowerPlantHiddenObjects
dw SeafoamIslands3HiddenObjects dw SeafoamIslands3HiddenObjects
dw SeafoamIslands5HiddenObjects dw SeafoamIslands5HiddenObjects
@ -625,11 +625,11 @@ CopycatsHouse2FHiddenObjects:
db $01,$01,NUGGET db $01,$01,NUGGET
dbw BANK(HiddenItems),HiddenItems dbw BANK(HiddenItems),HiddenItems
db $FF db $FF
UnknownDungeon1HiddenObjects: CeruleanCave1HiddenObjects:
db $0b,$0e,RARE_CANDY db $0b,$0e,RARE_CANDY
dbw BANK(HiddenItems),HiddenItems dbw BANK(HiddenItems),HiddenItems
db $FF db $FF
UnknownDungeon3HiddenObjects: CeruleanCave3HiddenObjects:
db $03,$1b,ULTRA_BALL db $03,$1b,ULTRA_BALL
dbw BANK(HiddenItems),HiddenItems dbw BANK(HiddenItems),HiddenItems
db $FF db $FF

0
data/wildPokemon/unknowndungeon1.asm → data/wildPokemon/ceruleancave1.asm Executable file → Normal file
View file

0
data/wildPokemon/unknowndungeon2.asm → data/wildPokemon/ceruleancave2.asm Executable file → Normal file
View file

0
data/wildPokemon/unknowndungeonb1.asm → data/wildPokemon/ceruleancaveb1.asm Executable file → Normal file
View file

6
data/wild_mons.asm
View file

@ -310,9 +310,9 @@ INCLUDE "data/wildPokemon/mansion2.asm"
INCLUDE "data/wildPokemon/mansion3.asm" INCLUDE "data/wildPokemon/mansion3.asm"
INCLUDE "data/wildPokemon/mansionb1.asm" INCLUDE "data/wildPokemon/mansionb1.asm"
INCLUDE "data/wildPokemon/route21.asm" INCLUDE "data/wildPokemon/route21.asm"
INCLUDE "data/wildPokemon/unknowndungeon1.asm" INCLUDE "data/wildPokemon/ceruleancave1.asm"
INCLUDE "data/wildPokemon/unknowndungeon2.asm" INCLUDE "data/wildPokemon/ceruleancave2.asm"
INCLUDE "data/wildPokemon/unknowndungeonb1.asm" INCLUDE "data/wildPokemon/ceruleancaveb1.asm"
INCLUDE "data/wildPokemon/powerplant.asm" INCLUDE "data/wildPokemon/powerplant.asm"
INCLUDE "data/wildPokemon/route23.asm" INCLUDE "data/wildPokemon/route23.asm"
INCLUDE "data/wildPokemon/victoryroad2.asm" INCLUDE "data/wildPokemon/victoryroad2.asm"

4
engine/menu/bills_pc.asm
View file

@ -106,7 +106,7 @@ BillsPC_::
bit 3, a ; accessing Bill's PC through another PC? bit 3, a ; accessing Bill's PC through another PC?
jr nz, BillsPCMenu jr nz, BillsPCMenu
; accessing it directly ; accessing it directly
ld a, $99 ld a, SFX_TURN_ON_PC
call PlaySound call PlaySound
ld hl, SwitchOnText ld hl, SwitchOnText
call PrintText call PrintText
@ -191,7 +191,7 @@ ExitBillsPC:
jr nz, .next jr nz, .next
; accessing it directly ; accessing it directly
call LoadTextBoxTilePatterns call LoadTextBoxTilePatterns
ld a, $9a ld a, SFX_TURN_OFF_PC
call PlaySound call PlaySound
call WaitForSoundToFinish call WaitForSoundToFinish
.next .next

2
scripts/HallOfFame.asm
View file

@ -94,7 +94,7 @@ HallofFameRoomScript1:
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, HS_UNKNOWN_DUNGEON_GUY ld a, HS_CERULEAN_CAVE_GUY
ld [wMissableObjectIndex], a ld [wMissableObjectIndex], a
predef HideObject predef HideObject
ld a, $2 ld a, $2