sync text

charmap.asm

@@ -147,9 +147,16 @@ charmap "ゅ", $E1
 charmap "ょ", $E2
 charmap "ー", $E3
 
+charmap "<pkmn>", $4A ; PkMn
 charmap "@", $50
+charmap "<PLAYER>", $52
+charmap "<RIVAL>", $53
 charmap "#", $54
 ;charmap "POKé", $54
+charmap "<TARGET>", $59
+charmap "<USER>", $5A
+charmap "′", $71
+charmap "″", $73
 charmap "…", $75
 
 charmap "┌", $79
@@ -233,6 +240,7 @@ charmap "'m", $E5
 charmap "?", $E6
 charmap "!", $E7
 charmap ".", $E8
+charmap "▷", $EC
 charmap "▶", $ED
 charmap "♂", $EF
 charmap "¥", $F0

constants.asm

@@ -30,3 +30,4 @@ INCLUDE "constants/tilesets.asm"
 INCLUDE "constants/starter_mons.asm"
 INCLUDE "constants/event_constants.asm"
 INCLUDE "constants/event_macros.asm"
+INCLUDE "constants/text_constants.asm"

constants/misc_constants.asm

@@ -29,6 +29,16 @@ D_LEFT   EQU %00100000
 D_UP     EQU %01000000
 D_DOWN   EQU %10000000
 
+const_value set 0
+	const BIT_A_BUTTON
+	const BIT_B_BUTTON
+	const BIT_SELECT
+	const BIT_START
+	const BIT_D_RIGHT
+	const BIT_D_LEFT
+	const BIT_D_UP
+	const BIT_D_DOWN
+
 SCREEN_WIDTH  EQU 20
 SCREEN_HEIGHT EQU 18
 
@@ -152,20 +162,6 @@ FLAG_RESET EQU 0
 FLAG_SET   EQU 1
 FLAG_TEST  EQU 2
 
-; special text IDs
-TEXT_MON_FAINTED      EQU $d0
-TEXT_BLACKED_OUT      EQU $d1
-TEXT_REPEL_WORE_OFF   EQU $d2
-TEXT_SAFARI_GAME_OVER EQU $d3
-
-; PrintNumber
-
-BIT_LEFT_ALIGN     EQU 6
-BIT_LEADING_ZEROES EQU 7
-
-LEFT_ALIGN EQU     (1 << BIT_LEFT_ALIGN)
-LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)
-
 ; HP bar
 HP_BAR_GREEN  EQU 0
 HP_BAR_YELLOW EQU 1

constants/text_constants.asm

@@ -0,0 +1,14 @@
+; special text IDs
+TEXT_MON_FAINTED      EQU $d0
+TEXT_BLACKED_OUT      EQU $d1
+TEXT_REPEL_WORE_OFF   EQU $d2
+TEXT_SAFARI_GAME_OVER EQU $d3
+
+; PrintNumber
+BIT_MONEY_SIGN     EQU 5
+BIT_LEFT_ALIGN     EQU 6
+BIT_LEADING_ZEROES EQU 7
+
+MONEY_SIGN EQU     (1 << BIT_MONEY_SIGN)
+LEFT_ALIGN EQU     (1 << BIT_LEFT_ALIGN)
+LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)

engine/gamefreak.asm

@@ -199,7 +199,6 @@ MoveDownSmallStars:
 	add hl, de
 	dec c
 	jr nz, .innerLoop
-
 ; Toggle the palette so that the lower star in the small stars tile blinks in
 ; and out.
 	ld a, [rOBP1]

engine/hall_of_fame.asm

@@ -58,8 +58,8 @@ AnimateHallOfFame:
 	ld c, 80
 	call DelayFrames
 	coord hl, 2, 13
-	ld b, $3
+	ld b, 3
-	ld c, $e
+	ld c, 14
 	call TextBoxBorder
 	coord hl, 4, 15
 	ld de, HallOfFameText

text/maps/bike_shop.asm

@@ -25,7 +25,7 @@ _BikeShopText_1d81f::
 	prompt
 
 _BikeShopText_1d824::
-	text $52, " exchanged"
+	text "<PLAYER> exchanged"
 	line "the BIKE VOUCHER"
 	cont "for a BICYCLE.@@"
 

text/maps/celadon_dept_store_3f.asm

@@ -8,7 +8,7 @@ _TM18PreReceiveText::
 	prompt
 
 _ReceivedTM18Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"

text/maps/fan_club.asm

@@ -83,13 +83,13 @@ FanClubChairStoryText::
 	prompt
 
 ReceivedBikeVoucherText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
 ExplainBikeVoucherText::
-	db $0
+	text ""
 	para "Exchange that for"
 	line "a BICYCLE!"
 
@@ -111,7 +111,7 @@ FanClubNoStoryText::
 	done
 
 FanClubChairFinalText::
-	text "Hello, ", $52, "!"
+	text "Hello, <PLAYER>!"
 
 	para "Did you come see"
 	line "me about my"

