pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove all address comments

Browse Source
This commit is contained in:
mid-kid
2018-06-24 16:09:41 +02:00
parent 131875d3e3
commit 1d9a68dbdd
616 changed files with 12133 additions and 20380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
engine/menus/debug.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/menus/delete_save.asm
View File

@@ -1,4 +1,4 @@
_DeleteSaveData: ; 4d54c
_DeleteSaveData:
farcall BlankScreen
ld b, SCGB_DIPLOMA
call GetSGBLayout

4
engine/menus/empty_sram.asm
View File

@@ -1,4 +1,4 @@
EmptyAllSRAMBanks: ; 4cf1f
EmptyAllSRAMBanks:
ld a, 0
call .EmptyBank
ld a, 1
@@ -9,7 +9,7 @@ EmptyAllSRAMBanks: ; 4cf1f
call .EmptyBank
ret
.EmptyBank: ; 4cf34
.EmptyBank:
call GetSRAMBank
ld hl, SRAM_Begin
ld bc, SRAM_End - SRAM_Begin

19
engine/menus/init_gender.asm
View File

@@ -1,4 +1,4 @@
InitCrystalData: ; 48000
InitCrystalData:
ld a, $1
ld [wd474], a
xor a
@@ -18,11 +18,10 @@ InitCrystalData: ; 48000
res 1, a
ld [wd479], a
ret
; 4802f
INCLUDE "mobile/mobile_12.asm"
InitGender: ; 48dcb (12:4dcb)
InitGender:
call InitGenderScreen
call LoadGenderScreenPal
call LoadGenderScreenLightBlueTile
@@ -41,7 +40,6 @@ InitGender: ; 48dcb (12:4dcb)
ld c, 10
call DelayFrames
ret
; 48dfc (12:4dfc)
.MenuHeader: ; 0x48dfc
db MENU_BACKUP_TILES ; flags
@@ -63,7 +61,7 @@ TextJump_AreYouABoyOrAreYouAGirl: ; 0x48e0f
db "@"
; 0x48e14
InitGenderScreen: ; 48e14 (12:4e14)
InitGenderScreen:
ld a, $10
ld [wMusicFade], a
ld a, MUSIC_NONE
@@ -85,7 +83,7 @@ InitGenderScreen: ; 48e14 (12:4e14)
call ByteFill
ret
LoadGenderScreenPal: ; 48e47 (12:4e47)
LoadGenderScreenPal:
ld hl, .Palette
ld de, wBGPals1
ld bc, 1 palettes
@@ -93,19 +91,16 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
call FarCopyWRAM
farcall ApplyPals
ret
; 48e5c (12:4e5c)
.Palette: ; 48e5c
.Palette:
INCLUDE "gfx/new_game/gender_screen.pal"
; 48e64
LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)
LoadGenderScreenLightBlueTile:
ld de, .LightBlueTile
ld hl, vTiles2 tile $00
lb bc, BANK(.LightBlueTile), 1
call Get2bpp
ret
; 48e71 (12:4e71)
.LightBlueTile: ; 48e71
.LightBlueTile:
INCBIN "gfx/new_game/gender_screen.2bpp"

199
engine/menus/intro_menu.asm
View File

File diff suppressed because it is too large Load Diff

57
engine/menus/main_menu.asm
View File

@@ -1,8 +1,7 @@
GFX_49c0c: ; 49c0c
GFX_49c0c:
INCBIN "gfx/unknown/049c0c.2bpp"
; 49cdc
MainMenu: ; 49cdc
MainMenu:
xor a
ld [wDisableTextAcceleration], a
call Function49ed0
@@ -27,24 +26,21 @@ MainMenu: ; 49cdc
.quit
ret
; 49d14
.MenuHeader: ; 49d14
.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 16, 7
dw .MenuData
db 1 ; default option
; 49d1c
.MenuData: ; 49d1c
.MenuData:
db STATICMENU_CURSOR ; flags
db 0 ; items
dw MainMenuItems
dw PlaceMenuStrings
dw .Strings
; 49d20
.Strings: ; 49d24
.Strings:
db "CONTINUE@"
db "NEW GAME@"
db "OPTION@"
@@ -145,7 +141,7 @@ StudiumMenu: ; 0x49d9e
db -1
MainMenu_GetWhichMenu: ; 49da4
MainMenu_GetWhichMenu:
nop
nop
nop
@@ -193,9 +189,8 @@ MainMenu_GetWhichMenu: ; 49da4
.ok4
ld a, $6 ; Mystery Gift
ret
; 49de4
MainMenuJoypadLoop: ; 49de4
MainMenuJoypadLoop:
call SetUpMenu
.loop
call MainMenu_PrintCurrentTimeAndDay
@@ -218,9 +213,8 @@ MainMenuJoypadLoop: ; 49de4
.b_button
scf
ret
; 49e09
MainMenu_PrintCurrentTimeAndDay: ; 49e09
MainMenu_PrintCurrentTimeAndDay:
ld a, [wSaveFileExists]
and a
ret z
@@ -237,10 +231,9 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
ld a, $1
ld [hBGMapMode], a
ret
; 49e27
.PlaceBox: ; 49e27
.PlaceBox:
call CheckRTCStatus
and $80
jr nz, .TimeFail
@@ -253,10 +246,9 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
.TimeFail:
call SpeechTextBox
ret
; 49e3d
.PlaceTime: ; 49e3d
.PlaceTime:
ld a, [wSaveFileExists]
and a
ret z
@@ -282,26 +274,22 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
.min
; unused
db "min.@"
; 49e75
.PrintTimeNotSet: ; 49e75
.PrintTimeNotSet:
hlcoord 1, 14
ld de, .TimeNotSet
call PlaceString
ret
; 49e7f
.TimeNotSet: ; 49e7f
.TimeNotSet:
db "TIME NOT SET@"
; 49e8c
.UnusedText: ; 49e8c
.UnusedText:
; Clock time unknown
text_jump UnknownText_0x1c5182
db "@"
; 49e91
.PlaceCurrentDay: ; 49e91
.PlaceCurrentDay:
push de
ld hl, .Days
ld a, b
@@ -315,7 +303,6 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
ld de, .Day
call PlaceString
ret
; 49ea8
.Days:
db "SUN@"
@@ -327,9 +314,8 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
db "SATUR@"
.Day:
db "DAY@"
; 49ed0
Function49ed0: ; 49ed0
Function49ed0:
xor a
ld [hMapAnims], a
call ClearTileMap
@@ -337,25 +323,20 @@ Function49ed0: ; 49ed0
call LoadStandardFont
call ClearWindowData
ret
; 49ee0
MainMenu_NewGame: ; 49ee0
MainMenu_NewGame:
farcall NewGame
ret
; 49ee7
MainMenu_Options: ; 49ee7
MainMenu_Options:
farcall OptionsMenu
ret
; 49eee
MainMenu_Continue: ; 49eee
MainMenu_Continue:
farcall Continue
ret
; 49ef5
MainMenu_MysteryGift: ; 49ef5
MainMenu_MysteryGift:
farcall MysteryGift
ret
; 49efc

