Merge pull request #105 from ElectroDeoxys/master

Work on Bank $7 (NPCs, Start Menu and Opening/Credits sequences)

3 files changed, 99 insertions, 99 deletions

diff --git a/src/text/text3.asm b/src/text/text3.asm
index ffe0f59..acc143b 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1269,29 +1269,29 @@ Text036b: ; 3ec03 (f:6c03)
 	text "Mail 15"
 	done
 
-Text036c: ; 3ec0c (f:6c0c)
+NewGameText: ; 3ec0c (f:6c0c)
 	text "NEW GAME"
 	done
 
-Text036d: ; 3ec16 (f:6c16)
+CardPopContinueDiaryNewGameText: ; 3ec16 (f:6c16)
 	text "CARD POP!"
 	line "CONTINUE FROM DIARY"
 	line "NEW GAME"
 	done
 
-Text036e: ; 3ec3e (f:6c3e)
+CardPopContinueDiaryNewGameContinueDuelText: ; 3ec3e (f:6c3e)
 	text "CARD POP!"
 	line "CONTINUE FROM DIARY"
 	line "New Game"
 	line "CONTINUE DUEL"
 	done
 
-Text036f: ; 3ec74 (f:6c74)
+WhenYouCardPopWithFriendText: ; 3ec74 (f:6c74)
 	text "When you CARD POP! with a friend,"
 	line "you will each receive a new card!"
 	done
 
-Text0370: ; 3ecb9 (f:6cb9)
+ContinueFromDiarySummaryText: ; 3ecb9 (f:6cb9)
 	text "  <RAMNAME>  <RAMTEXT>"
 	line "      Master Medals Won "
 	half2full
@@ -1307,32 +1307,32 @@ Text0370: ; 3ecb9 (f:6cb9)
 	text ""
 	done
 
-Text0371: ; 3ed14 (f:6d14)
+StartANewGameText: ; 3ed14 (f:6d14)
 	text "Start a New Game."
 	line ""
 	done
 
-Text0372: ; 3ed28 (f:6d28)
+TheGameWillContinueFromThePointInTheDuelText: ; 3ed28 (f:6d28)
 	text "The Game will continue from "
 	line "the point in the duel at"
 	line "which the power was turned OFF."
 	done
 
-Text0373: ; 3ed7f (f:6d7f)
+SavedDataAlreadyExistsText: ; 3ed7f (f:6d7f)
 	text "Saved data already exists."
 	line "If you continue, you will lose"
 	line "all the cards you have collected."
 	done
 
-Text0374: ; 3eddc (f:6ddc)
+OKToDeleteTheDataText: ; 3eddc (f:6ddc)
 	text "OK to delete the data?"
 	done
 
-Text0375: ; 3edf4 (f:6df4)
+AllDataWasDeletedText: ; 3edf4 (f:6df4)
 	text "All data was deleted."
 	done
 
-Text0376: ; 3ee0b (f:6e0b)
+DataExistsWhenPowerWasTurnedOFFDuringDuelText: ; 3ee0b (f:6e0b)
 	text "Data exists from when the power "
 	line "was turned OFF during a duel."
 	line "Choose CONTINUE DUEL on the"
@@ -1347,17 +1347,17 @@ Text0376: ; 3ee0b (f:6e0b)
 	line "from the point saved in"
 	done
 
-Text0377: ; 3ef50 (f:6f50)
+ContinueFromDiaryText: ; 3ef50 (f:6f50)
 	text "CONTINUE FROM DIARY?"
 	done
 
-Text0378: ; 3ef66 (f:6f66)
+YouCanAccessCardPopOnlyWithGameBoyColorsText: ; 3ef66 (f:6f66)
 	text "You can access Card Pop! only"
 	line "with two Game Boy Colors."
 	line "Please play using a Game Boy Color."
 	done
 
-Text0379: ; 3efc3 (f:6fc3)
+IsCrazyAboutPokemonAndPokemonCardCollectingText: ; 3efc3 (f:6fc3)
 	text "<RAMNAME> is crazy about Pokémon"
 	line "and Pokémon card collecting!"
 	line "One day,"
diff --git a/src/text/text9.asm b/src/text/text9.asm
index 9bd93af..036fbd5 100644
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -719,13 +719,13 @@ Text07b0: ; 56478 (15:6478)
 	line "when we Duel again!"
 	done
 
-Text07b1: ; 564db (15:64db)
+PokemonTradingCardGameStaffText: ; 564db (15:64db)
 	text ""
 	line "        Pokémon Trading Card Game "
 	line "                  Staff"
 	done
 
