This commit is contained in:
PikalaxALT
2015-12-15 18:59:49 -05:00
parent efe3462f9a
commit 77ef8404a1
65 changed files with 1512 additions and 1509 deletions

View File

@@ -1,3 +1,16 @@
PrinterReceive:: ; 2057
ld a, [hROMBank]
push af
ld a, BANK(_PrinterReceive)
rst Bankswitch
call _PrinterReceive
pop af
rst Bankswitch
ret
; 2063
AskSerial:: ; 2063
; send out a handshake while serial int is off
ld a, [wc2d4]

View File

@@ -72,25 +72,26 @@ Call_ExitMenu:: ; 1d7d
ret
; 1d81
InterpretMenu2::
VerticalMenu::
xor a
ld [hBGMapMode], a
call MenuBox
call UpdateSprites
call Function1c89
call PlaceVerticalMenuItems
call ApplyTilemap
call CopyMenuData2
ld a, [wMenuData2Flags]
bit 7, a
jr z, .cancel
call Function1c10
call Function1bc9
call Function1ff8
call InitVerticalMenuCursor
call StaticMenuJoypad
call MenuClickSound
bit 1, a
jr z, .okay
.cancel
scf
ret
.okay
and a
ret
@@ -98,9 +99,9 @@ InterpretMenu2::
GetMenu2:: ; 1dab
call LoadMenuDataHeader
call InterpretMenu2
call VerticalMenu
call WriteBackup
ld a, [MenuSelection2]
ld a, [wMenuCursorY]
ret
; 1db8
@@ -162,14 +163,14 @@ _YesNoBox:: ; 1dd9
call BackUpTiles
InterpretTwoOptionMenu:: ; 1dfe
call InterpretMenu2
call VerticalMenu
push af
ld c, $f
call DelayFrames
call WriteBackup
pop af
jr c, .no
ld a, [MenuSelection2]
ld a, [wMenuCursorY]
cp 2 ; no
jr z, .no
and a
@@ -177,7 +178,7 @@ InterpretTwoOptionMenu:: ; 1dfe
.no
ld a, 2
ld [MenuSelection2], a
ld [wMenuCursorY], a
scf
ret
; 1e1d
@@ -233,8 +234,8 @@ DoNthMenu:: ; 1e5d
call MenuWriteText
call Function1eff
call Function1f23
call Function1bdd
call Function1ff8
call GetMenuJoypad
call MenuClickSound
ret
; 1e70
@@ -341,7 +342,7 @@ Function1efb:: ; 1efb
; 1eff
Function1eff:: ; 1eff
call Function1c10
call InitVerticalMenuCursor
ld hl, wcfa8
ld a, [wMenuData2Flags]
bit 3, a
@@ -361,7 +362,7 @@ Function1eff:: ; 1eff
Function1f1a:: ; 1f1a
call Function1bd3
call ScrollingMenuJoypad
ld hl, wcfa8
and [hl]
jr Function1f2a
@@ -369,8 +370,8 @@ Function1f1a:: ; 1f1a
Function1f23:: ; 1f23
xor a
ld [wcf73], a
call Function1bc9
ld [wMenuJoypad], a
call StaticMenuJoypad
; 1f2a
Function1f2a:: ; 1f2a
@@ -385,39 +386,39 @@ Function1f2a:: ; 1f2a
bit 5, a
jr nz, .asm_1f4b
xor a
ld [wcf73], a
ld [wMenuJoypad], a
jr .asm_1f57
.asm_1f44
ld a, $10
ld [wcf73], a
ld [wMenuJoypad], a
jr .asm_1f57
.asm_1f4b
ld a, $20
ld [wcf73], a
ld [wMenuJoypad], a
jr .asm_1f57
.asm_1f52
ld a, $1
ld [wcf73], a
ld [wMenuJoypad], a
.asm_1f57
call Function1ebd
ld a, [MenuSelection2]
ld a, [wMenuCursorY]
ld l, a
ld h, $0
add hl, de
ld a, [hl]
ld [MenuSelection], a
ld a, [MenuSelection2]
ld a, [wMenuCursorY]
ld [wMenuCursorBuffer], a
and a
ret
.asm_1f6d
ld a, $2
ld [wcf73], a
ld [wMenuJoypad], a
ld a, $ff
ld [MenuSelection], a
scf
@@ -489,7 +490,7 @@ endr
; 1fbf
ResetTextRelatedRAM:: ; 1fbf
ld hl, wcf71
ld hl, wWindowStackPointer
call .bytefill
ld hl, wMenuDataHeader
call .bytefill
@@ -504,14 +505,14 @@ ResetTextRelatedRAM:: ; 1fbf
ld [rSVBK], a
xor a
ld hl, w7_dfff
ld hl, wWindowStackBottom
rept 2
ld [hld], a
endr
ld a, l
ld [wcf71], a
ld [wWindowStackPointer], a
ld a, h
ld [wcf72], a
ld [wWindowStackPointer + 1], a
pop af
ld [rSVBK], a
@@ -525,15 +526,14 @@ endr
ret
; 1ff8
Function1ff8:: ; 1ff8
MenuClickSound:: ; 1ff8
push af
and $3
and A_BUTTON | B_BUTTON
jr z, .nosound
ld hl, wMenuFlags
bit 3, [hl]
jr nz, .nosound
call PlayClickSFX
.nosound
pop af
ret
@@ -555,7 +555,7 @@ MenuTextBoxWaitButton:: ; 2012
ret
; 201c
Function201c:: ; 201c
Place2DMenuItemName:: ; 201c
ld [hBuffer], a
ld a, [hROMBank]
push af
@@ -569,39 +569,26 @@ Function201c:: ; 201c
ret
; 202a
InterpretMenu:: ; 202a
_2DMenu:: ; 202a
ld a, [hROMBank]
ld [wcf94], a
callba Function2400e
ld [wMenuData2_2DMenuItemStringsBank], a
callba _2DMenu_
ld a, [wMenuCursorBuffer]
ret
; 2039
Function2039:: ; 2039
InterpretBattleMenu:: ; 2039
ld a, [hROMBank]
ld [wcf94], a
callba Function24022
ld [wMenuData2_2DMenuItemStringsBank], a
callba _InterpretBattleMenu
ld a, [wMenuCursorBuffer]
ret
; 2048
Function2048:: ; 2048
InterpretMobileMenu:: ; 2048
ld a, [hROMBank]
ld [wcf94], a
callba Function2403c
ld [wMenuData2_2DMenuItemStringsBank], a
callba _InterpretMobileMenu
ld a, [wMenuCursorBuffer]
ret
; 2057
Function2057:: ; 2057
ld a, [hROMBank]
push af
ld a, BANK(Function842db)
rst Bankswitch
call Function842db
pop af
rst Bankswitch
ret
; 2063