98
engine/menus/menu.asm
View File

@@ -1,4 +1,4 @@
_2DMenu_:: ; 2400e
_2DMenu_::
ld hl, CopyMenuData
ld a, [wMenuData_2DMenuItemStringsBank]
rst FarCall
@@ -8,9 +8,8 @@ _2DMenu_:: ; 2400e
call ApplyTilemap
call Get2DMenuSelection
ret
; 24022
_InterpretBattleMenu:: ; 24022
_InterpretBattleMenu::
ld hl, CopyMenuData
ld a, [wMenuData_2DMenuItemStringsBank]
rst FarCall
@@ -21,9 +20,8 @@ _InterpretBattleMenu:: ; 24022
call ApplyTilemap
call Get2DMenuSelection
ret
; 2403c
_InterpretMobileMenu:: ; 2403c
_InterpretMobileMenu::
ld hl, CopyMenuData
ld a, [wMenuData_2DMenuItemStringsBank]
rst FarCall
@@ -56,23 +54,21 @@ _InterpretMobileMenu:: ; 2403c
ld [wMenuCursorBuffer], a
and a
ret
; 24085
Draw2DMenu: ; 24085
Draw2DMenu:
xor a
ld [hBGMapMode], a
call MenuBox
call Place2DMenuItemStrings
ret
; 2408f
Get2DMenuSelection: ; 2408f
Get2DMenuSelection:
call Init2DMenuCursorPosition
call StaticMenuJoypad
call MenuClickSound
Mobile_GetMenuSelection: ; 24098
Mobile_GetMenuSelection:
ld a, [wMenuDataFlags]
bit 1, a
jr z, .skip
@@ -108,22 +104,19 @@ Mobile_GetMenuSelection: ; 24098
.quit2
scf
ret
; 240cd
Get2DMenuNumberOfColumns: ; 240cd
Get2DMenuNumberOfColumns:
ld a, [wMenuData_2DMenuDimensions]
and $f
ret
; 240d3
Get2DMenuNumberOfRows: ; 240d3
Get2DMenuNumberOfRows:
ld a, [wMenuData_2DMenuDimensions]
swap a
and $f
ret
; 240db
Place2DMenuItemStrings: ; 240db
Place2DMenuItemStrings:
ld hl, wMenuData_2DMenuItemStringsAddr
ld e, [hl]
inc hl
@@ -164,10 +157,9 @@ Place2DMenuItemStrings: ; 240db
ld a, [wMenuData_2DMenuFunctionBank]
rst FarCall
ret
; 2411a
Init2DMenuCursorPosition: ; 2411a (9:411a)
Init2DMenuCursorPosition:
call GetMenuTextStartCoord
ld a, b
ld [w2DMenuCursorInitY], a
@@ -222,9 +214,8 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
ld [wCursorCurrentTile], a
ld [wCursorCurrentTile + 1], a
ret
; 24179
.InitFlags_a: ; 24179
.InitFlags_a:
xor a
ld hl, w2DMenuFlags1
ld [hli], a
@@ -235,16 +226,14 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
set 5, [hl]
set 4, [hl]
ret
; 2418a
.InitFlags_b: ; 2418a
.InitFlags_b:
ld a, [wMenuData_2DMenuSpacing]
or $20
ld [w2DMenuCursorOffsets], a
ret
; 24193
.InitFlags_c: ; 24193
.InitFlags_c:
ld hl, wMenuDataFlags
ld a, A_BUTTON
bit 0, [hl]
@@ -257,12 +246,11 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
.skip2
ld [wMenuJoypadFilter], a
ret
; 241a8
_StaticMenuJoypad:: ; 241a8
_StaticMenuJoypad::
call Place2DMenuCursor
_ScrollingMenuJoypad:: ; 241ab
_ScrollingMenuJoypad::
ld hl, w2DMenuFlags2
res 7, [hl]
ld a, [hBGMapMode]
@@ -271,9 +259,8 @@ _ScrollingMenuJoypad:: ; 241ab
pop af
ld [hBGMapMode], a
ret
; 241ba
MobileMenuJoypad: ; 241ba
MobileMenuJoypad:
ld hl, w2DMenuFlags2
res 7, [hl]
ld a, [hBGMapMode]
@@ -288,10 +275,9 @@ MobileMenuJoypad: ; 241ba
call GetMenuJoypad
ld c, a
ret
; 241d5
Unreferenced_Function241d5: ; 241d5
Unreferenced_Function241d5:
call Place2DMenuCursor
.loop
call Move2DMenuCursor
@@ -328,10 +314,9 @@ Unreferenced_Function241d5: ; 241d5
jr z, .loop2
and a
ret
; 24216
MenuJoypadLoop: ; 24216
MenuJoypadLoop:
.loop
call Move2DMenuCursor
call .BGMap_OAM
@@ -350,9 +335,8 @@ MenuJoypadLoop: ; 24216
.done
ret
; 24238
.BGMap_OAM: ; 24238
.BGMap_OAM:
ld a, [hOAMUpdate]
push af
ld a, $1
@@ -363,9 +347,8 @@ MenuJoypadLoop: ; 24216
xor a
ld [hBGMapMode], a
ret
; 24249
Do2DMenuRTCJoypad: ; 24249
Do2DMenuRTCJoypad:
.loopRTC
call RTC
call Menu_WasButtonPressed
@@ -375,9 +358,8 @@ Do2DMenuRTCJoypad: ; 24249
jr z, .loopRTC
and a
ret
; 24259
Menu_WasButtonPressed: ; 24259
Menu_WasButtonPressed:
ld a, [w2DMenuFlags1]
bit 6, a
jr z, .skip_to_joypad
@@ -390,9 +372,8 @@ Menu_WasButtonPressed: ; 24259
ret z
scf
ret
; 24270
_2DMenuInterpretJoypad: ; 24270
_2DMenuInterpretJoypad:
call GetMenuJoypad
bit A_BUTTON_F, a
jp nz, .a_b_start_select
@@ -413,7 +394,7 @@ _2DMenuInterpretJoypad: ; 24270
and a
ret
.set_bit_7 ; 24299
.set_bit_7
ld hl, w2DMenuFlags2
set 7, [hl]
scf
@@ -512,14 +493,12 @@ _2DMenuInterpretJoypad: ; 24270
ld [hl], $1
xor a
ret
; 24318
.a_b_start_select ; 24318
.a_b_start_select
xor a
ret
; 2431a
Move2DMenuCursor: ; 2431a
Move2DMenuCursor:
ld hl, wCursorCurrentTile
ld a, [hli]
ld h, [hl]
@@ -529,7 +508,7 @@ Move2DMenuCursor: ; 2431a
jr nz, Place2DMenuCursor
ld a, [wCursorOffCharacter]
ld [hl], a
Place2DMenuCursor: ; 24329
Place2DMenuCursor:
ld a, [w2DMenuCursorInitY]
ld b, a
ld a, [w2DMenuCursorInitX]
@@ -580,9 +559,8 @@ Place2DMenuCursor: ; 24329
ld a, h
ld [wCursorCurrentTile + 1], a
ret
; 24374
_PushWindow:: ; 24374
_PushWindow::
ld a, [rSVBK]
push af
ld a, BANK(wWindowStack)
@@ -651,9 +629,8 @@ _PushWindow:: ; 24374
ld hl, wWindowStackSize
inc [hl]
ret
; 243cd
.copy ; 243cd
.copy
call GetMenuBoxDims
inc b
inc c
@@ -678,13 +655,11 @@ _PushWindow:: ; 24374
jr nz, .row
ret
; 243e7
.ret ; 243e7
.ret
ret
; 243e8
_ExitMenu:: ; 243e8
_ExitMenu::
xor a
ld [hBGMapMode], a
@@ -722,9 +697,8 @@ _ExitMenu:: ; 243e8
ld hl, wWindowStackSize
dec [hl]
ret
; 24423
Unreferenced_Function24423: ; 24423
Unreferenced_Function24423:
ld a, [wVramState]
bit 0, a
ret z
@@ -755,22 +729,19 @@ Unreferenced_Function24423: ; 24423
jr nz, .loop
call CloseSRAM
ret
; 2445d
Error_Cant_ExitMenu: ; 2445d
Error_Cant_ExitMenu:
ld hl, .Text_NoWindowsAvailableForPopping
call PrintText
call WaitBGMap
.InfiniteLoop:
jr .InfiniteLoop
; 24468
.Text_NoWindowsAvailableForPopping: ; 24468
.Text_NoWindowsAvailableForPopping:
text_jump UnknownText_0x1c46b7
db "@"
; 2446d
_InitVerticalMenuCursor:: ; 2446d
_InitVerticalMenuCursor::
ld a, [wMenuDataFlags]
ld b, a
ld hl, w2DMenuCursorInitY
@@ -838,4 +809,3 @@ _InitVerticalMenuCursor:: ; 2446d
ld [hli], a
ld [hli], a
ret
; 244c3