text/maps/hall_of_fame.asm

@@ -1,7 +1,7 @@
 _HallofFameRoomText1::
 	text "OAK: Er-hem!"
 	line "Congratulations"
-	cont $52, "!"
+	cont "<PLAYER>!"
 
 	para "This floor is the"
 	line "#MON HALL OF"
@@ -16,13 +16,13 @@ _HallofFameRoomText1::
 	line "also recorded in"
 	cont "the HALL OF FAME!"
 
-	para $52, "! You have"
+	para "<PLAYER>! You have"
 	line "endeavored hard"
 	cont "to become the new"
 	cont "LEAGUE champion!"
 
 	para "Congratulations,"
-	line $52, ", you and"
+	line "<PLAYER>, you and"
 	cont "your #MON are"
 	cont "HALL OF FAMERs!"
 	done

text/maps/lance.asm

@@ -1,6 +1,6 @@
 _LanceBeforeBattleText::
 	text "Ah! I heard about"
-	line "you ", $52, "!"
+	line "you <PLAYER>!"
 
 	para "I lead the ELITE"
 	line "FOUR! You can"

text/maps/museum_1f.asm

@@ -81,7 +81,7 @@ _Museum1FText_5c28e::
 	prompt
 
 _ReceivedOldAmberText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "OLD AMBER!@@"
 
 _Museum1FText_5c299::

text/maps/oaks_lab.asm

@@ -1,11 +1,11 @@
 _OaksLabGaryText1::
-	text $53,": Yo"
+	text "<RIVAL>: Yo"
-	line $52,"! Gramps"
+	line "<PLAYER>! Gramps"
 	cont "isn't around!"
 	done
 
 _OaksLabText40::
-	text $53,": Heh, I"
+	text "<RIVAL>: Heh, I"
 	line "don't need to be"
 	cont "greedy like you!"
 
@@ -14,7 +14,7 @@ _OaksLabText40::
 	done
 
 _OaksLabText41::
-	text $53,": My"
+	text "<RIVAL>: My"
 	line "#MON looks a"
 	cont "lot stronger."
 	done
@@ -60,7 +60,7 @@ _OaksLabLastMonText::
 	done
 
 _OaksLabText_1d2f0::
-	text "OAK: Now, ", $52, ","
+	text "OAK: Now, <PLAYER>,"
 	line "which #MON do"
 	cont "you want?"
 	done
@@ -73,14 +73,14 @@ _OaksLabText_1d2f5::
 	done
 
 _OaksLabText_1d2fa::
-	text "OAK: ", $52, ","
+	text "OAK: <PLAYER>,"
 	line "raise your young"
 	cont "#MON by making"
 	cont "it fight!"
 	done
 
 _OaksLabDeliverParcelText1::
-	text "OAK: Oh, ", $52, "!"
+	text "OAK: Oh, <PLAYER>!"
 
 	para "How is my old"
 	line "#MON?"
@@ -95,11 +95,11 @@ _OaksLabDeliverParcelText1::
 	para "What? You have"
 	line "something for me?"
 
-	para $52, " delivered"
+	para "<PLAYER> delivered"
 	line "OAK's PARCEL.@@"
 
 _OaksLabDeliverParcelText2::
-	db $0
+	text ""
 	para "Ah! This is the"
 	line "custom # BALL"
 	cont "I ordered!"
@@ -109,7 +109,7 @@ _OaksLabDeliverParcelText2::
 _OaksLabAroundWorldText::
 	text "#MON around the"
 	line "world wait for"
-	cont "you, ", $52, "!"
+	cont "you, <PLAYER>!"
 	done
 
 _OaksLabGivePokeballsText1::
@@ -123,11 +123,11 @@ _OaksLabGivePokeballsText1::
 	cont "to capture wild"
 	cont "#MON."
 
-	para $52, " got 5"
+	para "<PLAYER> got 5"
 	line "# BALLs!@@"
 
 _OaksLabGivePokeballsText2::
-	db $0
+	text ""
 	para "When a wild"
 	line "#MON appears,"
 	cont "it's fair game."
@@ -182,20 +182,20 @@ _OaksLabText_1d340::
 	done
 
 _OaksLabRivalWaitingText::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
 _OaksLabChooseMonText::
-	text "OAK: ", $53, "?"
+	text "OAK: <RIVAL>?"
 	line "Let me think..."
 
 	para "Oh, that's right,"
 	line "I told you to"
 	cont "come! Just wait!"
 
-	para "Here, ", $52, "!"
+	para "Here, <PLAYER>!"
 
 	para "There are 3"
 	line "#MON here!"
@@ -216,14 +216,14 @@ _OaksLabChooseMonText::
 	done
 
 _OaksLabRivalInterjectionText::
-	text $53, ": Hey!"
+	text "<RIVAL>: Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
 
 _OaksLabBePatientText::
 	text "OAK: Be patient!"
