mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
Work on the Scarlet Book & Wild Data
* Wild data added to the Mt. Moon Crater * CoolTrainer NPC (young Sada) added to the Pewter Museum of Science. * [EXPERIMENTAL] Added the Scarlet Book to the hidden item list for the Pewter Mueseum of Science. Notes; * This commit will not work without SV Pokemon being implemented. * The Scarlet Book has not been placed correctly. The tileset for the museum doesn't load properly in Polished Map, so I'm kind of stumped. Neither has Sada. Things to do: * Add an NPC to Mt. Moon B2F that blocks off the crater, along with a warp there. NPC should disappear when you have 8 Gym Badges.
This commit is contained in:
parent
255ffaf929
commit
9ed18b1d8f
|
@ -242,6 +242,7 @@ ViridianGymHiddenObjects:
|
||||||
Museum1FHiddenObjects:
|
Museum1FHiddenObjects:
|
||||||
hidden_object 2, 3, SPRITE_FACING_UP, AerodactylFossil
|
hidden_object 2, 3, SPRITE_FACING_UP, AerodactylFossil
|
||||||
hidden_object 2, 6, SPRITE_FACING_UP, KabutopsFossil
|
hidden_object 2, 6, SPRITE_FACING_UP, KabutopsFossil
|
||||||
|
hidden_object 3, 3, SPRITE_FACING_UP, ScarletBook
|
||||||
db -1 ; end
|
db -1 ; end
|
||||||
|
|
||||||
PewterGymHiddenObjects:
|
PewterGymHiddenObjects:
|
||||||
|
|
|
@ -16,5 +16,6 @@ Museum1F_Object:
|
||||||
object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
|
object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
|
||||||
object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
|
object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
|
||||||
object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
|
object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
|
||||||
|
object_event 1, 1, SPRITE_COOLTRAINER_F, STAY, NONE, 6 ; person
|
||||||
|
|
||||||
def_warps_to MUSEUM_1F
|
def_warps_to MUSEUM_1F
|
||||||
|
|
|
@ -589,6 +589,52 @@ _KabutopsFossilText::
|
||||||
cont "rare #MON."
|
cont "rare #MON."
|
||||||
done
|
done
|
||||||
|
|
||||||
|
_ScarletBook1:: ; please don't overflow please don't overflow
|
||||||
|
text "A member of our"
|
||||||
|
line "survey team"
|
||||||
|
cont "photographed an"
|
||||||
|
cont "odd, screaming,"
|
||||||
|
cont "JIGGLYPUFF-like"
|
||||||
|
cont "#MON."
|
||||||
|
|
||||||
|
text "It has been"
|
||||||
|
line "named"
|
||||||
|
cont "SCREAM TAIL."
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
_ScarletBook2::
|
||||||
|
text "It is very"
|
||||||
|
line "aggressive, and"
|
||||||
|
cont "attacks all in"
|
||||||
|
cont "sight."
|
||||||
|
|
||||||
|
text "We need to be"
|
||||||
|
line "more careful."
|
||||||
|
|
||||||
|
text "Another team"
|
||||||
|
line "got back. They"
|
||||||
|
cont "were attacked by"
|
||||||
|
cont "a MAGNETON that"
|
||||||
|
cont "looked like a"
|
||||||
|
cont "a tyrannosaur."
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
_ScarletBook3::
|
||||||
|
text "These #MON are"
|
||||||
|
line "far too strong."
|
||||||
|
|
||||||
|
text "Their power is"
|
||||||
|
line "beyond mankind's"
|
||||||
|
cont "comprehension."
|
||||||
|
|
||||||
|
text "They must be"
|
||||||
|
line "contained, for"
|
||||||
|
cont "all our sakes."
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
_LinkCableHelpText1::
|
_LinkCableHelpText1::
|
||||||
text "TRAINER TIPS"
|
text "TRAINER TIPS"
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ WildDataPointers:
|
||||||
dw NothingWildMons
|
dw NothingWildMons
|
||||||
dw FarawayIslandInsideMons ; I think this is right??
|
dw FarawayIslandInsideMons ; I think this is right??
|
||||||
dw NothingWildMons
|
dw NothingWildMons
|
||||||
dw NothingWildMons
|
dw MtMoonCraterMons
|
||||||
dw NothingWildMons
|
dw NothingWildMons
|
||||||
dw NothingWildMons
|
dw NothingWildMons
|
||||||
dw NothingWildMons
|
dw NothingWildMons
|
||||||
|
@ -330,3 +330,4 @@ INCLUDE "data/wild/maps/SilphGauntlet4F.asm"
|
||||||
INCLUDE "data/wild/maps/SilphGauntlet5F.asm"
|
INCLUDE "data/wild/maps/SilphGauntlet5F.asm"
|
||||||
INCLUDE "data/wild/maps/SilphGauntlet6F.asm"
|
INCLUDE "data/wild/maps/SilphGauntlet6F.asm"
|
||||||
INCLUDE "data/wild/maps/FarawayIslandInside.asm"
|
INCLUDE "data/wild/maps/FarawayIslandInside.asm"
|
||||||
|
INCLUDE "data/wild/maps/MtMoonCrater.asm"
|
26
data/wild/maps/MtMoonCrater.asm
Normal file
26
data/wild/maps/MtMoonCrater.asm
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
MtMoonCraterMons:
|
||||||
|
def_grass_wildmons 10 ; encounter rate
|
||||||
|
db 49, DUGTRIO
|
||||||
|
db 47, VENOMOTH
|
||||||
|
db 53, CHANSEY
|
||||||
|
db 52, VENOMOTH
|
||||||
|
db 52, DUGTRIO
|
||||||
|
db 55, RAICHU
|
||||||
|
db 55, UMBREON
|
||||||
|
db 56, ESPEON
|
||||||
|
db 50, SCREAMTAIL
|
||||||
|
db 50, SANDYSHOX
|
||||||
|
end_grass_wildmons
|
||||||
|
|
||||||
|
def_water_wildmons 10 ; encounter rate
|
||||||
|
db 52, GOLDUCK
|
||||||
|
db 54, GOLDUCK
|
||||||
|
db 50, GOLDUCK
|
||||||
|
db 56, JABETTA
|
||||||
|
db 50, JABETTA
|
||||||
|
db 52, CROAKOZUNA
|
||||||
|
db 54, CROAKOZUNA
|
||||||
|
db 50, WUGTRIO
|
||||||
|
db 56, WUGTRIO
|
||||||
|
db 50, VAPOREON
|
||||||
|
end_water_wildmons
|
|
@ -38,6 +38,7 @@ SuperRodData:
|
||||||
dbw ROCK_TUNNEL_1F, .Group5
|
dbw ROCK_TUNNEL_1F, .Group5
|
||||||
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
|
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
|
||||||
dbw FARAWAY_ISLAND_INSIDE, .Group7
|
dbw FARAWAY_ISLAND_INSIDE, .Group7
|
||||||
|
dbw MT_MOON_CRATER, .Group10
|
||||||
db -1 ; end
|
db -1 ; end
|
||||||
|
|
||||||
; fishing groups
|
; fishing groups
|
||||||
|
|
|
@ -22,6 +22,31 @@ KabutopsFossilText::
|
||||||
text_far _KabutopsFossilText
|
text_far _KabutopsFossilText
|
||||||
text_end
|
text_end
|
||||||
|
|
||||||
|
ScarletBook::
|
||||||
|
tx_pre ScarletBook1
|
||||||
|
ld a, SCREAMTAIL
|
||||||
|
ld [wcf91], a
|
||||||
|
call PlayCry
|
||||||
|
jp DisplayMonFrontSpriteInBox
|
||||||
|
tx_pre ScarletBook2
|
||||||
|
ld a, SANDYSHOX
|
||||||
|
ld [wcf91], a
|
||||||
|
call PlayCry
|
||||||
|
jp DisplayMonFrontSpriteInBox
|
||||||
|
tx_pre ScarletBook3
|
||||||
|
|
||||||
|
ScarletBook1::
|
||||||
|
text_far _ScarletBook1
|
||||||
|
text_end
|
||||||
|
|
||||||
|
ScarletBook2::
|
||||||
|
text_far _ScarletBook2
|
||||||
|
text_end
|
||||||
|
|
||||||
|
ScarletBook3::
|
||||||
|
text_far _ScarletBook3
|
||||||
|
text_end
|
||||||
|
|
||||||
DisplayMonFrontSpriteInBox:
|
DisplayMonFrontSpriteInBox:
|
||||||
; Displays a pokemon's front sprite in a pop-up window.
|
; Displays a pokemon's front sprite in a pop-up window.
|
||||||
; [wcf91] = pokemon internal id number
|
; [wcf91] = pokemon internal id number
|
||||||
|
|
|
@ -37,6 +37,7 @@ Museum1F_TextPointers:
|
||||||
dw Museum1FText3
|
dw Museum1FText3
|
||||||
dw Museum1FText4
|
dw Museum1FText4
|
||||||
dw Museum1FText5
|
dw Museum1FText5
|
||||||
|
dw SadaText
|
||||||
|
|
||||||
Museum1FText1:
|
Museum1FText1:
|
||||||
text_asm
|
text_asm
|
||||||
|
@ -245,3 +246,7 @@ Museum1FText5:
|
||||||
Museum1FText_5c2bc:
|
Museum1FText_5c2bc:
|
||||||
text_far _Museum1FText_5c2bc
|
text_far _Museum1FText_5c2bc
|
||||||
text_end
|
text_end
|
||||||
|
|
||||||
|
SadaText:
|
||||||
|
text_far _SadaText
|
||||||
|
text_end
|
7
text/MtMoonCrater.asm
Normal file
7
text/MtMoonCrater.asm
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
_MtMoonPokecenterText1::
|
||||||
|
text "I've 6 # BALLs"
|
||||||
|
line "set in my belt."
|
||||||
|
|
||||||
|
para "At most, you can"
|
||||||
|
line "carry 6 #MON."
|
||||||
|
done
|
|
@ -106,3 +106,15 @@ _Museum1FText_5c2bc::
|
||||||
text "The AMBER is"
|
text "The AMBER is"
|
||||||
line "clear and gold!"
|
line "clear and gold!"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
_SadaText::
|
||||||
|
text "This book is so"
|
||||||
|
line "interesting! It"
|
||||||
|
cont "contains such"
|
||||||
|
cont "unusual #MON!"
|
||||||
|
|
||||||
|
text "I want to research"
|
||||||
|
line "ancient #MON"
|
||||||
|
cont "when I grow up!"
|
||||||
|
|
||||||
|
done
|
Loading…
Reference in a new issue