42
engine/menus/menu_2.asm
View File

@@ -27,22 +27,22 @@ PlaceMenuItemQuantity: ; 0x24ac3
.done
ret
PlaceMoneyTopRight: ; 24ae8
PlaceMoneyTopRight:
ld hl, MenuHeader_0x24b15
call CopyMenuHeader
jr PlaceMoneyTextBox
PlaceMoneyBottomLeft: ; 24af0
PlaceMoneyBottomLeft:
ld hl, MenuHeader_0x24b1d
call CopyMenuHeader
jr PlaceMoneyTextBox
PlaceMoneyAtTopLeftOfTextbox: ; 24af8
PlaceMoneyAtTopLeftOfTextbox:
ld hl, MenuHeader_0x24b15
lb de, 0, 11
call OffsetMenuHeader
PlaceMoneyTextBox: ; 24b01
PlaceMoneyTextBox:
call MenuBox
call MenuBoxCoord2Tile
ld de, SCREEN_WIDTH + 1
@@ -64,7 +64,7 @@ MenuHeader_0x24b1d: ; 0x24b1d
dw NULL
db 1 ; default option
DisplayCoinCaseBalance: ; 24b25
DisplayCoinCaseBalance:
; Place a text box of size 1x7 at 11, 0.
hlcoord 11, 0
ld b, 1
@@ -82,7 +82,7 @@ DisplayCoinCaseBalance: ; 24b25
call PrintNum
ret
DisplayMoneyAndCoinBalance: ; 24b4e
DisplayMoneyAndCoinBalance:
hlcoord 5, 0
ld b, 3
ld c, 13
@@ -103,14 +103,14 @@ DisplayMoneyAndCoinBalance: ; 24b4e
call PrintNum
ret
MoneyString: ; 24b83
MoneyString:
db "MONEY@"
CoinString: ; 24b89
CoinString:
db "COIN@"
ShowMoney_TerminatorString: ; 24b8e
ShowMoney_TerminatorString:
db "@"
Unreferenced_Function24b8f: ; 24b8f
Unreferenced_Function24b8f:
; related to safari?
ld hl, wOptions
ld a, [hl]
@@ -138,19 +138,19 @@ Unreferenced_Function24b8f: ; 24b8f
ld [wOptions], a
ret
.slash_500 ; 24bcf
.slash_500
db "／５００@"
.booru_ko ; 24bd4
.booru_ko
db "ボール　　　こ@"
StartMenu_DrawBugContestStatusBox: ; 24bdc
StartMenu_DrawBugContestStatusBox:
hlcoord 0, 0
ld b, 5
ld c, 17
call TextBox
ret
StartMenu_PrintBugContestStatus: ; 24be7
StartMenu_PrintBugContestStatus:
ld hl, wOptions
ld a, [hl]
push af
@@ -194,18 +194,18 @@ StartMenu_PrintBugContestStatus: ; 24be7
ld [wOptions], a
ret
.Balls_JP: ; 24c43
.Balls_JP:
db "ボール　　　こ@"
.CAUGHT: ; 24c4b
.CAUGHT:
db "CAUGHT@"
.Balls_EN: ; 24c52
.Balls_EN:
db "BALLS:@"
.None: ; 24c59
.None:
db "None@"
.LEVEL: ; 24c5e
.LEVEL:
db "LEVEL@"
FindApricornsInBag: ; 24c64
FindApricornsInBag:
; Checks the bag for Apricorns.
ld hl, wBuffer1
xor a
@@ -239,7 +239,7 @@ FindApricornsInBag: ; 24c64
scf
ret
.addtobuffer ; 24c94
.addtobuffer
push hl
ld hl, wBuffer1
inc [hl]

