diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm deleted file mode 100644 index 6532c722..00000000 --- a/data/pokemon/unused_pic_banks.asm +++ /dev/null @@ -1,17 +0,0 @@ -; This was a table of Pokémon sprite banks in the 1997 G/S prototype. -; See pokegold-spaceworld's gfx/pokemon/pkmn_pic_banks.asm. - -BetaMonPicBanks: ; unreferenced - ; last mon in bank, bank # - db RAICHU, $15 + 0 - db DUGTRIO, $15 + 1 - db GRAVELER, $15 + 2 - db KRABBY, $15 + 3 - db STARMIE, $15 + 4 - db ARTICUNO, $15 + 5 - db ARIADOS, $15 + 6 ; JARANRA in pokegold-spaceworld - db ESPEON, $15 + 7 ; KOUNYA in pokegold-spaceworld - db OCTILLERY, $15 + 8 ; BOMBSEEKER in pokegold-spaceworld - db LARVITAR, $15 + 9 ; NYULA in pokegold-spaceworld - db $ff, $15 + 10 - db $ff, $15 + 11 diff --git a/data/text/unused_dakutens.asm b/data/text/unused_dakutens.asm deleted file mode 100644 index f578e0ff..00000000 --- a/data/text/unused_dakutens.asm +++ /dev/null @@ -1,15 +0,0 @@ -Dakutens: ; unreferenced - db "かが", "きぎ", "くぐ", "けげ", "こご" - db "さざ", "しじ", "すず", "せぜ", "そぞ" - db "ただ", "ちぢ", "つづ", "てで", "とど" - db "はば", "ひび", "ふぶ", "へべ", "ほぼ" - db "カガ", "キギ", "クグ", "ケゲ", "コゴ" - db "サザ", "シジ", "スズ", "セゼ", "ソゾ" - db "タダ", "チヂ", "ツヅ", "テデ", "トド" - db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" - db -1 ; end - -Handakutens: ; unreferenced - db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" - db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" - db -1 ; end diff --git a/data/text/unused_gen1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm deleted file mode 100644 index fa839f36..00000000 --- a/data/text/unused_gen1_trainer_names.asm +++ /dev/null @@ -1,71 +0,0 @@ -Gen1TrainerClassNames: -; Untranslated trainer class names from Red. - dw .Youngster - dw .BugCatcher - dw .Lass - dw wOTClassName ; sailor - dw .JrTrainerM - dw .JrTrainerF - dw .Pokemaniac - dw .SuperNerd - dw wOTClassName ; hiker - dw wOTClassName ; biker - dw .Burglar - dw .Engineer - dw .Jack - dw wOTClassName ; fisher - dw .Swimmer - dw wOTClassName ; cue ball - dw wOTClassName ; gambler - dw .Beauty - dw wOTClassName ; psychic - dw .Rocker - dw .Juggler - dw wOTClassName ; tamer - dw wOTClassName ; bird keeper - dw .Blackbelt - dw wOTClassName ; rival1 - dw .ProfOak - dw .Chief - dw .Scientist - dw wOTClassName ; giovanni - dw .Rocket - dw .CooltrainerM - dw .CooltrainerF - dw wOTClassName ; bruno - dw wOTClassName ; brock - dw wOTClassName ; misty - dw wOTClassName ; lt.surge - dw wOTClassName ; erika - dw wOTClassName ; koga - dw wOTClassName ; blaine - dw wOTClassName ; sabrina - dw wOTClassName ; gentleman - dw wOTClassName ; rival2 - dw wOTClassName ; rival3 - dw wOTClassName ; lorelei - dw wOTClassName ; channeler - dw wOTClassName ; agatha - dw wOTClassName ; lance - -.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/text/unused_sweet_honey.asm b/data/text/unused_sweet_honey.asm deleted file mode 100644 index d4970118..00000000 --- a/data/text/unused_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: ; unreferenced - text "My #MON is an" - line "expert at collect-" - cont "ing SWEET HONEY." - - para "I'll share some" - line "with you." - done - -UnusedSweetHoneyBagFullText: ; unreferenced - text "I want to give you" - line "some SWEET HONEY," - - para "but you have no" - line "room for it." - done - -UnusedSweetHoneyGiveText: ; unreferenced - text "Here you go! Have" - line "some SWEET HONEY!" - done - -UnusedGotSweetHoneyText: ; unreferenced - text " received" - line "SWEET HONEY." - done - -UnusedSweetHoneyAfterText1: ; unreferenced - 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: ; unreferenced - text "Did you put SWEET" - line "HONEY on a tree?" - - para "What happened to" - line "it?" - done - -UnusedSweetHoneyAfterText3: ; unreferenced - 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: ; unreferenced - text "BUTTERFREE: Freeh!" - done diff --git a/engine/battle/getgen1trainerclassname.asm b/engine/battle/getgen1trainerclassname.asm deleted file mode 100644 index 78b543f1..00000000 --- a/engine/battle/getgen1trainerclassname.asm +++ /dev/null @@ -1,21 +0,0 @@ -GetGen1TrainerClassName: ; unreferenced - ld hl, Gen1TrainerClassNames - ld a, [wTrainerClass] - 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, wStringBuffer1 -.copy - ld a, [hli] - ld [de], a - inc de - cp "@" - jr nz, .copy - ret - -INCLUDE "data/text/unused_gen1_trainer_names.asm" diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm deleted file mode 100644 index 21b07e2a..00000000 --- a/engine/debug/color_picker.asm +++ /dev/null @@ -1,1444 +0,0 @@ - ; DebugColor_GFX tile IDs - const_def $6a - const DEBUGTEST_TICKS_1 ; $6a - const DEBUGTEST_TICKS_2 ; $6b - const DEBUGTEST_WHITE ; $6c - const DEBUGTEST_LIGHT ; $6d - const DEBUGTEST_DARK ; $6e - const DEBUGTEST_BLACK ; $6f - const DEBUGTEST_0 ; $70 - const DEBUGTEST_1 ; $71 - const DEBUGTEST_2 ; $72 - const DEBUGTEST_3 ; $73 - const DEBUGTEST_4 ; $74 - const DEBUGTEST_5 ; $75 - const DEBUGTEST_6 ; $76 - const DEBUGTEST_7 ; $77 - const DEBUGTEST_8 ; $78 - const DEBUGTEST_9 ; $79 - const DEBUGTEST_A ; $7a - const DEBUGTEST_B ; $7b - const DEBUGTEST_C ; $7c - const DEBUGTEST_D ; $7d - const DEBUGTEST_E ; $7e - const DEBUGTEST_F ; $7f - - ; DebugColorMain.Jumptable indexes - const_def - const DEBUGCOLORMAIN_INITSCREEN ; 0 - const DEBUGCOLORMAIN_UPDATESCREEN ; 1 - const DEBUGCOLORMAIN_UPDATEPALETTES ; 2 - const DEBUGCOLORMAIN_JOYPAD ; 3 - const DEBUGCOLORMAIN_INITTMHM ; 4 - const DEBUGCOLORMAIN_TMHMJOYPAD ; 5 - -DebugColorPicker: ; unreferenced -; A debug menu to test monster and trainer palettes at runtime. - ldh a, [hCGB] - and a - jr nz, .cgb - ldh a, [hSGB] - and a - ret z - -.cgb - ldh a, [hInMenu] - push af - ld a, TRUE - ldh [hInMenu], a - - call DisableLCD - call DebugColor_InitVRAM - call DebugColor_LoadGFX - call DebugColor_InitPalettes - call DebugColor_InitMonOrTrainerColor - call EnableLCD - ld de, MUSIC_NONE - call PlayMusic - - xor a ; DEBUGCOLORMAIN_INITSCREEN - ld [wJumptableIndex], a - ld [wDebugColorCurMon], a - ld [wDebugColorIsShiny], a -.loop - ld a, [wJumptableIndex] - bit 7, a - jr nz, .exit - call DebugColorMain - call DebugColor_PlaceCursor - call DelayFrame - jr .loop - -.exit - pop af - ldh [hInMenu], a - ret - -DebugColor_InitMonOrTrainerColor: - ld a, [wDebugColorIsTrainer] - and a - jr nz, DebugColor_InitTrainerColor - ld hl, PokemonPalettes - ; fallthrough - -DebugColor_InitMonColor: - ld de, wDebugOriginalColors - ld c, NUM_POKEMON + 1 -.loop - push bc - push hl - call DebugColor_InitColor - pop hl - ld bc, 8 - add hl, bc - pop bc - dec c - jr nz, .loop - ret - -DebugColor_InitTrainerColor: - ld hl, TrainerPalettes - ld de, wDebugOriginalColors - ld c, NUM_TRAINER_CLASSES + 1 -.loop - push bc - push hl - call DebugColor_InitColor - pop hl - ld bc, 4 - add hl, bc - pop bc - dec c - jr nz, .loop - ret - -DebugColor_InitColor: -rept 3 - ld a, BANK(PokemonPalettes) ; aka BANK(TrainerPalettes) - call GetFarByte - ld [de], a - inc de - inc hl -endr - ld a, BANK(PokemonPalettes) ; aka BANK(TrainerPalettes) - call GetFarByte - ld [de], a - inc de - ret - -DebugColor_InitVRAM: - ld a, $1 - ldh [rVBK], a - ld hl, VRAM_Begin - ld bc, VRAM_End - VRAM_Begin - xor a - call ByteFill - - ld a, $0 - ldh [rVBK], a - ld hl, VRAM_Begin - ld bc, VRAM_End - VRAM_Begin - xor a - call ByteFill - - hlcoord 0, 0, wAttrmap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - xor a - call ByteFill - - hlcoord 0, 0 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - xor a - call ByteFill - - call ClearSprites - ret - -DebugColor_LoadGFX: - ld hl, DebugColor_GFX - ld de, vTiles2 tile DEBUGTEST_TICKS_1 - ld bc, 22 tiles - call CopyBytes - - ld hl, DebugColor_UpArrowGFX - ld de, vTiles0 - ld bc, 1 tiles - call CopyBytes - -; Invert the font colors. - call LoadStandardFont - ld hl, vTiles1 - ld bc, $80 tiles -.loop - ld a, [hl] - xor $ff - ld [hli], a - dec bc - ld a, c - or b - jr nz, .loop - ret - -DebugColor_InitPalettes: - ldh a, [hCGB] - and a - ret z - - ldh a, [rSVBK] - push af - ld a, BANK(wBGPals2) - ldh [rSVBK], a - - ld hl, Palette_DebugBG - ld de, wBGPals2 - ld bc, 16 palettes - call CopyBytes - - ld a, 1 << rBGPI_AUTO_INCREMENT - ldh [rBGPI], a - ld hl, Palette_DebugBG - ld c, 8 palettes - xor a -.bg_loop - ldh [rBGPD], a - dec c - jr nz, .bg_loop - - ld a, 1 << rOBPI_AUTO_INCREMENT - ldh [rOBPI], a - ld hl, Palette_DebugOB - ld c, 8 palettes -.ob_loop - ld a, [hli] - ldh [rOBPD], a - dec c - jr nz, .ob_loop - - ld a, LOW(palred 20 + palgreen 20 + palblue 20) - ld [wDebugLightColor + 0], a - ld a, HIGH(palred 20 + palgreen 20 + palblue 20) - ld [wDebugLightColor + 1], a - ld a, LOW(palred 10 + palgreen 10 + palblue 10) - ld [wDebugDarkColor + 0], a - ld a, HIGH(palred 10 + palgreen 10 + palblue 10) - ld [wDebugDarkColor + 1], a - - pop af - ldh [rSVBK], a - ret - -Palette_DebugBG: -INCLUDE "gfx/debug/bg.pal" - -Palette_DebugOB: -INCLUDE "gfx/debug/ob.pal" - -DebugColorMain: - call JoyTextDelay - ld a, [wJumptableIndex] - cp DEBUGCOLORMAIN_INITTMHM - jr nc, .no_start_select - ld hl, hJoyLast - ld a, [hl] - and SELECT - jr nz, .NextMon - ld a, [hl] - and START - jr nz, .PreviousMon - -.no_start_select - jumptable .Jumptable, wJumptableIndex - -.NextMon: - call DebugColor_BackupSpriteColors - call .SetMaxNum - ld e, a - ld a, [wDebugColorCurMon] - inc a - cp e - jr c, .SwitchMon - xor a - jr .SwitchMon - -.PreviousMon: - call DebugColor_BackupSpriteColors - ld a, [wDebugColorCurMon] - dec a - cp -1 - jr nz, .SwitchMon - call .SetMaxNum - dec a - -.SwitchMon: - ld [wDebugColorCurMon], a - ld a, DEBUGCOLORMAIN_INITSCREEN - ld [wJumptableIndex], a - ret - -.SetMaxNum: -; Looping back around the pic set. - ld a, [wDebugColorIsTrainer] - and a - jr nz, .trainer -; mon - ld a, NUM_POKEMON ; CELEBI - ret -.trainer - ld a, NUM_TRAINER_CLASSES ; MYSTICALMAN - ret - -.Jumptable: -; entries correspond to DEBUGCOLORMAIN_* constants - dw DebugColor_InitScreen - dw DebugColor_UpdateScreen - dw DebugColor_UpdatePalettes - dw DebugColor_Joypad - dw DebugColor_InitTMHM - dw DebugColor_TMHMJoypad - -DebugColor_InitScreen: - xor a - ldh [hBGMapMode], a - hlcoord 0, 0 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - ld a, DEBUGTEST_BLACK - call ByteFill - hlcoord 1, 3 - lb bc, 7, 18 - ld a, DEBUGTEST_WHITE - call DebugColor_FillBoxWithByte - hlcoord 11, 0 - lb bc, 2, 3 - ld a, DEBUGTEST_LIGHT - call DebugColor_FillBoxWithByte - hlcoord 16, 0 - lb bc, 2, 3 - ld a, DEBUGTEST_DARK - call DebugColor_FillBoxWithByte - call DebugColor_LoadRGBMeter - call DebugColor_SetRGBMeter - ld a, [wDebugColorCurMon] - inc a - ld [wCurPartySpecies], a - ld [wTextDecimalByte], a - hlcoord 0, 1 - ld de, wTextDecimalByte - lb bc, PRINTNUM_LEADINGZEROS | 1, 3 - call PrintNum - ld a, [wDebugColorIsTrainer] - and a - jr nz, .trainer - -; mon - ld a, UNOWN_A - ld [wUnownLetter], a - call GetPokemonName - hlcoord 4, 1 - call PlaceString - xor a - ld [wBoxAlignment], a - hlcoord 12, 3 - call _PrepMonFrontpic - ld de, vTiles2 tile $31 - predef GetMonBackpic - ld a, $31 - ldh [hGraphicStartTile], a - hlcoord 2, 4 - lb bc, 6, 6 - predef PlaceGraphic - - ld a, [wDebugColorIsShiny] - and a - jr z, .normal -; shiny - ld de, .ShinyText - jr .place_text -.normal - ld de, .NormalText -.place_text - hlcoord 7, 17 - call PlaceString - hlcoord 0, 17 - ld de, .SwitchText - call PlaceString - jr .done - -.trainer - ld a, [wTextDecimalByte] - ld [wTrainerClass], a - callfar GetTrainerAttributes - ld de, wStringBuffer1 - hlcoord 4, 1 - call PlaceString - ld de, vTiles2 - callfar GetTrainerPic - xor a - ld [wTempEnemyMonSpecies], a - ldh [hGraphicStartTile], a - hlcoord 2, 3 - lb bc, 7, 7 - predef PlaceGraphic - -.done - ld a, DEBUGCOLORMAIN_UPDATESCREEN - ld [wJumptableIndex], a - ret - -.ShinyText: - db "レア", DEBUGTEST_BLACK, DEBUGTEST_BLACK, "@" ; Rare (shiny) - -.NormalText: - db "ノーマル@" ; Normal - -.SwitchText: - db DEBUGTEST_A, "きりかえ▶@" ; (A) Switches - -DebugColor_LoadRGBMeter: - decoord 0, 11, wAttrmap - hlcoord 2, 11 - ld a, 1 - call .load_meter - decoord 0, 13, wAttrmap - hlcoord 2, 13 - ld a, 2 - call .load_meter - decoord 0, 15, wAttrmap - hlcoord 2, 15 - ld a, 3 -.load_meter: - push af - ld a, DEBUGTEST_TICKS_1 - ld [hli], a - ld bc, 15 - ld a, DEBUGTEST_TICKS_2 - call ByteFill - ld l, e - ld h, d - pop af - ld bc, 20 * 2 - call ByteFill - ret - -DebugColor_SetRGBMeter: - ld a, [wDebugColorCurMon] - inc a - ld l, a - ld h, 0 - add hl, hl - add hl, hl - ld de, wDebugOriginalColors - add hl, de - ld de, wDebugMiddleColors - ld bc, 4 - call CopyBytes - xor a - ld [wDebugColorRGBJumptableIndex], a - ld [wDebugColorCurColor], a - ld de, wDebugLightColor - call DebugColor_CalculateRGB - ret - -DebugColor_UpdateScreen: - ldh a, [hCGB] - and a - jr z, .sgb - - ld a, 2 - ldh [hBGMapMode], a - call DelayFrame - call DelayFrame - call DelayFrame - -.sgb - call WaitBGMap - - ld a, DEBUGCOLORMAIN_UPDATEPALETTES - ld [wJumptableIndex], a - ret - -DebugColor_UpdatePalettes: - ldh a, [hCGB] - and a - jr z, .sgb - -; cgb - ldh a, [rSVBK] - push af - ld a, BANK(wBGPals2) - ldh [rSVBK], a - - ld hl, wBGPals2 - ld de, wDebugMiddleColors - ld c, 1 - call DebugColor_LoadPalettes_White_Col1_Col2_Black - - hlcoord 10, 2 - ld de, wDebugLightColor - call DebugColor_PrintHexColor - hlcoord 15, 2 - ld de, wDebugDarkColor - call DebugColor_PrintHexColor - - ld a, TRUE - ldh [hCGBPalUpdate], a - - ld a, DEBUGCOLORMAIN_JOYPAD - ld [wJumptableIndex], a - - pop af - ldh [rSVBK], a - ret - -.sgb - ld hl, wSGBPals - ld a, 1 - ld [hli], a - ld a, LOW(PALRGB_WHITE) - ld [hli], a - ld a, HIGH(PALRGB_WHITE) - ld [hli], a - ld a, [wDebugLightColor + 0] - ld [hli], a - ld a, [wDebugLightColor + 1] - ld [hli], a - ld a, [wDebugDarkColor + 0] - ld [hli], a - ld a, [wDebugDarkColor + 1] - ld [hli], a - xor a - ld [hli], a - ld [hli], a - ld [hl], a - - ld hl, wSGBPals - call DebugColor_PushSGBPals - - hlcoord 10, 2 - ld de, wDebugLightColor - call DebugColor_PrintHexColor - hlcoord 15, 2 - ld de, wDebugDarkColor - call DebugColor_PrintHexColor - - ld a, DEBUGCOLORMAIN_JOYPAD - ld [wJumptableIndex], a - ret - -DebugColor_PrintHexColor: - inc hl - inc hl - inc hl - ld a, [de] - call .place_tile - ld a, [de] - swap a - call .place_tile - inc de - ld a, [de] - call .place_tile - ld a, [de] - swap a -.place_tile: - and $f - add DEBUGTEST_0 - ld [hld], a - ret - -DebugColor_Joypad: - ldh a, [hJoyLast] - and B_BUTTON - jr nz, .tmhm - ldh a, [hJoyLast] - and A_BUTTON - jr nz, .toggle_shiny - - ld a, [wDebugColorRGBJumptableIndex] - maskbits 4 ; .PointerTable length - ld e, a - ld d, 0 - ld hl, .PointerTable - add hl, de - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - jp hl - -.tmhm -; Enter the TM/HM checker. - ld a, DEBUGCOLORMAIN_INITTMHM - ld [wJumptableIndex], a - ret - -.toggle_shiny -; Toggle between the normal and shiny mon colors. - ld a, [wDebugColorIsTrainer] - and a - ret nz - - ld a, [wDebugColorIsShiny] - xor %00000100 - ld [wDebugColorIsShiny], a - ld c, a - ld b, 0 - ld hl, PokemonPalettes - add hl, bc - call DebugColor_InitMonColor - - ld a, DEBUGCOLORMAIN_INITSCREEN - ld [wJumptableIndex], a - ret - -.PointerTable: - dw DebugColor_SelectColorBox - dw DebugColor_ChangeRedValue - dw DebugColor_ChangeGreenValue - dw DebugColor_ChangeBlueValue - -DebugColor_SelectColorBox: - ld hl, hJoyLast - ld a, [hl] - and D_DOWN - jr nz, DebugColor_NextRGBColor - ld a, [hl] - and D_LEFT - jr nz, .light - ld a, [hl] - and D_RIGHT - jr nz, .dark - ret - -.light - xor a ; FALSE - ld [wDebugColorCurColor], a - ld de, wDebugLightColor - call DebugColor_CalculateRGB - ret - -.dark - ld a, TRUE - ld [wDebugColorCurColor], a - ld de, wDebugDarkColor - call DebugColor_CalculateRGB - ret - -DebugColor_ChangeRedValue: - ld hl, hJoyLast - ld a, [hl] - and D_DOWN - jr nz, DebugColor_NextRGBColor - ld a, [hl] - and D_UP - jr nz, DebugColor_PreviousRGBColor - ld hl, wDebugRedChannel - jr DebugColor_UpdateRGBColor - -DebugColor_ChangeGreenValue: - ld hl, hJoyLast - ld a, [hl] - and D_DOWN - jr nz, DebugColor_NextRGBColor - ld a, [hl] - and D_UP - jr nz, DebugColor_PreviousRGBColor - ld hl, wDebugGreenChannel - jr DebugColor_UpdateRGBColor - -DebugColor_ChangeBlueValue: - ld hl, hJoyLast - ld a, [hl] - and D_UP - jr nz, DebugColor_PreviousRGBColor - ld hl, wDebugBlueChannel - ; fallthrough - -DebugColor_UpdateRGBColor: - ldh a, [hJoyLast] - and D_RIGHT - jr nz, .increment - ldh a, [hJoyLast] - and D_LEFT - jr nz, .decrement - ret - -.increment - ld a, [hl] - cp 31 - ret nc - inc [hl] - jr .done - -.decrement - ld a, [hl] - and a - ret z - dec [hl] - -.done - call DebugColor_CalculatePalette - ld a, DEBUGCOLORMAIN_UPDATEPALETTES - ld [wJumptableIndex], a - ret - -DebugColor_PreviousRGBColor: - ld hl, wDebugColorRGBJumptableIndex - dec [hl] - ret - -DebugColor_NextRGBColor: - ld hl, wDebugColorRGBJumptableIndex - inc [hl] - ret - -DebugColor_InitTMHM: - hlcoord 0, 10 - ld bc, SCREEN_WIDTH * 8 - ld a, DEBUGTEST_BLACK - call ByteFill - hlcoord 2, 12 - ld de, DebugColor_AreYouFinishedString - call PlaceString - xor a - ld [wDebugColorCurTMHM], a - call DebugColor_PrintTMHMMove - ld a, DEBUGCOLORMAIN_TMHMJOYPAD - ld [wJumptableIndex], a - ret - -DebugColor_TMHMJoypad: - ld hl, hJoyPressed - ld a, [hl] - and B_BUTTON - jr nz, .cancel - call .scroll - ret - -.cancel - ld a, DEBUGCOLORMAIN_INITSCREEN - ld [wJumptableIndex], a - ret - -.exit ; unreferenced - ld hl, wJumptableIndex - set 7, [hl] - ret - -.scroll: - ld hl, hJoyLast - ld a, [hl] - and D_UP - jr nz, .up - ld a, [hl] - and D_DOWN - jr nz, .down - ret - -.up - ld a, [wDebugColorCurTMHM] - cp NUM_TM_HM_TUTOR - 1 - jr z, .wrap_down - inc a - jr .done - -.wrap_down - xor a - jr .done - -.down - ld a, [wDebugColorCurTMHM] - and a - jr z, .wrap_up - dec a - jr .done - -.wrap_up - ld a, NUM_TM_HM_TUTOR - 1 - -.done - ld [wDebugColorCurTMHM], a - call DebugColor_PrintTMHMMove - ret - -DebugColor_PrintTMHMMove: - hlcoord 10, 11 - call .ClearRow - hlcoord 10, 12 - call .ClearRow - hlcoord 10, 13 - call .ClearRow - hlcoord 10, 14 - call .ClearRow - - ld a, [wDebugColorCurTMHM] - inc a - ld [wTempTMHM], a - predef GetTMHMMove - ld a, [wTempTMHM] - ld [wPutativeTMHMMove], a - call GetMoveName - hlcoord 10, 12 - call PlaceString - - ld a, [wDebugColorCurTMHM] - call .GetNumberedTMHM - ld [wCurItem], a - predef CanLearnTMHMMove - ld a, c - and a - ld de, .AbleText - jr nz, .place_string - ld de, .NotAbleText -.place_string - hlcoord 10, 14 - call PlaceString - ret - -.AbleText: - db "おぼえられる@" ; Learnable - -.NotAbleText: - db "おぼえられない@" ; Not learnable - -.GetNumberedTMHM: - cp NUM_TMS - jr c, .tm -; hm - skip two gap items - inc a - inc a -.tm - add TM01 - ret - -.ClearRow: - ld bc, 10 - ld a, DEBUGTEST_BLACK - call ByteFill - ret - -DebugColor_CalculatePalette: - ld a, [wDebugRedChannel] - and %00011111 - ld e, a - ld a, [wDebugGreenChannel] - and %00000111 - sla a - swap a - or e - ld e, a - ld a, [wDebugGreenChannel] - and %00011000 - sla a - swap a - ld d, a - ld a, [wDebugBlueChannel] - and %00011111 - sla a - sla a - or d - ld d, a - ld a, [wDebugColorCurColor] - and a - jr z, .light - -; dark - ld a, e - ld [wDebugDarkColor + 0], a - ld a, d - ld [wDebugDarkColor + 1], a - ret - -.light - ld a, e - ld [wDebugLightColor + 0], a - ld a, d - ld [wDebugLightColor + 1], a - ret - -DebugColor_CalculateRGB: - ld a, [de] - and %00011111 - ld [wDebugRedChannel], a - ld a, [de] - and %11100000 - swap a - srl a - ld b, a - inc de - ld a, [de] - and %00000011 - swap a - srl a - or b - ld [wDebugGreenChannel], a - ld a, [de] - and %01111100 - srl a - srl a - ld [wDebugBlueChannel], a - ret - -DebugColor_BackupSpriteColors: - ld a, [wDebugColorCurMon] - inc a - ld l, a - ld h, 0 - add hl, hl - add hl, hl - ld de, wDebugOriginalColors - add hl, de - ld e, l - ld d, h - ld hl, wDebugMiddleColors - ld bc, 4 - call CopyBytes - ret - -DebugColor_LoadPalettes_White_Col1_Col2_Black: -.loop - ld a, LOW(PALRGB_WHITE) - ld [hli], a - ld a, HIGH(PALRGB_WHITE) - ld [hli], a -rept 4 - ld a, [de] - inc de - ld [hli], a -endr - xor a - ld [hli], a - ld [hli], a - dec c - jr nz, .loop - ret - -DebugColor_FillBoxWithByte: -; For some reason, we have another copy of FillBoxWithByte here -.row - push bc - push hl -.col - ld [hli], a - dec c - jr nz, .col - pop hl - ld bc, SCREEN_WIDTH - add hl, bc - pop bc - dec b - jr nz, .row - ret - -DebugColor_PushSGBPals: - ld a, [wJoypadDisable] - push af - set JOYPAD_DISABLE_SGB_TRANSFER_F, a - ld [wJoypadDisable], a - call _DebugColor_PushSGBPals - pop af - ld [wJoypadDisable], a - ret - -_DebugColor_PushSGBPals: - ld a, [hl] - and $7 - ret z - ld b, a -.loop - push bc - xor a - ldh [rJOYP], a - ld a, $30 - ldh [rJOYP], a - ld b, $10 -.loop2 - ld e, $8 - ld a, [hli] - ld d, a -.loop3 - bit 0, d - ld a, $10 - jr nz, .okay - ld a, $20 -.okay - ldh [rJOYP], a - ld a, $30 - ldh [rJOYP], a - rr d - dec e - jr nz, .loop3 - dec b - jr nz, .loop2 - ld a, $20 - ldh [rJOYP], a - ld a, $30 - ldh [rJOYP], a - ld de, 7000 -.wait - nop - nop - nop - dec de - ld a, d - or e - jr nz, .wait - pop bc - dec b - jr nz, .loop - ret - -DebugColor_PlaceCursor: - ld a, DEBUGTEST_BLACK - hlcoord 10, 0 - ld [hl], a - hlcoord 15, 0 - ld [hl], a - hlcoord 1, 11 - ld [hl], a - hlcoord 1, 13 - ld [hl], a - hlcoord 1, 15 - ld [hl], a - - ld a, [wJumptableIndex] - cp DEBUGCOLORMAIN_JOYPAD - jr nz, .clearsprites - - ld a, [wDebugColorRGBJumptableIndex] - and a - jr z, .place_cursor - dec a - hlcoord 1, 11 - ld bc, 2 * SCREEN_WIDTH - call AddNTimes - ld [hl], "▶" - -.place_cursor - ld a, [wDebugColorCurColor] - and a - jr z, .light -; dark - hlcoord 15, 0 - jr .place -.light - hlcoord 10, 0 -.place - ld [hl], "▶" - - ld b, $70 ; initial tile id - ld c, 5 ; initial palette - ld hl, wShadowOAM - ld de, wDebugRedChannel - call .placesprite - ld de, wDebugGreenChannel - call .placesprite - ld de, wDebugBlueChannel - call .placesprite - ret - -.placesprite: - ld a, b - ld [hli], a ; y - ld a, [de] - add a - add a - add 3 * TILE_WIDTH - ld [hli], a ; x - xor a - ld [hli], a ; tile id - ld a, c - ld [hli], a ; attributes - ld a, 2 * TILE_WIDTH - add b - ld b, a - inc c - ret - -.clearsprites: - call ClearSprites - ret - -DebugColor_AreYouFinishedString: - db "おわりますか?" ; Are you finished? - next "はい", DEBUGTEST_A ; YES...(A) - next "いいえ", DEBUGTEST_B ; NO..(B) - db "@" - -DebugColor_UpArrowGFX: -INCBIN "gfx/debug/up_arrow.2bpp" - -DebugColor_GFX: -INCBIN "gfx/debug/color_test.2bpp" - -TilesetColorPicker: ; unreferenced -; A debug menu to test tileset palettes at runtime. -; dummied out - ret - - xor a - ld [wJumptableIndex], a - ld [wDebugTilesetCurPalette], a - ld [wDebugTilesetRGBJumptableIndex], a - ld [wDebugTilesetCurColor], a - ldh [hMapAnims], a - call ClearSprites - call OverworldTextModeSwitch - call WaitBGMap2 - xor a - ldh [hBGMapMode], a - ld de, DebugColor_GFX - ld hl, vTiles2 tile DEBUGTEST_TICKS_1 - lb bc, BANK(DebugColor_GFX), 22 - call Request2bpp - ld de, DebugColor_UpArrowGFX - ld hl, vTiles1 - lb bc, BANK(DebugColor_UpArrowGFX), 1 - call Request2bpp - ld a, HIGH(vBGMap1) - ldh [hBGMapAddress + 1], a - hlcoord 0, 0 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - ld a, DEBUGTEST_BLACK - call ByteFill - hlcoord 0, 0, wAttrmap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - ld a, PAL_BG_TEXT - call ByteFill - decoord 1, 1, 0 - ld a, DEBUGTEST_WHITE - call DebugTileset_DrawColorSwatch - decoord 6, 1, 0 - ld a, DEBUGTEST_LIGHT - call DebugTileset_DrawColorSwatch - decoord 11, 1, 0 - ld a, DEBUGTEST_DARK - call DebugTileset_DrawColorSwatch - decoord 16, 1, 0 - ld a, DEBUGTEST_BLACK - call DebugTileset_DrawColorSwatch - call DebugTileset_LoadRGBMeter - call DebugTileset_LoadPalettes - call WaitBGMap2 - ld [wJumptableIndex], a - ld a, $40 - ldh [hWY], a - ret - -DebugTileset_DrawColorSwatch: - hlcoord 0, 0 - call _DebugColor_DrawSwatch - -DebugColor_DrawAttributeSwatch: - ld a, [wDebugTilesetCurPalette] - hlcoord 0, 0, wAttrmap - ; fallthrough - -_DebugColor_DrawSwatch: -; Fills a 4x3 box at de with byte a. - add hl, de -rept 4 - ld [hli], a -endr -rept 2 - ld bc, SCREEN_WIDTH - 4 - add hl, bc -rept 4 - ld [hli], a -endr -endr - ret - -DebugTileset_LoadRGBMeter: - hlcoord 2, 4 - call .Place - hlcoord 2, 6 - call .Place - hlcoord 2, 8 -.Place: - ld a, DEBUGTEST_TICKS_1 - ld [hli], a - ld bc, 15 - ld a, DEBUGTEST_TICKS_2 - call ByteFill - ret - -DebugTileset_LoadPalettes: - ldh a, [rSVBK] - push af - ld a, BANK(wBGPals1) - ldh [rSVBK], a - - ld a, [wDebugTilesetCurPalette] - ld l, a - ld h, 0 - add hl, hl - add hl, hl - add hl, hl - ld de, wBGPals1 - add hl, de - ld de, wDebugPalette - ld bc, 1 palettes - call CopyBytes - ld de, wDebugPalette - call DebugColor_CalculateRGB - - pop af - ldh [rSVBK], a - ret - -DebugColorMain2: ; unreferenced - ld hl, hJoyLast - ld a, [hl] - and SELECT - jr nz, .next_palette - ld a, [hl] - and B_BUTTON - jr nz, .cancel - call DebugTileset_Joypad - ret - -.next_palette - ld hl, wDebugTilesetCurPalette - ld a, [hl] - inc a - and PALETTE_MASK - cp PAL_BG_TEXT - jr nz, .palette_ok - xor a ; PAL_BG_GRAY -.palette_ok - ld [hl], a - decoord 1, 1, 0 - call DebugColor_DrawAttributeSwatch - decoord 6, 1, 0 - call DebugColor_DrawAttributeSwatch - decoord 11, 1, 0 - call DebugColor_DrawAttributeSwatch - decoord 16, 1, 0 - call DebugColor_DrawAttributeSwatch - - ldh a, [rSVBK] - push af - ld a, BANK(wBGPals2) - ldh [rSVBK], a - - ld hl, wBGPals2 - ld a, [wDebugTilesetCurPalette] - ld bc, 1 palettes - call AddNTimes - ld de, wDebugPalette - ld bc, 1 palettes - call CopyBytes - - pop af - ldh [rSVBK], a - - ld a, 2 - ldh [hBGMapMode], a - ld c, 3 - call DelayFrames - ld a, 1 - ldh [hBGMapMode], a - ret - -.cancel - call ClearSprites - ldh a, [hWY] - xor %11010000 - ldh [hWY], a - ret - -DebugTileset_UpdatePalettes: - ldh a, [rSVBK] - push af - ld a, BANK(wBGPals2) - ldh [rSVBK], a - - ld hl, wBGPals2 - ld a, [wDebugTilesetCurPalette] - ld bc, 1 palettes - call AddNTimes - ld e, l - ld d, h - ld hl, wDebugPalette - ld bc, 1 palettes - call CopyBytes - - hlcoord 1, 0 - ld de, wDebugWhiteTileColor - call DebugColor_PrintHexColor - hlcoord 6, 0 - ld de, wDebugLightTileColor - call DebugColor_PrintHexColor - hlcoord 11, 0 - ld de, wDebugDarkTileColor - call DebugColor_PrintHexColor - hlcoord 16, 0 - ld de, wDebugBlackTileColor - call DebugColor_PrintHexColor - - pop af - ldh [rSVBK], a - - ld a, TRUE - ldh [hCGBPalUpdate], a - - call DelayFrame - ret - -DebugTileset_Joypad: - ld a, [wDebugTilesetRGBJumptableIndex] - maskbits 4 ; .PointerTable length - ld e, a - ld d, 0 - ld hl, .PointerTable - add hl, de - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - jp hl - -.PointerTable: - dw DebugTileset_SelectColorBox - dw DebugTileset_ChangeRedValue - dw DebugTileset_ChangeGreenValue - dw DebugTileset_ChangeBlueValue - -DebugTileset_SelectColorBox: - ld hl, hJoyLast - ld a, [hl] - and D_DOWN - jr nz, DebugTileset_NextRGBColor - ld a, [hl] - and D_LEFT - jr nz, .left - ld a, [hl] - and D_RIGHT - jr nz, .right - ret - -.left - ld a, [wDebugTilesetCurColor] - dec a - jr .done - -.right - ld a, [wDebugTilesetCurColor] - inc a - -.done - maskbits NUM_PAL_COLORS - ld [wDebugTilesetCurColor], a - ld e, a - ld d, 0 - ld hl, wDebugPalette - add hl, de - add hl, de - ld e, l - ld d, h - call DebugColor_CalculateRGB - ret - -DebugTileset_ChangeRedValue: - ld hl, hJoyLast - ld a, [hl] - and D_DOWN - jr nz, DebugTileset_NextRGBColor - ld a, [hl] - and D_UP - jr nz, DebugTileset_PreviousRGBColor - ld hl, wDebugRedChannel - jr DebugTileset_UpdateRGBColor - -DebugTileset_ChangeGreenValue: - ld hl, hJoyLast - ld a, [hl] - and D_DOWN - jr nz, DebugTileset_NextRGBColor - ld a, [hl] - and D_UP - jr nz, DebugTileset_PreviousRGBColor - ld hl, wDebugGreenChannel - jr DebugTileset_UpdateRGBColor - -DebugTileset_ChangeBlueValue: - ld hl, hJoyLast - ld a, [hl] - and D_UP - jr nz, DebugTileset_PreviousRGBColor - ld hl, wDebugBlueChannel - ; fallthrough - -DebugTileset_UpdateRGBColor: - ldh a, [hJoyLast] - and D_RIGHT - jr nz, .increment - ldh a, [hJoyLast] - and D_LEFT - jr nz, .decrement - ret - -.increment - ld a, [hl] - cp 31 - ret nc - inc [hl] - jr .done - -.decrement - ld a, [hl] - and a - ret z - dec [hl] - -.done - call DebugTileset_CalculatePalette - call DebugTileset_UpdatePalettes - ret - -DebugTileset_PreviousRGBColor: - ld hl, wDebugTilesetRGBJumptableIndex - dec [hl] - ret - -DebugTileset_NextRGBColor: - ld hl, wDebugTilesetRGBJumptableIndex - inc [hl] - ret - -DebugTileset_CalculatePalette: - ld a, [wDebugRedChannel] - and %00011111 - ld e, a - ld a, [wDebugGreenChannel] - and %0000111 - sla a - swap a - or e - ld e, a - ld a, [wDebugGreenChannel] - and %00011000 - sla a - swap a - ld d, a - ld a, [wDebugBlueChannel] - and %00011111 - sla a - sla a - or d - ld d, a - ld a, [wDebugTilesetCurColor] - ld c, a - ld b, 0 - ld hl, wDebugPalette - add hl, bc - add hl, bc - ld a, e - ld [hli], a - ld [hl], d - ret - -.dummy1: ; unreferenced - ret - -.dummy2: ; unreferenced - ret diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index eb075ae0..9cfe33d5 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -691,17 +691,6 @@ NamingScreen_AdvanceCursor_CheckEndOfString: scf ret -AddDakutenToCharacter: ; unreferenced - ld a, [wNamingScreenCurNameLength] - and a - ret z - push hl - ld hl, wNamingScreenCurNameLength - dec [hl] - call NamingScreen_GetTextCursorPosition - ld c, [hl] - pop hl - .loop ld a, [hli] cp -1 @@ -715,8 +704,6 @@ AddDakutenToCharacter: ; unreferenced ld a, [hl] jr NamingScreen_LoadNextCharacter -INCLUDE "data/text/unused_dakutens.asm" - NamingScreen_DeleteCharacter: ld hl, wNamingScreenCurNameLength ld a, [hl] @@ -968,9 +955,6 @@ INCBIN "gfx/naming_screen/mail.2bpp" ld [wNamingScreenMaxNameLength], a ret -.PleaseWriteAMailString: ; unreferenced - db "メールを かいてね@" - .InitCharset: call WaitTop hlcoord 0, 0 @@ -1334,18 +1318,6 @@ MailComposition_TryAddLastCharacter: ld a, [wNamingScreenLastCharacter] jp MailComposition_TryAddCharacter -.add_dakuten ; unreferenced - ld a, [wNamingScreenCurNameLength] - and a - ret z - cp $11 - jr nz, .one_back - push hl - ld hl, wNamingScreenCurNameLength - dec [hl] - dec [hl] - jr .continue - .one_back push hl ld hl, wNamingScreenCurNameLength diff --git a/engine/movie/unused_title.asm b/engine/movie/unused_title.asm deleted file mode 100644 index db916e92..00000000 --- a/engine/movie/unused_title.asm +++ /dev/null @@ -1,171 +0,0 @@ -UnusedTitleScreen: ; unreferenced - call ClearBGPalettes - call ClearTilemap - call DisableLCD - -; Turn BG Map update off - xor a - ldh [hBGMapMode], a - -; Reset timing variables - ld hl, wJumptableIndex - ld [hli], a ; wJumptableIndex - ld [hli], a ; wIntroSceneFrameCounter - ld [hli], a ; wTitleScreenTimer - ld [hl], a ; wTitleScreenTimer + 1 - - ld hl, UnusedTitleBG_GFX - ld de, vTiles2 - ld bc, vBGMap0 - vTiles2 - call CopyBytes - - ld hl, UnusedTitleBG_GFX + $80 tiles - ld de, vTiles1 - ld bc, vTiles2 - vTiles1 - call CopyBytes - - ld hl, UnusedTitleFG_GFX - ld de, vTiles0 - ld bc, vTiles1 - vTiles0 - call CopyBytes - - ld hl, UnusedTitleBG_Tilemap - debgcoord 0, 0 - ld bc, BG_MAP_WIDTH * BG_MAP_HEIGHT -.copy - ld a, 0 - ldh [rVBK], a - ld a, [hli] - ld [de], a - ld a, 1 - ldh [rVBK], a - ld a, [hli] - ld [de], a - inc de - dec bc - ld a, b - or c - jr nz, .copy - - ld hl, UnusedTitleFG_OAM - ld de, wShadowOAMSprite00 - ld bc, SPRITEOAMSTRUCT_LENGTH * NUM_SPRITE_OAM_STRUCTS - call CopyBytes - - call EnableLCD - ldh a, [rLCDC] - set rLCDC_SPRITES_ENABLE, a - set rLCDC_SPRITE_SIZE, a - ldh [rLCDC], a - - call DelayFrame - - ldh a, [rSVBK] - push af - ld a, BANK(wBGPals1) - ldh [rSVBK], a - - ld hl, UnusedTitleBG_Palettes - ld de, wBGPals1 - ld bc, 8 palettes - call CopyBytes - - ld hl, UnusedTitleFG_Palettes - ld de, wOBPals1 - ld bc, 8 palettes - call CopyBytes - - ld hl, UnusedTitleBG_Palettes - ld de, wBGPals2 - ld bc, 8 palettes - call CopyBytes - - ld hl, UnusedTitleFG_Palettes - ld de, wOBPals2 - ld bc, 8 palettes - call CopyBytes - - pop af - ldh [rSVBK], a - - ld a, TRUE - ldh [hCGBPalUpdate], a - - ld de, MUSIC_TITLE - call PlayMusic - - ret - -UnusedTitleBG_GFX: -INCBIN "gfx/title/old_bg.2bpp" - -UnusedTitleBG_Tilemap: -; 32x32 (alternating tiles and attributes) -INCBIN "gfx/title/old_bg.tilemap" - -UnusedTitleBG_Palettes: -INCLUDE "gfx/title/old_bg.pal" - -UnusedTitleFG_GFX: -INCBIN "gfx/title/old_fg.2bpp" - -UnusedTitleFG_Palettes: -INCLUDE "gfx/title/old_fg.pal" - -UnusedTitleFG_OAM: - dbsprite 7, 3, 0, 0, $00, 1 - dbsprite 8, 3, 0, 0, $02, 1 - dbsprite 9, 3, 0, 0, $04, 1 - dbsprite 10, 3, 0, 0, $06, 1 - dbsprite 11, 3, 0, 0, $08, 1 - dbsprite 12, 3, 0, 0, $0a, 1 - dbsprite 13, 3, 0, 0, $0c, 1 - dbsprite 14, 3, 0, 0, $0e, 1 - dbsprite 7, 5, 0, 0, $10, 0 - dbsprite 8, 5, 0, 0, $12, 0 - dbsprite 9, 5, 0, 0, $14, 0 - dbsprite 10, 5, 0, 0, $16, 0 - dbsprite 11, 5, 0, 0, $18, 0 - dbsprite 12, 5, 0, 0, $1a, 0 - dbsprite 13, 5, 0, 0, $1c, 0 - dbsprite 14, 5, 0, 0, $1e, 0 - dbsprite 7, 7, 0, 0, $20, 0 - dbsprite 8, 7, 0, 0, $22, 0 - dbsprite 9, 7, 0, 0, $24, 0 - dbsprite 10, 7, 0, 0, $26, 0 - dbsprite 11, 7, 0, 0, $28, 0 - dbsprite 12, 7, 0, 0, $2a, 0 - dbsprite 13, 7, 0, 0, $2c, 0 - dbsprite 14, 7, 0, 0, $2e, 0 - dbsprite 7, 9, 0, 0, $30, 2 - dbsprite 8, 9, 0, 0, $32, 2 - dbsprite 9, 9, 0, 0, $34, 2 - dbsprite 10, 9, 0, 0, $36, 2 - dbsprite 11, 9, 0, 0, $38, 2 - dbsprite 12, 9, 0, 0, $3a, 2 - dbsprite 13, 9, 0, 0, $3c, 2 - dbsprite 14, 9, 0, 0, $3e, 2 - dbsprite 7, 11, 0, 0, $40, 1 - dbsprite 8, 11, 0, 0, $42, 1 - dbsprite 9, 11, 0, 0, $44, 1 - dbsprite 10, 11, 0, 0, $46, 1 - dbsprite 11, 11, 0, 0, $48, 1 - dbsprite 12, 11, 0, 0, $4a, 1 - dbsprite 13, 11, 0, 0, $4c, 1 - dbsprite 14, 11, 0, 0, $4e, 1 - -TestCrystalTitleScreen: ; unreferenced -; Runs the title screen until A is pressed. -; Possibly used for testing. - call _TitleScreen -.loop - call JoyTextDelay - ldh a, [hJoyLast] - ld b, a - and A_BUTTON - jr nz, .done - call SuicuneFrameIterator - call DelayFrame - jr .loop -.done - ret diff --git a/gfx/debug/bg.pal b/gfx/debug/bg.pal deleted file mode 100644 index d0b57359..00000000 --- a/gfx/debug/bg.pal +++ /dev/null @@ -1,43 +0,0 @@ - ; white - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - ; red - RGB 31, 00, 00 - RGB 31, 00, 00 - RGB 31, 00, 00 - RGB 00, 00, 00 - - ; green - RGB 00, 31, 00 - RGB 00, 31, 00 - RGB 00, 31, 00 - RGB 00, 00, 00 - - ; blue - RGB 00, 00, 31 - RGB 00, 00, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 diff --git a/gfx/debug/color_test.png b/gfx/debug/color_test.png deleted file mode 100644 index e33be965..00000000 Binary files a/gfx/debug/color_test.png and /dev/null differ diff --git a/gfx/debug/ob.pal b/gfx/debug/ob.pal deleted file mode 100644 index 2a03f4e8..00000000 --- a/gfx/debug/ob.pal +++ /dev/null @@ -1,42 +0,0 @@ - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 00, 00, 00 - - ; red - RGB 31, 31, 31 - RGB 31, 00, 00 - RGB 31, 00, 00 - RGB 00, 00, 00 - - ; green - RGB 31, 31, 31 - RGB 00, 31, 00 - RGB 00, 31, 00 - RGB 00, 00, 00 - - ; blue - RGB 31, 31, 31 - RGB 00, 00, 31 - RGB 00, 00, 31 - RGB 00, 00, 00 diff --git a/gfx/title/old_bg.pal b/gfx/title/old_bg.pal deleted file mode 100644 index 307eb76a..00000000 --- a/gfx/title/old_bg.pal +++ /dev/null @@ -1,56 +0,0 @@ - RGB 00, 00, 00 - RGB 25, 15, 28 - RGB 22, 11, 28 - RGB 19, 08, 26 - - RGB 00, 00, 00 - RGB 17, 07, 22 - RGB 13, 07, 16 - RGB 19, 08, 26 - - RGB 25, 15, 28 - RGB 22, 11, 28 - RGB 19, 08, 26 - RGB 17, 07, 22 - - RGB 22, 11, 28 - RGB 19, 08, 26 - RGB 17, 07, 22 - RGB 13, 07, 16 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 22, 10, 31 - RGB 19, 08, 26 - RGB 17, 07, 22 - - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - - RGB 31, 31, 31 - RGB 20, 04, 20 - RGB 16, 08, 16 - RGB 24, 00, 24 - -rept 54 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 31, 31, 31 -endr diff --git a/gfx/title/old_bg.png b/gfx/title/old_bg.png deleted file mode 100644 index 2b6d5db2..00000000 Binary files a/gfx/title/old_bg.png and /dev/null differ diff --git a/gfx/title/old_bg.tilemap b/gfx/title/old_bg.tilemap deleted file mode 100644 index 58f448c3..00000000 Binary files a/gfx/title/old_bg.tilemap and /dev/null differ diff --git a/gfx/title/old_fg.pal b/gfx/title/old_fg.pal deleted file mode 100644 index 80e7d989..00000000 --- a/gfx/title/old_fg.pal +++ /dev/null @@ -1,319 +0,0 @@ - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 22, 00 - RGB 31, 27, 00 - RGB 31, 31, 00 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 16, 31, 00 - RGB 22, 31, 00 - RGB 27, 31, 00 - RGB 31, 31, 00 - - RGB 31, 00, 18 - RGB 31, 31, 31 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 00, 00, 00 - RGB 31, 31, 31 - RGB 20, 20, 20 - RGB 12, 12, 12 - - RGB 00, 00, 00 - RGB 01, 11, 23 - RGB 16, 16, 24 - RGB 02, 13, 21 - - RGB 16, 31, 00 - RGB 22, 31, 00 - RGB 27, 31, 00 - RGB 31, 31, 00 - - RGB 24, 18, 31 - RGB 31, 31, 00 - RGB 31, 31, 01 - RGB 31, 31, 03 - - RGB 31, 31, 05 - RGB 31, 31, 08 - RGB 31, 31, 10 - RGB 31, 31, 12 - - RGB 31, 31, 14 - RGB 31, 31, 16 - RGB 31, 31, 18 - RGB 31, 31, 20 - - RGB 31, 31, 22 - RGB 31, 31, 25 - RGB 31, 31, 27 - RGB 31, 31, 29 - - RGB 24, 06, 06 - RGB 01, 01, 01 - RGB 03, 03, 03 - RGB 05, 05, 05 - - RGB 08, 08, 08 - RGB 10, 10, 10 - RGB 12, 12, 12 - RGB 14, 14, 14 - - RGB 16, 16, 16 - RGB 18, 18, 18 - RGB 20, 20, 20 - RGB 22, 22, 22 - - RGB 25, 25, 25 - RGB 27, 27, 27 - RGB 29, 29, 29 - RGB 31, 31, 31 - - RGB 18, 24, 18 - RGB 31, 29, 01 - RGB 31, 27, 03 - RGB 31, 25, 05 - - RGB 31, 22, 08 - RGB 31, 20, 10 - RGB 31, 18, 12 - RGB 31, 16, 14 - - RGB 31, 14, 16 - RGB 31, 12, 18 - RGB 31, 10, 20 - RGB 31, 08, 22 - - RGB 31, 05, 25 - RGB 31, 03, 27 - RGB 31, 01, 29 - RGB 31, 00, 31 - - RGB 18, 06, 31 - RGB 00, 31, 31 - RGB 00, 31, 29 - RGB 00, 31, 27 - - RGB 00, 31, 25 - RGB 00, 31, 22 - RGB 00, 31, 20 - RGB 00, 31, 18 - - RGB 00, 31, 16 - RGB 00, 31, 14 - RGB 00, 31, 12 - RGB 00, 31, 10 - - RGB 00, 31, 08 - RGB 00, 31, 05 - RGB 00, 31, 03 - RGB 00, 31, 01 - - RGB 12, 31, 06 - RGB 00, 00, 31 - RGB 00, 01, 31 - RGB 00, 03, 31 - - RGB 00, 05, 31 - RGB 00, 08, 31 - RGB 00, 10, 31 - RGB 00, 12, 31 - - RGB 00, 14, 31 - RGB 00, 16, 31 - RGB 00, 18, 31 - RGB 00, 20, 31 - - RGB 00, 22, 31 - RGB 00, 25, 31 - RGB 00, 27, 31 - RGB 00, 29, 31 - - RGB 00, 00, 00 - RGB 06, 00, 04 - RGB 19, 02, 09 - RGB 28, 04, 11 - - RGB 31, 07, 16 - RGB 31, 17, 23 - RGB 31, 26, 30 - RGB 07, 05, 10 - - RGB 14, 10, 18 - RGB 20, 20, 25 - RGB 25, 27, 31 - RGB 09, 05, 06 - - RGB 23, 16, 13 - RGB 30, 23, 22 - RGB 31, 28, 28 - RGB 31, 31, 31 - - RGB 06, 31, 31 - RGB 04, 00, 04 - RGB 11, 02, 04 - RGB 17, 02, 04 - - RGB 24, 05, 04 - RGB 28, 07, 04 - RGB 31, 11, 04 - RGB 02, 01, 15 - - RGB 04, 11, 22 - RGB 12, 25, 25 - RGB 20, 31, 31 - RGB 09, 04, 03 - - RGB 22, 11, 08 - RGB 27, 19, 16 - RGB 30, 28, 26 - RGB 31, 31, 31 - - RGB 06, 18, 06 - RGB 04, 04, 02 - RGB 07, 07, 02 - RGB 18, 18, 04 - - RGB 24, 24, 06 - RGB 27, 27, 11 - RGB 31, 31, 20 - RGB 02, 03, 10 - - RGB 04, 05, 13 - RGB 06, 10, 25 - RGB 08, 15, 31 - RGB 04, 00, 06 - - RGB 11, 07, 14 - RGB 21, 16, 23 - RGB 29, 26, 31 - RGB 31, 31, 31 - - RGB 06, 00, 18 - RGB 00, 04, 03 - RGB 02, 09, 05 - RGB 11, 19, 07 - - RGB 16, 24, 08 - RGB 22, 31, 09 - RGB 24, 31, 18 - RGB 03, 01, 03 - - RGB 10, 04, 10 - RGB 20, 08, 20 - RGB 31, 17, 31 - RGB 01, 03, 06 - - RGB 05, 09, 10 - RGB 15, 21, 21 - RGB 23, 25, 25 - RGB 31, 31, 31 - - RGB 00, 18, 31 - RGB 00, 05, 07 - RGB 00, 08, 13 - RGB 00, 12, 17 - - RGB 01, 20, 24 - RGB 04, 27, 31 - RGB 14, 31, 31 - RGB 04, 02, 02 - - RGB 15, 01, 03 - RGB 26, 04, 07 - RGB 31, 13, 16 - RGB 00, 05, 02 - - RGB 01, 11, 03 - RGB 06, 21, 06 - RGB 13, 31, 16 - RGB 31, 31, 31 - - RGB 00, 06, 06 - RGB 00, 01, 08 - RGB 00, 05, 14 - RGB 00, 08, 19 - - RGB 02, 14, 26 - RGB 04, 21, 31 - RGB 06, 26, 31 - RGB 13, 00, 00 - - RGB 27, 07, 00 - RGB 31, 17, 05 - RGB 31, 25, 16 - RGB 02, 04, 00 - - RGB 07, 11, 03 - RGB 17, 19, 05 - RGB 27, 31, 16 - RGB 31, 31, 31 - - RGB 02, 00, 00 - RGB 04, 01, 06 - RGB 11, 03, 14 - RGB 16, 04, 19 - - RGB 20, 07, 22 - RGB 26, 12, 27 - RGB 26, 20, 31 - RGB 04, 07, 00 - - RGB 16, 20, 07 - RGB 24, 28, 15 - RGB 29, 31, 24 - RGB 05, 02, 02 - - RGB 15, 04, 02 - RGB 24, 11, 10 - RGB 31, 22, 20 - RGB 31, 31, 31 - - RGB 00, 00, 14 - RGB 12, 00, 00 - RGB 27, 05, 00 - RGB 31, 15, 05 - - RGB 31, 26, 13 - RGB 31, 30, 21 - RGB 05, 07, 16 - RGB 04, 16, 20 - - RGB 04, 24, 26 - RGB 08, 31, 31 - RGB 23, 31, 31 - RGB 00, 00, 00 - - RGB 05, 05, 05 - RGB 17, 17, 15 - RGB 28, 28, 24 - RGB 31, 31, 31 diff --git a/gfx/title/old_fg.png b/gfx/title/old_fg.png deleted file mode 100644 index 1a7351d5..00000000 Binary files a/gfx/title/old_fg.png and /dev/null differ diff --git a/main.asm b/main.asm index 701f3427..33b1209c 100644 --- a/main.asm +++ b/main.asm @@ -238,7 +238,6 @@ INCLUDE "engine/events/basement_key.asm" INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/pokemon/tempmon.asm" INCLUDE "engine/pokemon/types.asm" -INCLUDE "engine/battle/getgen1trainerclassname.asm" INCLUDE "engine/pokemon/mon_stats.asm" INCLUDE "engine/link/init_list.asm" INCLUDE "engine/pokemon/experience.asm" @@ -247,7 +246,6 @@ INCLUDE "engine/gfx/load_pics.asm" INCLUDE "engine/pokemon/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" -INCLUDE "data/pokemon/unused_pic_banks.asm" SECTION "Crystal Phone Text", ROMX @@ -274,7 +272,6 @@ INCLUDE "engine/overworld/player_movement.asm" INCLUDE "engine/events/engine_flags.asm" INCLUDE "engine/overworld/variables.asm" INCLUDE "data/text/battle.asm" -INCLUDE "engine/debug/color_picker.asm" SECTION "bank21", ROMX @@ -509,7 +506,6 @@ INCLUDE "mobile/mobile_42.asm" SECTION "Title", ROMX -INCLUDE "engine/movie/unused_title.asm" INCLUDE "engine/movie/title.asm" diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index b97db97b..f746c534 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -20,8 +20,6 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd Radio2Script -INCLUDE "data/text/unused_sweet_honey.asm" - GoldenrodNameRater_MapEvents: db 0, 0 ; filler