Mobile trade animations, pokepic animations

This commit is contained in:
PikalaxALT 2015-12-17 13:49:26 -05:00
parent 7203e9d2cc
commit efee40447e
16 changed files with 844 additions and 675 deletions

View File

@ -7577,7 +7577,7 @@ endr
sbc c
ld a, [hl]
sbc b
jr c, .max_exp
jr c, .not_max_exp
ld a, b
ld [hli], a
ld a, c
@ -7585,7 +7585,7 @@ endr
ld a, d
ld [hld], a
.max_exp
.not_max_exp
xor a ; PARTYMON
ld [MonType], a
predef CopyPkmnToTempMon
@ -7599,7 +7599,7 @@ endr
cp d
jp z, .skip_stats
; <NICKNAME> grew to level ##!
ld [wc719], a
ld [wTempLevel], a
ld a, [CurPartyLevel]
push af
ld a, d
@ -7707,7 +7707,7 @@ endr
ld c, $9
call TextBox
hlcoord 11, 1
ld bc, $0004
ld bc, 4
predef PrintTempMonStats
ld c, $1e
call DelayFrames
@ -7720,7 +7720,7 @@ endr
ld a, [CurPartyLevel]
push af
ld c, a
ld a, [wc719]
ld a, [wTempLevel]
ld b, a
.level_loop

View File

@ -703,7 +703,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
push af
ld de, MUSIC_NONE
call PlayMusic
callba Function8000
callba BlankScreen
call DisableLCD
ld hl, EggHatchGFX
ld de, VTiles0 tile $00

View File

@ -1067,7 +1067,7 @@ endr
.jumptable
dw _MainMenu
dw Function6389
dw DeleteSaveData
dw CrystalIntroSequence
dw CrystalIntroSequence
dw ResetClock
@ -1320,8 +1320,8 @@ TitleScreenEnd: ; 6375
ret
; 6389
Function6389: ; 6389
callba Function4d54c
DeleteSaveData: ; 6389
callba _DeleteSaveData
jp Init
; 6392

View File

@ -1258,7 +1258,7 @@ Function28835: ; 28835
ld [wd263], a
callab Function50db9
ld hl, OTPartyMon1Species
callba Function4d319
callba LinkMonStatsScreen
jp Function2891c
.asm_2885b
@ -1276,7 +1276,7 @@ Function28835: ; 28835
push bc
ld bc, NAME_LENGTH
add hl, bc
ld [hl], $7f
ld [hl], " "
pop bc
pop hl
ld a, [PartyCount]
@ -1450,7 +1450,7 @@ Function28926: ; 28926
ld a, $4
ld [wd263], a
callab Function50db9
callba Function4d319
callba LinkMonStatsScreen
call Call_LoadTempTileMapToTileMap
hlcoord 6, 1
lb bc, 6, 1

View File

@ -369,7 +369,7 @@ BargainShopData: ; 15c51
BuyMenu: ; 15c62
call FadeToMenu
callba Function8000
callba BlankScreen
xor a
ld [wd045 + 1], a
ld a, 1

View File

@ -120,7 +120,7 @@ Function4dd3a: ; 4dd3a (13:5d3a)
call DelayFrame
ret
.asm_4dd49
callba Functiond00b4
callba SetUpPokeAnim
jr nc, .asm_4dd56
ld hl, wcf64
res 6, [hl]

View File

