From fe3ef73a8c2d22da6067bdeab1686a24d527a65e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 00:44:40 -0500 Subject: Group unused data --- data/sprite_anims/oam.asm | 2 +- data/unknown_table.asm | 13 ------ data/unused/dakutens.asm | 15 ++++++ data/unused/gen_1_trainer_names.asm | 91 +++++++++++++++++++++++++++++++++++++ data/unused/sweet_honey_text.asm | 68 +++++++++++++++++++++++++++ data/unused/unknown_53d84.asm | 13 ++++++ data/unused_text/dakutens.asm | 15 ------ data/unused_text/gen_1_trainers.asm | 91 ------------------------------------- data/unused_text/sweet_honey.asm | 68 --------------------------- 9 files changed, 188 insertions(+), 188 deletions(-) delete mode 100755 data/unknown_table.asm create mode 100644 data/unused/dakutens.asm create mode 100644 data/unused/gen_1_trainer_names.asm create mode 100644 data/unused/sweet_honey_text.asm create mode 100755 data/unused/unknown_53d84.asm delete mode 100644 data/unused_text/dakutens.asm delete mode 100644 data/unused_text/gen_1_trainers.asm delete mode 100644 data/unused_text/sweet_honey.asm (limited to 'data') diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 31bb3fe15..bfd5cbcd3 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -14,7 +14,7 @@ SpriteAnimOAMData: ; 8d94d dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 dbw $06, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE - dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_NOTE + dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 dbw $04, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2 dbw $08, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3 diff --git a/data/unknown_table.asm b/data/unknown_table.asm deleted file mode 100755 index 026ec5275..000000000 --- a/data/unknown_table.asm +++ /dev/null @@ -1,13 +0,0 @@ -Unreferenced_53d84: - db $1a, $15 - db $33, $16 - db $4b, $17 - db $62, $18 - db $79, $19 - db $90, $1a - db $a8, $1b - db $c4, $1c - db $e0, $1d - db $f6, $1e - db $ff, $1f - db $ff, $20 diff --git a/data/unused/dakutens.asm b/data/unused/dakutens.asm new file mode 100644 index 000000000..82e884fdf --- /dev/null +++ b/data/unused/dakutens.asm @@ -0,0 +1,15 @@ +Dakutens: ; unused + db "かが", "きぎ", "くぐ", "けげ", "こご" + db "さざ", "しじ", "すず", "せぜ", "そぞ" + db "ただ", "ちぢ", "つづ", "てで", "とど" + db "はば", "ひび", "ふぶ", "へべ", "ほぼ" + db "カガ", "キギ", "クグ", "ケゲ", "コゴ" + db "サザ", "シジ", "スズ", "セゼ", "ソゾ" + db "タダ", "チヂ", "ツヅ", "テデ", "トド" + db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" + db -1 ; end + +Handakutens: ; unused + db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" + db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" + db -1 ; end diff --git a/data/unused/gen_1_trainer_names.asm b/data/unused/gen_1_trainer_names.asm new file mode 100644 index 000000000..e7e985f84 --- /dev/null +++ b/data/unused/gen_1_trainer_names.asm @@ -0,0 +1,91 @@ +Unreferenced_GetGen1TrainerClassName: ; 50a28 + 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/data/unused/sweet_honey_text.asm b/data/unused/sweet_honey_text.asm new file mode 100644 index 000000000..9bfa4f6b1 --- /dev/null +++ b/data/unused/sweet_honey_text.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 diff --git a/data/unused/unknown_53d84.asm b/data/unused/unknown_53d84.asm new file mode 100755 index 000000000..026ec5275 --- /dev/null +++ b/data/unused/unknown_53d84.asm @@ -0,0 +1,13 @@ +Unreferenced_53d84: + db $1a, $15 + db $33, $16 + db $4b, $17 + db $62, $18 + db $79, $19 + db $90, $1a + db $a8, $1b + db $c4, $1c + db $e0, $1d + db $f6, $1e + db $ff, $1f + db $ff, $20 diff --git a/data/unused_text/dakutens.asm b/data/unused_text/dakutens.asm deleted file mode 100644 index 82e884fdf..000000000 --- a/data/unused_text/dakutens.asm +++ /dev/null @@ -1,15 +0,0 @@ -Dakutens: ; unused - db "かが", "きぎ", "くぐ", "けげ", "こご" - db "さざ", "しじ", "すず", "せぜ", "そぞ" - db "ただ", "ちぢ", "つづ", "てで", "とど" - db "はば", "ひび", "ふぶ", "へべ", "ほぼ" - db "カガ", "キギ", "クグ", "ケゲ", "コゴ" - db "サザ", "シジ", "スズ", "セゼ", "ソゾ" - db "タダ", "チヂ", "ツヅ", "テデ", "トド" - db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" - db -1 ; end - -Handakutens: ; unused - db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" - db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" - db -1 ; end diff --git a/data/unused_text/gen_1_trainers.asm b/data/unused_text/gen_1_trainers.asm deleted file mode 100644 index e7e985f84..000000000 --- a/data/unused_text/gen_1_trainers.asm +++ /dev/null @@ -1,91 +0,0 @@ -Unreferenced_GetGen1TrainerClassName: ; 50a28 - 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/data/unused_text/sweet_honey.asm b/data/unused_text/sweet_honey.asm deleted file mode 100644 index 9bfa4f6b1..000000000 --- a/data/unused_text/sweet_honey.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 -- cgit v1.2.3