Skip to content

Commit

Permalink
Working on the human settlement. Starting with the leader, Julia.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tachytaenius committed May 22, 2016
1 parent 064a8dc commit 31bea07
Show file tree
Hide file tree
Showing 14 changed files with 222 additions and 16 deletions.
2 changes: 1 addition & 1 deletion extras
Submodule extras updated 1 files
+1 −1 pokemontools/gfx.py
Binary file modified gfx/overworld/028.2bpp
Binary file not shown.
Binary file modified gfx/overworld/085.2bpp
Binary file not shown.
Binary file added gfx/trainers/janine.2bpp
Binary file not shown.
Binary file removed gfx/trainers/janine.2bpp.lz
Binary file not shown.
5 changes: 3 additions & 2 deletions gfx/trainers/janine.pal
@@ -1,4 +1,5 @@

RGB 30, 18, 15
RGB 15, 08, 23
RGB 31, 19, 10
RGB 10, 10, 10

; humanFemale
2 changes: 2 additions & 0 deletions main.asm
Expand Up @@ -12578,6 +12578,8 @@ ElfPic::
INCBIN "gfx/trainers/erika.2bpp"
HumanPic::
INCBIN "gfx/trainers/hiker.2bpp"
HumanFemalePic::
INCBIN "gfx/trainers/janine.2bpp"
LizardmanPic::
INCBIN "gfx/trainers/lt_surge.2bpp"
;dead people
Expand Down
2 changes: 0 additions & 2 deletions maps/BlackthornCity.asm
Expand Up @@ -21,8 +21,6 @@ BlackthornCity_MapEventHeader:: db 0, 0

.ObjectEvents: db 0



cavern
jumptext .text
.text
Expand Down
6 changes: 3 additions & 3 deletions maps/BlackthornCity.blk
Expand Up @@ -13,8 +13,8 @@
 
1)  1)  ) 

1 ))
+1 ))
)
)

$
  #>=  