@ -180,23 +180,23 @@ Function28fdb: ; 28fdb
ld [hWX], a
ld a, $90
ld [hWY], a
callba Function4d7fd
callba GetTrademonFrontpic
call EnableLCD
call Function2982b
ld a, [wPlayerTrademonSpecies]
ld hl, wPlayerTrademonDVs
ld de, VTiles0
call Function29491
call TradeAnim_GetFrontpic
ld a, [wOTTrademonSpecies]
ld hl, wOTTrademonDVs
ld de, VTiles0 tile $31
call Function29491
call TradeAnim_GetFrontpic
ld a, [wPlayerTrademonSpecies]
ld de, wPlayerTrademonSpeciesName
call Function294a9
call TradeAnim_GetNickname
ld a, [wOTTrademonSpecies]
ld de, wOTTrademonSpeciesName
call Function294a9
call TradeAnim_GetNickname
call Function297ed
ret
; 29082
@ -368,7 +368,7 @@ Function2914e: ; 2914e
call WaitBGMap
ld b, SCGB_1B
call GetSGBLayout
ld a, $e4
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
ld a, $d0
call DmgToCgbObjPal0
@ -566,6 +566,7 @@ Function292be: ; 292be
hlcoord 17, 3
ld a, $5d
ld [hl], a
ld a, $61
ld de, SCREEN_WIDTH
ld c, $3
@ -574,6 +575,7 @@ Function292be: ; 292be
ld [hl], a
dec c
jr nz, .loop
add hl, de
ld a, $5f
ld [hld], a
@ -644,9 +646,9 @@ TradeAnim_EnterLinkTube: ; 29348
call WaitBGMap
ld b, SCGB_1B
call GetSGBLayout
ld a, $e4
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
ld de, $e4e4
lb de, %11100100, %11100100 ; 3,2,1,0, 3,2,1,0
call DmgToCgbObjPals
ld de, SFX_POTION
call PlaySFX
@ -784,9 +786,9 @@ TradeAnim_ShowGivemonData: ; 2942e
ld [TempMonDVs + 1], a
ld b, SCGB_1A
call GetSGBLayout
ld a, $e4
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
call Function294bb
call TradeAnim_ShowGivemonFrontpic
ld a, [wPlayerTrademonSpecies]
call GetCryIndex
@ -810,20 +812,20 @@ TradeAnim_ShowGetmonData: ; 29461
ld [TempMonDVs + 1], a
ld b, SCGB_1A
call GetSGBLayout
ld a, $e4
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
call Function294c0
call TradeAnim_ShowGetmonFrontpic
call TradeAnim_Next
ret
; 29487
TradeAnim_AnimateFrontpic: ; 29487
callba Function4d81e
callba AnimateTrademonFrontpic
call TradeAnim_Next
ret
; 29491
Function29491: ; 29491
TradeAnim_GetFrontpic: ; 29491
push de
push af
predef GetUnownLetter
@ -836,7 +838,7 @@ Function29491: ; 29491
ret
; 294a9
Function294a9: ; 294a9
TradeAnim_GetNickname: ; 294a9
push de
ld [wd265], a
call GetPokemonName
@ -847,14 +849,13 @@ Function294a9: ; 294a9
ret
; 294bb
Function294bb: ; 294bb
TradeAnim_ShowGivemonFrontpic: ; 294bb
ld de, VTiles0
jr Function294c3
jr TradeAnim_ShowFrontpic
Function294c0: ; 294c0
TradeAnim_ShowGetmonFrontpic: ; 294c0
ld de, VTiles0 tile $31
Function294c3: ; 294c3
TradeAnim_ShowFrontpic: ; 294c3
call DelayFrame
ld hl, VTiles2
lb bc, 10, $31
@ -1087,7 +1088,7 @@ TradeAnim_Poof: ; 29649
; 29660
TradeAnim_BulgeThroughTube: ; 29660
ld a, $e4
ld a, %11100100 ; 3,2,1,0
call DmgToCgbObjPal0
depixel 5, 11
ld a, SPRITE_ANIM_INDEX_10
@ -1374,13 +1375,13 @@ Function297db: ; 297db
Function297ed: ; 297ed
ld a, [hSGB]
and a
ld a, $e4
ld a, %11100100 ; 3,2,1,0
jr z, .asm_297f6
ld a, $f0
.asm_297f6
call DmgToCgbObjPal0
ld a, $e4
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
ret
; 297ff

View File

