summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/debug.asm2
-rw-r--r--engine/menus/intro_menu.asm13
-rw-r--r--engine/menus/main_menu.asm4
-rw-r--r--engine/menus/menu.asm6
-rw-r--r--engine/menus/naming_screen.asm37
-rw-r--r--engine/menus/options_menu.asm9
-rw-r--r--engine/menus/save.asm17
-rw-r--r--engine/menus/start_menu.asm48
-rw-r--r--engine/menus/trainer_card.asm4
9 files changed, 1 insertions, 139 deletions
diff --git a/engine/menus/debug.asm b/engine/menus/debug.asm
index d10d8b7b1..a48322488 100644
--- a/engine/menus/debug.asm
+++ b/engine/menus/debug.asm
@@ -1034,7 +1034,6 @@ String_81fcd:
DebugColorTestGFX:
INCBIN "gfx/debug/color_test.2bpp"
-
TilesetColorTest:
ret
xor a
@@ -1148,7 +1147,6 @@ Function8220f:
ld [rSVBK], a
ret
-
Function82236:
ld hl, hJoyLast
ld a, [hl]
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 1bdf8b02f..9652dd73e 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -94,7 +94,6 @@ ResetWRAM:
ret
_ResetWRAM:
-
ld hl, wVirtualOAM
ld bc, wOptions - wVirtualOAM
xor a
@@ -549,7 +548,6 @@ Continue_LoadMenuHeader:
db " @"
db "TIME@"
-
Continue_DisplayBadgesDexPlayerName:
call MenuBoxCoord2Tile
push hl
@@ -626,7 +624,6 @@ Continue_DisplayGameTime:
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
jp PrintNum
-
OakSpeech:
farcall InitClock
call RotateFourPalettesLeft
@@ -803,7 +800,6 @@ StorePlayerName:
ret
ShrinkPlayer:
-
ld a, [hROMBank]
push af
@@ -913,7 +909,6 @@ ShrinkFrame:
ret
Intro_PlacePlayerSprite:
-
farcall GetPlayerIcon
ld c, $c
ld hl, vTiles0
@@ -957,7 +952,6 @@ Intro_PlacePlayerSprite:
db 10 * 8 + 4, 9 * 8, 2
db 10 * 8 + 4, 10 * 8, 3
-
CrystalIntroSequence:
callfar Copyright_GFPresents
jr c, StartTitleScreen
@@ -1018,7 +1012,6 @@ StartTitleScreen:
dw CrystalIntroSequence
dw ResetClock
-
.TitleScreen:
farcall _TitleScreen
ret
@@ -1070,9 +1063,7 @@ TitleScreenScene:
inc [hl]
ret
-
TitleScreenEntrance:
-
; Animate the logo:
; Move each line by 4 pixels until our count hits 0.
ld a, [hSCX]
@@ -1119,9 +1110,7 @@ TitleScreenEntrance:
ld [hWY], a
ret
-
TitleScreenTimer:
-
; Next scene
ld hl, wJumptableIndex
inc [hl]
@@ -1135,7 +1124,6 @@ TitleScreenTimer:
ret
TitleScreenMain:
-
; Run the timer down.
ld hl, wTitleScreenTimer
ld e, [hl]
@@ -1236,7 +1224,6 @@ TitleScreenMain:
ret
TitleScreenEnd:
-
; Wait until the music is done fading.
ld hl, wTitleScreenTimer
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 87823228d..d6afda483 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -139,7 +139,6 @@ StudiumMenu:
db MOBILE_STUDIUM
db -1
-
MainMenu_GetWhichMenu:
nop
nop
@@ -231,7 +230,6 @@ MainMenu_PrintCurrentTimeAndDay:
ld [hBGMapMode], a
ret
-
.PlaceBox:
call CheckRTCStatus
and $80
@@ -246,7 +244,6 @@ MainMenu_PrintCurrentTimeAndDay:
call SpeechTextBox
ret
-
.PlaceTime:
ld a, [wSaveFileExists]
and a
@@ -323,7 +320,6 @@ Function49ed0:
call ClearWindowData
ret
-
MainMenu_NewGame:
farcall NewGame
ret
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index 5f2864ea3..c9ce72b13 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -55,8 +55,6 @@ _InterpretMobileMenu::
and a
ret
-
-
Draw2DMenu:
xor a
ld [hBGMapMode], a
@@ -158,7 +156,6 @@ Place2DMenuItemStrings:
rst FarCall
ret
-
Init2DMenuCursorPosition:
call GetMenuTextStartCoord
ld a, b
@@ -247,7 +244,6 @@ Init2DMenuCursorPosition:
ld [wMenuJoypadFilter], a
ret
-
_StaticMenuJoypad::
call Place2DMenuCursor
_ScrollingMenuJoypad::
@@ -276,7 +272,6 @@ MobileMenuJoypad:
ld c, a
ret
-
Unreferenced_Function241d5:
call Place2DMenuCursor
.loop
@@ -315,7 +310,6 @@ Unreferenced_Function241d5:
and a
ret
-
MenuJoypadLoop:
.loop
call Move2DMenuCursor
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index f269e32ad..8a8303067 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -10,7 +10,6 @@ _NamingScreen:
call ReturnToMapWithSpeechTextbox
ret
-
NamingScreen:
ld hl, wNamingScreenDestinationPointer
ld [hl], e
@@ -44,7 +43,6 @@ NamingScreen:
call ClearJoypad
ret
-
.SetUpNamingScreen:
call ClearBGPalettes
ld b, SCGB_DIPLOMA
@@ -61,7 +59,6 @@ NamingScreen:
call NamingScreen_InitNameEntry
ret
-
.GetNamingScreenSetup:
ld a, [wNamingScreenType]
and 7
@@ -75,7 +72,6 @@ NamingScreen:
ld l, a
jp hl
-
.Jumptable:
dw .Pokemon
dw .Player
@@ -117,12 +113,10 @@ NamingScreen:
call .StoreMonIconParams
ret
-
.NicknameStrings:
db "'S@"
db "NICKNAME?@"
-
.Player:
farcall GetPlayerIcon
call .LoadSprite
@@ -132,11 +126,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
-
.PlayerNameString:
db "YOUR NAME?@"
-
.Rival:
ld de, SilverSpriteGFX
ld b, BANK(SilverSpriteGFX)
@@ -147,11 +139,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
-
.RivalNameString:
db "RIVAL'S NAME?@"
-
.Mom:
ld de, MomSpriteGFX
ld b, BANK(MomSpriteGFX)
@@ -162,11 +152,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
-
.MomNameString:
db "MOTHER'S NAME?@"
-
.Box:
ld de, PokeBallSpriteGFX
ld hl, vTiles0 tile $00
@@ -188,11 +176,9 @@ NamingScreen:
call .StoreBoxIconParams
ret
-
.BoxNameString:
db "BOX NAME?@"
-
.Tomodachi:
hlcoord 3, 2
ld de, .oTomodachi_no_namae_sutoringu
@@ -200,11 +186,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
-
.oTomodachi_no_namae_sutoringu
db "おともだち　の　なまえは？@"
-
.LoadSprite:
push de
ld hl, vTiles0 tile $00
@@ -271,7 +255,6 @@ NamingScreen_IsTargetBox:
pop bc
ret
-
NamingScreen_InitText:
call WaitTop
hlcoord 0, 0
@@ -333,7 +316,6 @@ NamingScreen_ApplyTextInputMode:
jr nz, .row
ret
-
NamingScreenJoypadLoop:
call JoyTextDelay
ld a, [wJumptableIndex]
@@ -355,7 +337,6 @@ NamingScreenJoypadLoop:
scf
ret
-
.UpdateStringEntry:
xor a
ld [hBGMapMode], a
@@ -380,7 +361,6 @@ NamingScreenJoypadLoop:
ld [hBGMapMode], a
ret
-
.RunJumptable:
ld a, [wJumptableIndex]
ld e, a
@@ -393,7 +373,6 @@ NamingScreenJoypadLoop:
ld l, a
jp hl
-
.Jumptable:
dw .InitCursor
dw .ReadButtons
@@ -569,14 +548,12 @@ NamingScreen_AnimateCursor:
ld [hl], a
ret
-
.LetterEntries:
db $00, $10, $20, $30, $40, $50, $60, $70, $80
.CaseDelEnd:
db $00, $00, $00, $30, $30, $30, $60, $60, $60
-
.GetDPad:
ld hl, hJoyLast
ld a, [hl]
@@ -720,7 +697,6 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
scf
ret
-
; unused
ld a, [wNamingScreenCurrNameLength]
and a
@@ -745,10 +721,8 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
ld a, [hl]
jr NamingScreen_LoadNextCharacter
-
INCLUDE "data/text/unused_dakutens.asm"
-
NamingScreen_DeleteCharacter:
ld hl, wNamingScreenCurrNameLength
ld a, [hl]
@@ -777,7 +751,6 @@ NamingScreen_GetTextCursorPosition:
pop af
ret
-
NamingScreen_InitNameEntry:
; load NAMINGSCREEN_UNDERLINE, (NAMINGSCREEN_MIDDLELINE * [wNamingScreenMaxNameLength]), "@" into the dw address at wNamingScreenDestinationPointer
ld hl, wNamingScreenDestinationPointer
@@ -797,7 +770,6 @@ NamingScreen_InitNameEntry:
ld [hl], "@"
ret
-
NamingScreen_StoreEntry:
ld hl, wNamingScreenDestinationPointer
ld a, [hli]
@@ -907,7 +879,6 @@ LoadNamingScreenGFX:
ld [hWX], a
ret
-
NamingScreenGFX_Border:
INCBIN "gfx/naming_screen/border.2bpp"
@@ -995,7 +966,6 @@ _ComposeMailMessage:
ld [hl], "<NEXT>"
ret
-
.MailIcon:
INCBIN "gfx/icons/mail_big.2bpp"
@@ -1004,11 +974,9 @@ INCBIN "gfx/icons/mail_big.2bpp"
ld [wNamingScreenMaxNameLength], a
ret
-
.UnusedString11f7a:
db "メールを　かいてね@"
-
.InitCharset:
call WaitTop
hlcoord 0, 0
@@ -1235,14 +1203,12 @@ ComposeMail_AnimateCursor:
ld [hl], a
ret
-
.LetterEntries:
db $00, $10, $20, $30, $40, $50, $60, $70, $80, $90
.CaseDelEnd:
db $00, $00, $00, $30, $30, $30, $60, $60, $60, $60
-
.GetDPad:
ld hl, hJoyLast
ld a, [hl]
@@ -1383,7 +1349,6 @@ MailComposition_TryAddLastCharacter:
ld a, [wNamingScreenLastCharacter]
jp MailComposition_TryAddCharacter
-
; unused
ld a, [wNamingScreenCurrNameLength]
and a
@@ -1418,6 +1383,4 @@ MailComposition_TryAddLastCharacter:
ld a, [hl]
jp NamingScreen_LoadNextCharacter
-
INCLUDE "data/text/mail_input_chars.asm"
-
diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm
index 071872068..46fa33621 100644
--- a/engine/menus/options_menu.asm
+++ b/engine/menus/options_menu.asm
@@ -77,7 +77,6 @@ StringOptions:
db " :TYPE<LNBRK>"
db "CANCEL@"
-
GetOptionPointer:
ld a, [wJumptableIndex] ; load the cursor position to a
ld e, a ; copy it to de
@@ -100,7 +99,6 @@ GetOptionPointer:
dw Options_Frame
dw Options_Cancel
-
const_def
const OPT_TEXT_SPEED_FAST ; 0
const OPT_TEXT_SPEED_MED ; 1
@@ -163,7 +161,6 @@ Options_TextSpeed:
.Mid: db "MID @"
.Slow: db "SLOW@"
-
GetTextSpeed:
; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c,
; with previous/next TEXT_DELAY_* values in d/e
@@ -188,7 +185,6 @@ GetTextSpeed:
lb de, TEXT_DELAY_SLOW, TEXT_DELAY_MED
ret
-
Options_BattleScene:
ld hl, wOptions
ld a, [hJoyPressed]
@@ -228,7 +224,6 @@ Options_BattleScene:
.On: db "ON @"
.Off: db "OFF@"
-
Options_BattleStyle:
ld hl, wOptions
ld a, [hJoyPressed]
@@ -267,7 +262,6 @@ Options_BattleStyle:
.Shift: db "SHIFT@"
.Set: db "SET @"
-
Options_Sound:
ld hl, wOptions
ld a, [hJoyPressed]
@@ -313,7 +307,6 @@ Options_Sound:
.Mono: db "MONO @"
.Stereo: db "STEREO@"
-
const_def
const OPT_PRINT_LIGHTEST ; 0
const OPT_PRINT_LIGHTER ; 1
@@ -379,7 +372,6 @@ Options_Print:
.Darker: db "DARKER @"
.Darkest: db "DARKEST @"
-
GetPrinterSetting:
; converts GBPRINTER_* value in a to OPT_PRINT_* value in c,
; with previous/next GBPRINTER_* values in d/e
@@ -455,7 +447,6 @@ Options_MenuAccount:
.Off: db "OFF@"
.On: db "ON @"
-
Options_Frame:
ld hl, wTextBoxFrame
ld a, [hJoyPressed]
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 903d9db04..469c55abd 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -36,7 +36,6 @@ SaveAfterLinkTrade:
call ResumeGameLogic
ret
-
ChangeBoxSaveGame:
push de
ld hl, Text_SaveOnBoxSwitch
@@ -143,7 +142,6 @@ ResumeGameLogic:
ld [wGameLogicPaused], a
ret
-
AddHallOfFameEntry:
ld a, BANK(sHallOfFame)
call GetSRAMBank
@@ -254,7 +252,6 @@ SavedTheGame:
call DelayFrames
ret
-
SaveGameData_:
ld a, 1
ld [wSaveFileExists], a
@@ -349,7 +346,6 @@ SavingDontTurnOffThePower:
call DelayFrames
ret
-
ErasePreviousSave:
call EraseBoxes
call EraseHallOfFame
@@ -458,7 +454,6 @@ Unreferenced_Function14d93:
call CloseSRAM
ret
-
HallOfFame_InitSaveIfNeeded:
ld a, [wSavedAtLeastOnce]
and a
@@ -585,7 +580,6 @@ SaveBackupChecksum:
call CloseSRAM
ret
-
TryLoadSaveFile:
call VerifyChecksum
jr nz, .backup
@@ -632,7 +626,6 @@ TryLoadSaveFile:
scf
ret
-
TryLoadSaveData:
xor a
ld [wSaveFileExists], a
@@ -681,10 +674,8 @@ TryLoadSaveData:
call PanicResetClock
ret
-
INCLUDE "data/default_options.asm"
-
CheckPrimarySaveFile:
ld a, BANK(sCheckValue1) ; BANK(sCheckValue2)
call GetSRAMBank
@@ -726,7 +717,6 @@ CheckBackupSaveFile:
call CloseSRAM
ret
-
LoadPlayerData:
ld a, BANK(sPlayerData)
call GetSRAMBank
@@ -823,7 +813,6 @@ VerifyBackupChecksum:
pop af
ret
-
_SaveData:
; This is called within two scenarios:
; a) ErasePreviousSave (the process of erasing the save from a previous game file)
@@ -850,7 +839,6 @@ _SaveData:
jp CloseSRAM
-
_LoadData:
ld a, BANK(sCrystalData)
call GetSRAMBank
@@ -870,7 +858,6 @@ _LoadData:
jp CloseSRAM
-
GetBoxAddress:
ld a, [wCurBox]
cp NUM_BOXES
@@ -972,7 +959,6 @@ SaveBoxAddress:
pop hl
ret
-
LoadBoxAddress:
; Load box via wBoxPartialData.
; We do this in three steps because the size of wBoxPartialData is less than
@@ -1036,7 +1022,6 @@ LoadBoxAddress:
pop hl
ret
-
EraseBoxes:
ld hl, BoxAddresses
ld c, NUM_BOXES
@@ -1095,7 +1080,6 @@ BoxAddresses:
dbww BANK(sBox13), sBox13, sBox13End
dbww BANK(sBox14), sBox14, sBox14End
-
Checksum:
ld de, 0
.loop
@@ -1111,7 +1095,6 @@ Checksum:
jr nz, .loop
ret
-
Text_WouldYouLikeToSaveTheGame:
; Would you like to save the game?
text_jump UnknownText_0x1c454b
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 9cff1cb70..108a4edf6 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -10,9 +10,7 @@
const STARTMENUITEM_POKEGEAR ; 7
const STARTMENUITEM_QUIT ; 8
-
StartMenu::
-
call ClearWindowData
ld de, SFX_MENU
@@ -25,8 +23,8 @@ StartMenu::
ld hl, .MenuHeader
jr z, .GotMenuData
ld hl, .ContestMenuHeader
-.GotMenuData:
+.GotMenuData:
call LoadMenuHeader
call .SetUpMenuItems
ld a, [wBattleMenuCursorBuffer]
@@ -157,7 +155,6 @@ StartMenu::
call FinishExitMenu
ret
-
.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
@@ -235,7 +232,6 @@ StartMenu::
db "Quit and"
next "be judged.@"
-
.OpenMenu:
ld a, [wMenuSelection]
call .GetMenuAccountTextPointer
@@ -276,7 +272,6 @@ endr
pop de
ret
-
.GetMenuAccountTextPointer:
ld e, a
ld d, 0
@@ -289,7 +284,6 @@ rept 6
endr
ret
-
.SetUpMenuItems:
xor a
ld [wWhichIndexSet], a
@@ -349,7 +343,6 @@ endr
ld [wMenuItemsList], a
ret
-
.FillMenuList:
xor a
ld hl, wMenuItemsList
@@ -409,14 +402,12 @@ endr
farcall StartMenu_PrintBugContestStatus
ret
-
StartMenu_Exit:
; Exit the menu.
ld a, 1
ret
-
StartMenu_Quit:
; Retire from the bug catching contest.
@@ -437,7 +428,6 @@ StartMenu_Quit:
text_jump UnknownText_0x1c1a6c
db "@"
-
StartMenu_Save:
; Save the game.
@@ -450,7 +440,6 @@ StartMenu_Save:
ld a, 1
ret
-
StartMenu_Option:
; Game options.
@@ -459,7 +448,6 @@ StartMenu_Option:
ld a, 6
ret
-
StartMenu_Status:
; Player status.
@@ -469,9 +457,7 @@ StartMenu_Status:
ld a, 0
ret
-
StartMenu_Pokedex:
-
ld a, [wPartyCount]
and a
jr z, .asm_12949
@@ -484,18 +470,14 @@ StartMenu_Pokedex:
ld a, 0
ret
-
StartMenu_Pokegear:
-
call FadeToMenu
farcall PokeGear
call CloseSubmenu
ld a, 0
ret
-
StartMenu_Pack:
-
call FadeToMenu
farcall Pack
ld a, [wPackUsedItem]
@@ -510,9 +492,7 @@ StartMenu_Pack:
ld a, 4
ret
-
StartMenu_Pokemon:
-
ld a, [wPartyCount]
and a
jr z, .return
@@ -657,7 +637,6 @@ CantUseItemText:
text_jump UnknownText_0x1c1b03
db "@"
-
PartyMonItemName:
ld a, [wCurItem]
ld [wd265], a
@@ -665,14 +644,12 @@ PartyMonItemName:
call CopyName1
ret
-
CancelPokemonAction:
farcall InitPartyMenuWithCancel
farcall UnfreezeMonIcons
ld a, 1
ret
-
PokemonActionSubmenu:
hlcoord 1, 15
lb bc, 2, 18
@@ -717,9 +694,7 @@ PokemonActionSubmenu:
dbw MONMENUITEM_MOVE, ManagePokemonMoves
dbw MONMENUITEM_MAIL, MonMailAction
-
SwitchPartyMons:
-
; Don't try if there's nothing to switch!
ld a, [wPartyCount]
cp 2
@@ -769,9 +744,7 @@ SwitchPartyMons:
call CancelPokemonAction
ret
-
GiveTakePartyMonItem:
-
; Eggs can't hold items!
ld a, [wCurPartySpecies]
cp EGG
@@ -810,9 +783,7 @@ GiveTakePartyMonItem:
ld a, 3
ret
-
.GiveItem:
-
farcall DepositSellInitPackBuffers
.loop
@@ -842,9 +813,7 @@ GiveTakePartyMonItem:
.quit
ret
-
TryGiveItemToPartymon:
-
call SpeechTextBox
call PartyMonItemName
call GetPartyItemLocation
@@ -906,9 +875,7 @@ TryGiveItemToPartymon:
.abort
ret
-
GivePartyItem:
-
call GetPartyItemLocation
ld a, [wCurItem]
ld [hl], a
@@ -920,9 +887,7 @@ GivePartyItem:
.done
ret
-
TakePartyItem:
-
call SpeechTextBox
call GetPartyItemLocation
ld a, [hl]
@@ -955,7 +920,6 @@ TakePartyItem:
.asm_12c9a
ret
-
GiveTakeItemMenuData:
db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags
menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
@@ -968,7 +932,6 @@ GiveTakeItemMenuData:
db "GIVE@"
db "TAKE@"
-
TookAndMadeHoldText:
text_jump UnknownText_0x1c1b2c
db "@"
@@ -1001,7 +964,6 @@ CantBeHeldText:
text_jump UnknownText_0x1c1c09
db "@"
-
GetPartyItemLocation:
push af
ld a, MON_ITEM
@@ -1009,14 +971,12 @@ GetPartyItemLocation:
pop af
ret
-
ReceiveItemFromPokemon:
ld a, 1
ld [wItemQuantityChangeBuffer], a
ld hl, wNumItems
jp ReceiveItem
-
GiveItemToPokemon:
ld a, 1
ld [wItemQuantityChangeBuffer], a
@@ -1028,7 +988,6 @@ StartMenuYesNo:
call YesNoBox
jp ExitMenu
-
ComposeMailMessage:
ld de, wTempMailMessage
farcall _ComposeMailMessage
@@ -1130,7 +1089,6 @@ MonMailAction:
ld a, $3
ret
-
.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
@@ -1144,7 +1102,6 @@ MonMailAction:
db "TAKE@"
db "QUIT@"
-
.mailwilllosemessagetext
; The MAIL will lose its message. OK?
text_jump UnknownText_0x1c1c22
@@ -1175,7 +1132,6 @@ MonMailAction:
text_jump UnknownText_0x1c1cc4
db "@"
-
OpenPartyStats:
call LoadStandardMenuHeader
call ClearSprites
@@ -1189,7 +1145,6 @@ OpenPartyStats:
ld a, 0
ret
-
MonMenu_Cut:
farcall CutFunction
ld a, [wFieldMoveSucceeded]
@@ -1203,7 +1158,6 @@ MonMenu_Cut:
ld a, $3
ret
-
MonMenu_Fly:
farcall FlyFunction
ld a, [wFieldMoveSucceeded]
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm
index 7a0249b61..f48636f67 100644
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -136,7 +136,6 @@ TrainerCard_Page1_Joypad:
ld [wJumptableIndex], a
ret
-
TrainerCard_Page2_LoadGFX:
call ClearSprites
hlcoord 0, 8
@@ -256,7 +255,6 @@ TrainerCard_PrintTopHalfOfCard:
predef PlaceGraphic
ret
-
.Name_Money:
db "NAME/"
next ""
@@ -334,7 +332,6 @@ endr
call TrainerCard_Page2_3_OAMUpdate
ret
-
.BadgesTilemap:
db $79, $7a, $7b, $7c, $7d, -1 ; "BADGES"
@@ -540,7 +537,6 @@ TrainerCard_Page2_3_OAMUpdate:
inc de
jr .loop2
-
.facing1
dsprite 0, 0, 0, 0, $00, 0
dsprite 0, 0, 1, 0, $01, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 07:32:33 +0000