From 1ee38c7bd02db0ec98524ab7213f370ee576a863 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 4 Jul 2019 21:29:47 +0100 Subject: Label bank 2 text data --- src/text/text2.asm | 8 ++++---- src/text/text_offsets.asm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/text') diff --git a/src/text/text2.asm b/src/text/text2.asm index 27ccff9..7227085 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1751,19 +1751,19 @@ Text0247: ; 3bc9e (e:7c9e) text "'s Play Area" done -Text0248: ; 3bcad (e:7cad) +YourPlayAreaText: ; 3bcad (e:7cad) text "Your Play Area" done -Text0249: ; 3bcbd (e:7cbd) +OppPlayAreaText: ; 3bcbd (e:7cbd) text "Opp. Play Area" done -Text024a: ; 3bccd (e:7ccd) +InPlayAreaText: ; 3bccd (e:7ccd) text "In Play Area" done -Text024b: ; 3bcdb (e:7cdb) +GlossaryText: ; 3bcdb (e:7cdb) text "Glossary" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 65dab94..f024288 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -585,10 +585,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0245 ; 0x0245 textpointer Text0246 ; 0x0246 textpointer Text0247 ; 0x0247 - textpointer Text0248 ; 0x0248 - textpointer Text0249 ; 0x0249 - textpointer Text024a ; 0x024a - textpointer Text024b ; 0x024b + textpointer YourPlayAreaText ; 0x0248 + textpointer OppPlayAreaText ; 0x0249 + textpointer InPlayAreaText ; 0x024a + textpointer GlossaryText ; 0x024b textpointer Text024c ; 0x024c textpointer Text024d ; 0x024d textpointer Text024e ; 0x024e -- cgit v1.2.3 From dc903e4686c326dd579d2086529937c4c546f80d Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sat, 6 Jul 2019 23:44:00 +0100 Subject: YourPlayArea text data --- src/text/text2.asm | 6 +++--- src/text/text_offsets.asm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/text') diff --git a/src/text/text2.asm b/src/text/text2.asm index 7227085..b9c6d01 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1715,15 +1715,15 @@ Text023e: ; 3bbf8 (e:7bf8) text "No cards chosen." done -Text023f: ; 3bc0a (e:7c0a) +YourPokemonText: ; 3bc0a (e:7c0a) text "Your Pokémon" done -Text0240: ; 3bc18 (e:7c18) +YourDiscardPileText2: ; 3bc18 (e:7c18) text "Your Discard Pile" done -Text0241: ; 3bc2b (e:7c2b) +YourHandText: ; 3bc2b (e:7c2b) text "Your Hand" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index f024288..fc96176 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -576,9 +576,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text023c ; 0x023c textpointer Text023d ; 0x023d textpointer Text023e ; 0x023e - textpointer Text023f ; 0x023f - textpointer Text0240 ; 0x0240 - textpointer Text0241 ; 0x0241 + textpointer YourPokemonText ; 0x023f + textpointer YourDiscardPileText2 ; 0x0240 + textpointer YourHandText ; 0x0241 textpointer Text0242 ; 0x0242 textpointer Text0243 ; 0x0243 textpointer Text0244 ; 0x0244 -- cgit v1.2.3 From b0f1126b70af919921cd25889cb9ff17639f9657 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 7 Jul 2019 12:30:53 +0100 Subject: Text label in Func_85aa --- src/text/text2.asm | 2 +- src/text/text_offsets.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/text') diff --git a/src/text/text2.asm b/src/text/text2.asm index b9c6d01..07c0da8 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1775,7 +1775,7 @@ Text024d: ; 3bd08 (e:7d08) text "Please choose a Prize." done -Text024e: ; 3bd20 (e:7d20) +HandText2: ; 3bd20 (e:7d20) text "Hand" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index fc96176..4787481 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -591,7 +591,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer GlossaryText ; 0x024b textpointer Text024c ; 0x024c textpointer Text024d ; 0x024d - textpointer Text024e ; 0x024e + textpointer HandText2 ; 0x024e textpointer Text024f ; 0x024f textpointer Text0250 ; 0x0250 textpointer Text0251 ; 0x0251 -- cgit v1.2.3 From bbac07ad938c578dda414ed4c5496d35e24c6a38 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 7 Jul 2019 15:14:04 +0100 Subject: Work on Opponent's Play Area menu --- src/text/text2.asm | 6 +++--- src/text/text_offsets.asm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/text') diff --git a/src/text/text2.asm b/src/text/text2.asm index 07c0da8..3c46d8d 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1731,15 +1731,15 @@ Text0242: ; 3bc36 (e:7c36) text "To Your Play Area" done -Text0243: ; 3bc49 (e:7c49) +OpponentsPokemonText: ; 3bc49 (e:7c49) text "Opponent's Pokémon" done -Text0244: ; 3bc5d (e:7c5d) +OpponentsDiscardPileText2: ; 3bc5d (e:7c5d) text "Opponent's Discard Pile" done -Text0245: ; 3bc76 (e:7c76) +OpponentsHandText: ; 3bc76 (e:7c76) text "Opponent Hand" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 4787481..f8c547d 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -580,9 +580,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer YourDiscardPileText2 ; 0x0240 textpointer YourHandText ; 0x0241 textpointer Text0242 ; 0x0242 - textpointer Text0243 ; 0x0243 - textpointer Text0244 ; 0x0244 - textpointer Text0245 ; 0x0245 + textpointer OpponentsPokemonText ; 0x0243 + textpointer OpponentsDiscardPileText2 ; 0x0244 + textpointer OpponentsHandText ; 0x0245 textpointer Text0246 ; 0x0246 textpointer Text0247 ; 0x0247 textpointer YourPlayAreaText ; 0x0248 -- cgit v1.2.3 From 358b85a879fab87fe3e918fb9cf1691dcf3896a6 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 9 Jul 2019 00:08:36 +0100 Subject: Work on Func_8764 --- src/text/text2.asm | 2 +- src/text/text_offsets.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/text') diff --git a/src/text/text2.asm b/src/text/text2.asm index 3c46d8d..a7e4ee1 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1767,7 +1767,7 @@ GlossaryText: ; 3bcdb (e:7cdb) text "Glossary" done -Text024c: ; 3bce5 (e:7ce5) +WhichCardWouldYouLikeToSeeText: ; 3bce5 (e:7ce5) text "Which card would you like to see?" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index f8c547d..b933222 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -589,7 +589,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer OppPlayAreaText ; 0x0249 textpointer InPlayAreaText ; 0x024a textpointer GlossaryText ; 0x024b - textpointer Text024c ; 0x024c + textpointer WhichCardWouldYouLikeToSeeText ; 0x024c textpointer Text024d ; 0x024d textpointer HandText2 ; 0x024e textpointer Text024f ; 0x024f -- cgit v1.2.3 From e41cbb8d5fb584fc04bc810402ee91feb6083728 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 10 Jul 2019 21:30:15 +0100 Subject: Clean up documentation --- src/text/text2.asm | 2 +- src/text/text_offsets.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/text') diff --git a/src/text/text2.asm b/src/text/text2.asm index a7e4ee1..a4cabe8 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1747,7 +1747,7 @@ Text0246: ; 3bc85 (e:7c85) text "To Opponent's Play Area" done -Text0247: ; 3bc9e (e:7c9e) +PlayersPlayAreaText: ; 3bc9e (e:7c9e) text "'s Play Area" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index b933222..a1e2ef5 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -584,7 +584,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer OpponentsDiscardPileText2 ; 0x0244 textpointer OpponentsHandText ; 0x0245 textpointer Text0246 ; 0x0246 - textpointer Text0247 ; 0x0247 + textpointer PlayersPlayAreaText ; 0x0247 textpointer YourPlayAreaText ; 0x0248 textpointer OppPlayAreaText ; 0x0249 textpointer InPlayAreaText ; 0x024a -- cgit v1.2.3 From 53ad70b112d47ffa2536ee179fd136df900018a3 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Fri, 19 Jul 2019 19:51:33 +0100 Subject: Apply corrections --- src/text/text2.asm | 2 +- src/text/text_offsets.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/text') diff --git a/src/text/text2.asm b/src/text/text2.asm index a4cabe8..61d7fdc 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -1747,7 +1747,7 @@ Text0246: ; 3bc85 (e:7c85) text "To Opponent's Play Area" done -PlayersPlayAreaText: ; 3bc9e (e:7c9e) +DuelistsPlayAreaText: ; 3bc9e (e:7c9e) text "'s Play Area" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index a1e2ef5..56dda1f 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -584,7 +584,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer OpponentsDiscardPileText2 ; 0x0244 textpointer OpponentsHandText ; 0x0245 textpointer Text0246 ; 0x0246 - textpointer PlayersPlayAreaText ; 0x0247 + textpointer DuelistsPlayAreaText ; 0x0247 textpointer YourPlayAreaText ; 0x0248 textpointer OppPlayAreaText ; 0x0249 textpointer InPlayAreaText ; 0x024a -- cgit v1.2.3