-Text07b2: ; 56518 (15:6518)
+ProducersText: ; 56518 (15:6518)
 	text ""
 	line "                Producers"
 	line ""
@@ -735,7 +735,7 @@ Text07b2: ; 56518 (15:6518)
 	line "             Takehiro Izushi"
 	done
 
-Text07b3: ; 5658f (15:658f)
+DirectorText: ; 5658f (15:658f)
 	text ""
 	line "                Director"
 	line ""
@@ -743,7 +743,7 @@ Text07b3: ; 5658f (15:658f)
 	line "                Koji Arai"
 	done
 
-Text07b4: ; 565c6 (15:65c6)
+ProgrammersText: ; 565c6 (15:65c6)
 	text ""
 	line "               Programmers"
 	line ""
@@ -753,7 +753,7 @@ Text07b4: ; 565c6 (15:65c6)
 	line "             Masaki Tsumori"
 	done
 
-Text07b5: ; 5663a (15:663a)
+GBGraphicDesigners1Text: ; 5663a (15:663a)
 	text ""
 	line "           GB Graphic Designers"
 	line ""
@@ -763,19 +763,19 @@ Text07b5: ; 5663a (15:663a)
 	line "           Tsuguyuki Yamamoto"
 	done
 
-Text07b6: ; 566b5 (15:66b5)
+GBGraphicDesigners2Text: ; 566b5 (15:66b5)
 	text "            Yasuhiro Ichizawa"
 	line "              Miwa Matsuda"
 	line "             Norihiro Kanie"
 	done
 
-Text07b7: ; 5670b (15:670b)
+GBGraphicDesigners3Text: ; 5670b (15:670b)
 	text "             Kazushi Kousaka"
 	line "              Hiromi Sugiue"
 	line "           Katsuhisa Nishikawa"
 	done
 
-Text07b8: ; 56764 (15:6764)
+MusicText: ; 56764 (15:6764)
 	text ""
 	line "                  Music"
 	line ""
@@ -783,7 +783,7 @@ Text07b8: ; 56764 (15:6764)
 	line "            Ichiro Shimakura"
 	done
 
-Text07b9: ; 5679d (15:679d)
+SoundEffectsText: ; 5679d (15:679d)
 	text ""
 	line "              Sound Effects"
 	line ""
@@ -791,7 +791,7 @@ Text07b9: ; 5679d (15:679d)
 	line "              Masato Aihara"
 	done
 
-Text07ba: ; 567d9 (15:67d9)
+SoundDirectorText: ; 567d9 (15:67d9)
 	text ""
 	line "             Sound Director"
 	line ""
@@ -799,7 +799,7 @@ Text07ba: ; 567d9 (15:67d9)
 	line "            Toshiaki Takimoto"
 	done
 
-Text07bb: ; 56817 (15:6817)
+SoundSystemSupportText: ; 56817 (15:6817)
 	text ""
 	line "          Sound System Support"
 	line ""
@@ -808,7 +808,7 @@ Text07bb: ; 56817 (15:6817)
 	line "               Hideki Oka"
 	done
 
-Text07bc: ; 56873 (15:6873)
+CardGameCreator1Text: ; 56873 (15:6873)
 	text ""
 	line "            Card Game Creator"
 	line ""
@@ -816,7 +816,7 @@ Text07bc: ; 56873 (15:6873)
 	line "             Takumi Akabane"
 	done
 
-Text07bd: ; 568b1 (15:68b1)
+CardGameCreator2Text: ; 568b1 (15:68b1)
 	text ""
 	line "            Card Game Creator"
 	line ""
@@ -824,7 +824,7 @@ Text07bd: ; 568b1 (15:68b1)
 	line "             Kouichi Oyama"
 	done
 
-Text07be: ; 568ee (15:68ee)
+CardGameCreator3Text: ; 568ee (15:68ee)
 	text ""
 	line "            Card Game Creator"
 	line ""
@@ -832,7 +832,7 @@ Text07be: ; 568ee (15:68ee)
 	line "              Akihiko Miura"
 	done
 
-Text07bf: ; 5692c (15:692c)
+CardIllustrators1Text: ; 5692c (15:692c)
 	text ""
 	line "            Card Illustrators"
 	line ""
@@ -843,14 +843,14 @@ Text07bf: ; 5692c (15:692c)
 	line "             Kagemaru Himeno"
 	done
 