View File

@@ -51,14 +51,14 @@ Function3e60:: ; 3e60
ret
; 3e80
Function3e80:: ; 3e80
MobileReceive:: ; 3e80
ld a, [hROMBank]
push af
ld a, BANK(Function1116c5)
ld a, BANK(_MobileReceive)
ld [$c981], a
rst Bankswitch
call Function1116c5
call _MobileReceive
pop bc
ld a, b
ld [$c981], a

View File

@@ -160,19 +160,19 @@ endr
ret
; 1bc9
Function1bc9:: ; 1bc9
callab Function241a8
call Function1bdd
StaticMenuJoypad:: ; 1bc9
callab _StaticMenuJoypad
call GetMenuJoypad
ret
; 1bd3
Function1bd3:: ; 1bd3
callab Function241ab
call Function1bdd
ScrollingMenuJoypad:: ; 1bd3
callab _ScrollingMenuJoypad
call GetMenuJoypad
ret
; 1bdd
Function1bdd:: ; 1bdd
GetMenuJoypad:: ; 1bdd
push bc
push af
ld a, [hJoyLast]
@@ -189,20 +189,20 @@ Function1bdd:: ; 1bdd
; 1bee
Function1bee:: ; 1bee
ld hl, wcfac
ld hl, wCursorCurrentTile
ld a, [hli]
ld h, [hl]
ld l, a
ld [hl], $ec
ld [hl], "▷"
ret
; 1bf7
Function1bf7:: ; 1bf7
ld hl, wcfac
ld hl, wCursorCurrentTile
ld a, [hli]
ld h, [hl]
ld l, a
ld [hl], $7f
ld [hl], " "
ret
; 1c00

