From 253c09949b421ec09a688af2945eb3df1fc00777 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 12:38:59 -0500 Subject: Move data/audio/ back into audio/ Keep trainer data together --- text/trainer_class_names.asm | 67 -------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100755 text/trainer_class_names.asm (limited to 'text') diff --git a/text/trainer_class_names.asm b/text/trainer_class_names.asm deleted file mode 100755 index 555e6c652..000000000 --- a/text/trainer_class_names.asm +++ /dev/null @@ -1,67 +0,0 @@ - db "LEADER@" - db "LEADER@" - db "LEADER@" - db "LEADER@" - db "LEADER@" - db "LEADER@" - db "LEADER@" - db "LEADER@" - db "RIVAL@" - db "#MON PROF.@" - db "ELITE FOUR@" - db " TRAINER@" - db "ELITE FOUR@" - db "ELITE FOUR@" - db "ELITE FOUR@" - db "CHAMPION@" - db "LEADER@" - db "LEADER@" - db "LEADER@" - db "SCIENTIST@" - db "LEADER@" - db "YOUNGSTER@" - db "SCHOOLBOY@" - db "BIRD KEEPER@" - db "LASS@" - db "LEADER@" - db "COOLTRAINER@" - db "COOLTRAINER@" - db "BEAUTY@" - db "#MANIAC@" - db "ROCKET@" - db "GENTLEMAN@" - db "SKIER@" - db "TEACHER@" - db "LEADER@" - db "BUG CATCHER@" - db "FISHER@" - db "SWIMMER♂@" - db "SWIMMER♀@" - db "SAILOR@" - db "SUPER NERD@" - db "RIVAL@" - db "GUITARIST@" - db "HIKER@" - db "BIKER@" - db "LEADER@" - db "BURGLAR@" - db "FIREBREATHER@" - db "JUGGLER@" - db "BLACKBELT@" - db "ROCKET@" - db "PSYCHIC@" - db "PICNICKER@" - db "CAMPER@" - db "ROCKET@" - db "SAGE@" - db "MEDIUM@" - db "BOARDER@" - db "#FAN@" - db "KIMONO GIRL@" - db "TWINS@" - db "#FAN@" - db " TRAINER@" - db "LEADER@" - db "OFFICER@" - db "ROCKET@" - db "MYSTICALMAN@" -- cgit v1.2.3 From 1038ebca5e2638ecbce1052c1dad7474372a7fd5 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 20:10:54 -0500 Subject: Move more contiguous related code blocks from main.asm to engine/ and events/ --- text/sweethoney.asm | 68 ------------------------------- text/unused_gen_1_trainers.asm | 92 ++++++++++++++++++++++++++++++++++++++++++ text/unused_sweet_honey.asm | 68 +++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 68 deletions(-) delete mode 100644 text/sweethoney.asm create mode 100644 text/unused_gen_1_trainers.asm create mode 100644 text/unused_sweet_honey.asm (limited to 'text') diff --git a/text/sweethoney.asm b/text/sweethoney.asm deleted file mode 100644 index 9bfa4f6b1..000000000 --- a/text/sweethoney.asm +++ /dev/null @@ -1,68 +0,0 @@ -; Sweet Honey is a feature that was scrapped before development. -; It was later implemented in Pokémon Diamond and Pearl. -; -; Sweet Honey was probably reworked into Sweet Scent. -; A map in the final game has a Butterfree and a woman who gives -; the Sweet Scent TM. - -; Most of these texts seem to be associated with a single NPC. -; The last text is associated with a second NPC, probably a Butterfree. - -UnusedSweetHoneyText: ; 0x5578a - text "My #MON is an" - line "expert at collect-" - cont "ing SWEET HONEY." - - para "I'll share some" - line "with you." - done - -UnusedSweetHoneyBagFullText: ; 0x557d6 - text "I want to give you" - line "some SWEET HONEY," - - para "but you have no" - line "room for it." - done - -UnusedSweetHoneyGiveText: ; 0x55819 - text "Here you go! Have" - line "some SWEET HONEY!" - done - -UnusedGotSweetHoneyText: ; 0x5583e - text " received" - line "SWEET HONEY." - done - -UnusedSweetHoneyAfterText1: ; 0x55856 - text "My little brother" - line "takes SWEET HONEY" - - para "and goes somewhere" - line "with it." - - para "I wonder what he's" - line "up to?" - done - -UnusedSweetHoneyAfterText2: ; 0x558b1 - text "Did you put SWEET" - line "HONEY on a tree?" - - para "What happened to" - line "it?" - done - -UnusedSweetHoneyAfterText3: ; 0x558ea - text "Did you put SWEET" - line "HONEY on a tree?" - - para "It takes about a" - line "day for #MON to" - cont "be drawn to it." - done - -UnusedSweetHoneyButterfreeText: ; 0x5593f - text "BUTTERFREE: Freeh!" - done diff --git a/text/unused_gen_1_trainers.asm b/text/unused_gen_1_trainers.asm new file mode 100644 index 000000000..9a637d6a2 --- /dev/null +++ b/text/unused_gen_1_trainers.asm @@ -0,0 +1,92 @@ +GetGen1TrainerClassName: ; 50a28 +; XXX + ld hl, .Strings + ld a, [TrainerClass] + dec a + ld c, a + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld de, StringBuffer1 +.copy + ld a, [hli] + ld [de], a + inc de + cp "@" + jr nz, .copy + ret + +.Strings: ; 50a42 +; Untranslated trainer class names from Red. + dw .Youngster + dw .BugCatcher + dw .Lass + dw OTClassName + dw .JrTrainerM + dw .JrTrainerF + dw .Pokemaniac + dw .SuperNerd + dw OTClassName + dw OTClassName + dw .Burglar + dw .Engineer + dw .Jack + dw OTClassName + dw .Swimmer + dw OTClassName + dw OTClassName + dw .Beauty + dw OTClassName + dw .Rocker + dw .Juggler + dw OTClassName + dw OTClassName + dw .Blackbelt + dw OTClassName + dw .ProfOak + dw .Chief + dw .Scientist + dw OTClassName + dw .Rocket + dw .CooltrainerM + dw .CooltrainerF + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + dw OTClassName + +.Youngster: db "たんパン@" +.BugCatcher: db "むしとり@" +.Lass: db "ミニスカ@" +.JrTrainerM: db "ボーイ@" +.JrTrainerF: db "ガール@" +.Pokemaniac: db "マニア@" +.SuperNerd: db "りかけい@" +.Burglar: db "どろぼう@" +.Engineer: db "ォヤジ@" +.Jack: db "ジャック@" +.Swimmer: db "かいパン@" +.Beauty: db "おねえさん@" +.Rocker: db "グループ@" +.Juggler: db "ジャグラー@" +.Blackbelt: db "からて@" +.ProfOak: db "ォーキド@" +.Chief: db "チーフ@" +.Scientist: db "けんきゅういん@" +.Rocket: db "だんいん@" +.CooltrainerM: db "エりート♂@" +.CooltrainerF: db "エりート♀@" diff --git a/text/unused_sweet_honey.asm b/text/unused_sweet_honey.asm new file mode 100644 index 000000000..9bfa4f6b1 --- /dev/null +++ b/text/unused_sweet_honey.asm @@ -0,0 +1,68 @@ +; Sweet Honey is a feature that was scrapped before development. +; It was later implemented in Pokémon Diamond and Pearl. +; +; Sweet Honey was probably reworked into Sweet Scent. +; A map in the final game has a Butterfree and a woman who gives +; the Sweet Scent TM. + +; Most of these texts seem to be associated with a single NPC. +; The last text is associated with a second NPC, probably a Butterfree. + +UnusedSweetHoneyText: ; 0x5578a + text "My #MON is an" + line "expert at collect-" + cont "ing SWEET HONEY." + + para "I'll share some" + line "with you." + done + +UnusedSweetHoneyBagFullText: ; 0x557d6 + text "I want to give you" + line "some SWEET HONEY," + + para "but you have no" + line "room for it." + done + +UnusedSweetHoneyGiveText: ; 0x55819 + text "Here you go! Have" + line "some SWEET HONEY!" + done + +UnusedGotSweetHoneyText: ; 0x5583e + text " received" + line "SWEET HONEY." + done + +UnusedSweetHoneyAfterText1: ; 0x55856 + text "My little brother" + line "takes SWEET HONEY" + + para "and goes somewhere" + line "with it." + + para "I wonder what he's" + line "up to?" + done + +UnusedSweetHoneyAfterText2: ; 0x558b1 + text "Did you put SWEET" + line "HONEY on a tree?" + + para "What happened to" + line "it?" + done + +UnusedSweetHoneyAfterText3: ; 0x558ea + text "Did you put SWEET" + line "HONEY on a tree?" + + para "It takes about a" + line "day for #MON to" + cont "be drawn to it." + done + +UnusedSweetHoneyButterfreeText: ; 0x5593f + text "BUTTERFREE: Freeh!" + done -- cgit v1.2.3 From 25a3960646548c40af70f9f59bed544f4ce8d472 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 16 Dec 2017 19:00:50 -0500 Subject: Move some more main.asm routines into individual files --- text/common_text.asm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'text') diff --git a/text/common_text.asm b/text/common_text.asm index c4891ab15..d21685480 100644 --- a/text/common_text.asm +++ b/text/common_text.asm @@ -1,12 +1,18 @@ INCLUDE "includes.asm" + SECTION "Text 1", ROMX + INCLUDE "text/common_1.asm" + SECTION "Text 2", ROMX + INCLUDE "text/common_2.asm" INCLUDE "text/common_3.asm" + SECTION "Text 3", ROMX + INCLUDE "text/common_4.asm" INCLUDE "text/common_5.asm" -- cgit v1.2.3