pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Improve labels for some stuff in Kris's house.

Browse Source
This commit is contained in:
IIMarckus 2015-06-23 11:34:13 -06:00
parent 2bf3a322ba
commit 91e474b19f
1 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
maps/KrissHouse1F.asm
View File

@ -167,56 +167,49 @@ UnknownScript_0x7a5b8: ; 0x7a5b8
end end
; 0x7a5c1 ; 0x7a5c1
PokefanFScript_0x7a5c1: ; 0x7a5c1 NeighborScript:
faceplayer faceplayer
loadfont loadfont
checktime $1 checktime $1
iftrue UnknownScript_0x7a5d2 iftrue .MornScript
checktime $2 checktime $2
iftrue UnknownScript_0x7a5d9 iftrue .DayScript
checktime $4 checktime $4
iftrue UnknownScript_0x7a5e0 iftrue .NiteScript
UnknownScript_0x7a5d2: ; 0x7a5d2
writetext UnknownText_0x7a97d
keeptextopen
jump UnknownScript_0x7a5e7
; 0x7a5d9
UnknownScript_0x7a5d9: ; 0x7a5d9 .MornScript
writetext UnknownText_0x7a99c writetext NeighborMornIntroText
keeptextopen keeptextopen
jump UnknownScript_0x7a5e7 jump .Main
; 0x7a5e0
UnknownScript_0x7a5e0: ; 0x7a5e0 .DayScript
writetext UnknownText_0x7a9b4 writetext NeighborDayIntroText
keeptextopen keeptextopen
jump UnknownScript_0x7a5e7 jump .Main
; 0x7a5e7
UnknownScript_0x7a5e7: ; 0x7a5e7 .NiteScript
writetext UnknownText_0x7a9d3 writetext NeighborNiteIntroText
keeptextopen
jump .Main
.Main
writetext NeighborText
closetext closetext
loadmovesprites loadmovesprites
spriteface $6, $3 spriteface $6, $3
end end
; 0x7a5f0
MapKrissHouse1FSignpost3Script: ; 0x7a5f0 TVScript:
jumptext UnknownText_0x7aad0 jumptext TVText
; 0x7a5f3
MapKrissHouse1FSignpost0Script: ; 0x7a5f3 StoveScript:
jumptext UnknownText_0x7aa3a jumptext StoveText
; 0x7a5f6
MapKrissHouse1FSignpost1Script: ; 0x7a5f6 SinkScript:
jumptext UnknownText_0x7aa64 jumptext SinkText
; 0x7a5f9
MapKrissHouse1FSignpost2Script: ; 0x7a5f9 FridgeScript:
jumptext UnknownText_0x7aa91 jumptext FridgeText
; 0x7a5fc
MovementData_0x7a5fc: ; 0x7a5fc MovementData_0x7a5fc: ; 0x7a5fc
turn_head_right turn_head_right
@ -356,29 +349,26 @@ UnknownText_0x7a957: ; 0x7a957
done done
; 0x7a97d ; 0x7a97d
UnknownText_0x7a97d: ; 0x7a97d NeighborMornIntroText:
text "Good morning," text "Good morning,"
line $14, "!" line $14, "!"
para "I'm visiting!" para "I'm visiting!"
done done
; 0x7a99c
UnknownText_0x7a99c: ; 0x7a99c NeighborDayIntroText:
text "Hello, ", $14, "!" text "Hello, ", $14, "!"
line "I'm visiting!" line "I'm visiting!"
done done
; 0x7a9b4
UnknownText_0x7a9b4: ; 0x7a9b4 NeighborNiteIntroText:
text "Good evening," text "Good evening,"
line $14, "!" line $14, "!"
para "I'm visiting!" para "I'm visiting!"
done done
; 0x7a9d3
UnknownText_0x7a9d3: ; 0x7a9d3 NeighborText:
text $14, ", have you" text $14, ", have you"
line "heard?" line "heard?"
@ -391,33 +381,29 @@ UnknownText_0x7a9d3: ; 0x7a9d3
para "She really loves" para "She really loves"
line "#MON!" line "#MON!"
done done
; 0x7aa3a
UnknownText_0x7aa3a: ; 0x7aa3a StoveText:
text "Mom's specialty!" text "Mom's specialty!"
para "CINNABAR VOLCANO" para "CINNABAR VOLCANO"
line "BURGER!" line "BURGER!"
done done
; 0x7aa64
UnknownText_0x7aa64: ; 0x7aa64 SinkText:
text "The sink is spot-" text "The sink is spot-"
line "less. Mom likes it" line "less. Mom likes it"
cont "clean." cont "clean."
done done
; 0x7aa91
UnknownText_0x7aa91: ; 0x7aa91 FridgeText:
text "Let's see what's" text "Let's see what's"
line "in the fridge…" line "in the fridge…"
para "FRESH WATER and" para "FRESH WATER and"
line "tasty LEMONADE!" line "tasty LEMONADE!"
done done
; 0x7aad0
UnknownText_0x7aad0: ; 0x7aad0 TVText:
text "There's a movie on" text "There's a movie on"
line "TV: Stars dot the" line "TV: Stars dot the"
@ -427,7 +413,6 @@ UnknownText_0x7aad0: ; 0x7aad0
para "I'd better get" para "I'd better get"
line "rolling too!" line "rolling too!"
done done
; 0x7ab31
KrissHouse1F_MapEventHeader: ; 0x7ab31 KrissHouse1F_MapEventHeader: ; 0x7ab31
; filler ; filler
@ -446,10 +431,10 @@ KrissHouse1F_MapEventHeader: ; 0x7ab31
; signposts ; signposts
db 4 db 4
signpost 1, 0, $0, MapKrissHouse1FSignpost0Script signpost 1, 0, $0, StoveScript
signpost 1, 1, $0, MapKrissHouse1FSignpost1Script signpost 1, 1, $0, SinkScript
signpost 1, 2, $0, MapKrissHouse1FSignpost2Script signpost 1, 2, $0, FridgeScript
signpost 1, 4, $0, MapKrissHouse1FSignpost3Script signpost 1, 4, $0, TVScript
; people-events ; people-events
db 5 db 5
@ -457,6 +442,6 @@ KrissHouse1F_MapEventHeader: ; 0x7ab31
person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, $06c8 person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, $06c8
person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, $06c8 person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, $06c8
person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, $06c8 person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, $06c8
person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, PokefanFScript_0x7a5c1, $0792 person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, $0792
; 0x7abab ; 0x7abab