-Text07c0: ; 569c0 (15:69c0)
+CardIllustrators2Text: ; 569c0 (15:69c0)
 	text "             Tomoaki Imakuni"
 	line "               Miki Tanaka"
 	line "              Toshinao Aoki"
 	line "              Benimaru Ito"
 	done
 
-Text07c1: ; 56a30 (15:6a30)
+SpecialAppearances1Text: ; 56a30 (15:6a30)
 	text ""
 	line "         Special Appearances by"
 	line ""
@@ -859,12 +859,12 @@ Text07c1: ; 56a30 (15:6a30)
 	line "             Masako Uchiyama"
 	done
 
-Text07c2: ; 56a8c (15:6a8c)
+SpecialAppearances2Text: ; 56a8c (15:6a8c)
 	text "             Kunimi Kawamura"
 	line "                Imakuni?"
 	done
 
-Text07c3: ; 56ac3 (15:6ac3)
+USCoordination1Text: ; 56ac3 (15:6ac3)
 	text ""
 	line "             US COORDINATION"
 	line "           NINTENDO OF AMERICA"
@@ -874,12 +874,12 @@ Text07c3: ; 56ac3 (15:6ac3)
 	line "              HIRO NAKAMURA"
 	done
 
-Text07c4: ; 56b3a (15:6b3a)
+USCoordination2Text: ; 56b3a (15:6b3a)
 	text "              KENJI OKUBO"
 	line "             WILLIAM TRINEN"
 	done
 
-Text07c5: ; 56b71 (15:6b71)
+USCoordination3Text: ; 56b71 (15:6b71)
 	text ""
 	line "             US COORDINATION"
 	line "           Wizards of the Coast"
@@ -890,13 +890,13 @@ Text07c5: ; 56b71 (15:6b71)
 	line "             Jessica Beaven"
 	done
 
-Text07c6: ; 56c0d (15:6c0d)
+USCoordination4Text: ; 56c0d (15:6c0d)
 	text "             Paul Peterson"
 	line "            Michael G. Ryan"
 	line "               Tom Wylie"
 	done
 
-Text07c7: ; 56c5e (15:6c5e)
+TranslationDraftText: ; 56c5e (15:6c5e)
 	text ""
 	line "            TRANSLATION/DRAFT"
 	line ""
@@ -904,7 +904,7 @@ Text07c7: ; 56c5e (15:6c5e)
 	line "               BILL RITCH"
 	done
 
-Text07c8: ; 56c9a (15:6c9a)
+MasteringText: ; 56c9a (15:6c9a)
 	text ""
 	line "                Mastering"
 	line ""
@@ -912,7 +912,7 @@ Text07c8: ; 56c9a (15:6c9a)
 	line "             Tetsuya Komatsu"
 	done
 
-Text07c9: ; 56cd5 (15:6cd5)
+ManualCreationText: ; 56cd5 (15:6cd5)
 	text ""
 	line "             Manual Creation"
 	line ""
@@ -920,7 +920,7 @@ Text07c9: ; 56cd5 (15:6cd5)
 	line "              Haruki Mitani"
 	done
 
-Text07ca: ; 56d12 (15:6d12)
+ManualIllustrationsText: ; 56d12 (15:6d12)
 	text ""
 	line "           Manual Illustrations"
 	line ""
@@ -928,7 +928,7 @@ Text07ca: ; 56d12 (15:6d12)
 	line "             Kagemaru Himeno"
 	done
 
-Text07cb: ; 56d53 (15:6d53)
+PokemonOriginalStoryText: ; 56d53 (15:6d53)
 	text ""
 	line "          Pokémon Original Story"
 	line ""
@@ -937,7 +937,7 @@ Text07cb: ; 56d53 (15:6d53)
 	line ""
 	done
 
-Text07cc: ; 56d95 (15:6d95)
+CreatedInCooperationWithText: ; 56d95 (15:6d95)
 	text ""
 	line "       Created In Cooperation With"
 	line ""
@@ -947,7 +947,7 @@ Text07cc: ; 56d95 (15:6d95)
 	line "             Takahiro Harada"
 	done
 
-Text07cd: ; 56e11 (15:6e11)
+WithCooperation1Text: ; 56e11 (15:6e11)
 	text ""
 	line "          With Cooperation from"
 	line ""
@@ -957,21 +957,21 @@ Text07cd: ; 56e11 (15:6e11)
 	line "              Keigo Yasuda"
 	done
 
-Text07ce: ; 56e8a (15:6e8a)
+WithCooperation2Text: ; 56e8a (15:6e8a)
 	text "            Yusuke Kurushima"
 	line "           Nobuchika Takahashi"
 	line "             Junko Igarashi"
 	line "              Yukiko Tomita"
 	done
 
