mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-20 22:28:41 +13:00
Merge branch 'mistress' into renewables
This commit is contained in:
commit
6d4920da06
29 changed files with 577 additions and 70 deletions
|
|
@ -6,7 +6,7 @@ KeyItemFlags:
|
|||
dbit FALSE ; POKE_BALL
|
||||
dbit TRUE ; TOWN_MAP
|
||||
dbit TRUE ; BICYCLE
|
||||
dbit TRUE ; SURFBOARD
|
||||
dbit TRUE ; POCKET_LAPRAS
|
||||
dbit FALSE ; SAFARI_BALL
|
||||
dbit TRUE ; POKEDEX
|
||||
dbit FALSE ; MOON_STONE
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ ItemNames::
|
|||
li "POKé BALL"
|
||||
li "TOWN MAP"
|
||||
li "BICYCLE"
|
||||
li "LAPRAS' BALL" ; surfboard, ?????, etc.
|
||||
li "LAPRAS' BALL" ; Pocket Lapras
|
||||
li "SAFARI BALL"
|
||||
li "POKéDEX"
|
||||
li "MOON STONE"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ ItemPrices::
|
|||
bcd3 200 ; POKE_BALL
|
||||
bcd3 0 ; TOWN_MAP
|
||||
bcd3 0 ; BICYCLE
|
||||
bcd3 0 ; SURFBOARD
|
||||
bcd3 0 ; POCKET_LAPRAS
|
||||
bcd3 1000 ; SAFARI_BALL
|
||||
bcd3 0 ; POKEDEX
|
||||
bcd3 0 ; MOON_STONE
|
||||
|
|
|
|||
|
|
@ -10,14 +10,15 @@ CinnabarIsland_Object:
|
|||
warp_event 14, 11, CINNABAR_VOLCANO_FLOORS, 1
|
||||
|
||||
def_bg_events
|
||||
bg_event 11, 15, 3 ; CinnabarIslandText3
|
||||
bg_event 22, 19, 4 ; MartSignText
|
||||
bg_event 16, 17, 5 ; PokeCenterSignText
|
||||
bg_event 9, 23, 6 ; CinnabarIslandText6
|
||||
bg_event 23, 13, 7 ; CinnabarIslandText7
|
||||
bg_event 11, 15, 4 ; CinnabarIslandText3
|
||||
bg_event 22, 19, 5 ; MartSignText
|
||||
bg_event 16, 17, 6 ; PokeCenterSignText
|
||||
bg_event 9, 23, 7 ; CinnabarIslandText6
|
||||
bg_event 23, 13, 8 ; CinnabarIslandText7
|
||||
|
||||
def_object_events
|
||||
object_event 11, 18, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
|
||||
object_event 17, 20, SPRITE_GAMBLER, STAY, NONE, 2 ; person
|
||||
object_event 25, 18, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, 3 ; Pocket Lapras
|
||||
|
||||
def_warps_to CINNABAR_ISLAND
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
TitleMons:
|
||||
; mons on the title screen are randomly chosen from here
|
||||
db SCREAM_TAIL ; Mascots
|
||||
db SANDY_SHOCKS
|
||||
db TOTARTLE ; New Starters
|
||||
db GOROCHU
|
||||
db SYLVEON
|
||||
|
|
@ -9,10 +11,8 @@ TitleMons:
|
|||
db BELLIGNAN ; GS Betas
|
||||
db LUXWAN
|
||||
db PORYGON2 ; Post-Gen 1 Evos
|
||||
db MAGNEZONE
|
||||
db ANNIHILAPE
|
||||
db SCREAM_TAIL ; LGPE and SV
|
||||
db WUGTRIO
|
||||
db MELTAN
|
||||
db EXEGGUTOR_A ; Regional Variants
|
||||
db TANGROWTH
|
||||
db ANNIHILAPE
|
||||
db EXEGGUTOR_A ; Regional Variants & Convergents
|
||||
db TAUROS_PB
|
||||
db WUGTRIO
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ PredefPointers::
|
|||
add_predef LearnMoveFromLevelUp
|
||||
add_predef LearnMove
|
||||
add_predef GetQuantityOfItemInBag
|
||||
add_predef GetIndexOfItemInBag
|
||||
add_predef CheckForHiddenObjectOrBookshelfOrCardKeyDoor, $03 ; home bank
|
||||
add_predef GiveItem, $03 ; home bank
|
||||
add_predef ChangeBGPalColor0_4Frames
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ _UltraBallDescription::
|
|||
prompt
|
||||
|
||||
_GreatBallDescription::
|
||||
text "A BALL with a de-"
|
||||
next "cent success rate."
|
||||
text "A BALL with a good"
|
||||
next "success rate."
|
||||
prompt
|
||||
|
||||
_PokeBallDescription::
|
||||
|
|
@ -31,6 +31,11 @@ _BicycleDescription::
|
|||
next "for travel."
|
||||
prompt
|
||||
|
||||
_PocketLaprasDescription::
|
||||
text "A LAPRAS that lets"
|
||||
next "you cross water."
|
||||
prompt
|
||||
|
||||
_SafariBallDescription::
|
||||
text "Just an ULTRA BALL"
|
||||
next "painted green."
|
||||
|
|
@ -110,7 +115,7 @@ _EscapeRopeDescription::
|
|||
|
||||
_RepelDescription::
|
||||
text "Repels weak #-"
|
||||
next "MON for 100 steps."
|
||||
next "MON. (100 steps)"
|
||||
prompt
|
||||
|
||||
_OldAmberDescription::
|
||||
|
|
@ -205,18 +210,18 @@ _MaxReviveDescription::
|
|||
prompt
|
||||
|
||||
_GuardSpecDescription::
|
||||
text "Prevents stats"
|
||||
next "reduction. (1 BTL)"
|
||||
text "Prevents stat re-"
|
||||
next "duction. (1 BTL)"
|
||||
prompt
|
||||
|
||||
_SuperRepelDescription::
|
||||
text "Repels weak #-"
|
||||
next "MON for 200 steps."
|
||||
next "MON. (200 steps)"
|
||||
prompt
|
||||
|
||||
_MaxRepelDescription::
|
||||
text "Repels weak #-"
|
||||
next "MON for 250 steps."
|
||||
next "MON. (250 steps)"
|
||||
prompt
|
||||
|
||||
_DireHitDescription::
|
||||
|
|
@ -281,7 +286,7 @@ _OaksParcelDescription::
|
|||
|
||||
_ItemfinderDescription::
|
||||
text "Checks for unseen"
|
||||
next "items in the area."
|
||||
next "items nearby."
|
||||
prompt
|
||||
|
||||
_SilphScopeDescription::
|
||||
|
|
@ -340,8 +345,8 @@ _ElixerDescription::
|
|||
prompt
|
||||
|
||||
_MaxElixerDescription::
|
||||
text "Fully restores the"
|
||||
next "PP of one #MON."
|
||||
text "Fully restores PP"
|
||||
next "of all moves."
|
||||
prompt
|
||||
|
||||
_CitrinePassDescription::
|
||||
|
|
@ -380,13 +385,13 @@ _HM02Description::
|
|||
prompt
|
||||
|
||||
_HM03Description::
|
||||
text "A strong water-"
|
||||
text "A strong WATER-"
|
||||
next "type attack."
|
||||
prompt
|
||||
|
||||
_HM04Description::
|
||||
text "A powerful physi-"
|
||||
next "cal attack."
|
||||
text "A strong physical"
|
||||
next "attack."
|
||||
prompt
|
||||
|
||||
_HM05Description::
|
||||
|
|
@ -420,12 +425,12 @@ _TM05Description::
|
|||
prompt
|
||||
|
||||
_TM06Description::
|
||||
text "A poison move with"
|
||||
next "increasing damage."
|
||||
text "A POISON move with"
|
||||
next "rising damage."
|
||||
prompt
|
||||
|
||||
_TM07Description::
|
||||
text "A one-hit KO,"
|
||||
text "A one-hit KO"
|
||||
next "drill attack."
|
||||
prompt
|
||||
|
||||
|
|
@ -475,8 +480,8 @@ _TM16Description::
|
|||
prompt
|
||||
|
||||
_TM17Description::
|
||||
text "An attack that al-"
|
||||
next "so hurts the user."
|
||||
text "A move that also"
|
||||
next "hurts the user."
|
||||
prompt
|
||||
|
||||
_TM18Description::
|
||||
|
|
@ -520,13 +525,13 @@ _TM25Description::
|
|||
prompt
|
||||
|
||||
_TM26Description::
|
||||
text "Tough but useless"
|
||||
next "vs. flying foes."
|
||||
text "Tough, but useless"
|
||||
next "vs. FLYING foes."
|
||||
prompt
|
||||
|
||||
_TM27Description::
|
||||
text "A GROUND-type,"
|
||||
next "one-hit KO attack."
|
||||
text "A one-hit KO"
|
||||
next "GROUND attack."
|
||||
prompt
|
||||
|
||||
_TM28Description::
|
||||
|
|
@ -595,8 +600,8 @@ _TM40Description::
|
|||
prompt
|
||||
|
||||
_TM41Description::
|
||||
text "Restores HP by 1/2"
|
||||
next "the user's max HP."
|
||||
text "Restores 1/2 the"
|
||||
next "user's max HP."
|
||||
prompt
|
||||
|
||||
_TM42Description::
|
||||
|
|
@ -615,8 +620,8 @@ _TM44Description::
|
|||
prompt
|
||||
|
||||
_TM45Description::
|
||||
text "A move that may"
|
||||
next "cause paralysis."
|
||||
text "A move that will"
|
||||
next "paralyze a foe."
|
||||
prompt
|
||||
|
||||
_TM46Description::
|
||||
|
|
@ -640,8 +645,8 @@ _TM49Description::
|
|||
prompt
|
||||
|
||||
_TM50Description::
|
||||
text "Makes a decoy with"
|
||||
next "1/4 user's max HP."
|
||||
text "Uses 1/4 max HP"
|
||||
next "to make a decoy."
|
||||
prompt
|
||||
|
||||
_UnusedItemDescription::
|
||||
|
|
|
|||
|
|
@ -20,6 +20,10 @@ _PlayerBlackedOutText::
|
|||
_RepelWoreOffText::
|
||||
text "REPEL's effect"
|
||||
line "wore off."
|
||||
prompt
|
||||
|
||||
_RepelUseAnotherText::
|
||||
text "Use another?"
|
||||
done
|
||||
|
||||
_PokemartBuyingGreetingText::
|
||||
|
|
@ -229,3 +233,18 @@ ENDC
|
|||
line "your friend and"
|
||||
cont "come again!"
|
||||
done
|
||||
|
||||
_SortItemsText::
|
||||
text "Would you like to"
|
||||
next "sort items?"
|
||||
done
|
||||
|
||||
_SortComplete::
|
||||
text "Sorting is"
|
||||
next "complete!"
|
||||
prompt
|
||||
|
||||
_NothingToSort::
|
||||
text "There are no items"
|
||||
next "to sort."
|
||||
prompt
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue