summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-10-25 00:34:32 -0400
committersurskitty <surskitty@gmail.com>2017-10-25 00:34:32 -0400
commit6cdc14b9202e706ed4b4c7935054ef06abf83567 (patch)
treeb5a6a583c516184ce60ef376e2577aab16fdef20
parent9a2b212ffd92a815f614639e8c43b6a242db1642 (diff)
Labelling a few mom scripts.
-rw-r--r--engine/phone_scripts.asm36
-rw-r--r--text/phone/mom.asm8
2 files changed, 22 insertions, 22 deletions
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm
index f57404cb1..8beee58c6 100644
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -22,16 +22,16 @@ MomPhoneScript: ; 0xbceaa
buttonsound
mapnametotext $0
checkcode VAR_ROOFPALETTE
- if_equal $1, UnknownScript_0xbcee7
- if_equal $2, UnknownScript_0xbcf27
+ if_equal $1, MomPhonePalette1
+ if_equal $2, MomPhonePalette2
jump UnknownScript_0xbcf2f
-UnknownScript_0xbcedf: ; 0xbcedf
- farwritetext UnknownText_0x1b4021
+MomPhoneLandmark: ; 0xbcedf
+ farwritetext MomPhoneLandmarkText
buttonsound
jump UnknownScript_0xbcf37
-UnknownScript_0xbcee7: ; 0xbcee7
+MomPhonePalette1: ; 0xbcee7
checkcode VAR_MAPGROUP
if_equal GROUP_NEW_BARK_TOWN, .newbark
if_equal GROUP_CHERRYGROVE_CITY, .cherrygrove
@@ -54,39 +54,39 @@ UnknownScript_0xbcee7: ; 0xbcee7
.violet ; 0xbcf15
landmarktotext SPROUT_TOWER, 1
- jump UnknownScript_0xbcedf
+ jump MomPhoneLandmark
.azalea ; 0xbcf1b
landmarktotext SLOWPOKE_WELL, 1
- jump UnknownScript_0xbcedf
+ jump MomPhoneLandmark
.goldenrod ; 0xbcf21
landmarktotext RADIO_TOWER, 1
- jump UnknownScript_0xbcedf
+ jump MomPhoneLandmark
-UnknownScript_0xbcf27: ; 0xbcf27
- farwritetext UnknownText_0x1b411c
+MomPhonePalette2: ; 0xbcf27
+ farwritetext MomOtherAreaText
buttonsound
jump UnknownScript_0xbcf37
UnknownScript_0xbcf2f: ; 0xbcf2f
- farwritetext UnknownText_0x1b4150
+ farwritetext MomDeterminedText
buttonsound
jump UnknownScript_0xbcf37
UnknownScript_0xbcf37: ; 0xbcf37
checkflag ENGINE_MOM_SAVING_MONEY
- iffalse UnknownScript_0xbcf49
+ iffalse CheckIfMomHasMoney
checkmoney $1, 0
if_equal $0, UnknownScript_0xbcf55
jump UnknownScript_0xbcf63
-UnknownScript_0xbcf49: ; 0xbcf49
+CheckIfMomHasMoney: ; 0xbcf49
checkmoney $1, 0
- if_equal $0, UnknownScript_0xbcf79
- jump UnknownScript_0xbcf6e
+ if_equal $0, MomHasMoney
+ jump MomHasNoMoney
UnknownScript_0xbcf55: ; 0xbcf55
readmoney $1, $0
- farwritetext UnknownText_0x1b41a7
+ farwritetext MomCheckBalanceText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
@@ -97,13 +97,13 @@ UnknownScript_0xbcf63: ; 0xbcf63
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-UnknownScript_0xbcf6e: ; 0xbcf6e
+MomHasNoMoney: ; 0xbcf6e
farwritetext UnknownText_0x1b420d
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-UnknownScript_0xbcf79: ; 0xbcf79
+MomHasMoney: ; 0xbcf79
readmoney $1, $0
farwritetext UnknownText_0x1b4249
yesorno
diff --git a/text/phone/mom.asm b/text/phone/mom.asm
index 6842728b7..961297fb5 100644
--- a/text/phone/mom.asm
+++ b/text/phone/mom.asm
@@ -5,7 +5,7 @@ MomPhoneGreetingText: ; 0x1b4000
line "Working hard?"
done
-UnknownText_0x1b4021: ; 0x1b4021
+MomPhoneLandmarkText: ; 0x1b4021
text "Oh, so you're in"
line "@"
text_from_ram StringBuffer3
@@ -50,7 +50,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
line "home for a bit?"
done
-UnknownText_0x1b411c: ; 0x1b411c
+MomOtherAreaText: ; 0x1b411c
text "Wow, you're in"
line "@"
text_from_ram StringBuffer3
@@ -60,7 +60,7 @@ UnknownText_0x1b411c: ; 0x1b411c
line "#MON quest!"
done
-UnknownText_0x1b4150: ; 0x1b4150
+MomDeterminedText: ; 0x1b4150
text "That sounds really"
line "tough."
@@ -71,7 +71,7 @@ UnknownText_0x1b4150: ; 0x1b4150
line "be OK, right?"
done
-UnknownText_0x1b41a7: ; 0x1b41a7
+MomCheckBalanceText: ; 0x1b41a7
text "By the way, you've"
line "saved up ¥@"
text_from_ram StringBuffer3