-Text07cf: ; 56eff (15:6eff)
+WithCooperation3Text: ; 56eff (15:6eff)
 	text "              Mari Matsuda"
 	line "             Moto Yamaguchi"
 	line "              Shigeru Sato"
 	line "             Chiaki Nishiki"
 	done
 
-Text07d0: ; 56f6e (15:6f6e)
+ProjectManagerText: ; 56f6e (15:6f6e)
 	text ""
 	line "             Project Manager"
 	line ""
@@ -979,7 +979,7 @@ Text07d0: ; 56f6e (15:6f6e)
 	line "            Yasutaka Kakiseko"
 	done
 
-Text07d1: ; 56fad (15:6fad)
+SupervisorText: ; 56fad (15:6fad)
 	text ""
 	line "               Supervisor"
 	line ""
@@ -988,7 +988,7 @@ Text07d1: ; 56fad (15:6fad)
 	line "              Hiroshi Kudo"
 	done
 
-Text07d2: ; 56fe7 (15:6fe7)
+ExecutiveProducerText: ; 56fe7 (15:6fe7)
 	text ""
 	line "           Executive Producer"
 	line ""
@@ -997,7 +997,7 @@ Text07d2: ; 56fe7 (15:6fe7)
 	line "            Hiroshi Yamauchi"
 	done
 
-Text07d3: ; 57027 (15:7027)
+CreatedByText: ; 57027 (15:7027)
 	text ""
 	line "               Created by"
 	line ""
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index b9d2561..7040fc8 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -877,20 +877,20 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0369                                           ; 0x0369
 	textpointer Text036a                                           ; 0x036a
 	textpointer Text036b                                           ; 0x036b
-	textpointer Text036c                                           ; 0x036c
-	textpointer Text036d                                           ; 0x036d
-	textpointer Text036e                                           ; 0x036e
-	textpointer Text036f                                           ; 0x036f
-	textpointer Text0370                                           ; 0x0370
-	textpointer Text0371                                           ; 0x0371
-	textpointer Text0372                                           ; 0x0372
-	textpointer Text0373                                           ; 0x0373
-	textpointer Text0374                                           ; 0x0374
-	textpointer Text0375                                           ; 0x0375
-	textpointer Text0376                                           ; 0x0376
-	textpointer Text0377                                           ; 0x0377
-	textpointer Text0378                                           ; 0x0378
-	textpointer Text0379                                           ; 0x0379
+	textpointer NewGameText                                        ; 0x036c
+	textpointer CardPopContinueDiaryNewGameText                    ; 0x036d
+	textpointer CardPopContinueDiaryNewGameContinueDuelText        ; 0x036e
+	textpointer WhenYouCardPopWithFriendText                       ; 0x036f
+	textpointer ContinueFromDiarySummaryText                       ; 0x0370
+	textpointer StartANewGameText                                  ; 0x0371
+	textpointer TheGameWillContinueFromThePointInTheDuelText       ; 0x0372
+	textpointer SavedDataAlreadyExistsText                         ; 0x0373
+	textpointer OKToDeleteTheDataText                              ; 0x0374
+	textpointer AllDataWasDeletedText                              ; 0x0375
+	textpointer DataExistsWhenPowerWasTurnedOFFDuringDuelText      ; 0x0376
+	textpointer ContinueFromDiaryText                              ; 0x0377
+	textpointer YouCanAccessCardPopOnlyWithGameBoyColorsText       ; 0x0378
+	textpointer IsCrazyAboutPokemonAndPokemonCardCollectingText    ; 0x0379
 	textpointer Text037a                                           ; 0x037a
 	textpointer Text037b                                           ; 0x037b
 	textpointer Text037c                                           ; 0x037c
@@ -1970,41 +1970,41 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text07ae                                           ; 0x07ae
 	textpointer Text07af                                           ; 0x07af
 	textpointer Text07b0                                           ; 0x07b0
