Skip to content

Commit

Permalink
Orphanage Girls Text
Browse files Browse the repository at this point in the history
pkmncoraldev committed Sep 28, 2023
1 parent 6fa391a commit 3051e34
Showing 11 changed files with 201 additions and 35 deletions.
2 changes: 1 addition & 1 deletion constants/map_constants.asm
Original file line number Diff line number Diff line change
@@ -356,7 +356,7 @@ MAP_NONE EQU 0
map_const RADIANT_TOWNSHIP, 20, 14 ; 3
map_const RADIANT_FLOWER_SHOP, 5, 4 ; 4
map_const RADIANT_ORPHANAGE_1F, 6, 5 ; 5
map_const RADIANT_ORPHANAGE_2F, 5, 4 ; 6
map_const RADIANT_ORPHANAGE_2F, 8, 4 ; 6
map_const RADIANT_ORPHANAGE_LEILANIS_ROOM, 3, 3 ; 7
map_const RADIANT_POKECENTER, 6, 4 ; 9
Binary file modified data/tilesets/orphanage_attributes.bin
Binary file not shown.
Binary file modified data/tilesets/orphanage_attributes.bin.lz
Binary file not shown.
14 changes: 7 additions & 7 deletions data/tilesets/orphanage_collision.asm
Original file line number Diff line number Diff line change
@@ -28,19 +28,19 @@
tilecoll FLOOR, WALL, WALL, WALL ; 1b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
tilecoll WALL, WALL, FLOOR, RADIO ; 1d
tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e
tilecoll TOWN_MAP, WALL, FLOOR, TV ; 1e
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1f
tilecoll TOWN_MAP, WALL, FLOOR, LEFT_WALL ; 20
tilecoll RIGHT_WALL, WALL, FLOOR, WALL ; 21
tilecoll WALL, RIGHT_WALL, WALL, FLOOR ; 22
tilecoll COUNTER, FLOOR, WALL, FLOOR ; 23
tilecoll WALL, WALL, FLOOR, LEFT_WALL ; 24
tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
tilecoll FLOOR, FLOOR, WALL, WALL ; 26
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
tilecoll FLOOR, FLOOR, WALL, WALL ; 28
tilecoll WALL, WALL, FLOOR, FLOOR ; 29
tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
tilecoll WALL, WINDOW, BOOKSHELF, FLOOR ; 29
tilecoll WINDOW, WALL, FLOOR, FLOOR ; 2a
tilecoll WALL, TOWN_MAP, WALL, FLOOR ; 2b
tilecoll FLOOR, WALL, WALL, WALL ; 2c
tilecoll WALL, WALL, WALL, WALL ; 2d
@@ -117,7 +117,7 @@
tilecoll TOWN_MAP, WALL, FLOOR, LEFT_WALL ; 74
tilecoll WALL, WALL, FLOOR, LEFT_WALL ; 75
tilecoll WALL, WALL, FLOOR, FLOOR ; 76
tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 77
tilecoll WALL, WALL, LADDER, FLOOR ; 77
tilecoll WALL, WALL, WALL, WALL ; 78
tilecoll WALL, WALL, FLOOR, LADDER ; 79
tilecoll WALL, WALL, WALL, WALL ; 7a
Binary file modified data/tilesets/orphanage_metatiles.bin
Binary file not shown.
Binary file modified data/tilesets/orphanage_metatiles.bin.lz
Binary file not shown.
50 changes: 46 additions & 4 deletions maps/RadiantField.asm
Original file line number Diff line number Diff line change
@@ -126,11 +126,28 @@ VioletSetNameAsm:
db "VIOLET@@@@@"
RadiantFieldRoseText1:
text "TEXT 1"
text "Ah!"
para "I love the"
line "sunflowers!"
para "They're so pretty!"
done
RadiantFieldRoseText2:
text "ROSE: TEXT 2"
text "ROSE: Ah!"
para "I love the"
line "sunflowers!"
para "They're so pretty!"
para "What?"
para "MS. ERIKA wants us"
line "to come home?"
para "Ok! Bye bye!"
done
RadiantFieldIrisText1:
@@ -158,11 +175,36 @@ RadiantFieldIrisText2:
done
RadiantFieldVioletText1:
text "TEXT 1"
text "I love the smell"
line "of these flowers!"
para "I wish I could"
line "smell them forev-"
para "Ah… Ah. AH!"
para "ACHOO!"
done
RadiantFieldVioletText2:
text "VIOLET: TEXT 2"
text "VIOLET: I love the"
line "smell of these"
cont "flowers!"
para "I wish I could"
line "smell them forev-"
para "Ah…"
para "Ah…"
para "AH!"
para "…CHOO!"
para "I better go home"
line "before GRAMMA"
cont "worries about me…"
done
Movement_Rose2:
Binary file modified maps/RadiantOrphanage2F.ablk
Binary file not shown.
Binary file modified maps/RadiantOrphanage2F.ablk.lz
Binary file not shown.
120 changes: 111 additions & 9 deletions maps/RadiantOrphanage2F.asm
Original file line number Diff line number Diff line change
@@ -5,21 +5,21 @@ RadiantOrphanage2F_MapScriptHeader:
callback MAPCALLBACK_TILES, RadiantOrphanage2FCallback

