Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split base stats

Browse Source
This commit is contained in:
PikalaxALT
2016-01-09 16:28:22 -05:00
parent f14562da4b
commit 6d1b7f28c8
267 changed files with 6748 additions and 6488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

517
engine/compose_mail.asm
View File

@@ -1,517 +0,0 @@
_ComposeMailMessage: ; 11e75 (mail?)
ld hl, wc6d0
ld [hl], e
inc hl
ld [hl], d
ld a, [hMapAnims]
push af
xor a
ld [hMapAnims], a
ld a, [hInMenu]
push af
ld a, $1
ld [hInMenu], a
call .InitBlankMail
call DelayFrame
.loop
call .DoMailEntry
jr nc, .loop
pop af
ld [hInMenu], a
pop af
ld [hMapAnims], a
ret
.InitBlankMail: ; 11e9a (4:5e9a)
call ClearBGPalettes
call DisableLCD
call Function11c51
ld de, VTiles0 tile $00
ld hl, .MailIcon
ld bc, 8 tiles
ld a, BANK(.MailIcon)
call FarCopyBytes
xor a
ld hl, wSpriteAnimDict
ld [hli], a
ld [hl], a
; init mail icon
depixel 3, 2
ld a, SPRITE_ANIM_INDEX_00
call _InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], $0
call .InitCharset
ld a, $e3
ld [rLCDC], a
call .initwc6d3
ld b, SCGB_08
call GetSGBLayout
call WaitBGMap
call WaitTop
ld a, %11100100
call DmgToCgbBGPals
ld a, %11100100
call DmgToCgbObjPal0
call Function11be0
ld hl, wc6d0
ld e, [hl]
inc hl
ld d, [hl]
ld hl, $10
add hl, de
ld [hl], $4e
ret
; 11ef4 (4:5ef4)
.MailIcon: ; 11ef4
INCBIN "gfx/icon/mail2.2bpp"
; 11f74
.initwc6d3: ; 11f74 (4:5f74)
ld a, $21
ld [wc6d3], a
ret
; 11f7a (4:5f7a)
.Dummy: ; dummied out
db "メールを かいてね@"
; 11f84
.InitCharset: ; 11f84 (4:5f84)
call WaitTop
hlcoord 0, 0
ld bc, 6 * SCREEN_WIDTH
ld a, $60 ; border
call ByteFill
hlcoord 0, 6
ld bc, 12 * SCREEN_WIDTH
ld a, " "
call ByteFill
hlcoord 1, 1
lb bc, 4, SCREEN_WIDTH - 2
call ClearBox
ld de, MailEntry_Uppercase
.PlaceMailCharset: ; 11fa9 (4:5fa9)
hlcoord 1, 7
ld b, 6
.next
ld c, SCREEN_WIDTH - 1
.loop_
ld a, [de]
ld [hli], a
inc de
dec c
jr nz, .loop_
push de
ld de, SCREEN_WIDTH + 1
add hl, de
pop de
dec b
jr nz, .next
ret
.DoMailEntry: ; 11fc0 (4:5fc0)
call JoyTextDelay
ld a, [wJumptableIndex]
bit 7, a
jr nz, .exit_mail
call .DoJumptable
callba PlaySpriteAnimationsAndDelayFrame
call .Update
call DelayFrame
and a
ret
.exit_mail
callab ClearSpriteAnims
call ClearSprites
xor a
ld [hSCX], a
ld [hSCY], a
scf
ret
.Update: ; 11feb (4:5feb)
xor a
ld [hBGMapMode], a
hlcoord 1, 1
lb bc, 4, 18
call ClearBox
ld hl, wc6d0
ld e, [hl]
inc hl
ld d, [hl]
hlcoord 2, 2
call PlaceString
ld a, $1
ld [hBGMapMode], a
ret
.DoJumptable: ; 12008 (4:6008)
ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, .Jumptable
rept 2
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
jp [hl]
.Jumptable: ; 12017 (4:6017)
dw .init_blinking_cursor
dw .process_joypad
.init_blinking_cursor: ; 1201b (4:601b)
depixel 9, 2
ld a, SPRITE_ANIM_INDEX_09
call _InitSpriteAnimStruct
ld a, c
ld [wc6d5], a
ld a, b
ld [wc6d6], a
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld a, [hl]
ld hl, SPRITEANIMSTRUCT_0E
add hl, bc
ld [hl], a
ld hl, wJumptableIndex
inc [hl]
ret
.process_joypad: ; 1203a (4:603a)
ld hl, hJoyPressed ; $ffa7
ld a, [hl]
and A_BUTTON
jr nz, .a
ld a, [hl]
and B_BUTTON
jr nz, .b
ld a, [hl]
and START
jr nz, .start
ld a, [hl]
and SELECT
jr nz, .select
ret
.a
call Function12185
cp $1
jr z, .select
cp $2
jr z, .b
cp $3
jr z, .finished
call Function11c11
call Function121ac
jr c, .start
ld hl, wc6d2
ld a, [hl]
cp $10
ret nz
inc [hl]
call Function11bd0
ld [hl], $f2
dec hl
ld [hl], $4e
ret
.start
ld hl, wc6d5
ld c, [hl]
inc hl
ld b, [hl]
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld [hl], $9
ld hl, SPRITEANIMSTRUCT_0D
add hl, bc
ld [hl], $5
ret
.b
call Function11bbc
ld hl, wc6d2
ld a, [hl]
cp $10
ret nz
dec [hl]
call Function11bd0
ld [hl], $f2
inc hl
ld [hl], $4e
ret
.finished
call Function11bf7
ld hl, wJumptableIndex
set 7, [hl]
ret
.select
ld hl, wcf64
ld a, [hl]
xor $1
ld [hl], a
jr nz, .switch_to_lowercase
ld de, MailEntry_Uppercase
call .PlaceMailCharset
ret
.switch_to_lowercase
ld de, MailEntry_Lowercase
call .PlaceMailCharset
ret
; called from engine/sprite_anims.asm
Function120c1: ; 120c1 (4:60c1)
call Function1210c
ld hl, SPRITEANIMSTRUCT_0D
add hl, bc
ld a, [hl]
ld e, a
swap e
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], e
cp $5
ld de, Unknown_120f8
ld a, 0
jr nz, .asm_120df
ld de, Unknown_12102
ld a, 1
.asm_120df
ld hl, SPRITEANIMSTRUCT_0E
add hl, bc
add [hl]
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld [hl], a
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld l, [hl]
ld h, 0
add hl, de
ld a, [hl]
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
; 120f8 (4:60f8)
Unknown_120f8: ; 120f8
db $00, $10, $20, $30, $40, $50, $60, $70, $80, $90
Unknown_12102: ; 12102
db $00, $00, $00, $30, $30, $30, $60, $60, $60, $60
; 1210c
Function1210c: ; 1210c (4:610c)
ld hl, hJoyLast
ld a, [hl]
and D_UP
jr nz, .up
ld a, [hl]
and D_DOWN
jr nz, .down
ld a, [hl]
and D_LEFT
jr nz, .left
ld a, [hl]
and D_RIGHT
jr nz, .right
ret
.right
call Function1218b
and a
jr nz, .asm_12138
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld a, [hl]
cp $9
jr nc, .asm_12135
inc [hl]
ret
.asm_12135
ld [hl], $0
ret
.asm_12138
cp $3
jr nz, .asm_1213d
xor a
.asm_1213d
ld e, a
add a
add e
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld [hl], a
ret
.left
call Function1218b
and a
jr nz, .asm_12159
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld a, [hl]
and a
jr z, .asm_12156
dec [hl]
ret
.asm_12156
ld [hl], $9
ret
.asm_12159
cp $1
jr nz, .asm_1215f
ld a, $4
.asm_1215f
rept 2
dec a
endr
ld e, a
add a
add e
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld [hl], a
ret
.down
ld hl, SPRITEANIMSTRUCT_0D
add hl, bc
ld a, [hl]
cp $5
jr nc, .asm_12175
inc [hl]
ret
.asm_12175
ld [hl], $0
ret
.up
ld hl, SPRITEANIMSTRUCT_0D
add hl, bc
ld a, [hl]
and a
jr z, .asm_12182
dec [hl]
ret
.asm_12182
ld [hl], $5
ret
Function12185: ; 12185 (4:6185)
ld hl, wc6d5
ld c, [hl]
inc hl
ld b, [hl]
Function1218b: ; 1218b (4:618b)
ld hl, SPRITEANIMSTRUCT_0D
add hl, bc
ld a, [hl]
cp $5
jr nz, .asm_121aa
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld a, [hl]
cp $3
jr c, .asm_121a4
cp $6
jr c, .asm_121a7
ld a, $3
ret
.asm_121a4
ld a, $1
ret
.asm_121a7
ld a, $2
ret
.asm_121aa
xor a
ret
Function121ac: ; 121ac (4:61ac)
ld a, [wc6d7]
jp Function11b17
; 121b2 (4:61b2)
Function121b2: ; unreferenced
ld a, [wc6d2]
and a
ret z
cp $11
jr nz, .asm_121c3
push hl
ld hl, wc6d2
rept 2
dec [hl]
endr
jr .asm_121c8
.asm_121c3
push hl
ld hl, wc6d2
dec [hl]
.asm_121c8
call Function11bd0
ld c, [hl]
pop hl
.asm_121cd
ld a, [hli]
cp $ff
jp z, Function11b27
cp c
jr z, .asm_121d9
inc hl
jr .asm_121cd
.asm_121d9
ld a, [hl]
jp Function11b23
; 121dd
MailEntry_Uppercase: ; 122dd
db "A B C D E F G H I J"
db "K L M N O P Q R S T"
db "U V W X Y Z , ? !"
db "1 2 3 4 5 6 7 8 9 0"
db "<PK> <MN> <PO> <KE> é ♂ ♀ ¥ … ×"
db "lower DEL END "
; 1224f
MailEntry_Lowercase: ; 1224f
db "a b c d e f g h i j"
db "k l m n o p q r s t"
db "u v w x y z . - /"
db "'d 'l 'm 'r 's 't 'v & ( )"
db "<``> <''> [ ] ' : ; "
db "UPPER DEL END "
; 122c1

