From 21193167deaf379a4366d35f11779c1fad4ea931 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sat, 20 Feb 2021 21:42:51 +0000 Subject: Disassemble and label some printer functions --- src/text/text1.asm | 12 ++++++------ src/text/text2.asm | 2 +- src/text/text_offsets.asm | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index e94cb49..c363162 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -1002,32 +1002,32 @@ BackUpIsBrokenText: ; 37a59 (d:7a59) text "Back Up is broken." done -Text00d7: ; 37a6d (d:7a6d) +PrinterIsNotConnectedText: ; 37a6d (d:7a6d) text "Error No. 02:" line "Printer is not connected." done -Text00d8: ; 37a96 (d:7a96) +BatteriesHaveLostTheirChargeText: ; 37a96 (d:7a96) text "Error No. 01:" line "Batteries have lost their charge." done -Text00d9: ; 37ac7 (d:7ac7) +PrinterPaperIsJammedText: ; 37ac7 (d:7ac7) text "Error No. 03:" line "Printer paper is jammed." done -Text00da: ; 37aef (d:7aef) +CheckCableOrPrinterSwitchText: ; 37aef (d:7aef) text "Error No. 02:" line "Check cable or printer switch." done -Text00db: ; 37b1d (d:7b1d) +PrinterPacketErrorText: ; 37b1d (d:7b1d) text "Error No. 04:" line "Printer Packet Error." done -Text00dc: ; 37b42 (d:7b42) +PrintingWasInterruptedText: ; 37b42 (d:7b42) text "Printing was interrupted." done diff --git a/src/text/text2.asm b/src/text/text2.asm index 3da7115..64224cb 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -898,7 +898,7 @@ Text01a1: ; 3a0e1 (e:60e1) line "wasn't successful." done -Text01a2: ; 3a111 (e:6111) +NowPrintingText: ; 3a111 (e:6111) text "Now printing..." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index a62e8e7..8f38109 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -216,12 +216,12 @@ TextOffsets:: ; 34000 (d:4000) textpointer UnableDueToToxicGasText ; 0x00d4 textpointer Text00d5 ; 0x00d5 textpointer BackUpIsBrokenText ; 0x00d6 - textpointer Text00d7 ; 0x00d7 - textpointer Text00d8 ; 0x00d8 - textpointer Text00d9 ; 0x00d9 - textpointer Text00da ; 0x00da - textpointer Text00db ; 0x00db - textpointer Text00dc ; 0x00dc + textpointer PrinterIsNotConnectedText ; 0x00d7 + textpointer BatteriesHaveLostTheirChargeText ; 0x00d8 + textpointer PrinterPaperIsJammedText ; 0x00d9 + textpointer CheckCableOrPrinterSwitchText ; 0x00da + textpointer PrinterPacketErrorText ; 0x00db + textpointer PrintingWasInterruptedText ; 0x00dc textpointer Text00dd ; 0x00dd textpointer SandAttackCheckText ; 0x00de textpointer SmokescreenCheckText ; 0x00df @@ -419,7 +419,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text019f ; 0x019f textpointer Text01a0 ; 0x01a0 textpointer Text01a1 ; 0x01a1 - textpointer Text01a2 ; 0x01a2 + textpointer NowPrintingText ; 0x01a2 textpointer DrMasonText ; 0x01a3 textpointer DrawSevenCardsPracticeDuelText ; 0x01a4 textpointer ChooseGoldeenPracticeDuelText ; 0x01a5 -- cgit v1.2.3 From 8a7b1433f09e9cf8e1d40c9b69acde180d13a986 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Mon, 22 Feb 2021 13:45:13 +0000 Subject: Disassemble and document Card Pop! functions --- src/text/text1.asm | 2 +- src/text/text2.asm | 10 +++++----- src/text/text_offsets.asm | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/text') diff --git a/src/text/text1.asm b/src/text/text1.asm index c363162..2b683d8 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -1031,7 +1031,7 @@ PrintingWasInterruptedText: ; 37b42 (d:7b42) text "Printing was interrupted." done -Text00dd: ; 37b5d (d:7b5d) +CardPopCannotBePlayedWithTheGameBoyText: ; 37b5d (d:7b5d) text "Card Pop! cannot be played" line "with the Game Boy." line "Please use a" diff --git a/src/text/text2.asm b/src/text/text2.asm index 64224cb..55a08b4 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -784,27 +784,27 @@ Text0189: ; 39d1b (e:5d1b) line "with ." done -Text018a: ; 39d39 (e:5d39) +AreYouBothReadyToCardPopText: ; 39d39 (e:5d39) text "Are you both ready" line "to Card Pop! ?" done -Text018b: ; 39d5c (e:5d5c) +ThePopWasntSuccessfulText: ; 39d5c (e:5d5c) text "The Pop! wasn't successful." line "Please try again." done -Text018c: ; 39d8b (e:5d8b) +CannotCardPopWithFriendPreviouslyPoppedWithText: ; 39d8b (e:5d8b) text "You cannot Card Pop! with a" line "friend you previously Popped! with." done -Text018d: ; 39dcc (e:5dcc) +PositionGameBoyColorsAndPressAButtonText: ; 39dcc (e:5dcc) text "Position the Game Boy Colors" line "and press the A Button." done -Text018e: ; 39e02 (e:5e02) +ReceivedThroughCardPopText: ; 39e02 (e:5e02) text "Received " line "through Card Pop!" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 8f38109..f37c395 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -222,7 +222,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer CheckCableOrPrinterSwitchText ; 0x00da textpointer PrinterPacketErrorText ; 0x00db textpointer PrintingWasInterruptedText ; 0x00dc - textpointer Text00dd ; 0x00dd + textpointer CardPopCannotBePlayedWithTheGameBoyText ; 0x00dd textpointer SandAttackCheckText ; 0x00de textpointer SmokescreenCheckText ; 0x00df textpointer ParalysisCheckText ; 0x00e0 @@ -395,11 +395,11 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0187 ; 0x0187 textpointer Text0188 ; 0x0188 textpointer Text0189 ; 0x0189 - textpointer Text018a ; 0x018a - textpointer Text018b ; 0x018b - textpointer Text018c ; 0x018c - textpointer Text018d ; 0x018d - textpointer Text018e ; 0x018e + textpointer AreYouBothReadyToCardPopText ; 0x018a + textpointer ThePopWasntSuccessfulText ; 0x018b + textpointer CannotCardPopWithFriendPreviouslyPoppedWithText ; 0x018c + textpointer PositionGameBoyColorsAndPressAButtonText ; 0x018d + textpointer ReceivedThroughCardPopText ; 0x018e textpointer ReceivedCardText ; 0x018f textpointer ReceivedPromotionalCardText ; 0x0190 textpointer ReceivedLegendaryCardText ; 0x0191 -- cgit v1.2.3