db 1 ; warp events
warp_def 2, 6, 4, RADIANT_ORPHANAGE_1F
warp_def 3, 14, 4, RADIANT_ORPHANAGE_1F

db 0 ; coord events

db 1 ; bg events
signpost 2, 8, SIGNPOST_READ, RadiantOrphanage2FPhoto
signpost 2, 12, SIGNPOST_READ, RadiantOrphanage2FPhoto

db 7 ; object events
object_event 1, 2, SPRITE_PIGTAILS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, RadiantOrphanageLeilanisRoomRose, EVENT_RADIANT_GYM_ACTIVE
object_event 3, 2, SPRITE_PIGTAILS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_PINK, PERSONTYPE_SCRIPT, 0, RadiantOrphanageLeilanisRoomLily, EVENT_RADIANT_GYM_ACTIVE
object_event 5, 2, SPRITE_PIGTAILS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RadiantOrphanageLeilanisRoomIris, EVENT_RADIANT_GYM_ACTIVE
object_event 1, 6, SPRITE_PIGTAILS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RadiantOrphanageLeilanisRoomPoppy, EVENT_RADIANT_GYM_ACTIVE
object_event 5, 6, SPRITE_PIGTAILS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_PURPLE, PERSONTYPE_SCRIPT, 0, RadiantOrphanageLeilanisRoomViolet, EVENT_RADIANT_GYM_ACTIVE
object_event 7, 6, SPRITE_PIGTAILS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RadiantOrphanageLeilanisRoomClover, EVENT_RADIANT_GYM_ACTIVE
object_event 3, 6, SPRITE_PIGTAILS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_TEAL, PERSONTYPE_SCRIPT, 0, RadiantOrphanageLeilanisRoomFelicia, EVENT_RADIANT_GYM_ACTIVE
object_event 7, 2, SPRITE_PIGTAILS, SPRITEMOVEDATA_WANDER, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, RadiantOrphanage2FRose, EVENT_RADIANT_GYM_ACTIVE
object_event 3, 5, SPRITE_PIGTAILS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_PINK, PERSONTYPE_SCRIPT, 0, RadiantOrphanage2FLily, EVENT_RADIANT_GYM_ACTIVE
object_event 11, 3, SPRITE_PIGTAILS, SPRITEMOVEDATA_WANDER, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RadiantOrphanage2FIris, EVENT_RADIANT_GYM_ACTIVE
object_event 1, 4, SPRITE_PIGTAILS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RadiantOrphanage2FPoppy, EVENT_RADIANT_GYM_ACTIVE
object_event 11, 7, SPRITE_PIGTAILS, SPRITEMOVEDATA_WANDER, 1, 0, -1, -1, (1 << 3) | PAL_OW_PURPLE, PERSONTYPE_SCRIPT, 0, RadiantOrphanage2FViolet, EVENT_RADIANT_GYM_ACTIVE
object_event 2, 4, SPRITE_PIGTAILS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RadiantOrphanage2FClover, EVENT_RADIANT_GYM_ACTIVE
object_event 9, 6, SPRITE_PIGTAILS, SPRITEMOVEDATA_WANDER, 1, 0, -1, -1, (1 << 3) | PAL_OW_TEAL, PERSONTYPE_SCRIPT, 0, RadiantOrphanage2FFelicia, EVENT_RADIANT_GYM_ACTIVE


const_def 1 ; object constants
@@ -44,6 +44,108 @@ RadiantOrphanage2FCallback:
.end
return