-	textpointer Text07b1                                           ; 0x07b1
-	textpointer Text07b2                                           ; 0x07b2
-	textpointer Text07b3                                           ; 0x07b3
-	textpointer Text07b4                                           ; 0x07b4
-	textpointer Text07b5                                           ; 0x07b5
-	textpointer Text07b6                                           ; 0x07b6
-	textpointer Text07b7                                           ; 0x07b7
-	textpointer Text07b8                                           ; 0x07b8
-	textpointer Text07b9                                           ; 0x07b9
-	textpointer Text07ba                                           ; 0x07ba
-	textpointer Text07bb                                           ; 0x07bb
-	textpointer Text07bc                                           ; 0x07bc
-	textpointer Text07bd                                           ; 0x07bd
-	textpointer Text07be                                           ; 0x07be
-	textpointer Text07bf                                           ; 0x07bf
-	textpointer Text07c0                                           ; 0x07c0
-	textpointer Text07c1                                           ; 0x07c1
-	textpointer Text07c2                                           ; 0x07c2
-	textpointer Text07c3                                           ; 0x07c3
-	textpointer Text07c4                                           ; 0x07c4
-	textpointer Text07c5                                           ; 0x07c5
-	textpointer Text07c6                                           ; 0x07c6
-	textpointer Text07c7                                           ; 0x07c7
-	textpointer Text07c8                                           ; 0x07c8
-	textpointer Text07c9                                           ; 0x07c9
-	textpointer Text07ca                                           ; 0x07ca
-	textpointer Text07cb                                           ; 0x07cb
-	textpointer Text07cc                                           ; 0x07cc
-	textpointer Text07cd                                           ; 0x07cd
-	textpointer Text07ce                                           ; 0x07ce
-	textpointer Text07cf                                           ; 0x07cf
-	textpointer Text07d0                                           ; 0x07d0
-	textpointer Text07d1                                           ; 0x07d1
-	textpointer Text07d2                                           ; 0x07d2
-	textpointer Text07d3                                           ; 0x07d3
+	textpointer PokemonTradingCardGameStaffText                    ; 0x07b1
+	textpointer ProducersText                                      ; 0x07b2
+	textpointer DirectorText                                       ; 0x07b3
+	textpointer ProgrammersText                                    ; 0x07b4
+	textpointer GBGraphicDesigners1Text                            ; 0x07b5
+	textpointer GBGraphicDesigners2Text                            ; 0x07b6
+	textpointer GBGraphicDesigners3Text                            ; 0x07b7
+	textpointer MusicText                                          ; 0x07b8
+	textpointer SoundEffectsText                                   ; 0x07b9
+	textpointer SoundDirectorText                                  ; 0x07ba
+	textpointer SoundSystemSupportText                             ; 0x07bb
+	textpointer CardGameCreator1Text                               ; 0x07bc
+	textpointer CardGameCreator2Text                               ; 0x07bd
+	textpointer CardGameCreator3Text                               ; 0x07be
+	textpointer CardIllustrators1Text                              ; 0x07bf
+	textpointer CardIllustrators2Text                              ; 0x07c0
+	textpointer SpecialAppearances1Text                            ; 0x07c1
+	textpointer SpecialAppearances2Text                            ; 0x07c2
+	textpointer USCoordination1Text                                ; 0x07c3
+	textpointer USCoordination2Text                                ; 0x07c4
+	textpointer USCoordination3Text                                ; 0x07c5
+	textpointer USCoordination4Text                                ; 0x07c6
+	textpointer TranslationDraftText                               ; 0x07c7
+	textpointer MasteringText                                      ; 0x07c8
+	textpointer ManualCreationText                                 ; 0x07c9
+	textpointer ManualIllustrationsText                            ; 0x07ca
+	textpointer PokemonOriginalStoryText                           ; 0x07cb
+	textpointer CreatedInCooperationWithText                       ; 0x07cc
+	textpointer WithCooperation1Text                               ; 0x07cd
+	textpointer WithCooperation2Text                               ; 0x07ce
+	textpointer WithCooperation3Text                               ; 0x07cf
+	textpointer ProjectManagerText                                 ; 0x07d0
+	textpointer SupervisorText                                     ; 0x07d1
+	textpointer ExecutiveProducerText                              ; 0x07d2
+	textpointer CreatedByText                                      ; 0x07d3
 	textpointer Text07d4                                           ; 0x07d4
 	textpointer Text07d5                                           ; 0x07d5
 	textpointer Text07d6                                           ; 0x07d6
@@ -2124,7 +2124,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer CobraName                                          ; 0x0848
 	textpointer ArbokDescription                                   ; 0x0849
 	textpointer NidoranFName                                       ; 0x084a
-	textpointer FurySwipesName                                    ; 0x084b
+	textpointer FurySwipesName                                     ; 0x084b
 	textpointer TripleAttackX10Description                         ; 0x084c
 	textpointer CallForFamilyName                                  ; 0x084d
 	textpointer NidoranFsCallForFamilyDescription                  ; 0x084e