View File

@@ -6,17 +6,17 @@ Serial:: ; 6ef
push de
push hl
ld a, [hFFC9]
ld a, [hMobileReceive]
and a
jr nz, .asm_71c
jr nz, .mobile
ld a, [wc2d4]
bit 0, a
jr nz, .asm_721
jr nz, .printer
ld a, [hLinkPlayerNumber]
inc a ; is it equal to -1?
jr z, .asm_726
jr z, .init_player_number
ld a, [rSB]
ld [hSerialReceive], a
@@ -26,62 +26,62 @@ Serial:: ; 6ef
ld a, [hLinkPlayerNumber]
cp $2
jr z, .asm_752
jr z, .player2
ld a, 0 << rSC_ON
ld [rSC], a
ld a, 1 << rSC_ON
ld [rSC], a
jr .asm_752
jr .player2
.asm_71c
call Function3e80
jr .asm_75a
.mobile
call MobileReceive
jr .end
.asm_721
call Function2057
jr .asm_75a
.printer
call PrinterReceive
jr .end
.asm_726
.init_player_number
ld a, [rSB]
cp $1
jr z, .asm_730
jr z, .player1
cp $2
jr nz, .asm_752
jr nz, .player2
.asm_730
.player1
ld [hSerialReceive], a
ld [hLinkPlayerNumber], a
cp $2
jr z, .asm_74f
jr z, ._player2
xor a
ld [rSB], a
ld a, $3
ld [rDIV], a
.asm_73f
.wait_bit_7
ld a, [rDIV]
bit 7, a
jr nz, .asm_73f
jr nz, .wait_bit_7
ld a, 0 << rSC_ON
ld [rSC], a
ld a, 1 << rSC_ON
ld [rSC], a
jr .asm_752
jr .player2
.asm_74f
._player2
xor a
ld [rSB], a
.asm_752
.player2
ld a, $1
ld [hFFCA], a
ld a, $fe
ld a, -2
ld [hSerialSend], a
.asm_75a
.end
pop hl
pop de
pop bc

View File

@@ -5,12 +5,12 @@ BackUpTiles:: ; 1c00
ExitMenu:: ; 0x1c07
push af
callab Function243e8
callab _ExitMenu
pop af
ret
Function1c10:: ; 0x1c10
callab Function2446d
InitVerticalMenuCursor:: ; 0x1c10
callab _InitVerticalMenuCursor
ret
WriteBackup:: ; 0x1c17
@@ -54,7 +54,7 @@ RestoreTileBackup:: ; 0x1c23
ret
Function1c47:: ; 0x1c47
PopWindow:: ; 0x1c47
ld b, $10
ld de, wMenuFlags
.loop
@@ -98,8 +98,8 @@ CopyMenuData2:: ; 1c66
ret
; 1c7e
Function1c7e:: ; 1c7e
ld hl, wcf71
GetWindowStackTop:: ; 1c7e
ld hl, wWindowStackPointer
ld a, [hli]
ld h, [hl]
ld l, a
@@ -110,7 +110,7 @@ Function1c7e:: ; 1c7e
ret
; 1c89
Function1c89:: ; 1c89
PlaceVerticalMenuItems:: ; 1c89
call CopyMenuData2
ld hl, wMenuData2Pointer
ld e, [hl]
@@ -131,6 +131,7 @@ Function1c89:: ; 1c89
pop bc
dec b
jr nz, .loop
ld a, [wMenuData2Flags]
bit 4, a
ret z