177
engine/menus/naming_screen.asm
View File

File diff suppressed because it is too large Load Diff

54
engine/menus/options_menu.asm
View File

@@ -1,4 +1,4 @@
_OptionsMenu: ; e41d0
_OptionsMenu:
ld hl, hInMenu
ld a, [hl]
push af
@@ -59,9 +59,8 @@ _OptionsMenu: ; e41d0
pop af
ld [hInMenu], a
ret
; e4241
StringOptions: ; e4241
StringOptions:
db "TEXT SPEED<LNBRK>"
db " :<LNBRK>"
db "BATTLE SCENE<LNBRK>"
@@ -77,10 +76,9 @@ StringOptions: ; e4241
db "FRAME<LNBRK>"
db " :TYPE<LNBRK>"
db "CANCEL@"
; e42d6
GetOptionPointer: ; e42d6
GetOptionPointer:
ld a, [wJumptableIndex] ; load the cursor position to a
ld e, a ; copy it to de
ld d, 0
@@ -91,7 +89,6 @@ GetOptionPointer: ; e42d6
ld h, [hl]
ld l, a
jp hl ; jump to the code of the current highlighted item
; e42e5
.Pointers:
dw Options_TextSpeed
@@ -102,7 +99,6 @@ GetOptionPointer: ; e42d6
dw Options_MenuAccount
dw Options_Frame
dw Options_Cancel
; e42f5
const_def
@@ -110,7 +106,7 @@ GetOptionPointer: ; e42d6
const OPT_TEXT_SPEED_MED ; 1
const OPT_TEXT_SPEED_SLOW ; 2
Options_TextSpeed: ; e42f5
Options_TextSpeed:
call GetTextSpeed
ld a, [hJoyPressed]
bit D_LEFT_F, a
@@ -156,7 +152,6 @@ Options_TextSpeed: ; e42f5
call PlaceString
and a
ret
; e4331
.Strings:
; entries correspond to OPT_TEXT_SPEED_* constants
@@ -167,10 +162,9 @@ Options_TextSpeed: ; e42f5
.Fast: db "FAST@"
.Mid: db "MID @"
.Slow: db "SLOW@"
; e4346
GetTextSpeed: ; e4346
GetTextSpeed:
; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c,
; with previous/next TEXT_DELAY_* values in d/e
ld a, [wOptions]
@@ -193,10 +187,9 @@ GetTextSpeed: ; e4346
ld c, OPT_TEXT_SPEED_FAST
lb de, TEXT_DELAY_SLOW, TEXT_DELAY_MED
ret
; e4365
Options_BattleScene: ; e4365
Options_BattleScene:
ld hl, wOptions
ld a, [hJoyPressed]
bit D_LEFT_F, a
@@ -231,14 +224,12 @@ Options_BattleScene: ; e4365
call PlaceString
and a
ret
; e4398
.On: db "ON @"
.Off: db "OFF@"
; e43a0
Options_BattleStyle: ; e43a0
Options_BattleStyle:
ld hl, wOptions
ld a, [hJoyPressed]
bit D_LEFT_F, a
@@ -272,14 +263,12 @@ Options_BattleStyle: ; e43a0
call PlaceString
and a
ret
; e43d1
.Shift: db "SHIFT@"
.Set: db "SET @"
; e43dd
Options_Sound: ; e43dd
Options_Sound:
ld hl, wOptions
ld a, [hJoyPressed]
bit D_LEFT_F, a
@@ -320,11 +309,9 @@ Options_Sound: ; e43dd
call PlaceString
and a
ret
; e4416
.Mono: db "MONO @"
.Stereo: db "STEREO@"
; e4424
const_def
@@ -334,7 +321,7 @@ Options_Sound: ; e43dd
const OPT_PRINT_DARKER ; 3
const OPT_PRINT_DARKEST ; 4
Options_Print: ; e4424
Options_Print:
call GetPrinterSetting
ld a, [hJoyPressed]
bit D_LEFT_F, a
@@ -377,7 +364,6 @@ Options_Print: ; e4424
call PlaceString
and a
ret
; e445a
.Strings:
; entries correspond to OPT_PRINT_* constants
@@ -392,10 +378,9 @@ Options_Print: ; e4424
.Normal: db "NORMAL @"
.Darker: db "DARKER @"
.Darkest: db "DARKEST @"
; e4491
GetPrinterSetting: ; e4491
GetPrinterSetting:
; converts GBPRINTER_* value in a to OPT_PRINT_* value in c,
; with previous/next GBPRINTER_* values in d/e
ld a, [wGBPrinter]
@@ -431,9 +416,8 @@ GetPrinterSetting: ; e4491
ld c, OPT_PRINT_DARKEST
lb de, GBPRINTER_DARKER, GBPRINTER_LIGHTEST
ret
; e44c1
Options_MenuAccount: ; e44c1
Options_MenuAccount:
ld hl, wOptions2
ld a, [hJoyPressed]
bit D_LEFT_F, a
@@ -467,14 +451,12 @@ Options_MenuAccount: ; e44c1
call PlaceString
and a
ret
; e44f2
.Off: db "OFF@"
.On: db "ON @"
; e44fa
Options_Frame: ; e44fa
Options_Frame:
ld hl, wTextBoxFrame
ld a, [hJoyPressed]
bit D_LEFT_F, a
@@ -496,7 +478,7 @@ Options_Frame: ; e44fa
.Save:
and $7
ld [hl], a
UpdateFrame: ; e4512
UpdateFrame:
ld a, [wTextBoxFrame]
hlcoord 16, 15 ; where on the screen the number is drawn
add "1"
@@ -504,9 +486,8 @@ UpdateFrame: ; e4512
call LoadFontsExtra
and a
ret
; e4520
Options_Cancel: ; e4520
Options_Cancel:
ld a, [hJoyPressed]
and A_BUTTON
jr nz, .Exit
@@ -516,9 +497,8 @@ Options_Cancel: ; e4520
.Exit:
scf
ret
; e452a
OptionsControl: ; e452a
OptionsControl:
ld hl, wJumptableIndex
ld a, [hJoyLast]
cp D_DOWN
@@ -563,9 +543,8 @@ OptionsControl: ; e452a
dec [hl]
scf
ret
; e455c
Options_UpdateCursorPosition: ; e455c
Options_UpdateCursorPosition:
hlcoord 1, 1
ld de, SCREEN_WIDTH
ld c, $10
@@ -580,4 +559,3 @@ Options_UpdateCursorPosition: ; e455c
call AddNTimes
ld [hl], "▶"
ret
; e4579

173
engine/menus/save.asm
View File

File diff suppressed because it is too large Load Diff

4
engine/menus/savemenu_copytilemapatonce.asm
View File

@@ -1,4 +1,4 @@
SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45)
SaveMenu_CopyTilemapAtOnce:
ld a, [hCGB]
and a
jp z, WaitBGMap
@@ -38,7 +38,7 @@ SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45)
ld [hBGMapMode], a
ret
.CopyTilemapAtOnce: ; 4cf80 (13:4f80)
.CopyTilemapAtOnce:
ld [hSPBuffer], sp ; $ffd9
ld sp, hl
ld a, [hBGMapAddress + 1]

72
engine/menus/scrolling_menu.asm
View File

@@ -1,4 +1,4 @@
_InitScrollingMenu:: ; 245af
_InitScrollingMenu::
xor a
ld [wMenuJoypad], a
ld [hBGMapMode], a
@@ -12,25 +12,22 @@ _InitScrollingMenu:: ; 245af
xor a
ld [hBGMapMode], a
ret
; 245cb
_ScrollingMenu:: ; 245cb
_ScrollingMenu::
.loop
call ScrollingMenuJoyAction
jp c, .exit
call z, .zero
jr .loop
; 245d6
.exit ; 245d6
.exit
call MenuClickSound
ld [wMenuJoypad], a
ld a, 0
ld [hInMenu], a
ret
; 245e1
.zero ; 245e1
.zero
call ScrollingMenu_InitDisplay
ld a, 1
ld [hBGMapMode], a
@@ -39,9 +36,8 @@ _ScrollingMenu:: ; 245cb
xor a
ld [hBGMapMode], a
ret
; 245f1
ScrollingMenu_InitDisplay: ; 245f1
ScrollingMenu_InitDisplay:
xor a
ld [hBGMapMode], a
ld hl, wOptions
@@ -54,9 +50,8 @@ ScrollingMenu_InitDisplay: ; 245f1
pop af
ld [wOptions], a
ret
; 24609
ScrollingMenuJoyAction: ; 24609
ScrollingMenuJoyAction:
.loop
call ScrollingMenuJoypad
ld a, [hJoyLast]
@@ -82,15 +77,13 @@ ScrollingMenuJoyAction: ; 24609
bit D_DOWN_F, a
jp nz, .d_down
jr .loop
; 24640
.unreferenced ; unused
ld a, -1
and a
ret
; 24644
.a_button ; 24644
.a_button
call PlaceHollowCursor
ld a, [wMenuCursorY]
dec a
@@ -109,15 +102,13 @@ ScrollingMenuJoyAction: ; 24609
ld a, A_BUTTON
scf
ret
; 2466f
.b_button ; 2466f
.b_button
ld a, B_BUTTON
scf
ret
; 24673
.select ; 24673
.select
ld a, [wMenuDataFlags]
bit 7, a
jp z, xor_a_dec_a
@@ -133,18 +124,16 @@ ScrollingMenuJoyAction: ; 24609
ld a, SELECT
scf
ret
; 24695
.start ; 24695
.start
ld a, [wMenuDataFlags]
bit 6, a
jp z, xor_a_dec_a
ld a, START
scf
ret
; 246a1
.d_left ; 246a1
.d_left
ld hl, w2DMenuFlags2
bit 7, [hl]
jp z, xor_a_dec_a
@@ -154,9 +143,8 @@ ScrollingMenuJoyAction: ; 24609
ld a, D_LEFT
scf
ret
; 246b5
.d_right ; 246b5
.d_right
ld hl, w2DMenuFlags2
bit 7, [hl]
jp z, xor_a_dec_a
@@ -166,9 +154,8 @@ ScrollingMenuJoyAction: ; 24609
ld a, D_RIGHT
scf
ret
; 246c9
.d_up ; 246c9
.d_up
ld hl, w2DMenuFlags2
bit 7, [hl]
jp z, xor_a
@@ -181,9 +168,8 @@ ScrollingMenuJoyAction: ; 24609
.xor_dec_up
jp xor_a_dec_a
; 246df
.d_down ; 246df
.d_down
ld hl, w2DMenuFlags2
bit 7, [hl]
jp z, xor_a
@@ -199,18 +185,16 @@ ScrollingMenuJoyAction: ; 24609
.xor_dec_down
jp xor_a_dec_a
; 246fc
ScrollingMenu_GetCursorPosition: ; 246fc
ScrollingMenu_GetCursorPosition:
ld a, [wMenuScrollPosition]
ld c, a
ld a, [wMenuCursorY]
add c
ld c, a
ret
; 24706
ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706)
ScrollingMenu_ClearLeftColumn:
call MenuBoxCoord2Tile
ld de, SCREEN_WIDTH
add hl, de
@@ -223,7 +207,7 @@ ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706)
jr nz, .loop
ret
InitScrollingMenuCursor: ; 2471a
InitScrollingMenuCursor:
ld hl, wMenuData_ItemsPointerAddr
ld a, [hli]
ld h, [hl]
@@ -271,9 +255,8 @@ InitScrollingMenuCursor: ; 2471a
.asm_24763
ret
; 24764
ScrollingMenu_InitFlags: ; 24764
ScrollingMenu_InitFlags:
ld a, [wMenuDataFlags]
ld c, a
ld a, [wScrollingMenuListSize]
@@ -343,9 +326,8 @@ ScrollingMenu_InitFlags: ; 24764
ld [wCursorCurrentTile + 1], a
ld [wCursorOffCharacter], a
ret
; 247dd
ScrollingMenu_ValidateSwitchItem: ; 247dd
ScrollingMenu_ValidateSwitchItem:
ld a, [wScrollingMenuListSize]
ld c, a
ld a, [wSwitchItem]
@@ -359,9 +341,8 @@ ScrollingMenu_ValidateSwitchItem: ; 247dd
.done
ret
; 247f0
ScrollingMenu_UpdateDisplay: ; 247f0
ScrollingMenu_UpdateDisplay:
call ClearWholeMenuBox
ld a, [wMenuDataFlags]
bit 4, a ; place arrows
@@ -432,9 +413,8 @@ ScrollingMenu_UpdateDisplay: ; 247f0
ld e, l
ld hl, wMenuData_ScrollingMenuFunction1
jp CallPointerAt
; 2486e
ScrollingMenu_CallFunctions1and2: ; 2486e
ScrollingMenu_CallFunctions1and2:
push hl
ld d, h
ld e, l
@@ -454,9 +434,8 @@ ScrollingMenu_CallFunctions1and2: ; 2486e
.done
ret
; 2488b
ScrollingMenu_PlaceCursor: ; 2488b
ScrollingMenu_PlaceCursor:
ld a, [wSwitchItem]
and a
jr z, .done
@@ -486,9 +465,8 @@ ScrollingMenu_PlaceCursor: ; 2488b
.done
ret
; 248b8
ScrollingMenu_CheckCallFunction3: ; 248b8
ScrollingMenu_CheckCallFunction3:
ld a, [wMenuDataFlags]
bit 5, a ; call function 3
ret z
@@ -505,9 +483,8 @@ ScrollingMenu_CheckCallFunction3: ; 248b8
ld hl, wMenuData_ScrollingMenuFunction3
call CallPointerAt
ret
; 248d5
ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5
ScrollingMenu_GetListItemCoordAndFunctionArgs:
push de
push hl
ld e, a
@@ -540,4 +517,3 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5
pop hl
pop de
ret
; 2490c

