From 906ec5730c0ad831f68143b227b850189b0baed9 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Wed, 16 Dec 2020 20:59:36 +0700 Subject: Disassemble sound test debug menu --- engine/menu/debug_menu.asm | 290 ++++++++++++++++++++++++++++++++++++++++++++- home/unknown.asm | 8 +- layout.link | 4 +- ram/hram.asm | 16 ++- ram/wram.asm | 6 + shim.sym | 1 - 6 files changed, 317 insertions(+), 8 deletions(-) diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index e33d61c..a754c1b 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -25,7 +25,7 @@ DebugMenu:: DebugJumpTable:: dw DebugMenuOptionFight dw DebugMenuOptionField - dw Function094c ; sound test + dw DebugMenuSoundTest ; to home bank dw DebugMenuOptionSubGames dw DebugMenuOptionMonsterTest dw DebugMenuOptionName @@ -105,3 +105,291 @@ DebugMenuOptionName:: ld a, $e4 ldh [rBGP], a jp DebugMenu + +SECTION "engine/menu/debug_menu.asm@Sound Test", ROMX + +_DebugMenuSoundTest:: + call ClearTileMap + call LoadFontExtra + call ClearSprites + call GetMemSGBLayout + xor a + ldh [hDebugMenuSoundMenuIndex], a + call .DetermineDescriptionPointer + +.RefreshScreenAndLoop: + call WaitBGMap + +.Loop: + call ClearJoypad + call GetJoypad + ldh a, [hJoyDown] + and a + jr z, .Loop + + bit A_BUTTON_F, a + jr nz, .a_pressed + + bit B_BUTTON_F, a + jr nz, .b_pressed + + bit START_F, a + jr nz, .start_pressed + + bit D_UP_F, a + jr nz, .up_pressed + + bit D_DOWN_F, a + jr nz, .down_pressed + + ret + +.a_pressed + ldh a, [hDebugMenuSoundBank] + ld c, a + ldh a, [hDebugMenuSoundID] + jr .RefreshScreenAndLoop + +.up_pressed + ldh a, [hDebugMenuSoundMenuIndex] + inc a + cp 55 + jr nz, .SetIndex + + xor a + +.SetIndex: + ldh [hDebugMenuSoundMenuIndex], a + call .DetermineDescriptionPointer + jr .RefreshScreenAndLoop + +.down_pressed + ldh a, [hDebugMenuSoundMenuIndex] + dec a + cp -1 + jr nz, .SetIndex2 + + ld a, 54 + +.SetIndex2: + ldh [hDebugMenuSoundMenuIndex], a + call .DetermineDescriptionPointer + jr .RefreshScreenAndLoop + +.start_pressed + ldh a, [hDebugMenuSoundBank] + ld c, a + ld a, -1 + jr .RefreshScreenAndLoop + +.b_pressed + ldh a, [hDebugMenuSoundBank] + ld c, a + ld a, 10 + ld [wcdb5], a + ld [wcdb6], a + ld a, -1 + ld [wcdb4], a + jr .RefreshScreenAndLoop + +.DetermineDescriptionPointer: + ld hl, .TextPointers + ldh a, [hDebugMenuSoundMenuIndex] + add a + add a ; a * 8 + ld d, 0 + ld e, a + add hl, de + ld a, [hli] + ldh [hDebugMenuSoundID], a + ld a, [hli] + ldh [hDebugMenuSoundBank], a + ld a, [hli] + ld e, a + ld d, [hl] + call CopyStringToStringBuffer2 + call .DisplayText + ret + +.DisplayText: + ld hl, hDebugMenuSoundMenuIndex + inc [hl] + ld hl, .String + call PrintText + ld hl, hDebugMenuSoundMenuIndex + dec [hl] + ld c, 3 + call DelayFrames + ret + +.String: + deciram hDebugMenuSoundMenuIndex, 1, 1 + text "@" + text_from_ram wStartDay + text "　" + done + +.TextPointers: +; id? bank? description + dbbw $00, $3A, SoundTest_PalletTownText + dbbw $00, $3A, SoundTest_PokecenterText + dbbw $00, $3A, SoundTest_PokegymText + dbbw $07, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $0C, $3A, SoundTest_PokeEvolutionText + dbbw $08, $3A, SoundTest_HealingText + dbbw $02, $3A, SoundTest_QuestionMarkText + dbbw $03, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_ReservedText + dbbw $00, $3A, SoundTest_OakText + dbbw $00, $3A, SoundTest_RivalText + dbbw $00, $3A, SoundTest_StAnneText + dbbw $66, $3A, SoundTest_Fanfare3Text + dbbw $68, $3A, SoundTest_Fanfare5Text + dbbw $69, $3A, SoundTest_Fanfare6Text + dbbw $63, $3A, SoundTest_FanfareText + dbbw $21, $3A, SoundTest_FluteText + dbbw $04, $3B, SoundTest_BattleText + dbbw $05, $3B, SoundTest_BattleText + dbbw $00, $3B, SoundTest_BattleText + dbbw $00, $3B, SoundTest_ChampionBattleText + dbbw $0B, $3B, SoundTest_VictoryText + dbbw $00, $3B, SoundTest_VictoryText + dbbw $00, $3B, SoundTest_VictoryText + dbbw $67, $3B, SoundTest_Fanfare4Text + dbbw $68, $3B, SoundTest_Fanfare5Text_2 + dbbw $6B, $3B, SoundTest_Fanfare8Text + dbbw $00, $3C, SoundTest_TitleText + dbbw $00, $3C, SoundTest_EndingText + dbbw $00, $3C, SoundTest_HallOfFameText + dbbw $00, $3C, SoundTest_KenkiYujiyoText + dbbw $00, $3C, SoundTest_JigglypuffSongText + dbbw $09, $3C, SoundTest_BikeText + dbbw $00, $3C, SoundTest_SurfText + dbbw $00, $3C, SoundTest_CasinoText + dbbw $00, $3C, SoundTest_IntroBattleText + dbbw $00, $3C, SoundTest_DungeonText + dbbw $00, $3C, SoundTest_DungeonText + dbbw $00, $3C, SoundTest_DungeonText + dbbw $00, $3C, SoundTest_DungeonText + dbbw $00, $3C, SoundTest_TouText + dbbw $00, $3C, SoundTest_TouText + dbbw $0A, $3C, SoundTest_DealerText + dbbw $00, $3C, SoundTest_DealerText + dbbw $00, $3C, SoundTest_DealerText + dbbw $66, $3C, SoundTest_Fanfare3Text_2 + dbbw $69, $3C, SoundTest_Fanfare6Text_2 + dbbw -1 -1, .TextPointers + +SoundTest_PalletTownText: + db "マサラタウン@" + +SoundTest_PokecenterText: + db "#センター@" + +SoundTest_PokegymText: + db "#ジム@" + +SoundTest_PokeEvolutionText: + db "#しんか@" + +SoundTest_HealingText: + db "あさあさあさ@" + +SoundTest_ReservedText: + db "つれていかれる@" + +SoundTest_OakText: + db "オーキドとともに@" + +SoundTest_RivalText: + db "ライバル@" + +SoundTest_StAnneText: + db "サントアンヌゴウ@" + +SoundTest_FluteText: + db "ふえ@" + +SoundTest_BattleText: + db "せんとう@" + +SoundTest_ChampionBattleText: + db "さいしゆうせんとう@" + +SoundTest_VictoryText: + db "かち@" + +SoundTest_FanfareText: + db "フぁンファーレ@" + +SoundTest_Fanfare3Text: + db "フぁンファーレ３@" + +SoundTest_Fanfare5Text: + db "フぁンファーレ５@" + +SoundTest_Fanfare6Text: + db "フぁンファーレ６@" + +SoundTest_Fanfare4Text: + db "フぁンファーレ４@" + +SoundTest_Fanfare5Text_2: + db "フぁンファーレ５@" + +SoundTest_Fanfare8Text: + db "フぁンファーレ８@" + +SoundTest_Fanfare3Text_2: + db "フぁンファーレ３@" + +SoundTest_Fanfare6Text_2: + db "フぁンファーレ６@" + +SoundTest_TitleText: + db "タイトル@" + +SoundTest_EndingText: + db "エンディング@" + +SoundTest_HallOfFameText: + db "でんどういり@" + +SoundTest_KenkiYujiyoText: + db "けんきゆうじよ@" + +SoundTest_JigglypuffSongText: + db "プりンノうた@" + +SoundTest_BikeText: + db "じてんしや@" + +SoundTest_SurfText: + db "うみ@" + +SoundTest_CasinoText: + db "カジノ@" + +SoundTest_IntroBattleText: + db "オープニングデモ@" + +SoundTest_DungeonText: + db "どうくつ@" + +SoundTest_TouText: + db "とう@" + +SoundTest_DealerText: + db "ディーラー@" + +SoundTest_QuestionMarkText: + db "？@" + diff --git a/home/unknown.asm b/home/unknown.asm index f06101b..e808518 100644 --- a/home/unknown.asm +++ b/home/unknown.asm @@ -45,14 +45,14 @@ Function20f8:: ret -SECTION "home/unknown.asm@Unknown_094c", ROM0 +SECTION "home/unknown.asm@Debug menu sound test call", ROM0 -Function094c:: +DebugMenuSoundTest:: ldh a, [hROMBank] push af - ld a, BANK(Functionfe255) + ld a, BANK(_DebugMenuSoundTest) call Bankswitch - call Functionfe255 + call _DebugMenuSoundTest pop af call Bankswitch diff --git a/layout.link b/layout.link index e03d166..17467cc 100644 --- a/layout.link +++ b/layout.link @@ -42,7 +42,7 @@ ROM0 "home/serial.asm" "home/interrupts.asm@Joypad dummy interrupt" "home/joypad.asm" - "home/unknown.asm@Unknown_094c" + "home/unknown.asm@Debug menu sound test call" "home/pic.asm" "home/copy2.asm" "home/text.asm" @@ -953,6 +953,8 @@ ROMX $3f "engine/landmarks.asm@2" org $506f "gfx.asm@Town Map Cursor" + org $6255 + "engine/menu/debug_menu.asm@Sound Test" WRAM0 org $c000 diff --git a/ram/hram.asm b/ram/hram.asm index 4acfbfa..c0d49a1 100644 --- a/ram/hram.asm +++ b/ram/hram.asm @@ -57,7 +57,21 @@ hJoyDebounceSrc:: db hJoypadState2:: db - ds 6 ; TODO +UNION + +hFFA7:: db +hFFA8:: db +hFFA9:: db + +NEXTU + +hDebugMenuSoundMenuIndex:: db +hDebugMenuSoundID:: db +hDebugMenuSoundBank:: db + +ENDU + + ds 3 ; TODO hGraphicStartTile:: db hMoveMon:: db diff --git a/ram/wram.asm b/ram/wram.asm index da6d364..e0356b9 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -633,6 +633,12 @@ wTalkingTargetType:: db wcdb1:: ds 1 wcdb2:: ds 1 +ds 1 + +wcdb4:: ds 1 +wcdb5:: ds 1 +wcdb6:: ds 1 + SECTION "CDB9", WRAM0[$CDB9] wcdb9:: ds 1 diff --git a/shim.sym b/shim.sym index a34e54f..397bb7d 100755 --- a/shim.sym +++ b/shim.sym @@ -170,7 +170,6 @@ 3F:4C24 Functionfcc24 3F:4E3E Functionfce3e 3F:5B66 Functionfdb66 -3F:6255 Functionfe255 3F:64CE MonsterTest 3F:654E PicTest 3F:6750 PicTestMenu -- cgit v1.2.3 From cee9778e56eff493a591c2e2f44afc80a31be9c8 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Wed, 16 Dec 2020 21:06:58 +0700 Subject: Minor adjustments to value rep in debug menu --- engine/menu/debug_menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index a754c1b..87332ee 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -82,19 +82,19 @@ DebugMenuOptionSubGames:: DebugMenuOptionMonsterTest:: ld hl, wPokedexOwned ld de, wPokedexSeen - ld b, $1F - ld a, $FF + ld b, 31 + ld a, -1 .loop ld [hl+], a ld [de], a inc de dec b jr nz, .loop - ld a, $03 + ld a, 3 ld [hl], a ld [de], a callab MonsterTest - ld a, $e4 + ld a, %11100100 ldh [rBGP], a Function40eb:: @@ -102,7 +102,7 @@ Function40eb:: DebugMenuOptionName:: callab OpenTrainerGear - ld a, $e4 + ld a, %11100100 ldh [rBGP], a jp DebugMenu -- cgit v1.2.3 From 016a6f9c21ba08e07389f4ac3e59244fffce8b99 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Wed, 16 Dec 2020 21:07:36 +0700 Subject: Forgot the comma --- engine/menu/debug_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 87332ee..9ec4653 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -286,7 +286,7 @@ _DebugMenuSoundTest:: dbbw $00, $3C, SoundTest_DealerText dbbw $66, $3C, SoundTest_Fanfare3Text_2 dbbw $69, $3C, SoundTest_Fanfare6Text_2 - dbbw -1 -1, .TextPointers + dbbw -1, -1, .TextPointers SoundTest_PalletTownText: db "マサラタウン@" -- cgit v1.2.3 From 7cbd9c82b1ab2086b0b151d0a8c66f4fa597200a Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 17 Dec 2020 08:07:27 +0700 Subject: Amend sound description labels with more accurate translations Thanks SatoMew! --- engine/menu/debug_menu.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 9ec4653..0867cc7 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -247,10 +247,10 @@ _DebugMenuSoundTest:: dbbw $00, $3A, SoundTest_QuestionMarkText dbbw $00, $3A, SoundTest_QuestionMarkText dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_ReservedText - dbbw $00, $3A, SoundTest_OakText + dbbw $00, $3A, SoundTest_HurryAlongText + dbbw $00, $3A, SoundTest_MeetOakText dbbw $00, $3A, SoundTest_RivalText - dbbw $00, $3A, SoundTest_StAnneText + dbbw $00, $3A, SoundTest_SSAnneText dbbw $66, $3A, SoundTest_Fanfare3Text dbbw $68, $3A, SoundTest_Fanfare5Text dbbw $69, $3A, SoundTest_Fanfare6Text @@ -269,7 +269,7 @@ _DebugMenuSoundTest:: dbbw $00, $3C, SoundTest_TitleText dbbw $00, $3C, SoundTest_EndingText dbbw $00, $3C, SoundTest_HallOfFameText - dbbw $00, $3C, SoundTest_KenkiYujiyoText + dbbw $00, $3C, SoundTest_OaksLabText dbbw $00, $3C, SoundTest_JigglypuffSongText dbbw $09, $3C, SoundTest_BikeText dbbw $00, $3C, SoundTest_SurfText @@ -279,8 +279,8 @@ _DebugMenuSoundTest:: dbbw $00, $3C, SoundTest_DungeonText dbbw $00, $3C, SoundTest_DungeonText dbbw $00, $3C, SoundTest_DungeonText - dbbw $00, $3C, SoundTest_TouText - dbbw $00, $3C, SoundTest_TouText + dbbw $00, $3C, SoundTest_PokemonTowerText + dbbw $00, $3C, SoundTest_PokemonTowerText dbbw $0A, $3C, SoundTest_DealerText dbbw $00, $3C, SoundTest_DealerText dbbw $00, $3C, SoundTest_DealerText @@ -303,16 +303,16 @@ SoundTest_PokeEvolutionText: SoundTest_HealingText: db "あさあさあさ@" -SoundTest_ReservedText: +SoundTest_HurryAlongText: db "つれていかれる@" -SoundTest_OakText: +SoundTest_MeetOakText: db "オーキドとともに@" SoundTest_RivalText: db "ライバル@" -SoundTest_StAnneText: +SoundTest_SSAnneText: db "サントアンヌゴウ@" SoundTest_FluteText: @@ -363,7 +363,7 @@ SoundTest_EndingText: SoundTest_HallOfFameText: db "でんどういり@" -SoundTest_KenkiYujiyoText: +SoundTest_OaksLabText: db "けんきゆうじよ@" SoundTest_JigglypuffSongText: @@ -384,7 +384,7 @@ SoundTest_IntroBattleText: SoundTest_DungeonText: db "どうくつ@" -SoundTest_TouText: +SoundTest_PokemonTowerText: db "とう@" SoundTest_DealerText: -- cgit v1.2.3 From f36b10b718b36dce9d234f90477503b9921f105b Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 17 Dec 2020 08:08:49 +0700 Subject: SoundTest_DungeonText -> SoundTest_CaveText --- engine/menu/debug_menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 0867cc7..29f38ad 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -275,10 +275,10 @@ _DebugMenuSoundTest:: dbbw $00, $3C, SoundTest_SurfText dbbw $00, $3C, SoundTest_CasinoText dbbw $00, $3C, SoundTest_IntroBattleText - dbbw $00, $3C, SoundTest_DungeonText - dbbw $00, $3C, SoundTest_DungeonText - dbbw $00, $3C, SoundTest_DungeonText - dbbw $00, $3C, SoundTest_DungeonText + dbbw $00, $3C, SoundTest_CaveText + dbbw $00, $3C, SoundTest_CaveText + dbbw $00, $3C, SoundTest_CaveText + dbbw $00, $3C, SoundTest_CaveText dbbw $00, $3C, SoundTest_PokemonTowerText dbbw $00, $3C, SoundTest_PokemonTowerText dbbw $0A, $3C, SoundTest_DealerText @@ -381,7 +381,7 @@ SoundTest_CasinoText: SoundTest_IntroBattleText: db "オープニングデモ@" -SoundTest_DungeonText: +SoundTest_CaveText: db "どうくつ@" SoundTest_PokemonTowerText: -- cgit v1.2.3 From 4c02493506db894221474637dec0d8e4a6949bc6 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 17 Dec 2020 13:45:43 +0700 Subject: Sound test text one line each --- engine/menu/debug_menu.asm | 140 ++++++++++++--------------------------------- 1 file changed, 35 insertions(+), 105 deletions(-) diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 29f38ad..1173b42 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -288,108 +288,38 @@ _DebugMenuSoundTest:: dbbw $69, $3C, SoundTest_Fanfare6Text_2 dbbw -1, -1, .TextPointers -SoundTest_PalletTownText: - db "マサラタウン@" - -SoundTest_PokecenterText: - db "#センター@" - -SoundTest_PokegymText: - db "#ジム@" - -SoundTest_PokeEvolutionText: - db "#しんか@" - -SoundTest_HealingText: - db "あさあさあさ@" - -SoundTest_HurryAlongText: - db "つれていかれる@" - -SoundTest_MeetOakText: - db "オーキドとともに@" - -SoundTest_RivalText: - db "ライバル@" - -SoundTest_SSAnneText: - db "サントアンヌゴウ@" - -SoundTest_FluteText: - db "ふえ@" - -SoundTest_BattleText: - db "せんとう@" - -SoundTest_ChampionBattleText: - db "さいしゆうせんとう@" - -SoundTest_VictoryText: - db "かち@" - -SoundTest_FanfareText: - db "フぁンファーレ@" - -SoundTest_Fanfare3Text: - db "フぁンファーレ３@" - -SoundTest_Fanfare5Text: - db "フぁンファーレ５@" - -SoundTest_Fanfare6Text: - db "フぁンファーレ６@" - -SoundTest_Fanfare4Text: - db "フぁンファーレ４@" - -SoundTest_Fanfare5Text_2: - db "フぁンファーレ５@" - -SoundTest_Fanfare8Text: - db "フぁンファーレ８@" - -SoundTest_Fanfare3Text_2: - db "フぁンファーレ３@" - -SoundTest_Fanfare6Text_2: - db "フぁンファーレ６@" - -SoundTest_TitleText: - db "タイトル@" - -SoundTest_EndingText: - db "エンディング@" - -SoundTest_HallOfFameText: - db "でんどういり@" - -SoundTest_OaksLabText: - db "けんきゆうじよ@" - -SoundTest_JigglypuffSongText: - db "プりンノうた@" - -SoundTest_BikeText: - db "じてんしや@" - -SoundTest_SurfText: - db "うみ@" - -SoundTest_CasinoText: - db "カジノ@" - -SoundTest_IntroBattleText: - db "オープニングデモ@" - -SoundTest_CaveText: - db "どうくつ@" - -SoundTest_PokemonTowerText: - db "とう@" - -SoundTest_DealerText: - db "ディーラー@" - -SoundTest_QuestionMarkText: - db "？@" - +SoundTest_PalletTownText: db "マサラタウン@" +SoundTest_PokecenterText: db "#センター@" +SoundTest_PokegymText: db "#ジム@" +SoundTest_PokeEvolutionText: db "#しんか@" +SoundTest_HealingText: db "あさあさあさ@" +SoundTest_HurryAlongText: db "つれていかれる@" +SoundTest_MeetOakText: db "オーキドとともに@" +SoundTest_RivalText: db "ライバル@" +SoundTest_SSAnneText: db "サントアンヌゴウ@" +SoundTest_FluteText: db "ふえ@" +SoundTest_BattleText: db "せんとう@" +SoundTest_ChampionBattleText: db "さいしゆうせんとう@" +SoundTest_VictoryText: db "かち@" +SoundTest_FanfareText: db "フぁンファーレ@" +SoundTest_Fanfare3Text: db "フぁンファーレ３@" +SoundTest_Fanfare5Text: db "フぁンファーレ５@" +SoundTest_Fanfare6Text: db "フぁンファーレ６@" +SoundTest_Fanfare4Text: db "フぁンファーレ４@" +SoundTest_Fanfare5Text_2: db "フぁンファーレ５@" +SoundTest_Fanfare8Text: db "フぁンファーレ８@" +SoundTest_Fanfare3Text_2: db "フぁンファーレ３@" +SoundTest_Fanfare6Text_2: db "フぁンファーレ６@" +SoundTest_TitleText: db "タイトル@" +SoundTest_EndingText: db "エンディング@" +SoundTest_HallOfFameText: db "でんどういり@" +SoundTest_OaksLabText: db "けんきゆうじよ@" +SoundTest_JigglypuffSongText: db "プりンノうた@" +SoundTest_BikeText: db "じてんしや@" +SoundTest_SurfText: db "うみ@" +SoundTest_CasinoText: db "カジノ@" +SoundTest_IntroBattleText: db "オープニングデモ@" +SoundTest_CaveText: db "どうくつ@" +SoundTest_PokemonTowerText: db "とう@" +SoundTest_DealerText: db "ディーラー@" +SoundTest_QuestionMarkText: db "？@" -- cgit v1.2.3 From 3b72913fa7027fa4d8d1a9595af8172af9577d73 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 17 Dec 2020 13:50:58 +0700 Subject: Split sound test text pointers to another file --- data/sound_test_text_pointers.inc | 94 +++++++++++++++++++++++++++++++++++++ engine/menu/debug_menu.asm | 97 +-------------------------------------- 2 files changed, 96 insertions(+), 95 deletions(-) create mode 100644 data/sound_test_text_pointers.inc diff --git a/data/sound_test_text_pointers.inc b/data/sound_test_text_pointers.inc new file mode 100644 index 0000000..a2a4e43 --- /dev/null +++ b/data/sound_test_text_pointers.inc @@ -0,0 +1,94 @@ +SoundTestTextPointers: +; id? bank? description + dbbw $00, $3A, SoundTest_PalletTownText + dbbw $00, $3A, SoundTest_PokecenterText + dbbw $00, $3A, SoundTest_PokegymText + dbbw $07, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $0C, $3A, SoundTest_PokeEvolutionText + dbbw $08, $3A, SoundTest_HealingText + dbbw $02, $3A, SoundTest_QuestionMarkText + dbbw $03, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_QuestionMarkText + dbbw $00, $3A, SoundTest_HurryAlongText + dbbw $00, $3A, SoundTest_MeetOakText + dbbw $00, $3A, SoundTest_RivalText + dbbw $00, $3A, SoundTest_SSAnneText + dbbw $66, $3A, SoundTest_Fanfare3Text + dbbw $68, $3A, SoundTest_Fanfare5Text + dbbw $69, $3A, SoundTest_Fanfare6Text + dbbw $63, $3A, SoundTest_FanfareText + dbbw $21, $3A, SoundTest_FluteText + dbbw $04, $3B, SoundTest_BattleText + dbbw $05, $3B, SoundTest_BattleText + dbbw $00, $3B, SoundTest_BattleText + dbbw $00, $3B, SoundTest_ChampionBattleText + dbbw $0B, $3B, SoundTest_VictoryText + dbbw $00, $3B, SoundTest_VictoryText + dbbw $00, $3B, SoundTest_VictoryText + dbbw $67, $3B, SoundTest_Fanfare4Text + dbbw $68, $3B, SoundTest_Fanfare5Text_2 + dbbw $6B, $3B, SoundTest_Fanfare8Text + dbbw $00, $3C, SoundTest_TitleText + dbbw $00, $3C, SoundTest_EndingText + dbbw $00, $3C, SoundTest_HallOfFameText + dbbw $00, $3C, SoundTest_OaksLabText + dbbw $00, $3C, SoundTest_JigglypuffSongText + dbbw $09, $3C, SoundTest_BikeText + dbbw $00, $3C, SoundTest_SurfText + dbbw $00, $3C, SoundTest_CasinoText + dbbw $00, $3C, SoundTest_IntroBattleText + dbbw $00, $3C, SoundTest_CaveText + dbbw $00, $3C, SoundTest_CaveText + dbbw $00, $3C, SoundTest_CaveText + dbbw $00, $3C, SoundTest_CaveText + dbbw $00, $3C, SoundTest_PokemonTowerText + dbbw $00, $3C, SoundTest_PokemonTowerText + dbbw $0A, $3C, SoundTest_DealerText + dbbw $00, $3C, SoundTest_DealerText + dbbw $00, $3C, SoundTest_DealerText + dbbw $66, $3C, SoundTest_Fanfare3Text_2 + dbbw $69, $3C, SoundTest_Fanfare6Text_2 + dbbw -1, -1, SoundTestTextPointers + +SoundTest_PalletTownText: db "マサラタウン@" +SoundTest_PokecenterText: db "#センター@" +SoundTest_PokegymText: db "#ジム@" +SoundTest_PokeEvolutionText: db "#しんか@" +SoundTest_HealingText: db "あさあさあさ@" +SoundTest_HurryAlongText: db "つれていかれる@" +SoundTest_MeetOakText: db "オーキドとともに@" +SoundTest_RivalText: db "ライバル@" +SoundTest_SSAnneText: db "サントアンヌゴウ@" +SoundTest_FluteText: db "ふえ@" +SoundTest_BattleText: db "せんとう@" +SoundTest_ChampionBattleText: db "さいしゆうせんとう@" +SoundTest_VictoryText: db "かち@" +SoundTest_FanfareText: db "フぁンファーレ@" +SoundTest_Fanfare3Text: db "フぁンファーレ３@" +SoundTest_Fanfare5Text: db "フぁンファーレ５@" +SoundTest_Fanfare6Text: db "フぁンファーレ６@" +SoundTest_Fanfare4Text: db "フぁンファーレ４@" +SoundTest_Fanfare5Text_2: db "フぁンファーレ５@" +SoundTest_Fanfare8Text: db "フぁンファーレ８@" +SoundTest_Fanfare3Text_2: db "フぁンファーレ３@" +SoundTest_Fanfare6Text_2: db "フぁンファーレ６@" +SoundTest_TitleText: db "タイトル@" +SoundTest_EndingText: db "エンディング@" +SoundTest_HallOfFameText: db "でんどういり@" +SoundTest_OaksLabText: db "けんきゆうじよ@" +SoundTest_JigglypuffSongText: db "プりンノうた@" +SoundTest_BikeText: db "じてんしや@" +SoundTest_SurfText: db "うみ@" +SoundTest_CasinoText: db "カジノ@" +SoundTest_IntroBattleText: db "オープニングデモ@" +SoundTest_CaveText: db "どうくつ@" +SoundTest_PokemonTowerText: db "とう@" +SoundTest_DealerText: db "ディーラー@" +SoundTest_QuestionMarkText: db "？@" diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 1173b42..80ff640 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -193,7 +193,7 @@ _DebugMenuSoundTest:: jr .RefreshScreenAndLoop .DetermineDescriptionPointer: - ld hl, .TextPointers + ld hl, SoundTestTextPointers ldh a, [hDebugMenuSoundMenuIndex] add a add a ; a * 8 @@ -229,97 +229,4 @@ _DebugMenuSoundTest:: text "　" done -.TextPointers: -; id? bank? description - dbbw $00, $3A, SoundTest_PalletTownText - dbbw $00, $3A, SoundTest_PokecenterText - dbbw $00, $3A, SoundTest_PokegymText - dbbw $07, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $0C, $3A, SoundTest_PokeEvolutionText - dbbw $08, $3A, SoundTest_HealingText - dbbw $02, $3A, SoundTest_QuestionMarkText - dbbw $03, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_QuestionMarkText - dbbw $00, $3A, SoundTest_HurryAlongText - dbbw $00, $3A, SoundTest_MeetOakText - dbbw $00, $3A, SoundTest_RivalText - dbbw $00, $3A, SoundTest_SSAnneText - dbbw $66, $3A, SoundTest_Fanfare3Text - dbbw $68, $3A, SoundTest_Fanfare5Text - dbbw $69, $3A, SoundTest_Fanfare6Text - dbbw $63, $3A, SoundTest_FanfareText - dbbw $21, $3A, SoundTest_FluteText - dbbw $04, $3B, SoundTest_BattleText - dbbw $05, $3B, SoundTest_BattleText - dbbw $00, $3B, SoundTest_BattleText - dbbw $00, $3B, SoundTest_ChampionBattleText - dbbw $0B, $3B, SoundTest_VictoryText - dbbw $00, $3B, SoundTest_VictoryText - dbbw $00, $3B, SoundTest_VictoryText - dbbw $67, $3B, SoundTest_Fanfare4Text - dbbw $68, $3B, SoundTest_Fanfare5Text_2 - dbbw $6B, $3B, SoundTest_Fanfare8Text - dbbw $00, $3C, SoundTest_TitleText - dbbw $00, $3C, SoundTest_EndingText - dbbw $00, $3C, SoundTest_HallOfFameText - dbbw $00, $3C, SoundTest_OaksLabText - dbbw $00, $3C, SoundTest_JigglypuffSongText - dbbw $09, $3C, SoundTest_BikeText - dbbw $00, $3C, SoundTest_SurfText - dbbw $00, $3C, SoundTest_CasinoText - dbbw $00, $3C, SoundTest_IntroBattleText - dbbw $00, $3C, SoundTest_CaveText - dbbw $00, $3C, SoundTest_CaveText - dbbw $00, $3C, SoundTest_CaveText - dbbw $00, $3C, SoundTest_CaveText - dbbw $00, $3C, SoundTest_PokemonTowerText - dbbw $00, $3C, SoundTest_PokemonTowerText - dbbw $0A, $3C, SoundTest_DealerText - dbbw $00, $3C, SoundTest_DealerText - dbbw $00, $3C, SoundTest_DealerText - dbbw $66, $3C, SoundTest_Fanfare3Text_2 - dbbw $69, $3C, SoundTest_Fanfare6Text_2 - dbbw -1, -1, .TextPointers - -SoundTest_PalletTownText: db "マサラタウン@" -SoundTest_PokecenterText: db "#センター@" -SoundTest_PokegymText: db "#ジム@" -SoundTest_PokeEvolutionText: db "#しんか@" -SoundTest_HealingText: db "あさあさあさ@" -SoundTest_HurryAlongText: db "つれていかれる@" -SoundTest_MeetOakText: db "オーキドとともに@" -SoundTest_RivalText: db "ライバル@" -SoundTest_SSAnneText: db "サントアンヌゴウ@" -SoundTest_FluteText: db "ふえ@" -SoundTest_BattleText: db "せんとう@" -SoundTest_ChampionBattleText: db "さいしゆうせんとう@" -SoundTest_VictoryText: db "かち@" -SoundTest_FanfareText: db "フぁンファーレ@" -SoundTest_Fanfare3Text: db "フぁンファーレ３@" -SoundTest_Fanfare5Text: db "フぁンファーレ５@" -SoundTest_Fanfare6Text: db "フぁンファーレ６@" -SoundTest_Fanfare4Text: db "フぁンファーレ４@" -SoundTest_Fanfare5Text_2: db "フぁンファーレ５@" -SoundTest_Fanfare8Text: db "フぁンファーレ８@" -SoundTest_Fanfare3Text_2: db "フぁンファーレ３@" -SoundTest_Fanfare6Text_2: db "フぁンファーレ６@" -SoundTest_TitleText: db "タイトル@" -SoundTest_EndingText: db "エンディング@" -SoundTest_HallOfFameText: db "でんどういり@" -SoundTest_OaksLabText: db "けんきゆうじよ@" -SoundTest_JigglypuffSongText: db "プりンノうた@" -SoundTest_BikeText: db "じてんしや@" -SoundTest_SurfText: db "うみ@" -SoundTest_CasinoText: db "カジノ@" -SoundTest_IntroBattleText: db "オープニングデモ@" -SoundTest_CaveText: db "どうくつ@" -SoundTest_PokemonTowerText: db "とう@" -SoundTest_DealerText: db "ディーラー@" -SoundTest_QuestionMarkText: db "？@" +INCLUDE "data/sound_test_text_pointers.inc" -- cgit v1.2.3 From ff816609edeedd093e470ef70162d9fec1e92f3d Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 17 Dec 2020 23:56:24 +0700 Subject: Suggested changes to #85 --- engine/menu/debug_menu.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 80ff640..728dc8e 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -82,15 +82,15 @@ DebugMenuOptionSubGames:: DebugMenuOptionMonsterTest:: ld hl, wPokedexOwned ld de, wPokedexSeen - ld b, 31 - ld a, -1 + ld b, NUM_POKEMON / 8 + ld a, %11111111 .loop - ld [hl+], a + ld [hli], a ld [de], a inc de dec b jr nz, .loop - ld a, 3 + ld a, (1 << ((NUM_POKEMON - 1) % 8)) - 1 ; discount #251 ld [hl], a ld [de], a callab MonsterTest @@ -188,7 +188,7 @@ _DebugMenuSoundTest:: ld a, 10 ld [wcdb5], a ld [wcdb6], a - ld a, -1 + ld a, $ff ld [wcdb4], a jr .RefreshScreenAndLoop @@ -196,7 +196,7 @@ _DebugMenuSoundTest:: ld hl, SoundTestTextPointers ldh a, [hDebugMenuSoundMenuIndex] add a - add a ; a * 8 + add a ; a * 4 ld d, 0 ld e, a add hl, de -- cgit v1.2.3