You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Mobile and more battle anims
This commit is contained in:
@@ -111,7 +111,7 @@ Function170139: ; 170139
|
||||
call CopyBytes
|
||||
ld bc, PlayerID
|
||||
ld de, PlayerGender
|
||||
callba Function4e929
|
||||
callba GetMobileOTTrainerClass
|
||||
ld de, wBT_OTTempPkmn1CaughtGender
|
||||
ld a, c
|
||||
ld [de], a
|
||||
|
||||
@@ -941,7 +941,7 @@ Function11c658: ; 11c658 (47:4658)
|
||||
call Function11cfb5
|
||||
|
||||
Function11c675: ; 11c675 (47:4675)
|
||||
ld hl, wcd25
|
||||
ld hl, wMobileCommsJumptableIndex
|
||||
ld de, hJoypadPressed ; $ffa3
|
||||
ld a, [de]
|
||||
and A_BUTTON
|
||||
@@ -975,7 +975,7 @@ Function11c675: ; 11c675 (47:4675)
|
||||
ld [wcd26], a
|
||||
ld a, [hl]
|
||||
ld b, a
|
||||
ld hl, wcd25
|
||||
ld hl, wMobileCommsJumptableIndex
|
||||
ld a, [wcd26]
|
||||
add [hl]
|
||||
jr c, .asm_11c6b9
|
||||
@@ -986,7 +986,7 @@ Function11c675: ; 11c675 (47:4675)
|
||||
ld hl, wcd26
|
||||
sub [hl]
|
||||
dec a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
.asm_11c6c4
|
||||
call Function11c992
|
||||
call Function11c7bc
|
||||
@@ -1101,7 +1101,7 @@ Function11c675: ; 11c675 (47:4675)
|
||||
|
||||
Function11c770: ; 11c770 (47:4770)
|
||||
xor a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ld [wcd26], a
|
||||
ld [wcd27], a
|
||||
ld a, [wcd2b]
|
||||
@@ -1390,7 +1390,7 @@ Function11c8f6: ; 11c8f6 (47:48f6)
|
||||
and a
|
||||
jr z, .asm_11c927
|
||||
ld hl, wcd26
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
add [hl]
|
||||
.asm_11c911
|
||||
ld e, a
|
||||
@@ -1412,7 +1412,7 @@ Function11c8f6: ; 11c8f6 (47:48f6)
|
||||
|
||||
.asm_11c927
|
||||
ld hl, wcd26
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
add [hl]
|
||||
ld c, a
|
||||
ld b, $0
|
||||
@@ -1438,7 +1438,7 @@ Function11c8f6: ; 11c8f6 (47:48f6)
|
||||
ld d, $0
|
||||
add hl, de
|
||||
add hl, de
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
ld e, a
|
||||
add hl, de
|
||||
add hl, de
|
||||
@@ -2554,7 +2554,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
|
||||
.three ; 11d10f (47:510f)
|
||||
ld a, SPRITE_ANIM_FRAMESET_27
|
||||
call ReinitSpriteAnimFrame
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
sla a
|
||||
ld hl, Unknown_11d29e
|
||||
ld e, $8
|
||||
|
||||
@@ -769,7 +769,7 @@ Function8956f: ; 8956f
|
||||
add hl, bc
|
||||
ld b, h
|
||||
ld c, l
|
||||
callba Function4e929
|
||||
callba GetMobileOTTrainerClass
|
||||
ld a, c
|
||||
ld [TrainerClass], a
|
||||
ld a, [rSVBK]
|
||||
@@ -1214,7 +1214,7 @@ Function897af: ; 897af
|
||||
add hl, bc
|
||||
ld b, h
|
||||
ld c, l
|
||||
callba Function4e929
|
||||
callba GetMobileOTTrainerClass
|
||||
ld a, c
|
||||
ld [TrainerClass], a
|
||||
xor a
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -806,17 +806,17 @@ Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J
|
||||
; 10635c
|
||||
|
||||
Function10635c: ; 10635c
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
bit 7, a
|
||||
ret nz
|
||||
ld a, [wcd25]
|
||||
ld hl, Jumptable_10636a
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
ld hl, .Jumptable
|
||||
rst JumpTable
|
||||
ret
|
||||
; 10636a
|
||||
|
||||
Jumptable_10636a: ; 10636a
|
||||
dw Function10637c
|
||||
.Jumptable: ; 10636a
|
||||
dw .init
|
||||
dw Function106392
|
||||
dw Function1063cc
|
||||
dw Function1063d8
|
||||
@@ -827,15 +827,15 @@ Jumptable_10636a: ; 10636a
|
||||
dw Function106453
|
||||
; 10637c
|
||||
|
||||
Function10637c: ; 10637c
|
||||
.init: ; 10637c
|
||||
ld de, wcd30
|
||||
ld hl, $41
|
||||
ld bc, $41
|
||||
ld a, $40
|
||||
call Function3e32
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
; 106392
|
||||
|
||||
@@ -857,39 +857,39 @@ Function106392: ; 106392
|
||||
ld a, $b
|
||||
ld [wcf64], a
|
||||
ld a, $7
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
|
||||
.asm_1063b4
|
||||
ld a, $7
|
||||
ld [wcf64], a
|
||||
ld a, $7
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
|
||||
.asm_1063bf
|
||||
ld a, $1
|
||||
ld [wcf64], a
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
; 1063cc
|
||||
|
||||
Function1063cc: ; 1063cc
|
||||
ld a, $78
|
||||
ld [wcd42], a
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
|
||||
Function1063d8: ; 1063d8
|
||||
ld hl, wcd42
|
||||
dec [hl]
|
||||
ret nz
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
; 1063e5
|
||||
|
||||
@@ -897,9 +897,9 @@ Function1063e5: ; 1063e5
|
||||
ld a, [wcf64]
|
||||
cp $3
|
||||
ret nz
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
; 1063f3
|
||||
|
||||
@@ -907,9 +907,9 @@ Function1063f3: ; 1063f3
|
||||
ld de, wcd31
|
||||
ld a, $32
|
||||
call Function3e32
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
; 106403
|
||||
|
||||
@@ -930,9 +930,9 @@ Function106403: ; 106403
|
||||
inc a
|
||||
ld c, a
|
||||
call MobileFn_106314
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
|
||||
.asm_106426
|
||||
@@ -940,17 +940,17 @@ Function106403: ; 106403
|
||||
ld a, c
|
||||
and a
|
||||
jr z, .asm_106435
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
|
||||
.asm_106435
|
||||
ld c, $0
|
||||
call MobileFn_106314
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
ret
|
||||
; 106442
|
||||
|
||||
@@ -960,14 +960,14 @@ Function106442: ; 106442
|
||||
xor a
|
||||
ld [hMobile], a
|
||||
ld [hMobileReceive], a
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
|
||||
Function106453: ; 106453
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
set 7, a
|
||||
ld [wcd25], a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
nop
|
||||
ld a, $4
|
||||
ld [wcf64], a
|
||||
|
||||
@@ -1,48 +1,56 @@
|
||||
Function16c000: ; 16c000
|
||||
; unreferenced
|
||||
; Only for CGB
|
||||
ld a, [hCGB]
|
||||
and a
|
||||
ret z
|
||||
; Only do this once per boot cycle
|
||||
ld a, [hFFEA]
|
||||
and a
|
||||
ret z
|
||||
; Set some flag, preserving the old state
|
||||
ld a, [wcfbe]
|
||||
push af
|
||||
set 7, a
|
||||
ld [wcfbe], a
|
||||
call Function16c108
|
||||
callba Function100063
|
||||
callba Function100082
|
||||
call Function16c031
|
||||
callba Function1000a4
|
||||
; Do stuff
|
||||
call MobileSystemSplashScreen_InitGFX ; Load GFX
|
||||
callba SetRAMStateForMobile
|
||||
callba EnableMobile
|
||||
call .RunJumptable
|
||||
callba DisableMobile
|
||||
; Prevent this routine from running again
|
||||
; until the next time the syatem is turned on
|
||||
xor a
|
||||
ld [hFFEA], a
|
||||
; Restore the flag state
|
||||
pop af
|
||||
ld [wcfbe], a
|
||||
ret
|
||||
; 16c031
|
||||
|
||||
Function16c031: ; 16c031
|
||||
.RunJumptable: ; 16c031
|
||||
xor a
|
||||
ld [wJumptableIndex], a
|
||||
ld [wcf64], a
|
||||
ld [wd002], a
|
||||
ld [wd003], a
|
||||
.asm_16c03e
|
||||
.loop
|
||||
call DelayFrame
|
||||
callba Function10635c
|
||||
ld a, [wd002]
|
||||
ld hl, Jumptable_16c05c
|
||||
ld hl, .Jumptable
|
||||
rst JumpTable
|
||||
call Function16cb2e
|
||||
call Function16cbae
|
||||
ld a, [wd002]
|
||||
cp $ff
|
||||
jr nz, .asm_16c03e
|
||||
jr nz, .loop
|
||||
ret
|
||||
; 16c05c
|
||||
|
||||
Jumptable_16c05c: ; 16c05c
|
||||
dw Function16c074
|
||||
.Jumptable: ; 16c05c
|
||||
dw .init
|
||||
dw Function16c0ba
|
||||
dw Function16c089
|
||||
dw Function16c09e
|
||||
@@ -53,10 +61,10 @@ Jumptable_16c05c: ; 16c05c
|
||||
dw Function16c0ca
|
||||
dw Function16c0dc
|
||||
dw Function16c0ec
|
||||
dw Function16c081
|
||||
dw .quit
|
||||
; 16c074
|
||||
|
||||
Function16c074: ; 16c074
|
||||
.init ; 16c074
|
||||
ld a, [wcf64]
|
||||
and a
|
||||
ret z
|
||||
@@ -66,7 +74,7 @@ Function16c074: ; 16c074
|
||||
ret
|
||||
; 16c081
|
||||
|
||||
Function16c081: ; 16c081
|
||||
.quit ; 16c081
|
||||
push af
|
||||
ld a, $ff
|
||||
ld [wd002], a
|
||||
@@ -160,15 +168,15 @@ Function16c0fa: ; 16c0fa
|
||||
ret
|
||||
; 16c108
|
||||
|
||||
Function16c108: ; 16c108
|
||||
MobileSystemSplashScreen_InitGFX: ; 16c108
|
||||
call DisableLCD
|
||||
ld hl, VTiles2
|
||||
ld de, GFX_16c173
|
||||
lb bc, BANK(GFX_16c173), $68
|
||||
ld de, .Tiles
|
||||
lb bc, BANK(.Tiles), $68
|
||||
call Get2bpp
|
||||
call Function16c130
|
||||
call Function16c145
|
||||
call Function16c15c
|
||||
call .LoadPals
|
||||
call .LoadTileMap
|
||||
call .LoadAttrMap
|
||||
hlbgcoord 0, 0
|
||||
call Function16cc73
|
||||
call Function16cc02
|
||||
@@ -178,9 +186,9 @@ Function16c108: ; 16c108
|
||||
ret
|
||||
; 16c130
|
||||
|
||||
Function16c130: ; 16c130
|
||||
.LoadPals: ; 16c130
|
||||
ld de, UnknBGPals
|
||||
ld hl, Unknown_16c903
|
||||
ld hl, UnknownMobilePalettes_16c903
|
||||
ld bc, 8
|
||||
ld a, $5
|
||||
call FarCopyWRAM
|
||||
@@ -188,40 +196,40 @@ Function16c130: ; 16c130
|
||||
ret
|
||||
; 16c145
|
||||
|
||||
Function16c145: ; 16c145
|
||||
.LoadTileMap: ; 16c145
|
||||
hlcoord 0, 0
|
||||
ld bc, 20
|
||||
xor a
|
||||
call ByteFill
|
||||
ld hl, Tilemap_16c633
|
||||
ld hl, .TileMap
|
||||
decoord 0, 1
|
||||
ld bc, $0154
|
||||
call CopyBytes
|
||||
ret
|
||||
; 16c15c
|
||||
|
||||
Function16c15c: ; 16c15c
|
||||
.LoadAttrMap: ; 16c15c
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld bc, SCREEN_WIDTH
|
||||
xor a
|
||||
call ByteFill
|
||||
ld hl, Tilemap_16c79b
|
||||
ld hl, .AttrMap
|
||||
decoord 0, 1, AttrMap
|
||||
ld bc, 17 * SCREEN_WIDTH
|
||||
call CopyBytes
|
||||
ret
|
||||
; 16c173
|
||||
|
||||
GFX_16c173:
|
||||
.Tiles:
|
||||
INCBIN "gfx/unknown/16c173.2bpp"
|
||||
|
||||
Tilemap_16c633:
|
||||
.TileMap:
|
||||
INCBIN "gfx/unknown/16c633.tilemap"
|
||||
|
||||
Tilemap_16c79b:
|
||||
.AttrMap:
|
||||
INCBIN "gfx/unknown/16c79b.tilemap"
|
||||
|
||||
Unknown_16c903:
|
||||
UnknownMobilePalettes_16c903: ; 16c903
|
||||
RGB 31, 31, 31
|
||||
RGB 04, 10, 20
|
||||
RGB 16, 19, 25
|
||||
@@ -287,7 +295,7 @@ Function16c943: ; 16c943
|
||||
ld e, $0
|
||||
ld a, $0
|
||||
.asm_16c969
|
||||
ld hl, Unknown_16c903
|
||||
ld hl, UnknownMobilePalettes_16c903
|
||||
call Function16cab6
|
||||
call Function16cabb
|
||||
ld d, a
|
||||
@@ -310,7 +318,7 @@ Function16c943: ; 16c943
|
||||
call Function16cadc
|
||||
|
||||
.asm_16c991
|
||||
ld hl, Unknown_16c903
|
||||
ld hl, UnknownMobilePalettes_16c903
|
||||
call Function16cab6
|
||||
call Function16cad8
|
||||
ld d, a
|
||||
@@ -333,7 +341,7 @@ Function16c943: ; 16c943
|
||||
call Function16cb08
|
||||
|
||||
.asm_16c9b9
|
||||
ld hl, Unknown_16c903
|
||||
ld hl, UnknownMobilePalettes_16c903
|
||||
call Function16cab6
|
||||
call Function16cac4
|
||||
ld d, a
|
||||
|
||||
@@ -3224,7 +3224,7 @@ Function17e451: ; 17e451
|
||||
ld b, $0
|
||||
add hl, bc
|
||||
pop bc
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
.asm_17e48b
|
||||
push af
|
||||
push hl
|
||||
@@ -3339,7 +3339,7 @@ Function17e51b: ; 17e51b
|
||||
ld c, a
|
||||
ld b, $0
|
||||
add hl, bc
|
||||
ld a, [wcd25]
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
ld c, a
|
||||
ld a, [wcd27]
|
||||
call SimpleMultiply
|
||||
|
||||
Reference in New Issue
Block a user