35
engine/mon_icons.asm
View File

@@ -18,16 +18,16 @@ Function8e83f: ; 8e83f
push hl
push de
push bc
call Function8e849
call .LoadIcon
pop bc
pop de
pop hl
ret
; 8e849
Function8e849: ; 8e849
.LoadIcon: ; 8e849
ld d, 0
ld hl, .dw
ld hl, .Jumptable
rept 2
add hl, de
endr
@@ -38,23 +38,23 @@ endr
; 8e854
.dw: ; 8e854 (23:6854)
.Jumptable: ; 8e854 (23:6854)
dw Function8e8d5 ; init
dw Function8e961
dw Function8e97d
dw Function8e99a
dw Trade_LoadMonIconGFX
dw Function8e898
dw Mobile_InitPartyMenuBGPal71
dw Function8e862
dw .GetPartyMenuMonIcon
Function8e862: ; 8e862 (23:6862)
.GetPartyMenuMonIcon: ; 8e862 (23:6862)
call InitPartyMenuIcon
call Function8e86c
call .GetPartyMonItemGFX
call SetPartyMonIconAnimSpeed
ret
Function8e86c: ; 8e86c (23:686c)
.GetPartyMonItemGFX: ; 8e86c (23:686c)
push bc
ld a, [hObjectStructIndexBuffer]
ld hl, PartyMon1Item
@@ -63,22 +63,23 @@ Function8e86c: ; 8e86c (23:686c)
pop bc
ld a, [hl]
and a
jr z, .asm_8e890
jr z, .no_item
push hl
push bc
ld d, a
callab ItemIsMail
pop bc
pop hl
jr c, .asm_8e88e
jr c, .not_mail
ld a, $6
jr .asm_8e892
.asm_8e88e
jr .got_tile
.not_mail
ld a, $5
; jr .asm_8e892
.asm_8e890
; jr .got_tile
.no_item
ld a, $4
.asm_8e892
.got_tile
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld [hl], a
@@ -246,7 +247,7 @@ Function8e97d: ; 8e97d (23:697d)
ld [hl], SPRITE_ANIM_SEQ_NULL
ret
Function8e99a: ; 8e99a (23:699a)
Trade_LoadMonIconGFX: ; 8e99a (23:699a)
ld a, [wd265]
call ReadMonMenuIcon
ld [CurIcon], a