262
engine/menus/start_menu.asm
View File

File diff suppressed because it is too large Load Diff

68
engine/menus/trainer_card.asm
View File

@@ -8,7 +8,7 @@
const TRAINERCARDSTATE_PAGE3_JOYPAD ; 5
const TRAINERCARDSTATE_QUIT ; 6
TrainerCard: ; 25105
TrainerCard:
ld a, [wVramState]
push af
xor a
@@ -38,7 +38,7 @@ TrainerCard: ; 25105
ld [wVramState], a
ret
.InitRAM: ; 2513b (9:513b)
.InitRAM:
call ClearBGPalettes
call ClearSprites
call ClearTileMap
@@ -78,10 +78,10 @@ TrainerCard: ; 25105
ld [hl], a ; wTrainerCardBadgeAttributes
ret
.RunJumptable: ; 2518e (9:518e)
.RunJumptable:
jumptable .Jumptable, wJumptableIndex
.Jumptable: ; 2519d (9:519d)
.Jumptable:
; entries correspond to TRAINERCARDSTATE_* constants
dw TrainerCard_Page1_LoadGFX
dw TrainerCard_Page1_Joypad
@@ -91,17 +91,17 @@ TrainerCard: ; 25105
dw TrainerCard_Page3_Joypad
dw TrainerCard_Quit
TrainerCard_IncrementJumptable: ; 251ab (9:51ab)
TrainerCard_IncrementJumptable:
ld hl, wJumptableIndex
inc [hl]
ret
TrainerCard_Quit: ; 251b0 (9:51b0)
TrainerCard_Quit:
ld hl, wJumptableIndex
set 7, [hl]
ret
TrainerCard_Page1_LoadGFX: ; 251b6 (9:51b6)
TrainerCard_Page1_LoadGFX:
call ClearSprites
hlcoord 0, 8
ld d, 6
@@ -115,7 +115,7 @@ TrainerCard_Page1_LoadGFX: ; 251b6 (9:51b6)
call TrainerCard_IncrementJumptable
ret
TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
TrainerCard_Page1_Joypad:
call TrainerCard_Page1_PrintGameTime
ld hl, hJoyLast
ld a, [hl]
@@ -136,9 +136,8 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
ld [wJumptableIndex], a
ret
; 251f4
TrainerCard_Page2_LoadGFX: ; 251f4 (9:51f4)
TrainerCard_Page2_LoadGFX:
call ClearSprites
hlcoord 0, 8
ld d, 6
@@ -156,7 +155,7 @@ TrainerCard_Page2_LoadGFX: ; 251f4 (9:51f4)
call TrainerCard_IncrementJumptable
ret
TrainerCard_Page2_Joypad: ; 25221 (9:5221)
TrainerCard_Page2_Joypad:
ld hl, TrainerCard_JohtoBadgesOAM
call TrainerCard_Page2_3_AnimateBadges
ld hl, hJoyLast
@@ -186,7 +185,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221)
ld [wJumptableIndex], a
ret
TrainerCard_Page3_LoadGFX: ; 2524c (9:524c)
TrainerCard_Page3_LoadGFX:
call ClearSprites
hlcoord 0, 8
ld d, 6
@@ -204,7 +203,7 @@ TrainerCard_Page3_LoadGFX: ; 2524c (9:524c)
call TrainerCard_IncrementJumptable
ret
TrainerCard_Page3_Joypad: ; 25279 (9:5279)
TrainerCard_Page3_Joypad:
ld hl, TrainerCard_JohtoBadgesOAM
call TrainerCard_Page2_3_AnimateBadges
ld hl, hJoyLast
@@ -226,7 +225,7 @@ TrainerCard_Page3_Joypad: ; 25279 (9:5279)
ld [wJumptableIndex], a
ret
TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299)
TrainerCard_PrintTopHalfOfCard:
hlcoord 0, 0
ld d, 5
call TrainerCard_InitBorder
@@ -257,21 +256,19 @@ TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299)
predef PlaceGraphic
ret
; 252ec (9:52ec)
.Name_Money: ; 252ec
.Name_Money:
db "NAME/"
next ""
next "MONEY@"
.ID_No: ; 252f9
.ID_No:
db $27, $28, -1 ; ID NO
.HorizontalDivider: ; 252fc
.HorizontalDivider:
db $25, $25, $25, $25, $25, $25, $25, $25, $25, $25, $25, $25, $26, -1 ; ____________>
; 2530a
TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
TrainerCard_Page1_PrintDexCaught_GameTime:
hlcoord 2, 10
ld de, .Dex_PlayTime
call PlaceString
@@ -304,11 +301,10 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
.Badges:
db " BADGES▶@"
.StatusTilemap: ; 25366
.StatusTilemap:
db $29, $2a, $2b, $2c, $2d, -1
; 2536c
TrainerCard_Page2_3_InitObjectsAndStrings: ; 2536c (9:536c)
TrainerCard_Page2_3_InitObjectsAndStrings:
hlcoord 2, 8
ld de, .BadgesTilemap
call TrainerCardSetup_PlaceTilemapString
@@ -338,13 +334,11 @@ endr
call TrainerCard_Page2_3_OAMUpdate
ret
; 253a2 (9:53a2)
.BadgesTilemap: ; 253a2
.BadgesTilemap:
db $79, $7a, $7b, $7c, $7d, -1 ; "BADGES"
; 253a8
TrainerCardSetup_PlaceTilemapString: ; 253a8 (9:53a8)
TrainerCardSetup_PlaceTilemapString:
.loop
ld a, [de]
cp -1
@@ -353,7 +347,7 @@ TrainerCardSetup_PlaceTilemapString: ; 253a8 (9:53a8)
inc de
jr .loop
TrainerCard_InitBorder: ; 253b0 (9:53b0)
TrainerCard_InitBorder:
ld e, SCREEN_WIDTH
.loop1
ld a, $23
@@ -411,7 +405,7 @@ TrainerCard_InitBorder: ; 253b0 (9:53b0)
jr nz, .loop6
ret
TrainerCard_Page2_3_PlaceLeadersFaces: ; 253f4 (9:53f4)
TrainerCard_Page2_3_PlaceLeadersFaces:
push de
push hl
ld [hli], a
@@ -442,7 +436,7 @@ TrainerCard_Page2_3_PlaceLeadersFaces: ; 253f4 (9:53f4)
pop de
ret
TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415)
TrainerCard_Page1_PrintGameTime:
hlcoord 11, 12
ld de, wGameTimeHours
lb bc, 2, 4
@@ -460,7 +454,7 @@ TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415)
ld [hl], a
ret
TrainerCard_Page2_3_AnimateBadges: ; 25438 (9:5438)
TrainerCard_Page2_3_AnimateBadges:
ld a, [hVBlankCounter]
and %111
ret nz
@@ -470,7 +464,7 @@ TrainerCard_Page2_3_AnimateBadges: ; 25438 (9:5438)
ld [wTrainerCardBadgeFrameCounter], a
jr TrainerCard_Page2_3_OAMUpdate
TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
TrainerCard_Page2_3_OAMUpdate:
; copy flag array pointer
ld a, [hli]
ld e, a
@@ -510,7 +504,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
jr nz, .loop
ret
.PrepOAM: ; 2547b (9:547b)
.PrepOAM:
ld a, [wTrainerCardBadgeTileID]
and 1 << 7
jr nz, .xflip
@@ -546,23 +540,22 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
inc de
jr .loop2
; 254a7 (9:54a7)
.facing1 ; 254a7
.facing1
dsprite 0, 0, 0, 0, $00, 0
dsprite 0, 0, 1, 0, $01, 0
dsprite 1, 0, 0, 0, $02, 0
dsprite 1, 0, 1, 0, $03, 0
db -1
.facing2 ; 254b8
.facing2
dsprite 0, 0, 0, 0, $01, 0 | X_FLIP
dsprite 0, 0, 1, 0, $00, 0 | X_FLIP
dsprite 1, 0, 0, 0, $03, 0 | X_FLIP
dsprite 1, 0, 1, 0, $02, 0 | X_FLIP
db -1
TrainerCard_JohtoBadgesOAM: ; 254c9
TrainerCard_JohtoBadgesOAM:
; Template OAM data for each badge on the trainer card.
; Format:
; y, x, palette
@@ -611,7 +604,6 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
db $80, $78, 0
db $1c, $20, $24, $20 | (1 << 7)
db $1c | (1 << 7), $20, $24, $20 | (1 << 7)
; 25523
CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp"