Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KrissHouse → PlayersHouse

Browse Source
This commit is contained in:
Rangi
2018-01-22 19:10:09 -05:00
parent 7f187be36c
commit 363d8b9242
26 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maps/MrPokemonsHouse.asm
View File

@@ -123,8 +123,8 @@ MrPokemonsHouse_OakScript:
waitbutton
closetext
setevent EVENT_RIVAL_NEW_BARK_TOWN
setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR
clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
setscene 1
setmapscene CHERRYGROVE_CITY, 1
setmapscene ELMS_LAB, 3

4
maps/NewBarkTown.asm
View File

@@ -288,8 +288,8 @@ NewBarkTown_MapEvents:
.Warps:
db 4
warp_def 6, 3, 1, ELMS_LAB
warp_def 13, 5, 1, KRISS_HOUSE_1F
warp_def 3, 11, 1, KRISS_NEIGHBORS_HOUSE
warp_def 13, 5, 1, PLAYERS_HOUSE_1F
warp_def 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE
warp_def 11, 13, 1, ELMS_HOUSE
.CoordEvents:

44
maps/KrissHouse1F.asm → maps/PlayersHouse1F.asm
View File

@@ -1,11 +1,11 @@
const_value set 2
const KRISSHOUSE1F_MOM1
const KRISSHOUSE1F_MOM2
const KRISSHOUSE1F_MOM3
const KRISSHOUSE1F_MOM4
const KRISSHOUSE1F_POKEFAN_F
const PLAYERSHOUSE1F_MOM1
const PLAYERSHOUSE1F_MOM2
const PLAYERSHOUSE1F_MOM3
const PLAYERSHOUSE1F_MOM4
const PLAYERSHOUSE1F_POKEFAN_F
KrissHouse1F_MapScripts:
PlayersHouse1F_MapScripts:
.SceneScripts:
db 2
scene_script .DummyScene0
@@ -25,15 +25,15 @@ UnknownScript_0x7a4d8:
UnknownScript_0x7a4db:
playmusic MUSIC_MOM
showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15
showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
spriteface PLAYER, LEFT
checkevent EVENT_GAVE_KURT_APRICORNS
iffalse UnknownScript_0x7a4f2
applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
jump UnknownScript_0x7a4f6
UnknownScript_0x7a4f2:
applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe
UnknownScript_0x7a4f6:
opentext
writetext UnknownText_0x7a604
@@ -44,8 +44,8 @@ UnknownScript_0x7a4f6:
setflag ENGINE_PHONE_CARD
addcellnum PHONE_MOM
setscene 1
setevent EVENT_KRISS_HOUSE_MOM_1
clearevent EVENT_KRISS_HOUSE_MOM_2
setevent EVENT_PLAYERS_HOUSE_MOM_1
clearevent EVENT_PLAYERS_HOUSE_MOM_2
writetext UnknownText_0x7a6bd
buttonsound
special Special_SetDayOfWeek
@@ -89,16 +89,16 @@ UnknownScript_0x7a549:
jump UnknownScript_0x7a56b
UnknownScript_0x7a55d:
applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600
jump UnknownScript_0x7a56b
UnknownScript_0x7a564:
applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602
jump UnknownScript_0x7a56b
UnknownScript_0x7a56b:
special RestartMapMusic
spriteface KRISSHOUSE1F_MOM1, LEFT
spriteface PLAYERSHOUSE1F_MOM1, LEFT
end
UnknownScript_0x7a572:
@@ -181,7 +181,7 @@ NeighborScript:
writetext NeighborText
waitbutton
closetext
spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT
spriteface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
end
TVScript:
@@ -385,7 +385,7 @@ TVText:
line "rolling too!"
done
KrissHouse1F_MapEvents:
PlayersHouse1F_MapEvents:
; filler
db 0, 0
@@ -393,7 +393,7 @@ KrissHouse1F_MapEvents:
db 3
warp_def 6, 7, 2, NEW_BARK_TOWN
warp_def 7, 7, 2, NEW_BARK_TOWN
warp_def 9, 0, 1, KRISS_HOUSE_2F
warp_def 9, 0, 1, PLAYERS_HOUSE_2F
.CoordEvents:
db 2
@@ -409,8 +409,8 @@ KrissHouse1F_MapEvents:
.ObjectEvents:
db 5
object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR
object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR

0
maps/KrissHouse1F.blk → maps/PlayersHouse1F.blk
View File

60
maps/KrissHouse2F.asm → maps/PlayersHouse2F.asm
View File

@@ -1,10 +1,10 @@
const_value set 2
const KRISSHOUSE2F_CONSOLE
const KRISSHOUSE2F_DOLL_1
const KRISSHOUSE2F_DOLL_2
const KRISSHOUSE2F_BIG_DOLL
const PLAYERSHOUSE2F_CONSOLE
const PLAYERSHOUSE2F_DOLL_1
const PLAYERSHOUSE2F_DOLL_2
const PLAYERSHOUSE2F_BIG_DOLL
KrissHouse2F_MapScripts:
PlayersHouse2F_MapScripts:
.SceneScripts:
db 0
@@ -46,27 +46,27 @@ BigDoll:
GameConsole:
describedecoration DECODESC_CONSOLE
KrissHousePoster:
conditional_event EVENT_KRISS_ROOM_POSTER, .Script
PlayersHousePoster:
conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script
.Script:
describedecoration DECODESC_POSTER
KrissHouseRadio:
PlayersHouseRadio:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue .NormalRadio
checkevent EVENT_LISTENED_TO_INITIAL_RADIO
iftrue .AbbreviatedRadio
playmusic MUSIC_POKEMON_TALK
opentext
writetext KrisRadioText1
writetext PlayersRadioText1
pause 45
writetext KrisRadioText2
writetext PlayersRadioText2
pause 45
writetext KrisRadioText3
writetext PlayersRadioText3
pause 45
musicfadeout MUSIC_NEW_BARK_TOWN, 16
writetext KrisRadioText4
writetext PlayersRadioText4
pause 45
closetext
setevent EVENT_LISTENED_TO_INITIAL_RADIO
@@ -77,17 +77,17 @@ KrissHouseRadio:
.AbbreviatedRadio:
opentext
writetext KrisRadioText4
writetext PlayersRadioText4
pause 45
closetext
end
KrissHouseBookshelf:
PlayersHouseBookshelf:
jumpstd picturebookshelf
KrissHousePC:
PlayersHousePC:
opentext
special Special_KrissHousePC
special Special_PlayersHousePC
iftrue .Warp
closetext
end
@@ -95,47 +95,47 @@ KrissHousePC:
warp NONE, 0, 0
end
KrisRadioText1:
PlayersRadioText1:
text "PROF.OAK'S #MON"
line "TALK! Please tune"
cont "in next time!"
done
KrisRadioText2:
PlayersRadioText2:
text "#MON CHANNEL!"
done
KrisRadioText3:
PlayersRadioText3:
text "This is DJ MARY,"
line "your co-host!"
done
KrisRadioText4:
PlayersRadioText4:
text "#MON!"
line "#MON CHANNEL…"
done
KrissHouse2F_MapEvents:
PlayersHouse2F_MapEvents:
; filler
db 0, 0
.Warps:
db 1
warp_def 7, 0, 3, KRISS_HOUSE_1F
warp_def 7, 0, 3, PLAYERS_HOUSE_1F
.CoordEvents:
db 0
.BGEvents:
db 4
bg_event 2, 1, BGEVENT_UP, KrissHousePC
bg_event 3, 1, BGEVENT_READ, KrissHouseRadio
bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf
bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster
bg_event 2, 1, BGEVENT_UP, PlayersHousePC
bg_event 3, 1, BGEVENT_READ, PlayersHouseRadio
bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelf
bg_event 6, 0, BGEVENT_IFSET, PlayersHousePoster
.ObjectEvents:
db 4
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_PLAYERS_HOUSE_2F_CONSOLE
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_PLAYERS_HOUSE_2F_DOLL_1
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_PLAYERS_HOUSE_2F_DOLL_2
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL

0
maps/KrissHouse2F.blk → maps/PlayersHouse2F.blk
View File

52
maps/KrissNeighborsHouse.asm → maps/PlayersNeighborsHouse.asm
View File

@@ -1,38 +1,38 @@
const_value set 2
const KRISSNEIGHBORSHOUSE_COOLTRAINER_F
const KRISSNEIGHBORSHOUSE_POKEFAN_F
const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F
const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
KrissNeighborsHouse_MapScripts:
PlayersNeighborsHouse_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 0
KrissNeighborsDaughter:
jumptextfaceplayer KrissNeighborsDaughterText
PlayersNeighborsDaughter:
jumptextfaceplayer PlayersNeighborsDaughterText
KrissNeighbor:
jumptextfaceplayer KrissNeighborText
PlayersNeighbor:
jumptextfaceplayer PlayersNeighborText
KrissNeighborsHouseBookshelf:
PlayersNeighborsHouseBookshelf:
jumpstd magazinebookshelf
KrissNeighborsHouseRadio:
PlayersNeighborsHouseRadio:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue .NormalRadio
checkevent EVENT_LISTENED_TO_INITIAL_RADIO
iftrue .AbbreviatedRadio
playmusic MUSIC_POKEMON_TALK
opentext
writetext KrisNeighborRadioText1
writetext PlayerNeighborRadioText1
pause 45
writetext KrisNeighborRadioText2
writetext PlayerNeighborRadioText2
pause 45
writetext KrisNeighborRadioText3
writetext PlayerNeighborRadioText3
pause 45
musicfadeout MUSIC_NEW_BARK_TOWN, 16
writetext KrisNeighborRadioText4
writetext PlayerNeighborRadioText4
pause 45
closetext
setevent EVENT_LISTENED_TO_INITIAL_RADIO
@@ -41,12 +41,12 @@ KrissNeighborsHouseRadio:
jumpstd radio1
.AbbreviatedRadio:
opentext
writetext KrisNeighborRadioText4
writetext PlayerNeighborRadioText4
pause 45
closetext
end
KrissNeighborsDaughterText:
PlayersNeighborsDaughterText:
text "PIKACHU is an"
line "evolved #MON."
@@ -65,7 +65,7 @@ KrissNeighborsDaughterText:
cont "him…"
done
KrissNeighborText:
PlayersNeighborText:
text "My daughter is"
line "adamant about"
@@ -78,27 +78,27 @@ KrissNeighborText:
para "But then, so do I!"
done
KrisNeighborRadioText1:
PlayerNeighborRadioText1:
text "PROF.OAK'S #MON"
line "TALK! Please tune"
cont "in next time!"
done
KrisNeighborRadioText2:
PlayerNeighborRadioText2:
text "#MON CHANNEL!"
done
KrisNeighborRadioText3:
PlayerNeighborRadioText3:
text "This is DJ MARY,"
line "your co-host!"
done
KrisNeighborRadioText4:
PlayerNeighborRadioText4:
text "#MON!"
line "#MON CHANNEL…"
done
KrissNeighborsHouse_MapEvents:
PlayersNeighborsHouse_MapEvents:
; filler
db 0, 0
@@ -112,11 +112,11 @@ KrissNeighborsHouse_MapEvents:
.BGEvents:
db 3
bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio
bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf
bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf
bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadio
.ObjectEvents:
db 2
object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1
object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughter, -1
object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighbor, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR