mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
KrissHouse → PlayersHouse
This commit is contained in:
Rangi
parent
7f187be36c
commit
363d8b9242
@ -63,7 +63,7 @@
|
||||
const ENGINE_UNLOCKED_UNOWNS_UNUSED_6
|
||||
const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
|
||||
; wVisitedSpawns
|
||||
const ENGINE_FLYPOINT_KRISS_HOUSE
|
||||
const ENGINE_FLYPOINT_PLAYERS_HOUSE
|
||||
const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
|
||||
const ENGINE_FLYPOINT_PALLET
|
||||
const ENGINE_FLYPOINT_VIRIDIAN
|
||||
|
||||
@ -730,7 +730,7 @@
|
||||
const EVENT_DECO_GEODUDE_DOLL
|
||||
const EVENT_DECO_MACHOP_DOLL
|
||||
const EVENT_DECO_TENTACOOL_DOLL
|
||||
const EVENT_KRISS_ROOM_POSTER
|
||||
const EVENT_PLAYERS_ROOM_POSTER
|
||||
const EVENT_DECO_GOLD_TROPHY
|
||||
const EVENT_DECO_SILVER_TROPHY
|
||||
const EVENT_DECO_BIG_SNORLAX_DOLL
|
||||
@ -1806,8 +1806,8 @@
|
||||
const EVENT_RIVAL_SPROUT_TOWER
|
||||
const EVENT_RIVAL_BURNED_TOWER
|
||||
const EVENT_RIVAL_DRAGONS_DEN
|
||||
const EVENT_KRISS_HOUSE_MOM_1
|
||||
const EVENT_KRISS_HOUSE_MOM_2
|
||||
const EVENT_PLAYERS_HOUSE_MOM_1
|
||||
const EVENT_PLAYERS_HOUSE_MOM_2
|
||||
const EVENT_MR_POKEMONS_HOUSE_OAK
|
||||
const EVENT_VIOLET_CITY_EARL
|
||||
const EVENT_EARLS_ACADEMY_EARL
|
||||
@ -1928,10 +1928,10 @@
|
||||
const EVENT_KURTS_HOUSE_KURT_1
|
||||
const EVENT_KURTS_HOUSE_KURT_2
|
||||
const EVENT_SLOWPOKE_WELL_KURT ; 740
|
||||
const EVENT_KRISS_HOUSE_2F_CONSOLE
|
||||
const EVENT_KRISS_HOUSE_2F_DOLL_1
|
||||
const EVENT_KRISS_HOUSE_2F_DOLL_2
|
||||
const EVENT_KRISS_HOUSE_2F_BIG_DOLL
|
||||
const EVENT_PLAYERS_HOUSE_2F_CONSOLE
|
||||
const EVENT_PLAYERS_HOUSE_2F_DOLL_1
|
||||
const EVENT_PLAYERS_HOUSE_2F_DOLL_2
|
||||
const EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
|
||||
const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
|
||||
const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
|
||||
const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
|
||||
@ -2012,8 +2012,8 @@
|
||||
const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
|
||||
const EVENT_DRAGON_SHRINE_CLAIR ; 790
|
||||
const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
|
||||
const EVENT_KRISS_HOUSE_1F_NEIGHBOR
|
||||
const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
|
||||
const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
|
||||
const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
|
||||
const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
|
||||
|
||||
@ -447,9 +447,9 @@ ENDM
|
||||
mapconst ROUTE_29, 9, 30 ; 3
|
||||
mapconst NEW_BARK_TOWN, 9, 10 ; 4
|
||||
mapconst ELMS_LAB, 6, 5 ; 5
|
||||
mapconst KRISS_HOUSE_1F, 4, 5 ; 6
|
||||
mapconst KRISS_HOUSE_2F, 3, 4 ; 7
|
||||
mapconst KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8
|
||||
mapconst PLAYERS_HOUSE_1F, 4, 5 ; 6
|
||||
mapconst PLAYERS_HOUSE_2F, 3, 4 ; 7
|
||||
mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8
|
||||
mapconst ELMS_HOUSE, 4, 4 ; 9
|
||||
mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10
|
||||
mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11
|
||||
|
||||
@ -188,7 +188,7 @@ CianwoodLugiaSpeechHouse_Blocks:
|
||||
PokeSeersHouse_Blocks:
|
||||
ViridianNicknameSpeechHouse_Blocks:
|
||||
Route2NuggetSpeechHouse_Blocks:
|
||||
KrissNeighborsHouse_Blocks:
|
||||
PlayersNeighborsHouse_Blocks:
|
||||
Route26HealSpeechHouse_Blocks:
|
||||
Route26DayofWeekSiblingsHouse_Blocks:
|
||||
Route27SandstormHouse_Blocks:
|
||||
@ -265,8 +265,8 @@ Route43_Blocks:
|
||||
Route39_Blocks:
|
||||
INCBIN "maps/Route39.blk"
|
||||
|
||||
KrissHouse1F_Blocks:
|
||||
INCBIN "maps/KrissHouse1F.blk"
|
||||
PlayersHouse1F_Blocks:
|
||||
INCBIN "maps/PlayersHouse1F.blk"
|
||||
|
||||
Route38EcruteakGate_Blocks:
|
||||
Route42EcruteakGate_Blocks:
|
||||
@ -846,8 +846,8 @@ OlivineCafe_Blocks:
|
||||
SafariZoneMainOffice_Blocks:
|
||||
INCBIN "maps/OlivineCafe.blk"
|
||||
|
||||
KrissHouse2F_Blocks:
|
||||
INCBIN "maps/KrissHouse2F.blk"
|
||||
PlayersHouse2F_Blocks:
|
||||
INCBIN "maps/PlayersHouse2F.blk"
|
||||
|
||||
SaffronMagnetTrainStation_Blocks:
|
||||
INCBIN "maps/SaffronMagnetTrainStation.blk"
|
||||
|
||||
@ -654,9 +654,9 @@ ENDM
|
||||
map_data Route2Gate, ROUTE_2_GATE, $00, 0
|
||||
map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
|
||||
map_data ElmsLab, ELMS_LAB, $00, 0
|
||||
map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0
|
||||
map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0
|
||||
map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0
|
||||
map_data PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0
|
||||
map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0
|
||||
map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
|
||||
map_data ElmsHouse, ELMS_HOUSE, $00, 0
|
||||
map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0
|
||||
map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
|
||||
|
||||
@ -445,9 +445,9 @@ MapGroup_NewBark:
|
||||
map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
|
||||
map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
|
||||
map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
|
||||
@ -28,7 +28,7 @@ MapScenes:: ; 4d01e
|
||||
scene_def ROUTE_27, wRoute27SceneID
|
||||
scene_def NEW_BARK_TOWN, wNewBarkTownSceneID
|
||||
scene_def ELMS_LAB, wElmsLabSceneID
|
||||
scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID
|
||||
scene_def PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID
|
||||
scene_def ROUTE_29, wRoute29SceneID
|
||||
scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID
|
||||
scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID
|
||||
|
||||
@ -151,9 +151,9 @@ SECTION "Map Scripts 9", ROMX
|
||||
|
||||
INCLUDE "maps/Route34.asm"
|
||||
INCLUDE "maps/ElmsLab.asm"
|
||||
INCLUDE "maps/KrissHouse1F.asm"
|
||||
INCLUDE "maps/KrissHouse2F.asm"
|
||||
INCLUDE "maps/KrissNeighborsHouse.asm"
|
||||
INCLUDE "maps/PlayersHouse1F.asm"
|
||||
INCLUDE "maps/PlayersHouse2F.asm"
|
||||
INCLUDE "maps/PlayersNeighborsHouse.asm"
|
||||
INCLUDE "maps/ElmsHouse.asm"
|
||||
INCLUDE "maps/Route26HealSpeechHouse.asm"
|
||||
INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm"
|
||||
|
||||
@ -7,7 +7,7 @@ ENDM
|
||||
SpawnPoints: ; 0x152ab
|
||||
; entries correspond to SPAWN_* constants
|
||||
|
||||
spawn KRISS_HOUSE_2F, 3, 3
|
||||
spawn PLAYERS_HOUSE_2F, 3, 3
|
||||
spawn VIRIDIAN_POKECENTER_1F, 5, 3
|
||||
|
||||
spawn PALLET_TOWN, 5, 6
|
||||
|
||||
@ -11,7 +11,7 @@ ENDM
|
||||
PhoneContacts: ; 9045f
|
||||
; entries correspond to PHONE_* constants
|
||||
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
|
||||
phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript
|
||||
phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript
|
||||
phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript
|
||||
phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2
|
||||
phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2
|
||||
|
||||
@ -40,7 +40,7 @@ SpecialsPointers:: ; c029
|
||||
add_special Special_MagikarpHouseSign
|
||||
add_special HealParty ; this is both a special and a predef
|
||||
add_special Special_PokemonCenterPC
|
||||
add_special Special_KrissHousePC
|
||||
add_special Special_PlayersHousePC
|
||||
add_special Special_DayCareMan
|
||||
add_special Special_DayCareLady
|
||||
add_special Special_DayCareManOutside
|
||||
|
||||
@ -1071,12 +1071,12 @@ UnknownText_0x1c1368::
|
||||
line "to do?"
|
||||
done
|
||||
|
||||
_KrissPCHowManyWithdrawText::
|
||||
_PlayersPCHowManyWithdrawText::
|
||||
text "How many do you"
|
||||
line "want to withdraw?"
|
||||
done
|
||||
|
||||
_KrissPCWithdrewItemsText::
|
||||
_PlayersPCWithdrewItemsText::
|
||||
text "Withdrew @"
|
||||
deciram wItemQuantityChangeBuffer, 1, 2
|
||||
text_start
|
||||
@ -1085,7 +1085,7 @@ _KrissPCWithdrewItemsText::
|
||||
text "(S)."
|
||||
prompt
|
||||
|
||||
_KrissPCNoRoomWithdrawText::
|
||||
_PlayersPCNoRoomWithdrawText::
|
||||
text "There's no room"
|
||||
line "for more items."
|
||||
prompt
|
||||
@ -1094,12 +1094,12 @@ UnknownText_0x1c13df::
|
||||
text "No items here!"
|
||||
prompt
|
||||
|
||||
_KrissPCHowManyDepositText::
|
||||
_PlayersPCHowManyDepositText::
|
||||
text "How many do you"
|
||||
line "want to deposit?"
|
||||
done
|
||||
|
||||
_KrissPCDepositItemsText::
|
||||
_PlayersPCDepositItemsText::
|
||||
text "Deposited @"
|
||||
deciram wItemQuantityChangeBuffer, 1, 2
|
||||
text_start
|
||||
@ -1108,7 +1108,7 @@ _KrissPCDepositItemsText::
|
||||
text "(S)."
|
||||
prompt
|
||||
|
||||
_KrissPCNoRoomDepositText::
|
||||
_PlayersPCNoRoomDepositText::
|
||||
text "There's no room to"
|
||||
line "store items."
|
||||
prompt
|
||||
|
||||
@ -5,7 +5,7 @@ InitDecorations: ; 26751 (9:6751)
|
||||
ld [Poster], a
|
||||
ret
|
||||
|
||||
_KrisDecorationMenu: ; 0x2675c
|
||||
_PlayerDecorationMenu: ; 0x2675c
|
||||
ld a, [wWhichIndexSet]
|
||||
push af
|
||||
ld hl, .MenuDataHeader
|
||||
@ -1233,7 +1233,7 @@ SetPosterVisibility: ; 27027
|
||||
ld b, RESET_FLAG
|
||||
|
||||
.ok
|
||||
ld de, EVENT_KRISS_ROOM_POSTER
|
||||
ld de, EVENT_PLAYERS_ROOM_POSTER
|
||||
jp EventFlagAction
|
||||
; 27037
|
||||
|
||||
@ -1249,19 +1249,19 @@ SetDecorationTile: ; 27037
|
||||
; 27043
|
||||
|
||||
Special_ToggleDecorationsVisibility: ; 27043
|
||||
ld de, EVENT_KRISS_HOUSE_2F_CONSOLE
|
||||
ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE
|
||||
ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS
|
||||
ld a, [Console]
|
||||
call ToggleDecorationVisibility
|
||||
ld de, EVENT_KRISS_HOUSE_2F_DOLL_1
|
||||
ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_1
|
||||
ld hl, VariableSprites + SPRITE_DOLL_1 - SPRITE_VARS
|
||||
ld a, [LeftOrnament]
|
||||
call ToggleDecorationVisibility
|
||||
ld de, EVENT_KRISS_HOUSE_2F_DOLL_2
|
||||
ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_2
|
||||
ld hl, VariableSprites + SPRITE_DOLL_2 - SPRITE_VARS
|
||||
ld a, [RightOrnament]
|
||||
call ToggleDecorationVisibility
|
||||
ld de, EVENT_KRISS_HOUSE_2F_BIG_DOLL
|
||||
ld de, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
|
||||
ld hl, VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS
|
||||
ld a, [BigDoll]
|
||||
call ToggleDecorationVisibility
|
||||
|
||||
@ -171,7 +171,7 @@ PC_WaitPlaySFX: ; 156d0
|
||||
ret
|
||||
; 156d9
|
||||
|
||||
_KrissHousePC: ; 156d9
|
||||
_PlayersHousePC: ; 156d9
|
||||
call PC_PlayBootSound
|
||||
ld hl, UnknownText_0x156ff
|
||||
call PC_DisplayText
|
||||
@ -212,7 +212,7 @@ Function15715: ; 15715
|
||||
xor a
|
||||
ld [wPCItemsCursor], a
|
||||
ld [wPCItemsScrollPosition], a
|
||||
ld hl, KrissPCMenuData
|
||||
ld hl, PlayersPCMenuData
|
||||
call LoadMenuDataHeader
|
||||
.asm_15722
|
||||
call UpdateTimePals
|
||||
@ -230,28 +230,28 @@ Function15715: ; 15715
|
||||
ret
|
||||
; 15736
|
||||
|
||||
KrissPCMenuData: ; 0x15736
|
||||
PlayersPCMenuData: ; 0x15736
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
db 0, 0 ; top left corner coords (y, x)
|
||||
db 12, 15 ; bottom right corner coords (y, x)
|
||||
dw .KrissPCMenuData2
|
||||
dw .PlayersPCMenuData2
|
||||
db 1 ; default selected option
|
||||
|
||||
.KrissPCMenuData2:
|
||||
.PlayersPCMenuData2:
|
||||
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
|
||||
db 0 ; # items?
|
||||
dw .KrissPCMenuList1
|
||||
dw .PlayersPCMenuList1
|
||||
dw PlaceNthMenuStrings
|
||||
dw .KrissPCMenuPointers
|
||||
dw .PlayersPCMenuPointers
|
||||
|
||||
.KrissPCMenuPointers: ; 0x15746
|
||||
dw KrisWithdrawItemMenu, .WithdrawItem
|
||||
dw KrisDepositItemMenu, .DepositItem
|
||||
dw KrisTossItemMenu, .TossItem
|
||||
dw KrisMailBoxMenu, .MailBox
|
||||
dw KrisDecorationMenu, .Decoration
|
||||
dw KrisLogOffMenu, .LogOff
|
||||
dw KrisLogOffMenu, .TurnOff
|
||||
.PlayersPCMenuPointers: ; 0x15746
|
||||
dw PlayerWithdrawItemMenu, .WithdrawItem
|
||||
dw PlayerDepositItemMenu, .DepositItem
|
||||
dw PlayerTossItemMenu, .TossItem
|
||||
dw PlayerMailBoxMenu, .MailBox
|
||||
dw PlayerDecorationMenu, .Decoration
|
||||
dw PlayerLogOffMenu, .LogOff
|
||||
dw PlayerLogOffMenu, .TurnOff
|
||||
|
||||
.WithdrawItem: db "WITHDRAW ITEM@"
|
||||
.DepositItem: db "DEPOSIT ITEM@"
|
||||
@ -269,7 +269,7 @@ DECORATION EQU 4
|
||||
TURN_OFF EQU 5
|
||||
LOG_OFF EQU 6
|
||||
|
||||
.KrissPCMenuList1:
|
||||
.PlayersPCMenuList1:
|
||||
db 5
|
||||
db WITHDRAW_ITEM
|
||||
db DEPOSIT_ITEM
|
||||
@ -278,7 +278,7 @@ LOG_OFF EQU 6
|
||||
db TURN_OFF
|
||||
db -1
|
||||
|
||||
.KrissPCMenuList2:
|
||||
.PlayersPCMenuList2:
|
||||
db 6
|
||||
db WITHDRAW_ITEM
|
||||
db DEPOSIT_ITEM
|
||||
@ -305,7 +305,7 @@ UnknownText_0x157cc: ; 0x157cc
|
||||
db "@"
|
||||
; 0x157d1
|
||||
|
||||
KrisWithdrawItemMenu: ; 0x157d1
|
||||
PlayerWithdrawItemMenu: ; 0x157d1
|
||||
call LoadStandardMenuDataHeader
|
||||
farcall ClearPCItemScreen
|
||||
.loop
|
||||
@ -370,18 +370,18 @@ KrisWithdrawItemMenu: ; 0x157d1
|
||||
ret
|
||||
|
||||
.HowManyText: ; 0x15850
|
||||
text_jump _KrissPCHowManyWithdrawText
|
||||
text_jump _PlayersPCHowManyWithdrawText
|
||||
db "@"
|
||||
|
||||
.WithdrewText: ; 0x15855
|
||||
text_jump _KrissPCWithdrewItemsText
|
||||
text_jump _PlayersPCWithdrewItemsText
|
||||
db "@"
|
||||
|
||||
.NoRoomText: ; 0x1585a
|
||||
text_jump _KrissPCNoRoomWithdrawText
|
||||
text_jump _PlayersPCNoRoomWithdrawText
|
||||
db "@"
|
||||
|
||||
KrisTossItemMenu: ; 0x1585f
|
||||
PlayerTossItemMenu: ; 0x1585f
|
||||
call LoadStandardMenuDataHeader
|
||||
farcall ClearPCItemScreen
|
||||
.loop
|
||||
@ -397,8 +397,8 @@ KrisTossItemMenu: ; 0x1585f
|
||||
ret
|
||||
; 0x1587d
|
||||
|
||||
KrisDecorationMenu: ; 0x1587d
|
||||
farcall _KrisDecorationMenu
|
||||
PlayerDecorationMenu: ; 0x1587d
|
||||
farcall _PlayerDecorationMenu
|
||||
ld a, c
|
||||
and a
|
||||
ret z
|
||||
@ -406,13 +406,13 @@ KrisDecorationMenu: ; 0x1587d
|
||||
ret
|
||||
; 0x15888
|
||||
|
||||
KrisLogOffMenu: ; 0x15888
|
||||
PlayerLogOffMenu: ; 0x15888
|
||||
xor a
|
||||
scf
|
||||
ret
|
||||
; 0x1588b
|
||||
|
||||
KrisDepositItemMenu: ; 0x1588b
|
||||
PlayerDepositItemMenu: ; 0x1588b
|
||||
call .CheckItemsInBag
|
||||
jr c, .nope
|
||||
call DisableSpriteUpdates
|
||||
@ -532,19 +532,19 @@ KrisDepositItemMenu: ; 0x1588b
|
||||
ret
|
||||
|
||||
.HowManyText: ; 0x1596e
|
||||
text_jump _KrissPCHowManyDepositText
|
||||
text_jump _PlayersPCHowManyDepositText
|
||||
db "@"
|
||||
|
||||
.DepositText: ; 0x15973
|
||||
text_jump _KrissPCDepositItemsText
|
||||
text_jump _PlayersPCDepositItemsText
|
||||
db "@"
|
||||
|
||||
.NoRoomText: ; 0x15978
|
||||
text_jump _KrissPCNoRoomDepositText
|
||||
text_jump _PlayersPCNoRoomDepositText
|
||||
db "@"
|
||||
|
||||
KrisMailBoxMenu: ; 0x1597d
|
||||
farcall _KrisMailBoxMenu
|
||||
PlayerMailBoxMenu: ; 0x1597d
|
||||
farcall _PlayerMailBoxMenu
|
||||
xor a
|
||||
ret
|
||||
; 0x15985
|
||||
|
||||
@ -539,10 +539,10 @@ InitializeEventsScript:
|
||||
setevent EVENT_MAHOGANY_MART_OWNERS
|
||||
setevent EVENT_TIN_TOWER_ROOF_HO_OH
|
||||
setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
|
||||
setevent EVENT_KRISS_HOUSE_2F_CONSOLE
|
||||
setevent EVENT_KRISS_HOUSE_2F_DOLL_1
|
||||
setevent EVENT_KRISS_HOUSE_2F_DOLL_2
|
||||
setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL
|
||||
setevent EVENT_PLAYERS_HOUSE_2F_CONSOLE
|
||||
setevent EVENT_PLAYERS_HOUSE_2F_DOLL_1
|
||||
setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2
|
||||
setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
|
||||
setevent EVENT_DECO_BED_1
|
||||
setevent EVENT_DECO_PLANT_4
|
||||
setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
|
||||
@ -576,7 +576,7 @@ InitializeEventsScript:
|
||||
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
|
||||
setevent EVENT_DRAGON_SHRINE_CLAIR
|
||||
setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
|
||||
setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
|
||||
setevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
|
||||
setevent EVENT_AZALEA_TOWN_KURT
|
||||
setevent EVENT_AZALEA_TOWN_KURT
|
||||
setevent EVENT_ILEX_FOREST_KURT
|
||||
@ -585,7 +585,7 @@ InitializeEventsScript:
|
||||
setevent EVENT_GOLDENROD_SALE_OFF
|
||||
setevent EVENT_ECRUTEAK_CITY_GRAMPS
|
||||
setevent EVENT_EUSINE_IN_BURNED_TOWER
|
||||
setevent EVENT_KRISS_HOUSE_MOM_2
|
||||
setevent EVENT_PLAYERS_HOUSE_MOM_2
|
||||
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
|
||||
setevent EVENT_CIANWOOD_CITY_EUSINE
|
||||
setevent EVENT_TIN_TOWER_1F_EUSINE
|
||||
|
||||
@ -310,7 +310,7 @@ IsAnyMonHoldingMail: ; 44781
|
||||
ret
|
||||
; 447a0
|
||||
|
||||
_KrisMailBoxMenu: ; 0x447a0
|
||||
_PlayerMailBoxMenu: ; 0x447a0
|
||||
call InitMail
|
||||
jr z, .nomail
|
||||
call LoadStandardMenuDataHeader
|
||||
|
||||
@ -129,10 +129,10 @@ Special_DisplayLinkRecord: ; c2da
|
||||
ret
|
||||
; c2e7
|
||||
|
||||
Special_KrissHousePC: ; c2e7
|
||||
Special_PlayersHousePC: ; c2e7
|
||||
xor a
|
||||
ld [ScriptVar], a
|
||||
farcall _KrissHousePC
|
||||
farcall _PlayersHousePC
|
||||
ld a, c
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
@ -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
|
||||
@ -328,14 +328,14 @@ Function17d0f3: ; 17d0f3
|
||||
; 17d187
|
||||
|
||||
Mobile_CopyDefaultOTName: ; 17d187
|
||||
ld hl, Mobile5F_KrissName
|
||||
ld hl, Mobile5F_PlayersName
|
||||
ld de, $c63d
|
||||
ld bc, 5
|
||||
call CopyBytes
|
||||
ret
|
||||
; 17d194
|
||||
|
||||
Mobile5F_KrissName:
|
||||
Mobile5F_PlayersName:
|
||||
db "クりス@@"
|
||||
; 17d198
|
||||
|
||||
@ -371,7 +371,7 @@ Mobile_CopyDefaultMailAuthor: ; 17d1c9
|
||||
ld de, $c668
|
||||
ld bc, 5
|
||||
call ByteFill
|
||||
ld hl, Mobile5F_KrissName
|
||||
ld hl, Mobile5F_PlayersName
|
||||
ld de, $c668
|
||||
ld bc, 5
|
||||
call CopyBytes
|
||||
|
||||
2
wram.asm
2
wram.asm
@ -2523,7 +2523,7 @@ wHallOfFameSceneID:: db ; d984
|
||||
wRoute27SceneID:: db ; d985
|
||||
wNewBarkTownSceneID:: db ; d986
|
||||
wElmsLabSceneID:: db ; d987
|
||||
wKrissHouse1FSceneID:: db ; d988
|
||||
wPlayersHouse1FSceneID:: db ; d988
|
||||
wRoute29SceneID:: db ; d989
|
||||
wCherrygroveCitySceneID:: db ; d98a
|
||||
wMrPokemonsHouseSceneID:: db ; d98b
|
||||
|
||||
Loading…
Reference in New Issue
Block a user