@ -97,7 +97,7 @@ AnimateFrontpic: ; d008e
ret c
call LoadMonAnimation
.loop
call Functiond00b4
call SetUpPokeAnim
push af
callba Function10402d
pop af
@ -121,7 +121,7 @@ endr
ret
; d00b4
Functiond00b4: ; d00b4
SetUpPokeAnim: ; d00b4
ld a, [rSVBK]
push af
ld a, $2
@ -184,8 +184,8 @@ PokeAnim_Wait: ; d00fe
; d010b
PokeAnim_Setup: ; d010b
ld c, $0
ld b, $0
ld c, FALSE
ld b, 0
call Functiond0228
call Functiond0504
ld a, [wPokeAnimSceneIndex]
@ -195,8 +195,8 @@ PokeAnim_Setup: ; d010b
; d011d
PokeAnim_Setup2: ; d011d
ld c, $0
ld b, $4
ld c, FALSE
ld b, 4
call Functiond0228
call Functiond0504
ld a, [wPokeAnimSceneIndex]
@ -206,8 +206,8 @@ PokeAnim_Setup2: ; d011d
; d012f
PokeAnim_Extra: ; d012f
ld c, $1
ld b, $0
ld c, TRUE
ld b, 0
call Functiond0228
call Functiond0504
ld a, [wPokeAnimSceneIndex]
@ -365,18 +365,18 @@ Functiond0228: ; d0228
ld a, $2
ld [rSVBK], a
push bc
ld hl, w2_d172
ld bc, wPokeAnimStructEnd - w2_d172
ld hl, wPokeAnimExtraFlag
ld bc, wPokeAnimStructEnd - wPokeAnimExtraFlag
xor a
call ByteFill
pop bc
ld a, b
ld [w2_d173], a
ld a, c
ld [w2_d172], a
call Functiond055c
call Functiond05ce
call Functiond061b
ld [wPokeAnimExtraFlag], a
call GetMonAnimPointer
call GetMonFramesPointer
call GetMonBitmaskPointer
pop af
ld [rSVBK], a
ret
@ -425,16 +425,16 @@ Functiond0282: ; d0282
PokeAnim_SetRepeat: ; d028e
ld a, [w2_d183]
ld [w2_d17f], a
ld [wPokeAnimRepeatTimer], a
jr Functiond0253
; d0296
PokeAnim_DoRepeat: ; d0296
ld a, [w2_d17f]
ld a, [wPokeAnimRepeatTimer]
and a
ret z
dec a
ld [w2_d17f], a
ld [wPokeAnimRepeatTimer], a
ret z
ld a, [w2_d183]
ld [w2_d17d], a
@ -509,14 +509,14 @@ Functiond02f8: ; d02f8
ld a, [w2_d17d]
ld e, a
ld d, $0
ld hl, w2_d175
ld hl, wPokeAnimPointerAddr
ld a, [hli]
ld h, [hl]
ld l, a
rept 2
add hl, de
endr
ld a, [w2_d174]
ld a, [wPokeAnimPointerBank]
call GetFarHalfword
ld a, l
ld [w2_d182], a
@ -533,16 +533,16 @@ Functiond031b: ; d031b
dec a
ld c, a
ld b, $0
ld hl, w2_d178
ld hl, wPokeAnimFramesAddr
ld a, [hli]
ld h, [hl]
ld l, a
rept 2
add hl, bc
endr
ld a, [w2_d177]
ld a, [wPokeAnimFramesBank]
call GetFarHalfword
ld a, [w2_d177]
ld a, [wPokeAnimFramesBank]
call GetFarByte
ld [w2_d180], a
inc hl
@ -552,7 +552,7 @@ endr
Functiond033b: ; d033b
call Functiond0356
push bc
ld hl, w2_d17b
ld hl, wPokeAnimBitmaskAddr
ld a, [hli]
ld h, [hl]
ld l, a
@ -560,7 +560,7 @@ Functiond033b: ; d033b
call AddNTimes
pop bc
ld de, w2_d188
ld a, [w2_d17a]
ld a, [wPokeAnimBitmaskBank]
call FarCopyBytes
ret
; d0356
@ -594,7 +594,7 @@ Functiond036b: ; d036b
and a
jr z, .next
ld a, [w2_d177]
ld a, [wPokeAnimFramesBank]
call GetFarByte
inc hl
push hl
@ -737,20 +737,34 @@ Functiond03f7: ; d03f7
ret
; d042f
macro_d042f: MACRO
y = 7
rept 7 +- \1
x = \1
rept 7 +- \1
db x + y
x = x + 1
endr
y = y + 7
endr
endm
Unknown_d042f:
db 9, 10, 11, 12, 13
db 16, 17, 18, 19, 20
db 23, 24, 25, 26, 27
db 30, 31, 32, 33, 34
db 37, 38, 39, 40, 41
macro_d042f 2
; db 9, 10, 11, 12, 13
; db 16, 17, 18, 19, 20
; db 23, 24, 25, 26, 27
; db 30, 31, 32, 33, 34
; db 37, 38, 39, 40, 41
Unknown_d0448:
db 8, 9, 10, 11, 12, 13
db 15, 16, 17, 18, 19, 20
db 22, 23, 24, 25, 26, 27
db 29, 30, 31, 32, 33, 34
db 36, 37, 38, 39, 40, 41
db 43, 44, 45, 46, 47, 48
macro_d042f 1
; db 8, 9, 10, 11, 12, 13
; db 15, 16, 17, 18, 19, 20
; db 22, 23, 24, 25, 26, 27
; db 29, 30, 31, 32, 33, 34
; db 36, 37, 38, 39, 40, 41
; db 43, 44, 45, 46, 47, 48
Functiond046c: ; d046c
@ -931,7 +945,7 @@ Functiond0551: ; d0551
ret
; d055c
Functiond055c: ; d055c
GetMonAnimPointer: ; d055c
call PokeAnim_IsEgg
jr z, .egg
@ -945,12 +959,12 @@ Functiond055c: ; d055c
ld de, AnimationExtraPointers
.unown
ld a, [w2_d172]
ld a, [wPokeAnimExtraFlag]
and a
jr z, .asm_d057e
jr z, .extras
ld h, d
ld l, e
.asm_d057e
.extras
ld a, [wPokeAnimSpeciesOrUnown]
dec a
@ -960,30 +974,30 @@ rept 2
add hl, de
endr
ld a, c
ld [w2_d174], a
ld [wPokeAnimPointerBank], a
call GetFarHalfword
ld a, l
ld [w2_d175], a
ld [wPokeAnimPointerAddr], a
ld a, h
ld [w2_d176], a
ld [wPokeAnimPointerAddr + 1], a
ret
.egg
ld hl, EggAnimation
ld c, BANK(EggAnimation)
ld a, [w2_d172]
ld a, [wPokeAnimExtraFlag]
and a
jr z, .asm_d05a7
jr z, .extras_egg
ld hl, EggAnimationExtra
ld c, BANK(EggAnimationExtra)
.asm_d05a7
.extras_egg
ld a, c
ld [w2_d174], a
ld [wPokeAnimPointerBank], a
ld a, l
ld [w2_d175], a
ld [wPokeAnimPointerAddr], a
ld a, h
ld [w2_d176], a
ld [wPokeAnimPointerAddr + 1], a
ret
; d05b4
@ -1003,7 +1017,7 @@ PokeAnim_GetFrontpicDims: ; d05b4
ret
; d05ce
Functiond05ce: ; d05ce
GetMonFramesPointer: ; d05ce
call PokeAnim_IsEgg
jr z, .egg
@ -1013,7 +1027,7 @@ Functiond05ce: ; d05ce
ld hl, UnownFramesPointers
jr z, .got_frames
ld a, [wPokeAnimSpecies]
cp 151 + 1
cp CHIKORITA
ld b, BANK(FramesPointers)
ld c, BANK(KantoFrames)
ld hl, FramesPointers
@ -1021,7 +1035,7 @@ Functiond05ce: ; d05ce
ld c, BANK(JohtoFrames)
.got_frames
ld a, c
ld [w2_d177], a
ld [wPokeAnimFramesBank], a
ld a, [wPokeAnimSpeciesOrUnown]
dec a
@ -1033,24 +1047,24 @@ endr
ld a, b
call GetFarHalfword
ld a, l
ld [w2_d178], a
ld [wPokeAnimFramesAddr], a
ld a, h
ld [w2_d179], a
ld [wPokeAnimFramesAddr + 1], a
ret
.egg
ld hl, EggFrames
ld c, BANK(EggFrames)
ld a, c
ld [w2_d177], a
ld [wPokeAnimFramesBank], a
ld a, l
ld [w2_d178], a
ld [wPokeAnimFramesAddr], a
ld a, h
ld [w2_d179], a
ld [wPokeAnimFramesAddr + 1], a
ret
; d061b
Functiond061b: ; d061b
GetMonBitmaskPointer: ; d061b
call PokeAnim_IsEgg
jr z, .egg
@ -1061,7 +1075,7 @@ Functiond061b: ; d061b
ld a, BANK(BitmasksPointers)
ld hl, BitmasksPointers
.unown
ld [w2_d17a], a
ld [wPokeAnimBitmaskBank], a
ld a, [wPokeAnimSpeciesOrUnown]
dec a
@ -1070,23 +1084,23 @@ Functiond061b: ; d061b
rept 2
add hl, de
endr
ld a, [w2_d17a]
ld a, [wPokeAnimBitmaskBank]
call GetFarHalfword
ld a, l
ld [w2_d17b], a
ld [wPokeAnimBitmaskAddr], a
ld a, h
ld [w2_d17c], a
ld [wPokeAnimBitmaskAddr + 1], a
ret
.egg
ld c, BANK(EggBitmasks)
ld hl, EggBitmasks
ld a, c
ld [w2_d17a], a
ld [wPokeAnimBitmaskBank], a
ld a, l
ld [w2_d17b], a
ld [wPokeAnimBitmaskAddr], a
ld a, h
ld [w2_d17c], a
ld [wPokeAnimBitmaskAddr + 1], a
ret
; d065c

View File

@ -139,7 +139,7 @@ endr
InitMenu3:: ; 1bb1
push hl
push bc
ld hl, wcfa1
ld hl, w2DMenuCursorInitY
ld b, $8
.loop
ld a, [de]

View File

@ -1,166 +1,253 @@
enum_start
enum tradeanim_next_command
tradeanim_next: macro
db tradeanim_next_command
db tradeanim_next_command ; 00
endm
enum tradeanim_show_givemon_data_command
tradeanim_show_givemon_data: macro
db tradeanim_show_givemon_data_command
db tradeanim_show_givemon_data_command ; 01
endm
enum tradeanim_show_getmon_data_command
tradeanim_show_getmon_data: macro
db tradeanim_show_getmon_data_command
db tradeanim_show_getmon_data_command ; 02
endm
enum tradeanim_enter_link_tube_command
tradeanim_enter_link_tube: macro
db tradeanim_enter_link_tube_command
db tradeanim_enter_link_tube_command ; 03
endm
__enum__ set $5
enum tradeanim_exit_link_tube_command
tradeanim_exit_link_tube: macro
db tradeanim_exit_link_tube_command
db tradeanim_exit_link_tube_command ; 05
endm
enum tradeanim_tube_to_ot_command
tradeanim_tube_to_ot: macro
db tradeanim_tube_to_ot_command
db tradeanim_tube_to_ot_command ; 06
endm
__enum__ set $e
enum tradeanim_tube_to_player_command
tradeanim_tube_to_player: macro
db tradeanim_tube_to_player_command
db tradeanim_tube_to_player_command ; 0e
endm
__enum__ set $16
enum tradeanim_sent_to_ot_text_command
tradeanim_sent_to_ot_text: macro
db tradeanim_sent_to_ot_text_command
db tradeanim_sent_to_ot_text_command ; 16
endm
enum tradeanim_ot_bids_farewell_command
tradeanim_ot_bids_farewell: macro
db tradeanim_ot_bids_farewell_command
db tradeanim_ot_bids_farewell_command ; 17
endm
enum tradeanim_take_care_of_text_command
tradeanim_take_care_of_text: macro
db tradeanim_take_care_of_text_command
db tradeanim_take_care_of_text_command ; 18
endm
enum tradeanim_ot_sends_text_1_command
tradeanim_ot_sends_text_1: macro
db tradeanim_ot_sends_text_1_command
db tradeanim_ot_sends_text_1_command ; 19
endm
enum tradeanim_ot_sends_text_2_command
tradeanim_ot_sends_text_2: macro
db tradeanim_ot_sends_text_2_command
db tradeanim_ot_sends_text_2_command ; 1a
endm
enum tradeanim_setup_givemon_scroll_command
tradeanim_setup_givemon_scroll: macro
db tradeanim_setup_givemon_scroll_command
db tradeanim_setup_givemon_scroll_command ; 1b
endm
enum tradeanim_do_givemon_scroll_command
tradeanim_do_givemon_scroll: macro
db tradeanim_do_givemon_scroll_command
db tradeanim_do_givemon_scroll_command ; 1c
endm
enum tradeanim_1d_command
tradeanim_1d: macro
db tradeanim_1d_command
db tradeanim_1d_command ; 1d
endm
enum tradeanim_1e_command
tradeanim_1e: macro
db tradeanim_1e_command
db tradeanim_1e_command ; 1e
endm
enum tradeanim_scroll_out_right_command
tradeanim_scroll_out_right: macro
db tradeanim_scroll_out_right_command
db tradeanim_scroll_out_right_command ; 1f
endm
__enum__ set $21
enum tradeanim_wait_80_command
tradeanim_wait_80: macro
db tradeanim_wait_80_command
db tradeanim_wait_80_command ; 21
endm
enum tradeanim_wait_40_command
tradeanim_wait_40: macro
db tradeanim_wait_40_command
db tradeanim_wait_40_command ; 22
endm
enum tradeanim_rocking_ball_command
tradeanim_rocking_ball: macro
db tradeanim_rocking_ball_command
db tradeanim_rocking_ball_command ; 23
endm
enum tradeanim_drop_ball_command
tradeanim_drop_ball: macro
db tradeanim_drop_ball_command
db tradeanim_drop_ball_command ; 24
endm
enum tradeanim_wait_anim_command
tradeanim_wait_anim: macro
db tradeanim_wait_anim_command
db tradeanim_wait_anim_command ; 25
endm
__enum__ set $27
enum tradeanim_poof_command
tradeanim_poof: macro
db tradeanim_poof_command
db tradeanim_poof_command ; 27
endm
enum tradeanim_bulge_through_tube_command
tradeanim_bulge_through_tube: macro
db tradeanim_bulge_through_tube_command
db tradeanim_bulge_through_tube_command ; 28
endm
enum tradeanim_give_trademon_sfx_command
tradeanim_give_trademon_sfx: macro
db tradeanim_give_trademon_sfx_command
db tradeanim_give_trademon_sfx_command ; 29
endm
enum tradeanim_get_trademon_sfx_command
tradeanim_get_trademon_sfx: macro
db tradeanim_get_trademon_sfx_command
db tradeanim_get_trademon_sfx_command ; 2a
endm
enum tradeanim_end_command
tradeanim_end: macro
db tradeanim_end_command
db tradeanim_end_command ; 2b
endm
enum tradeanim_animate_frontpic_command
tradeanim_animate_frontpic: macro
db tradeanim_animate_frontpic_command
db tradeanim_animate_frontpic_command ; 2c
endm
enum tradeanim_wait_96_command
tradeanim_wait_96: macro
db tradeanim_wait_96_command
db tradeanim_wait_96_command ; 2d
endm
enum tradeanim_wait_80_if_ot_egg_command
tradeanim_wait_80_if_ot_egg: macro
db tradeanim_wait_80_if_ot_egg_command
db tradeanim_wait_80_if_ot_egg_command ; 2e
endm
enum tradeanim_wait_180_if_ot_egg_command
tradeanim_wait_180_if_ot_egg: macro
db tradeanim_wait_180_if_ot_egg_command
db tradeanim_wait_180_if_ot_egg_command ; 2f
endm
; Mobile
enum_start 1
enum mobiletradeanim_showgivemon_command
mobiletradeanim_showgivemon: macro
db mobiletradeanim_showgivemon_command ; 01
endm
enum mobiletradeanim_02_command
mobiletradeanim_02: macro
db mobiletradeanim_02_command ; 02
endm
enum mobiletradeanim_sendmon_command
mobiletradeanim_sendmon: macro
db mobiletradeanim_sendmon_command ; 03
endm
__enum__ set $05
enum mobiletradeanim_05_command
mobiletradeanim_05: macro
db mobiletradeanim_05_command ; 05
endm
enum mobiletradeanim_06_command
mobiletradeanim_06: macro
db mobiletradeanim_06_command ; 06
endm
enum mobiletradeanim_07_command
mobiletradeanim_07: macro
db mobiletradeanim_07_command ; 07
endm
enum mobiletradeanim_receivemon_command
mobiletradeanim_receivemon: macro
db mobiletradeanim_receivemon_command ; 08
endm
__enum__ set $0b
enum mobiletradeanim_showgetmon_command
mobiletradeanim_showgetmon: macro
db mobiletradeanim_showgetmon_command ; 0b
endm
enum mobiletradeanim_end_command
mobiletradeanim_end: macro
db mobiletradeanim_end_command ; 0c
endm
enum mobiletradeanim_showwondertradegivemon_command
mobiletradeanim_showwondertradegivemon: macro
db mobiletradeanim_showwondertradegivemon_command ; 0d
endm
enum mobiletradeanim_showwondertradegetmon_command
mobiletradeanim_showwondertradegetmon: macro
db mobiletradeanim_showwondertradegetmon_command ; 0e
endm
enum mobiletradeanim_0f_command
mobiletradeanim_0f: macro
db mobiletradeanim_0f_command ; 0f
endm
enum mobiletradeanim_10_command
mobiletradeanim_10: macro
db mobiletradeanim_10_command ; 10
endm
enum mobiletradeanim_11_command
mobiletradeanim_11: macro
db mobiletradeanim_11_command ; 11
endm
enum mobiletradeanim_12_command
mobiletradeanim_12: macro
db mobiletradeanim_12_command ; 12
endm
enum mobiletradeanim_showoddegg_command
mobiletradeanim_showoddegg: macro
db mobiletradeanim_showoddegg_command ; 13
endm

View File

@ -743,7 +743,7 @@ Predef1: ; 747a
SECTION "bank2", ROMX, BANK[$2]
Function8000: ; 8000
BlankScreen: ; 8000
call DisableSpriteUpdates
xor a
ld [hBGMapMode], a
@ -10286,7 +10286,7 @@ Special_MoveTutor: ; 4925b
; 492b9
CheckCanLearnMoveTutorMove: ; 492b9
ld hl, MenuDataHeader_0x4930a
ld hl, .MenuDataHeader
call LoadMenuDataHeader
predef CanLearnTMHMMove
@ -10333,7 +10333,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
ret
; 4930a
MenuDataHeader_0x4930a: ; 0x4930a
.MenuDataHeader: ; 0x4930a
db $40 ; flags
db 12, 00 ; start coords
db 17, 19 ; end coords
@ -10601,11 +10601,11 @@ SaveMenu_LoadEDTile: ; 4cf45 (13:4f45)
ld a, 1 ; BANK(VBGMap2)
ld [rVBK], a
hlcoord 0, 0, AttrMap
call Function4cf80
call .LoadEDTile
ld a, 0 ; BANK(VBGMap0)
ld [rVBK], a
hlcoord 0, 0
call Function4cf80
call .LoadEDTile
.WaitLY2
ld a, [rLY]
cp $60
@ -10618,7 +10618,7 @@ SaveMenu_LoadEDTile: ; 4cf45 (13:4f45)
ld [hBGMapMode], a
ret
Function4cf80: ; 4cf80 (13:4f80)
.LoadEDTile: ; 4cf80 (13:4f80)
ld [hSPBuffer], sp ; $ffd9
ld sp, hl
ld a, [hBGMapAddress + 1]
@ -10809,7 +10809,7 @@ Shrink2Pic: ; 4d2d9
INCBIN "gfx/shrink2.2bpp.lz"
; 4d319
Function4d319: ; 4d319
LinkMonStatsScreen: ; 4d319
ld a, [wMenuCursorY]
dec a
ld [CurPartyMon], a
@ -10909,7 +10909,7 @@ Function4d3ab: ; 4d3ab
; 4d3b1
_ResetClock: ; 4d3b1
callba Function8000
callba BlankScreen
ld b, SCGB_08
call GetSGBLayout
call LoadStandardFont
@ -11184,17 +11184,17 @@ ClockResetPassword: ; 4d41e
ret
; 4d54c
Function4d54c: ; 4d54c
callba Function8000
_DeleteSaveData: ; 4d54c
callba BlankScreen
ld b, SCGB_08
call GetSGBLayout
call LoadStandardFont
call LoadFontsExtra
ld de, MUSIC_MAIN_MENU
call PlayMusic
ld hl, UnknownText_0x4d580
ld hl, .Text_ClearAllSaveData
call PrintText
ld hl, MenuDataHeader_0x4d585
ld hl, .NoYesMenuDataHeader
call CopyMenuDataHeader
call VerticalMenu
ret c
@ -11205,21 +11205,21 @@ Function4d54c: ; 4d54c
ret
; 4d580
UnknownText_0x4d580: ; 0x4d580
.Text_ClearAllSaveData: ; 0x4d580
; Clear all save data?
text_jump UnknownText_0x1c564a
db "@"
; 0x4d585
MenuDataHeader_0x4d585: ; 0x4d585
.NoYesMenuDataHeader: ; 0x4d585
db $00 ; flags
db 07, 14 ; start coords
db 11, 19 ; end coords
dw MenuData2_0x4d58d
dw .MenuData2
db 1 ; default option
; 0x4d58d
MenuData2_0x4d58d: ; 0x4d58d
.MenuData2: ; 0x4d58d
db $c0 ; flags
db 2 ; items
db "NO@"
@ -11301,9 +11301,9 @@ FlagPredef: ; 4d7c1
ret
; 4d7fd
Function4d7fd: ; 4d7fd
ld a, [wc702]
ld hl, wEnemyTrappingMove
GetTrademonFrontpic: ; 4d7fd
ld a, [wOTTrademonSpecies]
ld hl, wOTTrademonDVs
ld de, VTiles2
push de
push af
@ -11317,23 +11317,23 @@ Function4d7fd: ; 4d7fd
ret
; 4d81e
Function4d81e: ; 4d81e
ld a, [wc702]
AnimateTrademonFrontpic: ; 4d81e
ld a, [wOTTrademonSpecies]
call IsAPokemon
ret c
callba Function29549
ld a, [wc702]
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld a, [wEnemyTrappingMove]
ld a, [wOTTrademonDVs]
ld [TempMonDVs], a
ld a, [wPlayerWrapCount]
ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a
ld b, SCGB_1A
call GetSGBLayout
ld a, $e4
ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals
callba Function294c0
ld a, [wc702]
callba TradeAnim_ShowGetmonFrontpic
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
hlcoord 7, 2
ld d, $0

View File

@ -219,7 +219,7 @@ CallInSafeGFXMode: ; 104177
ld [hMapAnims], a
ld a, [rSVBK]
push af
ld a, 6
ld a, $6
ld [rSVBK], a
ld a, [rVBK]
push af

View File

@ -2582,7 +2582,7 @@ Function10107d: ; 10107d
ld hl, wc608
ld bc, wc7bd - wc608
call ByteFill
ld hl, wd26b
ld hl, OTPlayerName
ld de, wc608
ld bc, NAME_LENGTH
call CopyBytes
@ -3067,7 +3067,7 @@ Function1013aa: ; 1013aa
; 1013c0
Function1013c0: ; 1013c0
callba Function8000
callba BlankScreen
callba MobileFunc_106462
callba Function106464
call Function2b5c
@ -3972,7 +3972,7 @@ Function10194b: ; 10194b
; 10196d
Function10196d: ; 10196d
callba Function8000
callba BlankScreen
callba Function10060d
ld hl, wcd29
set 5, [hl]
@ -4003,7 +4003,7 @@ Function1019ab: ; 1019ab
xor a
ld [wdc5f], a
ld [wdc60], a
callba Function8000
callba BlankScreen
call SpeechTextBox
callba Function100846
ld c, $78
@ -6303,8 +6303,8 @@ Jumptable_1029cb: ; 1029cb
Function1029cf: ; 1029cf
call LoadStandardMenuDataHeader
hlcoord 10, 7
ld b, $3
ld c, $8
ld b, 3
ld c, 8
ld d, h
ld e, l
callba _LinkTextbox
@ -6313,7 +6313,7 @@ Function1029cf: ; 1029cf
call PlaceString
ld hl, wcd4b
set 1, [hl]
ld de, Unknown_102a33
ld de, MenuData3_102a33
call InitMenu3
ld a, [wcd4a]
inc a
@ -6327,7 +6327,7 @@ Function1029fe: ; 1029fe
ret c
callba MobileMenuJoypad
ld a, c
ld hl, wcfa8
ld hl, w2DMenuFlags4
and [hl]
ret z
push af
@ -6353,15 +6353,17 @@ String_102a26: ; 102a26
db "@"
; 102a33
Unknown_102a33:
db $8, $b, $2, $1, $80, $, $20, $1
MenuData3_102a33:
db 8, 11
db 2, 1
db $80, $00, $20, $01
Function102a3b: ; 102a3b
ld a, [wcd30]
ld [wc74e], a
ld hl, PlayerName
ld de, wc6e7
ld bc, 11
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd4c]
dec a
@ -6370,30 +6372,30 @@ Function102a3b: ; 102a3b
ld hl, PartySpecies
add hl, bc
ld a, [hl]
ld [wc6d0], a
ld [wPlayerTrademonSpecies], a
ld a, [wcd4c]
dec a
ld hl, PartyMonOT
call SkipNames
ld de, wc6f2
ld bc, 11
ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd4c]
dec a
ld hl, PartyMon1ID
call GetPartyLocation
ld a, [hli]
ld [wc6ff], a
ld [wPlayerTrademonID], a
ld a, [hl]
ld [wc700], a
ld [wPlayerTrademonID + 1], a
ld a, [wcd4c]
dec a
ld hl, PartyMon1DVs
call GetPartyLocation
ld a, [hli]
ld [wc6fd], a
ld [wPlayerTrademonDVs], a
ld a, [hl]
ld [wc6fe], a
ld [wPlayerTrademonDVs + 1], a
ld a, [wcd4c]
dec a
ld hl, PartyMon1Species
@ -6402,11 +6404,12 @@ Function102a3b: ; 102a3b
ld c, l
callba GetCaughtGender
ld a, c
ld [wc701], a
ld hl, wd26b
ld de, wc719
ld bc, 11
ld [wPlayerTrademonCaughtData], a
ld hl, OTPlayerName
ld de, wOTTrademonSenderName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd4d]
dec a
ld c, a
@ -6414,30 +6417,30 @@ Function102a3b: ; 102a3b
ld hl, OTPartySpecies
add hl, bc
ld a, [hl]
ld [wc702], a
ld [wOTTrademonSpecies], a
ld a, [wcd4d]
dec a
ld hl, OTPartyMonOT
call SkipNames
ld de, wc724
ld bc, 11
ld de, wOTTrademonOTName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd4d]
dec a
ld hl, OTPartyMon1ID
call GetPartyLocation
ld a, [hli]
ld [wEnemyWrapCount], a
ld [wOTTrademonID], a
ld a, [hl]
ld [wPlayerCharging], a
ld [wOTTrademonID + 1], a
ld a, [wcd4d]
dec a
ld hl, OTPartyMon1DVs
call GetPartyLocation
ld a, [hli]
ld [wEnemyTrappingMove], a
ld [wOTTrademonDVs], a
ld a, [hl]
ld [wPlayerWrapCount], a
ld [wOTTrademonDVs + 1], a
ld a, [wcd4d]
dec a
ld hl, OTPartyMon1Species
@ -6446,12 +6449,12 @@ Function102a3b: ; 102a3b
ld c, l
callba GetCaughtGender
ld a, c
ld [wEnemyCharging], a
ld [wOTTrademonCaughtData], a
ret
; 102b12
Function102b12: ; 102b12
ld c, $64
ld c, 100
call DelayFrames
call Function102d9a
call LoadFontsBattleExtra
@ -6892,7 +6895,7 @@ Function102e4f: ; 102e4f
call PlaceString
ld a, $14
ld [bc], a
ld de, wd26b
ld de, OTPlayerName
hlcoord 4, 8
call PlaceString
ld a, $14

File diff suppressed because it is too large Load Diff

View File

@ -441,10 +441,10 @@ UnknownText_0x1bc6c7: ; 0x1bc6c7
; 0x1bc6e9
UnknownText_0x1bc6e9: ; 0x1bc6e9
text_from_ram wc6d1
text_from_ram wPlayerTrademonSpeciesName
text " was"
line "sent to @"
text_from_ram wc719
text_from_ram wOTTrademonSenderName
text "."
done
; 0x1bc701
@ -455,14 +455,14 @@ UnknownText_0x1bc701: ; 0x1bc701
; 0x1bc703
UnknownText_0x1bc703: ; 0x1bc703
text_from_ram wc719
text_from_ram wOTTrademonSenderName
text " bids"
line "farewell to"
done
; 0x1bc719
UnknownText_0x1bc719: ; 0x1bc719
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
text "."
done
; 0x1bc71f
@ -470,35 +470,35 @@ UnknownText_0x1bc719: ; 0x1bc719
UnknownText_0x1bc71f: ; 0x1bc71f
text "Take good care of"
line "@"
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
text "."
done
; 0x1bc739
UnknownText_0x1bc739: ; 0x1bc739
text "For @"
text_from_ram wc6e7
text_from_ram wPlayerTrademonSenderName
text "'s"
line "@"
text_from_ram wc6d1
text_from_ram wPlayerTrademonSpeciesName
text ","
done
; 0x1bc74c
UnknownText_0x1bc74c: ; 0x1bc74c
text_from_ram wc719
text_from_ram wOTTrademonSenderName
text " sends"
line "@"
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
text "."
done
; 0x1bc75e
UnknownText_0x1bc75e: ; 0x1bc75e
text_from_ram wc719
text_from_ram wOTTrademonSenderName
text " will"
line "trade @"
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
db "@"
; 0x1bc773
@ -508,19 +508,19 @@ UnknownText_0x1bc773: ; 0x1bc773
UnknownText_0x1bc774: ; 0x1bc774
text "for @"
text_from_ram wc6e7
text_from_ram wPlayerTrademonSenderName
text "'s"
line "@"
text_from_ram wc6d1
text_from_ram wPlayerTrademonSpeciesName
text "."
done
; 0x1bc787
UnknownText_0x1bc787: ; 0x1bc787
text_from_ram wc6e7
text_from_ram wPlayerTrademonSenderName
text " will"
line "trade @"
text_from_ram wc6d1
text_from_ram wPlayerTrademonSpeciesName
db "@"
; 0x1bc79c
@ -530,19 +530,19 @@ UnknownText_0x1bc79c: ; 0x1bc79c
UnknownText_0x1bc79d: ; 0x1bc79d
text "for @"
text_from_ram wc719
text_from_ram wOTTrademonSenderName
text "'s"
line "@"
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
text "."
done
; 0x1bc7b0
UnknownText_0x1bc7b0: ; 0x1bc7b0
text_from_ram wc6e7
text_from_ram wPlayerTrademonSenderName
text "'s"
line "@"
text_from_ram wc6d1
text_from_ram wPlayerTrademonSpeciesName
text " trade…"
done
; 0x1bc7c3
@ -550,16 +550,16 @@ UnknownText_0x1bc7b0: ; 0x1bc7b0
UnknownText_0x1bc7c3: ; 0x1bc7c3
text "Take good care of"
line "@"
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
text "."
done
; 0x1bc7dd
UnknownText_0x1bc7dd: ; 0x1bc7dd
text_from_ram wc6e7
text_from_ram wPlayerTrademonSenderName
text "'s"
line "@"
text_from_ram wc6d1
text_from_ram wPlayerTrademonSpeciesName
text " trade…"
done
; 0x1bc7f0
@ -567,13 +567,13 @@ UnknownText_0x1bc7dd: ; 0x1bc7dd
UnknownText_0x1bc7f0: ; 0x1bc7f0
text "Take good care of"
line "@"
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
text "."
done
; 0x1bc80a
UnknownText_0x1bc80a: ; 0x1bc80a
text_from_ram wc703
text_from_ram wOTTrademonSpeciesName
text " came"
line "back!"
done

View File

@ -1014,6 +1014,7 @@ wEnemySwitchMonParam::
wc717:: ds 1
wc718::
wEnemySwitchMonIndex:: ds 1
wTempLevel::
wc719:: ds 1
LastPlayerMon:: ; c71a
wc71a:: ds 1
@ -3113,20 +3114,17 @@ w2_d16e:: ds 1
wPokeAnimCoord:: ds 2
wPokeAnimFrontpicHeight:: ds 1
; PokeAnim Data
w2_d172:: ds 1
wPokeAnimExtraFlag:: ds 1
w2_d173:: ds 1
w2_d174:: ds 1
w2_d175:: ds 1
w2_d176:: ds 1
w2_d177:: ds 1
w2_d178:: ds 1
w2_d179:: ds 1
w2_d17a:: ds 1
w2_d17b:: ds 1
w2_d17c:: ds 1
wPokeAnimPointerBank:: ds 1
wPokeAnimPointerAddr:: ds 2
wPokeAnimFramesBank:: ds 1
wPokeAnimFramesAddr:: ds 2
wPokeAnimBitmaskBank:: ds 1
wPokeAnimBitmaskAddr:: ds 2
w2_d17d:: ds 1
w2_d17e:: ds 1
w2_d17f:: ds 1
wPokeAnimRepeatTimer:: ds 1
w2_d180:: ds 1
wPokeAnimWaitCounter:: ds 1
w2_d182:: ds 1