Skip to content

Commit

Permalink
Add a quest in Meadow and 3rd cave which results in an Eevee.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanqui committed May 13, 2013
1 parent 8801657 commit 6710113
Show file tree
Hide file tree
Showing 7 changed files with 128 additions and 15 deletions.
3 changes: 3 additions & 0 deletions constants.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1620,6 +1620,9 @@ STARDUST EQU $83
STAR_PIECE EQU $84
BASEMENT_KEY EQU $85
PASS EQU $86

BACKPACK EQU $87

CHARCOAL EQU $8A
BERRY_JUICE EQU $8B
SCOPE_LENS EQU $8C
Expand Down
8 changes: 4 additions & 4 deletions items/item_attributes.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1074,12 +1074,12 @@ Item2Attributes:
db KEY_ITEM
db $00 ; can't use

; TERU-SAMA
dw 39321 ; price
; BACKPACK
dw 0 ; price
db NONE ; effect
db 0 ; param
db 0 ; can select + toss
db ITEM
db CANT_SELECT | CANT_TOSS
db KEY_ITEM
db $00 ; can't use

; TERU-SAMA
Expand Down
7 changes: 4 additions & 3 deletions items/item_descriptions.asm
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ ItemDescriptions:
dw StarPieceDesc
dw BasementKeyDesc
dw PassDesc
dw TeruSama9Desc
dw BackpackDesc
dw TeruSama10Desc
dw TeruSama11Desc
dw CharcoalDesc
Expand Down Expand Up @@ -810,8 +810,9 @@ PassDesc:
db "A ticket for the",$4E
db "MAGNET TRAIN.@"

TeruSama9Desc:
db "?@"
BackpackDesc:
db "A backpack which",$4E
db "was stolen!@"

TeruSama10Desc:
db "?@"
Expand Down
2 changes: 1 addition & 1 deletion items/item_names.asm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
db "Star Piece@"
db "Basement Key@"
db "Pass@"
db "Teru-Sama@"
db "Backpack@"
db "Teru-Sama@"
db "Teru-Sama@"
db "Charcoal@"
Expand Down
59 changes: 56 additions & 3 deletions maps/Meadow.asm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Meadow_MapEventHeader: ;

; warps
db 1
warp_def $d, $e, 1, GROUP_THIRDCAVE, MAP_THIRDCAVE
warp_def $d, $e, 3, GROUP_THIRDCAVE, MAP_THIRDCAVE

; xy triggers
db 0
Expand All @@ -35,9 +35,62 @@ Meadow_MapEventHeader: ;
signpost 8, 8, $0, MapMeadowSignpost0Script

; people-events
db 1
db 3

person_event $54, 8, 8, $1, $0, 255, 255, $1, 0, MeadowSuperPotion, $065a
; spr y x facing movement hour daytime function sight pointer bit
person_event $54, $10+4, $15+4, $1, $0, 255, 255, $1, 0, MeadowSuperPotion, $065b
person_event $3e, $17+4, $0c+4, $0, $0, 255, 255, $0, 0, MeadowRandomPerson, $ffff
person_event $9, $20+4, $0e+4, $0, $0, 255, 255, $0, 0, MeadowRandomPerson2, $ffff

MeadowSuperPotion:
db SUPER_POTION, 5
MeadowRandomPerson:
jumptextfaceplayer RandomPersonText

RandomPersonText:
print "I've been looking for a very rare Pokémon for the past hour... It should be around here somewhere."

MeadowRandomPerson2:
faceplayer
loadfont
setbit1 $0500
checkbit1 $0502
iftrue .goteevee
checkbit1 $0501
iftrue .broughtback
; didn't
2writetext MeadowRandomPerson2Text
closetext
loadmovesprites
end
.broughtback
takeitem BACKPACK, 1
setbit1 $0502
2writetext MeadowRandomPerson2Text2
closetext
2writetext MeadowReceivedEeveeText
playsound $0002
waitbutton
keeptextopen
givepoke EEVEE, 5, BERRY, 0
;closetext
loadmovesprites
end
.goteevee
2writetext MeadowRandomPerson2Text3
closetext
loadmovesprites
end

MeadowRandomPerson2Text:
print "Oh no! I was in that cave over there when somebody stole my backpack! I can't really go back and challenge them.. Oh, what will I do?"

MeadowRandomPerson2Text2:
print "Golly, you got it for me? That's so kind of you. To express my gratitude, you can have this Eevee... I'm sure it would appreciate being with an energetic trainer such as you!"

MeadowReceivedEeveeText:
print "Received Eevee!"

MeadowRandomPerson2Text3:
print "How is that Eevee I gave you doing? Maybe you should evolve it!"
60 changes: 58 additions & 2 deletions maps/ThirdCave.asm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ThirdCave_MapEventHeader:
warp_def 1, 11, 1, GROUP_MEADOW, MAP_MEADOW

; bottom
warp_def 30, 15, 1, GROUP_KRISS_HOUSE_2F, MAP_KRISS_HOUSE_2F
warp_def 29, 15, 1, GROUP_MEADOW, MAP_MEADOW

; xy triggers
db 0
Expand All @@ -28,8 +28,64 @@ ThirdCave_MapEventHeader:
db 0

; people-events
db 1
db 2
; spr y x facing movement hour daytime function sight pointer bit
person_event $54, 8, 8, $1, $0, 255, 255, $1, 0, ThirdCaveGreatBall, $065a
person_event $2d+8, $3+4, $f+4, $9, $0, 255, 255, $0, 0, ThirdCaveRocketScript, $ffff

ThirdCaveGreatBall:
db GREAT_BALL, 5

ThirdCaveRocketScript:
faceplayer
loadfont
checkbit1 $0501
iftrue .notstolen
2writetext ThirdCaveRocketText1
closetext
checkbit1 $0500
iftrue .aware
; player is unaware
loadmovesprites
end

.aware
2writetext ThirdCaveRocketText2
closetext
loadmovesprites
winlosstext ThirdCaveRocketTextDefeat, $0000
loadtrainer GRUNTM, 1
startbattle
returnafterbattle
loadfont
2writetext ThirdCaveRocketText3
closetext
verbosegiveitem BACKPACK, 1
setbit1 $0501
;closetext
loadmovesprites
end
.notstolen
2writetext ThirdCaveRocketText4
closetext
loadmovesprites
end


ThirdCaveRocketText1:
print "Yeah, yeah. What are you looking at?"
ThirdCaveRocketText2:
print "Oh, you mean this backpack? So you want to get it for that old guy, huh? Well, only if you can defeat me!"
ThirdCaveRocketTextDefeat:
print "Welp..."

ThirdCaveRocketText3:
print "Pff, fine. You can have it."

ThirdCaveRocketText4:
print "I haven't stolen anything now!"
4 changes: 2 additions & 2 deletions trainers/trainers.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3477,11 +3477,11 @@ GruntMGroup:
; ================

; GRUNTM (1)
db "GRUNT@"
db "Grunt@"
db 0 ; normal

; party
db 14, KOFFING
db 5, KOFFING

db $ff ; end

Expand Down

0 comments on commit 6710113

Please sign in to comment.