-	line $53, ", you can"
+	line "<RIVAL>, you can"
 	cont "have one too!"
 	done
 
@@ -233,19 +233,19 @@ _OaksLabLeavingText::
 	done
 
 _OaksLabRivalPickingMonText::
-	text $53, ": I'll take"
+	text "<RIVAL>: I'll take"
 	line "this one, then!"
 	done
 
 _OaksLabRivalReceivedMonText::
-	text $53, " received"
+	text "<RIVAL> received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
 
 _OaksLabRivalChallengeText::
-	text $53, ": Wait"
+	text "<RIVAL>: Wait"
-	line $52, "!"
+	line "<PLAYER>!"
 	cont "Let's check out"
 	cont "our #MON!"
 
@@ -261,26 +261,26 @@ _OaksLabText_1d3be::
 	prompt
 
 _OaksLabText_1d3c3::
-	text $53, ": Yeah! Am"
+	text "<RIVAL>: Yeah! Am"
 	line "I great or what?"
 	prompt
 
 _OaksLabRivalToughenUpText::
-	text $53, ": Okay!"
+	text "<RIVAL>: Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
 	cont "toughen it up!"
 
-	para $52, "! Gramps!"
+	para "<PLAYER>! Gramps!"
 	line "Smell you later!"
 	done
 
 _OaksLabText21::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	done
 
 _OaksLabText22::
-	text $53, ": What did"
+	text "<RIVAL>: What did"
 	line "you call me for?"
 	done
 
@@ -305,11 +305,11 @@ _OaksLabText24::
 	done
 
 _OaksLabText25::
-	text "OAK: ", $52, " and"
+	text "OAK: <PLAYER> and"
-	line $53, "! Take"
+	line "<RIVAL>! Take"
 	cont "these with you!"
 
-	para $52, " got"
+	para "<PLAYER> got"
 	line "#DEX from OAK!@@"
 
 _OaksLabText26::
@@ -336,11 +336,11 @@ _OaksLabText26::
 	done
 
 _OaksLabText27::
-	text $53, ": Alright"
+	text "<RIVAL>: Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
 
-	para $52, ", I hate to"
+	para "<PLAYER>, I hate to"
 	line "say it, but I"
 	cont "don't need you!"
 
@@ -350,7 +350,7 @@ _OaksLabText27::
 
 	para "I'll tell her not"
 	line "to lend you one,"
-	cont $52, "! Hahaha!"
+	cont "<PLAYER>! Hahaha!"
 	done
 
 _OaksLabText_1d405::

text/maps/reds_house_1f.asm

@@ -10,7 +10,7 @@ _MomWakeUpText::
 	done
 
 _MomHealText1::
-	text "MOM: ",$52,"!"
+	text "MOM: <PLAYER>!"
 	line "You should take a"
 	cont "quick rest."
 	prompt

text/maps/route_22.asm

@@ -60,7 +60,7 @@ _Route22RivalBeforeBattleText2::
 	cont "That's cool!"
 
 	para "Then I'll whip you"
-	line $52, " as a"
+	line "<PLAYER> as a"
 	cont "warm up for"
 	cont "#MON LEAGUE!"
 
@@ -88,8 +88,8 @@ _Route22RivalDefeatedText2::
 	prompt
 
 _Route22Text_511d0::
-	text $53, ": Hahaha!"
+	text "<RIVAL>: Hahaha!"
-	line $52, "! That's"
+	line "<PLAYER>! That's"
 	cont "your best? You're"
 	cont "nowhere near as"
 	cont "good as me, pal!"

text/maps/silph_co_11f.asm

@@ -58,7 +58,7 @@ _SilphCo11Text2::
 	done
 
 _SilphCo11Text3::
-	text "Ah ", $52, "!"
+	text "Ah <PLAYER>!"
 	line "So we meet again!"
 
 	para "The PRESIDENT and"

text/maps/vermilion_city.asm

@@ -35,7 +35,7 @@ _SSAnneWelcomeText9::
 	prompt
 
 _SSAnneFlashedTicketText::
-	text $52, " flashed"
+	text "<PLAYER> flashed"
 	line "the S.S.TICKET!"
 
 	para "Great! Welcome to"
@@ -43,7 +43,7 @@ _SSAnneFlashedTicketText::
 	done
 
 _SSAnneNoTicketText::
-	text $52, " doesn't"
+	text "<PLAYER> doesn't"
 	line "have the needed"
 	cont "S.S.TICKET."
 
@@ -71,7 +71,7 @@ _VermilionCityText5::
 	line "Gogogoh!@@"
 
 _VermilionCityText14::
-	db $0
+	text ""
 	para "A MACHOP is"
 	line "stomping the land"
 	cont "flat."

text/oakspeech.asm

@@ -53,4 +53,3 @@ _OakSpeechText3::
 	cont "with #MON"
 	cont "awaits! Let's go!"
 	done
-