2
engine/money.asm
View File

@@ -86,7 +86,7 @@ CompareFunds: ; 1600d
jr .skip_carry
.set_carry
ld a, TRUE
ld a, 1
and a
scf
.skip_carry

985
engine/namingscreen.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/sprite_anims.asm
View File

@@ -218,7 +218,7 @@ DoAnimFrame: ; 8d24b
ret
.five: ; 8d36c (23:536c)
callab Function11a3b
callab NamingScreen_AnimateCursor
ret
.twelve: ; 8d373 (23:5373)

52
engine/trade/animation.asm
View File

@@ -3,12 +3,12 @@ TradeAnimation: ; 28f24
ld [wcf66], a
ld hl, wPlayerTrademonSenderName
ld de, wOTTrademonSenderName
call Function297ff
call LinkTradeAnim_LoadTradePlayerNames
ld hl, wPlayerTrademonSpecies
ld de, wOTTrademonSpecies
call Function29814
call LinkTradeAnim_LoadTradeMonSpecies
ld de, .data_28f3f
jr Function28fa1
jr RunTradeAnimSequence
.data_28f3f
tradeanim_setup_givemon_scroll
@@ -54,12 +54,12 @@ TradeAnimationPlayer2: ; 28f63
ld [wcf66], a
ld hl, wOTTrademonSenderName
ld de, wPlayerTrademonSenderName
call Function297ff
call LinkTradeAnim_LoadTradePlayerNames
ld hl, wOTTrademonSpecies
ld de, wPlayerTrademonSpecies
call Function29814
call LinkTradeAnim_LoadTradeMonSpecies
ld de, .data_28f7e
jr Function28fa1
jr RunTradeAnimSequence
.data_28f7e
tradeanim_ot_sends_text_2
@@ -99,7 +99,7 @@ TradeAnimationPlayer2: ; 28f63
tradeanim_scroll_out_right
tradeanim_end
Function28fa1: ; 28fa1
RunTradeAnimSequence: ; 28fa1
ld hl, wTradeAnimPointer
ld [hl], e
inc hl
@@ -116,7 +116,7 @@ Function28fa1: ; 28fa1
ld a, [hl]
push af
set 4, [hl]
call Function28fdb
call .TradeAnimLayout
ld a, [wcf66]
and a
jr nz, .anim_loop
@@ -134,7 +134,7 @@ Function28fa1: ; 28fa1
ret
; 28fdb
Function28fdb: ; 28fdb
.TradeAnimLayout: ; 28fdb
xor a
ld [wJumptableIndex], a
call ClearBGPalettes
@@ -145,7 +145,7 @@ Function28fdb: ; 28fdb
callab ClearSpriteAnims
ld a, [hCGB]
and a
jr z, .asm_2900b
jr z, .NotCGB
ld a, $1
ld [rVBK], a
ld hl, VTiles0
@@ -155,7 +155,7 @@ Function28fdb: ; 28fdb
ld a, $0
ld [rVBK], a
.asm_2900b
.NotCGB
hlbgcoord 0, 0
ld bc, sScratch - VBGMap0
ld a, " "
@@ -182,7 +182,7 @@ Function28fdb: ; 28fdb
ld [hWY], a
callba GetTrademonFrontpic
call EnableLCD
call Function2982b
call LoadTradeBallAndCableGFX
ld a, [wPlayerTrademonSpecies]
ld hl, wPlayerTrademonDVs
ld de, VTiles0
@@ -313,7 +313,7 @@ TradeAnim_End: ; 29123
TradeAnim_TubeToOT1: ; 29129
ld a, $ed
call Function292f6
ld a, [wc74c]
ld a, [wLinkTradeSendmonSpecies]
ld [wd265], a
xor a
depixel 5, 11, 4, 0
@@ -323,7 +323,7 @@ TradeAnim_TubeToOT1: ; 29129
TradeAnim_TubeToPlayer1: ; 2913c
ld a, $ee
call Function292f6
ld a, [wc74d]
ld a, [wLinkTradeGetmonSpecies]
ld [wd265], a
ld a, $2
depixel 9, 18, 4, 4
@@ -350,7 +350,7 @@ Function2914e: ; 2914e
ld a, $70
ld [hWY], a
call EnableLCD
call Function2985a
call LoadTradeBubbleGFX
pop de
ld a, SPRITE_ANIM_INDEX_11
call _InitSpriteAnimStruct
@@ -476,7 +476,7 @@ TradeAnim_TubeToPlayer8: ; 29229
ld a, $90
ld [hWY], a
call EnableLCD
call Function2982b
call LoadTradeBallAndCableGFX
call WaitBGMap
call Function297ed
call TradeAnim_Next
@@ -1376,17 +1376,17 @@ Function297ed: ; 297ed
ld a, [hSGB]
and a
ld a, %11100100 ; 3,2,1,0
jr z, .asm_297f6
jr z, .not_sgb
ld a, $f0
.asm_297f6
.not_sgb
call DmgToCgbObjPal0
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
ret
; 297ff
Function297ff: ; 297ff
LinkTradeAnim_LoadTradePlayerNames: ; 297ff
push de
ld de, wLinkPlayer1Name
ld bc, NAME_LENGTH
@@ -1398,11 +1398,11 @@ Function297ff: ; 297ff
ret
; 29814
Function29814: ; 29814
LinkTradeAnim_LoadTradeMonSpecies: ; 29814
ld a, [hl]
ld [wc74c], a
ld [wLinkTradeSendmonSpecies], a
ld a, [de]
ld [wc74d], a
ld [wLinkTradeGetmonSpecies], a
ret
; 2981d
@@ -1416,7 +1416,7 @@ Function2981d: ; 2981d
ret
; 2982b
Function2982b: ; 2982b
LoadTradeBallAndCableGFX: ; 2982b
call DelayFrame
ld de, TradeBallGFX
ld hl, VTiles0 tile $62
@@ -1431,13 +1431,13 @@ Function2982b: ; 2982b
lb bc, BANK(TradeCableGFX), $4
call Request2bpp
xor a
ld hl, wc300
ld hl, wSpriteAnimDict
ld [hli], a
ld [hl], $62
ret
; 2985a
Function2985a: ; 2985a
LoadTradeBubbleGFX: ; 2985a
call DelayFrame
ld e, $3
callab Function8e83f
@@ -1446,7 +1446,7 @@ Function2985a: ; 2985a
lb bc, BANK(TradeBubbleGFX), $4
call Request2bpp
xor a
ld hl, wc300
ld hl, wSpriteAnimDict
ld [hli], a
ld [hl], $62
ret