(  #>=  
Expand Down
1 change: 0 additions & 1 deletion maps/BlackthornGym1F.asm
Expand Up @@ -456,7 +456,6 @@ gem
line "to use that."
done
.TKEitem
opentext
writetext .takeitemquestion
writetext .doSo
Expand Down
208 changes: 206 additions & 2 deletions maps/CeladonGym.asm
Expand Up @@ -15,10 +15,214 @@ CeladonGym_MapEventHeader:: db 0, 0
.BGEvents: db 1
signpost 16, 7, SIGNPOST_READ, .ruins

.ObjectEvents: db 0
.ObjectEvents: db 1
person_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_RED, PERSONTYPE_SCRIPT, 0, .JuliaScript, -1

.ruins
jumptext .ruins_
.ruins_
text "Passage to ruins."
done
done

.USEno
jumptext .cannotUse
.cannotUse
text "There is no way"
line "to use that."
done
.INGno
jumptext .ingestNo
.ingestNo
text "That is not"
line "edible."
done
.TKEno
jumptext .noTke
.noTke
text "You are unable"
line "to take that."
prompt
.ATKno
jumptext .noAtk
.noAtk
text "No! You may"
line "not! You are"
cont "able, though."
done
.notice
text "The human notices"
line "you."
prompt
.name
text "???: Greetings."
line "I am Julia."
prompt
.go
faceplayer
opentext
writetext .notice
writetext .name
closetext
setevent EVENT_10F
jump .back
.JuliaScript
showemote EMOTE_SAD, LAST_TALKED, 15
checkevent EVENT_10F
iffalse .go
.back
callasm StartMenuSecondary
if_equal 1, .ATKno
if_equal 2, .TCHVernix
if_equal 3, .TLKVernix
if_equal 4, .LOKVernix
if_equal 5, .INGno
if_equal 6, .TKEno
if_equal 7, .USEno
end
.TCHVernix
opentext
writetext .withinReachVernix
yesorno
iffalse .Done
faceplayer
showemote EMOTE_FISH, LAST_TALKED, 15
jumptext .VernixWhat
.withinReachVernix
text "The human is in"
line "reach. Touch it?"
prompt
.VernixWhat
text "Julia: [Hey!]"
done
.LOKVernix
callasm .lookAtVernix
waitbutton
jumptext .lookVernix
.lookVernix
text "You see see a"
line "friendly human."
done
.greetingsFromVernix
text "Julia: [Hi.]"
done
.anyMore
text "Julia: [Anything"
line "else?]"
prompt
.loopVernix
writetext .anyMore
buttonsound
jump .loopReturn
.TLKVernix
opentext
loadmenudata .Greet
verticalmenu
closewindow
if_equal 2, .Done
faceplayer
writetext .greetingsFromVernix
buttonsound
.loopReturn
loadmenudata .What
verticalmenu
closewindow
if_equal 1, .WhatOne
if_equal 2, .WhatTwo
if_equal 3, .WhatOne
if_equal 4, .WhatFour
; WhatFive
jumptext .ohokthen
.WhatFour
writetext .floorTwo
jump .loopVernix
.floorTwo
text "Julia: [I do not"
line "know what lies"
para "beyond this level,"
line "but I know where"
para "the ladder to the"
line "second level is;"
para "simply leave our"
line "settlement and"
para "walk straight on."
done
.WhatOne
writetext .iKnowNothing
jump .loopVernix
.iKnowNothing
text "Julia: [Of this I"
line "know nothing."
cont "Sorry.]"
prompt
.WhatTwo
writetext .ohokthen3
callasm .martNameLanugo
pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE
jump .loopVernix
.martNameLanugo
ld b, 6
ld hl, StringBuffer3
ld de, .NameLanugo
.loop
ld a, [de]
inc de
ld [hli], a
dec b
jr nz, .loop
ret
.NameLanugo
db "Julia@"
.ohokthen
text "Julia: [Bye.]"
done
.ohokthen3
text "Julia: [Sure.]"
prompt
.Greet
db $40 ; flags
db 00, 00 ; start coords
db 11, 19 ; end coords
dw .Greet2
db 1 ; default option
.Greet2
db $81 ; flags
db 2 ; items
db "[Greetings.]@"
db "Cancel@"
.What
db $40 ; flags
db 00, 00 ; start coords
db 11, 19 ; end coords
dw .What2
db 1 ; default option
.What2
db $81 ; flags
db 5 ; items
db "[Gems?]@"
db "[Trade?]@"
db "[Ruins?]@"
db "[Level 2?]@"
db "[Thanks.]@"
.Done
closetext
end
.lookAtVernix
ld hl, .goblinPalette
ld a, h
ld [wPaletteHighBuffer], a
ld a, l
ld [wPaletteLowBuffer], a
ld a, BANK(.goblinPalette)
ld [wPaletteBankBuffer], a
lb bc, BANK(HumanFemalePic), 6*8
ld hl, HumanFemalePic
ld a, h
ld [ItempicPointer], a
ld a, l
ld [ItempicPointer + 1], a
callba Personpic
ret
.goblinPalette
RGB 31, 31, 31
INCLUDE "gfx/trainers/erika.pal"
RGB 00, 00, 00
4 changes: 2 additions & 2 deletions maps/CeladonGym.blk
@@ -1,8 +1,8 @@
5
*

1*

1(*

*
!
1  
Expand Down
2 changes: 2 additions & 0 deletions maps/RedsHouse1F.asm
Expand Up @@ -57,10 +57,12 @@ RedsHouse1F_MapEventHeader:: db 0, 0
line "I am Vernix."
prompt
.go
faceplayer
opentext
writetext .notice
writetext .name
closetext
setevent EVENT_10E
jump .back
.VernixScript
showemote EMOTE_SAD, LAST_TALKED, 15
Expand Down
6 changes: 3 additions & 3 deletions trainers/attributes.asm
Expand Up @@ -151,9 +151,9 @@ TrainerClassAttributes: ; 3959c
dw CONTEXT_USE + SWITCH_OFTEN

; Janine
db DIRE_HIT, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
db POTION, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_OFFENSIVE + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES

; Cooltrainerm
Expand Down

0 comments on commit 31bea07

Please sign in to comment.