RadiantOrphanage2FRose:
jumptextfaceplayer RadiantOrphanage2FRoseText
RadiantOrphanage2FRoseText:
text "MS. ERIKA told me"
line "that they don't"
cont "have sunflowers"
cont "where she lives."
para "Isn't that sad?"
done
RadiantOrphanage2FLily:
faceplayer
opentext
writetext RadiantOrphanage2FLilyText
waitbutton
closetext
spriteface RADIANT_ORPHANAGE_2F_LILY, UP
end
RadiantOrphanage2FLilyText:
text "Hehe!"
para "Watching cartoons"
line "is fun!"
para "The kitties on TV"
line "can't scratch me"
cont "like that mean"
cont "MEOWTH did!"
done
RadiantOrphanage2FIris:
jumptextfaceplayer RadiantOrphanage2FIrisText
RadiantOrphanage2FIrisText:
text "La la la!"
para "Oh, hi!"
para "Teehee!"
done
RadiantOrphanage2FPoppy:
faceplayer
opentext
writetext RadiantOrphanage2FPoppyText
waitbutton
closetext
spriteface RADIANT_ORPHANAGE_2F_POPPY, LEFT
end
RadiantOrphanage2FPoppyText:
text "Training #MON"
line "is fun, but I"
cont "wanna build cars"
cont "when I grow up!"
done
RadiantOrphanage2FViolet:
jumptextfaceplayer RadiantOrphanage2FVioletText
RadiantOrphanage2FVioletText:
text "I love to sniff"
line "the flowers in"
cont "the meadow."
para "But every time I"
line "do, I sneeze!"
para "I hope I'm not"
line "allergic…"
done
RadiantOrphanage2FClover:
faceplayer
opentext
writetext RadiantOrphanage2FCloverText
waitbutton
closetext
spriteface RADIANT_ORPHANAGE_2F_CLOVER, RIGHT
end
RadiantOrphanage2FCloverText:
text "I shouldn't act out"
line "if it's going to"
cont "make GRAMMA worry…"
done
RadiantOrphanage2FFelicia:
jumptextfaceplayer RadiantOrphanage2FFeliciaText
RadiantOrphanage2FFeliciaText:
text "GRAMMA is feeling"
line "better, but now"
cont "MS. ERIKA is going"
cont "to leave!"
para "WAHHHH!"
done

RadiantOrphanage2FPhoto:
checkevent EVENT_LOST_GIRLS_QUEST_ACTIVE
iftrue .know_erika
50 changes: 36 additions & 14 deletions maps/RadiantOrphanageLeilanisRoom.asm
Original file line number Diff line number Diff line change
@@ -73,52 +73,74 @@ RadiantOrphanageLeilanisRoomCallback:
return

RadiantOrphanageLeilanisRoomRose:
jumptext RadiantOrphanageLeilanisRoomRoseText
jumptextfaceplayer RadiantOrphanageLeilanisRoomRoseText
RadiantOrphanageLeilanisRoomRoseText:
text "ROSE TEXT"
text "FELICIA said some-"
line "thing about the"
cont "beach before she"
cont "ran off."
done
RadiantOrphanageLeilanisRoomLily:
jumptext RadiantOrphanageLeilanisRoomLilyText
jumptextfaceplayer RadiantOrphanageLeilanisRoomLilyText
RadiantOrphanageLeilanisRoomLilyText:
text "LILY TEXT"
text "CLOVER was with me"
line "but I lost track"
cont "of her when we got"
cont "to DUSK TURNPIKE."
done
RadiantOrphanageLeilanisRoomIris:
jumptext RadiantOrphanageLeilanisRoomIrisText
jumptextfaceplayer RadiantOrphanageLeilanisRoomIrisText
RadiantOrphanageLeilanisRoomIrisText:
text "IRIS TEXT"
text "I think LILY ran"
line "off toward DUSK"
cont "TURNPIKE."
done
RadiantOrphanageLeilanisRoomPoppy:
jumptext RadiantOrphanageLeilanisRoomPoppyText
jumptextfaceplayer RadiantOrphanageLeilanisRoomPoppyText
RadiantOrphanageLeilanisRoomPoppyText:
text "POPPY TEXT"
text "IRIS said she was"
line "going to pick some"
cont "flowers for GRAMMA"
cont "LEILANI."
done
RadiantOrphanageLeilanisRoomViolet:
jumptext RadiantOrphanageLeilanisRoomVioletText
jumptextfaceplayer RadiantOrphanageLeilanisRoomVioletText
RadiantOrphanageLeilanisRoomVioletText:
text "VIOLET TEXT"
text "POPPY told me she"
line "wanted to go look"
cont "at the cars at"
cont "DUSK TURNPIKE."
done
RadiantOrphanageLeilanisRoomClover:
jumptext RadiantOrphanageLeilanisRoomCloverText
jumptextfaceplayer RadiantOrphanageLeilanisRoomCloverText
RadiantOrphanageLeilanisRoomCloverText:
text "CLOVER TEXT"
text "VIOLET loves the"
line "smell of the"
cont "flowers at RADIANT"
cont "MEADOW."
done
RadiantOrphanageLeilanisRoomFelicia:
jumptext RadiantOrphanageLeilanisRoomFeliciaText
jumptextfaceplayer RadiantOrphanageLeilanisRoomFeliciaText
RadiantOrphanageLeilanisRoomFeliciaText:
text "FELICIA TEXT"
text "ROSE probably went"
line "off to RADIANT"
cont "MEADOW."
para "She loves the"
line "sunflowers."
done

RadiantOrphanageLeilanisRoomErika:

0 comments on commit 3051e34

Please sign in to comment.