Fixed various typo's and updated internal DEFs

constants/item_data_constants.asm

@@ -51,7 +51,7 @@ DEF MAX_ITEMS     EQU 20
 DEF MAX_BALLS     EQU 12
 DEF MAX_KEY_ITEMS EQU 25
 DEF MAX_PC_ITEMS  EQU 50
-MAX_BERRIES       EQU 17
+DEF MAX_BERRIES   EQU 17
 
 DEF MAX_ITEM_STACK EQU 99
 

constants/wram_constants.asm

@@ -125,7 +125,7 @@ DEF NUM_DAYTIMES EQU const_value
 DEF MORN     EQU 1 << MORN_F
 DEF DAY      EQU 1 << DAY_F
 DEF NITE     EQU 1 << NITE_F
-EVE          EQU 1 << EVE_F
+DEF EVE      EQU 1 << EVE_F
 
 DEF ANYTIME EQU MORN | DAY | EVE | NITE
 
@@ -249,7 +249,7 @@ DEF NUM_BADGES       EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
 	const POKEGEAR_EXPN_CARD_F  ; 3
 	const POKEGEAR_PAGER_CARD_F ; 4
 
-POKEGEAR_OBTAINED_F EQU 7
+DEF POKEGEAR_OBTAINED_F EQU 7
 
 ; wPagerFlags::
 	const_def
@@ -260,7 +260,7 @@ POKEGEAR_OBTAINED_F EQU 7
 	const PAGER_FLASH_F      ; 4
 	const PAGER_WHIRLPOOL_F  ; 5
 	const PAGER_ROCK_SMASH_F ; 6
-NUM_PAGER_FLAGS EQU const_value
+DEF NUM_PAGER_FLAGS EQU const_value
 
 ; wWhichRegisteredItem::
 DEF REGISTERED_POCKET EQU %11000000

data/phone/text/alfred_callee.asm

@@ -1,3 +1,64 @@
+AlfredAnswerPhoneText:
+	text "Hello. This is"
+	line "@"
+	text_ram wStringBuffer3
+	text "…"
+
+	para "Good morning,"
+	line "<PLAY_G>!"
+	done
+
+AlfredAnswerPhoneDayText:
+	text "Hello. This is"
+	line "@"
+	text_ram wStringBuffer3
+	text "…"
+
+	para "Good afternoon,"
+	line "<PLAY_G>!"
+	done
+
+AlfredAnswerPhoneNiteText:
+	text "Hello. This is"
+	line "@"
+	text_ram wStringBuffer3
+	text "…"
+
+	para "Good evening,"
+	line "<PLAY_G>!"
+	done
+
+AlfredGreetText:
+	text "<PLAY_G>, good"
+	line "morning!"
+
+	para "This is, @"
+	text_ram wStringBuffer3
+	text "."
+	line "How are you doing?"
+	done
+
+AlfredGreetDayText:
+	text "<PLAY_G>, good"
+	line "afternoon!"
+
+	para "This is, @"
+	text_ram wStringBuffer3
+	text "."
+	line "Isn't it nice out?"
+	done
+
+AlfredGreetNiteText:
+	text "<PLAY_G>, good"
+	line "evening!"
+
+	para "This is, @"
+	text_ram wStringBuffer3
+	text "."
+	line "Do you have a"
+	cont "moment to spare?"
+	done
+
 AlfredReminderText:
 	text "Oh, hey, good"
 	line "afternoon."
@@ -22,7 +83,7 @@ AlfredPokemonBlurbText:
 	text "Just like this,"
 	line "when calling a"
 
-	para "young persoan such"
+	para "young person such"
 	line "as yourself, you"
 	
 	para "can trade in-"

data/phone/text/alfred_caller.asm

@@ -32,4 +32,8 @@ AlfredNoctowlTradeText:
 	line "can't truly happen"
 	cont "in this world,"
 	cont "right?"
+	done
+
+AlfredHangUpText:
+	text "Well, goodbye!"
 	done

data/phone/text/alfred_overworld.asm

@@ -1,6 +1,6 @@
 AlfredAskNumber1Text:
 	text "Well, now that"
-	line "we've me each"
+	line "we've met each"
 	
 	para "other's acquain-"
 	line "tance, shall we"

engine/battle/effect_commands.asm

@@ -6769,7 +6769,7 @@ BattleCommand_WeightDamage:
 
 ; The output with these specific values is correct,
 ;  but it might be inaccurate for other values, especially bigger ones.
-kg EQUS "* 10000000 / 453592"
+DEF kg EQUS "* 10000000 / 453592"
 .table
 	dwb 200 kg, 120
 	dwb 100 kg, 100

engine/phone/scripts/generic_callee.asm

@@ -44,6 +44,7 @@ PhoneScript_AnswerPhone_Male:
 	ifequal PHONE_FISHER_WILTON, .Wilton
 	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 	ifequal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_GENTLEMAN_ALFRED, .Alfred
 
 .Jack:
 	farwritetext JackAnswerPhoneText
@@ -145,6 +146,11 @@ PhoneScript_AnswerPhone_Male:
 	promptbutton
 	end
 
+.Alfred:
+	farwritetext AlfredAnswerPhoneText
+	promptbutton
+	end
+
 PhoneScript_AnswerPhone_Male_Day:
 	readvar VAR_CALLERID
 	ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -167,6 +173,7 @@ PhoneScript_AnswerPhone_Male_Day:
 	ifequal PHONE_FISHER_WILTON, .Wilton
 	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 	ifequal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_GENTLEMAN_ALFRED, .Alfred
 
 .Jack:
 	farwritetext JackAnswerPhoneDayText
@@ -268,6 +275,11 @@ PhoneScript_AnswerPhone_Male_Day:
 	promptbutton
 	end
 
+.Alfred:
+	farwritetext AlfredAnswerPhoneDayText
+	promptbutton
+	end
+
 PhoneScript_AnswerPhone_Male_Nite:
 	readvar VAR_CALLERID
 	ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -290,6 +302,7 @@ PhoneScript_AnswerPhone_Male_Nite:
 	ifequal PHONE_FISHER_WILTON, .Wilton
 	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 	ifequal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_GENTLEMAN_ALFRED, .Alfred
 
 .Jack:
 	farwritetext JackAnswerPhoneNiteText
@@ -391,6 +404,11 @@ PhoneScript_AnswerPhone_Male_Nite:
 	promptbutton
 	end
 
+.Alfred:
+	farwritetext AlfredAnswerPhoneNiteText
+	promptbutton
+	end
+
 PhoneScript_AnswerPhone_Female:
 	checktime DAY
 	iftrue PhoneScript_AnswerPhone_Female_Day
@@ -574,6 +592,7 @@ PhoneScript_GreetPhone_Male:
 	ifequal PHONE_FISHER_WILTON, .Wilton
 	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 	ifequal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_GENTLEMAN_ALFRED, .Alfred
 
 .Jack:
 	farwritetext JackGreetText
@@ -675,6 +694,11 @@ PhoneScript_GreetPhone_Male:
 	promptbutton
 	end
 
+.Alfred:
+	farwritetext AlfredGreetText
+	promptbutton
+	end
+
 PhoneScript_GreetPhone_Male_Day:
 	readvar VAR_CALLERID
 	ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -697,6 +721,7 @@ PhoneScript_GreetPhone_Male_Day:
 	ifequal PHONE_FISHER_WILTON, .Wilton
 	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 	ifequal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_GENTLEMAN_ALFRED, .Alfred
 
 .Jack:
 	farwritetext JackGreetDayText
@@ -798,6 +823,11 @@ PhoneScript_GreetPhone_Male_Day:
 	promptbutton
 	end
 
+.Alfred:
+	farwritetext AlfredGreetDayText
+	promptbutton
+	end
+
 PhoneScript_GreetPhone_Male_Nite:
 	readvar VAR_CALLERID
 	ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -820,6 +850,7 @@ PhoneScript_GreetPhone_Male_Nite:
 	ifequal PHONE_FISHER_WILTON, .Wilton
 	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 	ifequal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_GENTLEMAN_ALFRED, .Alfred
 
 .Jack:
 	farwritetext JackGreetNiteText
@@ -921,6 +952,11 @@ PhoneScript_GreetPhone_Male_Nite:
 	promptbutton
 	end
 
+.Alfred:
+	farwritetext AlfredGreetNiteText
+	promptbutton
+	end
+
 PhoneScript_GreetPhone_Female:
 	checktime DAY
 	iftrue PhoneScript_GreetPhone_Female_Day

engine/phone/scripts/generic_caller.asm

@@ -710,6 +710,7 @@ PhoneScript_HangUpText_Male:
 	ifequal PHONE_FISHER_WILTON, .Wilton
 	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 	ifequal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_GENTLEMAN_ALFRED, .Alfred
 
 .Jack:
 	farwritetext JackHangUpText
@@ -791,6 +792,10 @@ PhoneScript_HangUpText_Male:
 	farwritetext ParryHangUpText
 	end
 
+.Alfred:
+	farwritetext AlfredHangUpText
+	end
+
 PhoneScript_KyleConnectionLostText:
 	farwritetext KyleConnectionLostText
 	end

engine/pokegear/pokegear.asm

@@ -3377,11 +3377,11 @@ ClearPhoneOrPagerArea:
 
 ClearPhoneOrPagerCursors:
 	ld a, " "
-x = 4
+DEF x = 4
 rept PHONE_OR_PAGER_HEIGHT
 	hlcoord 1, x
 	ld [hl], a
-x = x + 2
+DEF x = x + 2
 endr
 	ret
 

home/trainers.asm

@@ -91,12 +91,12 @@ _CheckTrainerBattle::
 	ret
 
 .startbattle
-	if DEF(_DEBUG)
+if DEF(_DEBUG)
 	ldh a, [hJoypadDown]
 	and B_BUTTON
 	cp B_BUTTON
 	jr z, .next ; ignore trainers
-	endc
+endc
 	pop de
 	pop af
 	ldh [hLastTalked], a

main.asm

@@ -702,7 +702,6 @@ INCLUDE "data/phone/text/unused.asm"
 INCLUDE "data/phone/text/vance_callee.asm"
 INCLUDE "data/phone/text/wade_callee.asm"
 INCLUDE "data/phone/text/walt_callee.asm" ; new
-INCLUDE "data/phone/text/wilton_callee.asm"
 
 
 SECTION "Special Phone Text 2", ROMX
@@ -714,6 +713,7 @@ INCLUDE "data/phone/text/kayandtia_callee.asm" ; new
 INCLUDE "data/phone/text/kenny_callee.asm" ; new
 INCLUDE "data/phone/text/reese_callee.asm" ; new
 INCLUDE "data/phone/text/timandsue_callee.asm" ; new
+INCLUDE "data/phone/text/wilton_callee.asm"
 
 
 SECTION "Miscellaneous Text", ROMX

maps/MoveDeletersHouse.asm

@@ -144,7 +144,7 @@ MoveDeletersHouse_MoveReminderIntroText:
 
 	para "I can make your"
 	line "#MON remember"
-	cont "it's moves."
+	cont "its moves."
 
 	para "Are you"
 	line "interested?"

maps/RadioTower4F.asm

@@ -129,11 +129,11 @@ RadioTower4FDJMaryText_ClearedRockets:
 	done
 
 RadioTower4FDJMaryText_GiveBrightPowder:
-	text "MARY: When a"
-	line "#MON holds that,"
+	text "MARY: When held,"
+	line "that tricky powder"
 
-	para "it lowers the"
-	line "foe's ACCURACY."
+	para "lowers the foe's"
+	line "ACCURACY."
 	done
 
 RadioTower4FDJMaryText_After: