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

more trade animation labels

Browse Source
This commit is contained in:
PikalaxALT
2015-11-23 02:08:08 -05:00
parent 58020fb5f6
commit 0dc5ae04b8
4 changed files with 313 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/npctrade.asm
View File

@@ -438,13 +438,13 @@ npctrade: MACRO
ENDM ENDM
npctrade 0, ABRA, MACHOP, "MUSCLE@@@@@", $6637, GOLD_BERRY, $9254, "MIKE@@@@@@@", TRADE_EITHER_GENDER npctrade 0, ABRA, MACHOP, "MUSCLE@@@@@", $6637, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
npctrade 0, BELLSPROUT, ONIX, "ROCKY@@@@@@", $6696, BITTER_BERRY, $bf1e, "KYLE@@@@@@@", TRADE_EITHER_GENDER npctrade 0, BELLSPROUT, ONIX, "ROCKY@@@@@@", $6696, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
npctrade 1, KRABBY, VOLTORB, "VOLTY@@@@@@", $8898, PRZCUREBERRY, $7205, "TIM@@@@@@@@", TRADE_EITHER_GENDER npctrade 1, KRABBY, VOLTORB, "VOLTY@@@@@@", $8898, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER
npctrade 3, DRAGONAIR, DODRIO, "DORIS@@@@@@", $6677, SMOKE_BALL, $011b, "EMY@@@@@@@@", TRADE_FEMALE_ONLY npctrade 3, DRAGONAIR, DODRIO, "DORIS@@@@@@", $6677, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY
npctrade 2, HAUNTER, XATU, "PAUL@@@@@@@", $8696, MYSTERYBERRY, $3d00, "CHRIS@@@@@@", TRADE_EITHER_GENDER npctrade 2, HAUNTER, XATU, "PAUL@@@@@@@", $8696, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
npctrade 3, CHANSEY, AERODACTYL, "AEROY@@@@@@", $6696, GOLD_BERRY, $677b, "KIM@@@@@@@@", TRADE_EITHER_GENDER npctrade 3, CHANSEY, AERODACTYL, "AEROY@@@@@@", $6696, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
npctrade 0, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $6696, METAL_COAT, $c3a2, "FOREST@@@@@", TRADE_EITHER_GENDER npctrade 0, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $6696, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER
; fcf38 ; fcf38

432
engine/trade/animation.asm
View File

@@ -11,42 +11,42 @@ TradeAnimation: ; 28f24
jr Function28fa1 jr Function28fa1
.data_28f3f .data_28f3f
tradeanim_1b tradeanim_setup_givemon_scroll
tradeanim_01 tradeanim_show_givemon_data
tradeanim_1c tradeanim_do_givemon_scroll
tradeanim_21 tradeanim_wait_80
tradeanim_2d tradeanim_wait_96
tradeanim_27 tradeanim_poof
tradeanim_23 tradeanim_rocking_ball
tradeanim_03 tradeanim_enter_link_tube
tradeanim_25 tradeanim_wait_anim
tradeanim_28 tradeanim_bulge_through_tube
tradeanim_25 tradeanim_wait_anim
tradeanim_1e tradeanim_1e
tradeanim_29 tradeanim_give_trademon_sfx
tradeanim_06 tradeanim_tube_to_ot
tradeanim_16 tradeanim_sent_to_ot_text
tradeanim_1f tradeanim_scroll_out_right
tradeanim_19 tradeanim_ot_sends_text_1
tradeanim_17 tradeanim_ot_bids_farewell
tradeanim_22 tradeanim_wait_40
tradeanim_1f tradeanim_scroll_out_right
tradeanim_2a tradeanim_get_trademon_sfx
tradeanim_0e tradeanim_tube_to_player
tradeanim_03 tradeanim_enter_link_tube
tradeanim_24 tradeanim_drop_ball
tradeanim_05 tradeanim_exit_link_tube
tradeanim_25 tradeanim_wait_anim
tradeanim_02 tradeanim_show_getmon_data
tradeanim_27 tradeanim_poof
tradeanim_25 tradeanim_wait_anim
tradeanim_1d tradeanim_1d
tradeanim_2c tradeanim_animate_frontpic
tradeanim_2e tradeanim_wait_80_if_ot_egg
tradeanim_1e tradeanim_1e
tradeanim_18 tradeanim_take_care_of_text
tradeanim_1f tradeanim_scroll_out_right
tradeanim_end tradeanim_end
TradeAnimationPlayer2: ; 28f63 TradeAnimationPlayer2: ; 28f63
@@ -62,41 +62,41 @@ TradeAnimationPlayer2: ; 28f63
jr Function28fa1 jr Function28fa1
.data_28f7e .data_28f7e
tradeanim_1a tradeanim_ot_sends_text_2
tradeanim_17 tradeanim_ot_bids_farewell
tradeanim_22 tradeanim_wait_40
tradeanim_1f tradeanim_scroll_out_right
tradeanim_2a tradeanim_get_trademon_sfx
tradeanim_06 tradeanim_tube_to_ot
tradeanim_03 tradeanim_enter_link_tube
tradeanim_24 tradeanim_drop_ball
tradeanim_05 tradeanim_exit_link_tube
tradeanim_25 tradeanim_wait_anim
tradeanim_02 tradeanim_show_getmon_data
tradeanim_27 tradeanim_poof
tradeanim_25 tradeanim_wait_anim
tradeanim_1d tradeanim_1d
tradeanim_2c tradeanim_animate_frontpic
tradeanim_2f tradeanim_wait_180_if_ot_egg
tradeanim_1e tradeanim_1e
tradeanim_18 tradeanim_take_care_of_text
tradeanim_1f tradeanim_scroll_out_right
tradeanim_1b tradeanim_setup_givemon_scroll
tradeanim_01 tradeanim_show_givemon_data
tradeanim_1c tradeanim_do_givemon_scroll
tradeanim_22 tradeanim_wait_40
tradeanim_27 tradeanim_poof
tradeanim_23 tradeanim_rocking_ball
tradeanim_03 tradeanim_enter_link_tube
tradeanim_25 tradeanim_wait_anim
tradeanim_28 tradeanim_bulge_through_tube
tradeanim_25 tradeanim_wait_anim
tradeanim_1e tradeanim_1e
tradeanim_29 tradeanim_give_trademon_sfx
tradeanim_0e tradeanim_tube_to_player
tradeanim_16 tradeanim_sent_to_ot_text
tradeanim_1f tradeanim_scroll_out_right
tradeanim_end tradeanim_end
Function28fa1: ; 28fa1 Function28fa1: ; 28fa1
@@ -234,54 +234,54 @@ endr
; 290af ; 290af
.JumpTable: ; 290af .JumpTable: ; 290af
dw GetTradeAnimByte ; 00 dw TradeAnim_Next ; 00
dw TradeAnim_01 ; 01 get player mon frontpic dw TradeAnim_ShowGivemonData ; 01
dw TradeAnim_02 ; 02 dw TradeAnim_ShowGetmonData ; 02
dw TradeAnim_03 ; 03 transition to link tube dw TradeAnim_EnterLinkTube ; 03
dw TradeAnim_04 ; 04 slide in link tube dw TradeAnim_04 ; 04
dw TradeAnim_05 ; 05 dw TradeAnim_ExitLinkTube ; 05
dw TradeAnim_06 ; 06 trademon navigates to OT system dw TradeAnim_TubeToOT1 ; 06
dw TradeAnim_07 ; 07 pan bgmap dw TradeAnim_TubeToOT2 ; 07
dw TradeAnim_08 ; 08 pan bgmap dw TradeAnim_TubeToOT3 ; 08
dw TradeAnim_09 ; 09 pan bgmap dw TradeAnim_TubeToOT4 ; 09
dw TradeAnim_0a ; 0a stop scroll dw TradeAnim_TubeToOT5 ; 0a
dw TradeAnim_0b ; 0b disappear mon icon dw TradeAnim_TubeToOT6 ; 0b
dw TradeAnim_0c ; 0c continue flashing OT screen dw TradeAnim_TubeToOT7 ; 0c
dw TradeAnim_0d ; 0d end scene dw TradeAnim_TubeToOT8 ; 0d
dw TradeAnim_0e ; 0e trademon navigates to player system dw TradeAnim_TubeToPlayer1 ; 0e
dw TradeAnim_0f ; 0f pan bgmap dw TradeAnim_TubeToPlayer2 ; 0f
dw TradeAnim_10 ; 10 pan bgmap dw TradeAnim_TubeToPlayer3 ; 10
dw TradeAnim_11 ; 11 pan bgmap dw TradeAnim_TubeToPlayer4 ; 11
dw TradeAnim_12 ; 12 stop scroll dw TradeAnim_TubeToPlayer5 ; 12
dw TradeAnim_13 ; 13 disappear mon icon dw TradeAnim_TubeToPlayer6 ; 13
dw TradeAnim_14 ; 14 continue flashing OT screen dw TradeAnim_TubeToPlayer7 ; 14
dw TradeAnim_15 ; 15 end scene dw TradeAnim_TubeToPlayer8 ; 15
dw TradeAnim_16 ; 16 dw TradeAnim_SentToOTText ; 16
dw TradeAnim_17 ; 17 dw TradeAnim_OTBidsFarewell ; 17
dw TradeAnim_18 ; 18 dw TradeAnim_TakeCareOfText ; 18
dw TradeAnim_19 ; 19 dw TradeAnim_OTSendsText1 ; 19
dw TradeAnim_1a ; 1a dw TradeAnim_OTSendsText2 ; 1a
dw TradeAnim_1b ; 1b set up scroll for player mon dw TradeAnim_SetupGivemonScroll ; 1b
dw TradeAnim_1c ; 1c scroll across dw TradeAnim_DoGivemonScroll ; 1c
dw TradeAnim_1d ; 1d dw TradeAnim_1d ; 1d
dw TradeAnim_1e ; 1e set up scroll for mon transfer dw TradeAnim_1e ; 1e
dw TradeAnim_1f ; 1f dw TradeAnim_ScrollOutRight ; 1f
dw TradeAnim_20 ; 20 dw TradeAnim_ScrollOutRight2 ; 20
dw TradeAnim_21 ; 21 wait 80 frames dw TraideAnim_Wait80 ; 21
dw TradeAnim_22 ; 22 dw TraideAnim_Wait40 ; 22
dw TradeAnim_23 ; 23 ball appear anim dw TradeAnim_RockingBall ; 23
dw TradeAnim_24 ; 24 ball rises into tube dw TradeAnim_DropBall ; 24
dw TradeAnim_25 ; 25 wait ball rise dw TradeAnim_WaitAnim ; 25
dw TradeAnim_26 ; 26 dw TradeAnim_WaitAnim2 ; 26
dw TradeAnim_27 ; 27 ball return poof anim dw TradeAnim_Poof ; 27
dw TradeAnim_28 ; 28 ball travels through tube dw TradeAnim_BulgeThroughTube ; 28
dw TradeAnim_29 ; 29 give trademon sfx dw TradeAnim_GiveTrademonSFX ; 29
dw TradeAnim_2a ; 2a get trademon sfx dw TradeAnim_GetTrademonSFX ; 2a
dw EndTradeAnim ; 2b dw TradeAnim_End ; 2b
dw TradeAnim_2c ; 2c dw TradeAnim_AnimateFrontpic ; 2c
dw TradeAnim_2d ; 2d wait 96 frames dw TraideAnim_Wait96 ; 2d
dw TradeAnim_2e ; 2e dw TraideAnim_Wait80IfOTEgg ; 2e
dw TradeAnim_2f ; 2f dw TraideAnim_Wait180IfOTEgg ; 2f
; 2910f ; 2910f
NextTradeAnim: ; 2910f NextTradeAnim: ; 2910f
@@ -290,7 +290,7 @@ NextTradeAnim: ; 2910f
ret ret
; 29114 ; 29114
GetTradeAnimByte: ; 29114 TradeAnim_Next: ; 29114
ld hl, wTradeAnimPointer ld hl, wTradeAnimPointer
ld e, [hl] ld e, [hl]
inc hl inc hl
@@ -304,13 +304,13 @@ GetTradeAnimByte: ; 29114
ret ret
; 29123 ; 29123
EndTradeAnim: ; 29123 TradeAnim_End: ; 29123
ld hl, wJumptableIndex ld hl, wJumptableIndex
set 7, [hl] set 7, [hl]
ret ret
; 29129 ; 29129
TradeAnim_06: ; 29129 TradeAnim_TubeToOT1: ; 29129
ld a, $ed ld a, $ed
call Function292f6 call Function292f6
ld a, [wc74c] ld a, [wc74c]
@@ -320,7 +320,7 @@ TradeAnim_06: ; 29129
ld b, $0 ld b, $0
jr Function2914e jr Function2914e
TradeAnim_0e: ; 2913c TradeAnim_TubeToPlayer1: ; 2913c
ld a, $ee ld a, $ee
call Function292f6 call Function292f6
ld a, [wc74d] ld a, [wc74d]
@@ -378,7 +378,7 @@ Function2914e: ; 2914e
ret ret
; 291af ; 291af
TradeAnim_07: ; 291af TradeAnim_TubeToOT2: ; 291af
call Function2981d call Function2981d
ld a, [hSCX] ld a, [hSCX]
add $2 add $2
@@ -391,7 +391,7 @@ TradeAnim_07: ; 291af
ret ret
; 291c4 ; 291c4
TradeAnim_08: ; 291c4 TradeAnim_TubeToOT3: ; 291c4
call Function2981d call Function2981d
ld a, [hSCX] ld a, [hSCX]
add $2 add $2
@@ -404,7 +404,7 @@ TradeAnim_08: ; 291c4
ret ret
; 291d9 ; 291d9
TradeAnim_09: ; 291d9 TradeAnim_TubeToOT4: ; 291d9
call Function2981d call Function2981d
ld a, [hSCX] ld a, [hSCX]
add $2 add $2
@@ -415,7 +415,7 @@ TradeAnim_09: ; 291d9
ret ret
; 291e8 ; 291e8
TradeAnim_10: ; 291e8 TradeAnim_TubeToPlayer3: ; 291e8
call Function2981d call Function2981d
ld a, [hSCX] ld a, [hSCX]
sub $2 sub $2
@@ -428,7 +428,7 @@ TradeAnim_10: ; 291e8
ret ret
; 291fd ; 291fd
TradeAnim_11: ; 291fd TradeAnim_TubeToPlayer4: ; 291fd
call Function2981d call Function2981d
ld a, [hSCX] ld a, [hSCX]
sub $2 sub $2
@@ -441,7 +441,7 @@ TradeAnim_11: ; 291fd
ret ret
; 29211 ; 29211
TradeAnim_12: ; 29211 TradeAnim_TubeToPlayer5: ; 29211
call Function2981d call Function2981d
ld a, [hSCX] ld a, [hSCX]
sub $2 sub $2
@@ -452,16 +452,16 @@ TradeAnim_12: ; 29211
ret ret
; 29220 ; 29220
TradeAnim_0b: TradeAnim_TubeToOT6:
TradeAnim_13: ; 29220 TradeAnim_TubeToPlayer6: ; 29220
ld a, $80 ld a, $80
ld [wcf64], a ld [wcf64], a
call NextTradeAnim call NextTradeAnim
ret ret
; 29229 ; 29229
TradeAnim_0d: TradeAnim_TubeToOT8:
TradeAnim_15: ; 29229 TradeAnim_TubeToPlayer8: ; 29229
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTileMap
call ClearSprites call ClearSprites
@@ -479,14 +479,14 @@ TradeAnim_15: ; 29229
call Function2982b call Function2982b
call WaitBGMap call WaitBGMap
call Function297ed call Function297ed
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 2925d ; 2925d
TradeAnim_0a: TradeAnim_TubeToOT5:
TradeAnim_0c: TradeAnim_TubeToOT7:
TradeAnim_0f: TradeAnim_TubeToPlayer2:
TradeAnim_14: ; 2925d TradeAnim_TubeToPlayer7: ; 2925d
call Function2981d call Function2981d
ld hl, wcf64 ld hl, wcf64
ld a, [hl] ld a, [hl]
@@ -500,15 +500,15 @@ TradeAnim_14: ; 2925d
ret ret
; 2926d ; 2926d
TradeAnim_29: ; 2926d TradeAnim_GiveTrademonSFX: ; 2926d
call GetTradeAnimByte call TradeAnim_Next
ld de, SFX_GIVE_TRADEMON ld de, SFX_GIVE_TRADEMON
call PlaySFX call PlaySFX
ret ret
; 29277 ; 29277
TradeAnim_2a: ; 29277 TradeAnim_GetTrademonSFX: ; 29277
call GetTradeAnimByte call TradeAnim_Next
ld de, SFX_GET_TRADEMON ld de, SFX_GET_TRADEMON
call PlaySFX call PlaySFX
ret ret
@@ -540,7 +540,7 @@ Function29297: ; 29297
hlcoord 9, 3 hlcoord 9, 3
ld [hl], $5b ld [hl], $5b
inc hl inc hl
ld bc, $a ld bc, 10
ld a, $60 ld a, $60
call ByteFill call ByteFill
hlcoord 3, 2 hlcoord 3, 2
@@ -569,11 +569,11 @@ Function292be: ; 292be
ld a, $61 ld a, $61
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
ld c, $3 ld c, $3
.asm_292d9 .loop
add hl, de add hl, de
ld [hl], a ld [hl], a
dec c dec c
jr nz, .asm_292d9 jr nz, .loop
add hl, de add hl, de
ld a, $5f ld a, $5f
ld [hld], a ld [hld], a
@@ -603,21 +603,21 @@ Function292f6: ; 292f6
ld a, "─" ld a, "─"
call ByteFill call ByteFill
hlcoord 0, 1 hlcoord 0, 1
ld de, wc736 ld de, wLinkPlayer1Name
call PlaceString call PlaceString
ld hl, wc741 ld hl, wLinkPlayer2Name
ld de, 0 ld de, 0
.asm_2931e .find_name_end_loop
ld a, [hli] ld a, [hli]
cp "@" cp "@"
jr z, .asm_29326 jr z, .done
dec de dec de
jr .asm_2931e jr .find_name_end_loop
.asm_29326 .done
hlcoord 0, 4 hlcoord 0, 4
add hl, de add hl, de
ld de, wc741 ld de, wLinkPlayer2Name
call PlaceString call PlaceString
hlcoord 7, 2 hlcoord 7, 2
ld bc, 6 ld bc, 6
@@ -631,7 +631,7 @@ Function292f6: ; 292f6
ret ret
; 29348 ; 29348
TradeAnim_03: ; 29348 TradeAnim_EnterLinkTube: ; 29348
call ClearTileMap call ClearTileMap
call WaitTop call WaitTop
ld a, $a0 ld a, $a0
@@ -665,11 +665,11 @@ TradeAnim_04: ; 2937e
.done .done
ld c, 80 ld c, 80
call DelayFrames call DelayFrames
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29391 ; 29391
TradeAnim_05: ; 29391 TradeAnim_ExitLinkTube: ; 29391
ld a, [hSCX] ld a, [hSCX]
cp $a0 cp $a0
jr z, .asm_2939c jr z, .asm_2939c
@@ -681,22 +681,22 @@ TradeAnim_05: ; 29391
call ClearTileMap call ClearTileMap
xor a xor a
ld [hSCX], a ld [hSCX], a
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 293a6 ; 293a6
TradeAnim_1b: ; 293a6 TradeAnim_SetupGivemonScroll: ; 293a6
ld a, $8f ld a, $8f
ld [hWX], a ld [hWX], a
ld a, $88 ld a, $88
ld [hSCX], a ld [hSCX], a
ld a, $50 ld a, $50
ld [hWY], a ld [hWY], a
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 293b6 ; 293b6
TradeAnim_1c: ; 293b6 TradeAnim_DoGivemonScroll: ; 293b6
ld a, [hWX] ld a, [hWX]
cp $7 cp $7
jr z, .done jr z, .done
@@ -712,7 +712,7 @@ TradeAnim_1c: ; 293b6
ld [hWX], a ld [hWX], a
xor a xor a
ld [hSCX], a ld [hSCX], a
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 293d2 ; 293d2
@@ -721,7 +721,7 @@ TradeAnim_1d: ; 293d2
ld [hWX], a ld [hWX], a
ld a, $50 ld a, $50
ld [hWY], a ld [hWY], a
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 293de ; 293de
@@ -730,11 +730,11 @@ TradeAnim_1e: ; 293de
ld [hWX], a ld [hWX], a
ld a, $90 ld a, $90
ld [hWY], a ld [hWY], a
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 293ea ; 293ea
TradeAnim_1f: ; 293ea TradeAnim_ScrollOutRight: ; 293ea
call WaitTop call WaitTop
ld a, VBGMap1 / $100 ld a, VBGMap1 / $100
ld [hBGMapAddress + 1], a ld [hBGMapAddress + 1], a
@@ -752,15 +752,15 @@ TradeAnim_1f: ; 293ea
ret ret
; 2940c ; 2940c
TradeAnim_20: ; 2940c TradeAnim_ScrollOutRight2: ; 2940c
ld a, [hWX] ld a, [hWX]
cp $a1 cp $a1
jr nc, .asm_29417 jr nc, .done
add $4 add $4
ld [hWX], a ld [hWX], a
ret ret
.asm_29417 .done
ld a, VBGMap1 / $100 ld a, VBGMap1 / $100
ld [hBGMapAddress + 1], a ld [hBGMapAddress + 1], a
call WaitBGMap call WaitBGMap
@@ -770,11 +770,11 @@ TradeAnim_20: ; 2940c
ld [hWY], a ld [hWY], a
ld a, VBGMap0 / $100 ld a, VBGMap0 / $100
ld [hBGMapAddress + 1], a ld [hBGMapAddress + 1], a
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 2942e ; 2942e
TradeAnim_01: ; 2942e TradeAnim_ShowGivemonData: ; 2942e
call Function2951f call Function2951f
ld a, [wPlayerTrademonSpecies] ld a, [wPlayerTrademonSpecies]
ld [CurPartySpecies], a ld [CurPartySpecies], a
@@ -796,11 +796,11 @@ TradeAnim_01: ; 2942e
call PlayCryHeader call PlayCryHeader
.skip_cry .skip_cry
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29461 ; 29461
TradeAnim_02: ; 29461 TradeAnim_ShowGetmonData: ; 29461
call Function29549 call Function29549
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a ld [CurPartySpecies], a
@@ -813,13 +813,13 @@ TradeAnim_02: ; 29461
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
call Function294c0 call Function294c0
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29487 ; 29487
TradeAnim_2c: ; 29487 TradeAnim_AnimateFrontpic: ; 29487
callba Function4d81e callba Function4d81e
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29491 ; 29491
@@ -870,53 +870,53 @@ Function294c3: ; 294c3
ret ret
; 294e7 ; 294e7
TradeAnim_21: ; 294e7 TraideAnim_Wait80: ; 294e7
ld c, 80 ld c, 80
call DelayFrames call DelayFrames
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 294f0 ; 294f0
TradeAnim_22: ; 294f0 TraideAnim_Wait40: ; 294f0
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 294f9 ; 294f9
TradeAnim_2d: ; 294f9 TraideAnim_Wait96: ; 294f9
ld c, 96 ld c, 96
call DelayFrames call DelayFrames
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29502 ; 29502
TradeAnim_2e: ; 29502 TraideAnim_Wait80IfOTEgg: ; 29502
call Function29516 call IsOTTrademonEgg
ret nz ret nz
ld c, 80 ld c, 80
call DelayFrames call DelayFrames
ret ret
; 2950c ; 2950c
TradeAnim_2f: ; 2950c TraideAnim_Wait180IfOTEgg: ; 2950c
call Function29516 call IsOTTrademonEgg
ret nz ret nz
ld c, 180 ld c, 180
call DelayFrames call DelayFrames
ret ret
; 29516 ; 29516
Function29516: ; 29516 IsOTTrademonEgg: ; 29516
call GetTradeAnimByte call TradeAnim_Next
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
cp $fd cp EGG
ret ret
; 2951f ; 2951f
Function2951f: ; 2951f Function2951f: ; 2951f
ld de, wPlayerTrademonSpecies ld de, wPlayerTrademonSpecies
ld a, [de] ld a, [de]
cp $fd cp EGG
jr z, Function295a1 jr z, Function295a1
call Function29573 call Function29573
ld de, wPlayerTrademonSpecies ld de, wPlayerTrademonSpecies
@@ -935,7 +935,7 @@ Function2951f: ; 2951f
Function29549: ; 29549 Function29549: ; 29549
ld de, wOTTrademonSpecies ld de, wOTTrademonSpecies
ld a, [de] ld a, [de]
cp $fd cp EGG
jr z, Function295a1 jr z, Function295a1
call Function29573 call Function29573
ld de, wOTTrademonSpecies ld de, wOTTrademonSpecies
@@ -970,7 +970,7 @@ String29591: ; 29591
db "─── №." db "─── №."
next "" next ""
next "OT/" next "OT/"
next $73, "№.@" next "<ID>№.@"
; 295a1 ; 295a1
Function295a1: ; 295a1 Function295a1: ; 295a1
@@ -1048,17 +1048,17 @@ Function29611: ; 29611
ret ret
; 2961b ; 2961b
TradeAnim_23: ; 2961b TradeAnim_RockingBall: ; 2961b
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_0E ld a, SPRITE_ANIM_INDEX_0E
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
call GetTradeAnimByte call TradeAnim_Next
ld a, $20 ld a, $20
ld [wcf64], a ld [wcf64], a
ret ret
; 2962c ; 2962c
TradeAnim_24: ; 2962c TradeAnim_DropBall: ; 2962c
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_0E ld a, SPRITE_ANIM_INDEX_0E
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
@@ -1068,17 +1068,17 @@ TradeAnim_24: ; 2962c
ld hl, $7 ld hl, $7
add hl, bc add hl, bc
ld [hl], $dc ld [hl], $dc
call GetTradeAnimByte call TradeAnim_Next
ld a, $38 ld a, $38
ld [wcf64], a ld [wcf64], a
ret ret
; 29649 ; 29649
TradeAnim_27: ; 29649 TradeAnim_Poof: ; 29649
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_0F ld a, SPRITE_ANIM_INDEX_0F
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
call GetTradeAnimByte call TradeAnim_Next
ld a, $10 ld a, $10
ld [wcf64], a ld [wcf64], a
ld de, SFX_BALL_POOF ld de, SFX_BALL_POOF
@@ -1086,13 +1086,13 @@ TradeAnim_27: ; 29649
ret ret
; 29660 ; 29660
TradeAnim_28: ; 29660 TradeAnim_BulgeThroughTube: ; 29660
ld a, $e4 ld a, $e4
call Functioncf8 call Functioncf8
depixel 5, 11 depixel 5, 11
ld a, SPRITE_ANIM_INDEX_10 ld a, SPRITE_ANIM_INDEX_10
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
call GetTradeAnimByte call TradeAnim_Next
ld a, $40 ld a, $40
ld [wcf64], a ld [wcf64], a
ret ret
@@ -1209,7 +1209,7 @@ Function296f2: ; 296f2 (a:56f2)
ret ret
; 29701 (a:5701) ; 29701 (a:5701)
TradeAnim_16: ; 29701 TradeAnim_SentToOTText: ; 29701
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_TIMECAPSULE cp LINK_TIMECAPSULE
jr z, .time_capsule jr z, .time_capsule
@@ -1222,14 +1222,14 @@ TradeAnim_16: ; 29701
call Function297c9 call Function297c9
ld c, 128 ld c, 128
call DelayFrames call DelayFrames
call GetTradeAnimByte call TradeAnim_Next
ret ret
.time_capsule .time_capsule
ld hl, UnknownText_0x29732 ld hl, UnknownText_0x29732
call PrintText call PrintText
call Function297c9 call Function297c9
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29732 ; 29732
@@ -1245,14 +1245,14 @@ UnknownText_0x29737: ; 0x29737
db "@" db "@"
; 0x2973c ; 0x2973c
TradeAnim_17: ; 2973c TradeAnim_OTBidsFarewell: ; 2973c
ld hl, UnknownText_0x29752 ld hl, UnknownText_0x29752
call PrintText call PrintText
call Function297c9 call Function297c9
ld hl, UnknownText_0x29757 ld hl, UnknownText_0x29757
call PrintText call PrintText
call Function297c9 call Function297c9
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29752 ; 29752
@@ -1268,7 +1268,7 @@ UnknownText_0x29757: ; 0x29757
db "@" db "@"
; 0x2975c ; 0x2975c
TradeAnim_18: ; 2975c TradeAnim_TakeCareOfText: ; 2975c
call WaitTop call WaitTop
hlcoord 0, 10 hlcoord 0, 10
ld bc, 8 * SCREEN_WIDTH ld bc, 8 * SCREEN_WIDTH
@@ -1278,7 +1278,7 @@ TradeAnim_18: ; 2975c
ld hl, UnknownText_0x2977a ld hl, UnknownText_0x2977a
call PrintText call PrintText
call Function297c9 call Function297c9
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 2977a ; 2977a
@@ -1288,7 +1288,7 @@ UnknownText_0x2977a: ; 0x2977a
db "@" db "@"
; 0x2977f ; 0x2977f
TradeAnim_19: ; 2977f TradeAnim_OTSendsText1: ; 2977f
ld hl, UnknownText_0x2979a ld hl, UnknownText_0x2979a
call PrintText call PrintText
call Function297c9 call Function297c9
@@ -1297,7 +1297,7 @@ TradeAnim_19: ; 2977f
call Function297c9 call Function297c9
ld c, 14 ld c, 14
call DelayFrames call DelayFrames
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 2979a ; 2979a
@@ -1313,7 +1313,7 @@ UnknownText_0x2979f: ; 0x2979f
db "@" db "@"
; 0x297a4 ; 0x297a4
TradeAnim_1a: ; 297a4 TradeAnim_OTSendsText2: ; 297a4
ld hl, UnknownText_0x297bf ld hl, UnknownText_0x297bf
call PrintText call PrintText
call Function297c9 call Function297c9
@@ -1322,7 +1322,7 @@ TradeAnim_1a: ; 297a4
call Function297c9 call Function297c9
ld c, 14 ld c, 14
call DelayFrames call DelayFrames
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 297bf ; 297bf
@@ -1387,11 +1387,11 @@ Function297ed: ; 297ed
Function297ff: ; 297ff Function297ff: ; 297ff
push de push de
ld de, wc736 ld de, wLinkPlayer1Name
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
pop hl pop hl
ld de, wc741 ld de, wLinkPlayer2Name
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
ret ret
@@ -1451,7 +1451,7 @@ Function2985a: ; 2985a
ret ret
; 29879 ; 29879
TradeAnim_25: ; 29879 TradeAnim_WaitAnim: ; 29879
ld hl, wcf64 ld hl, wcf64
ld a, [hl] ld a, [hl]
and a and a
@@ -1460,25 +1460,25 @@ TradeAnim_25: ; 29879
ret ret
.done .done
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29886 ; 29886
TradeAnim_26: ; 29886 TradeAnim_WaitAnim2: ; 29886
ld hl, wcf64 ld hl, wcf64
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_2988f jr z, .done
dec [hl] dec [hl]
ret ret
.asm_2988f .done
call GetTradeAnimByte call TradeAnim_Next
ret ret
; 29893 ; 29893
Function29893: ; 29893 DebugTrade: ; 29893
; This function is unreferenced. ; This function is unreferenced.
; It was meant for use in Japanese versions, so the ; It was meant for use in Japanese versions, so the
; constant used for copy length was changed by accident. ; constant used for copy length was changed by accident.
@@ -1488,30 +1488,30 @@ Function29893: ; 29893
ld a, [hli] ld a, [hli]
ld [wPlayerTrademonSpecies], a ld [wPlayerTrademonSpecies], a
ld de, wPlayerTrademonSenderName ld de, wPlayerTrademonSenderName
ld c, 13 ; jp: 8 ld c, 11 + 2 ; jp: 6 + 2
.asm_2989f .loop1
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
dec c dec c
jr nz, .asm_2989f jr nz, .loop1
ld a, [hli] ld a, [hli]
ld [wOTTrademonSpecies], a ld [wOTTrademonSpecies], a
ld de, wOTTrademonSenderName ld de, wOTTrademonSenderName
ld c, 13 ; jp: 8 ld c, 11 + 2 ; jp: 6 + 2
.asm_298ae .loop2
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
dec c dec c
jr nz, .asm_298ae jr nz, .loop2
ret ret
; 298b5 ; 298b5
Unknown_298b5: ; 298b5 Unknown_298b5: ; 298b5
db $03, "ゲーフり@@", $23, $01 ; GAME FREAK db VENUSAUR, "ゲーフり@@", $23, $01 ; GAME FREAK
db $06, "クりーチャ@", $56, $04 ; Creatures Inc. db CHARIZARD, "クりーチャ@", $56, $04 ; Creatures Inc.
; 298c7 ; 298c7

183
macros/trade_anim.asm
View File

@@ -4,78 +4,75 @@ tradeanim_next: macro
db tradeanim_next_command db tradeanim_next_command
endm endm
enum tradeanim_01_command enum tradeanim_show_givemon_data_command
tradeanim_01: macro tradeanim_show_givemon_data: macro
db tradeanim_01_command db tradeanim_show_givemon_data_command
endm endm
enum tradeanim_02_command enum tradeanim_show_getmon_data_command
tradeanim_02: macro tradeanim_show_getmon_data: macro
db tradeanim_02_command db tradeanim_show_getmon_data_command
endm endm
enum tradeanim_03_command enum tradeanim_enter_link_tube_command
tradeanim_03: macro tradeanim_enter_link_tube: macro
db tradeanim_03_command db tradeanim_enter_link_tube_command
endm endm
enum tradeanim_04_command __enum__ set $5
tradeanim_04: macro
db tradeanim_04_command enum tradeanim_exit_link_tube_command
tradeanim_exit_link_tube: macro
db tradeanim_exit_link_tube_command
endm endm
enum tradeanim_05_command enum tradeanim_tube_to_ot_command
tradeanim_05: macro tradeanim_tube_to_ot: macro
db tradeanim_05_command db tradeanim_tube_to_ot_command
endm
enum tradeanim_06_command
tradeanim_06: macro
db tradeanim_06_command
endm endm
__enum__ set $e __enum__ set $e
enum tradeanim_0e_command enum tradeanim_tube_to_player_command
tradeanim_0e: macro tradeanim_tube_to_player: macro
db tradeanim_0e_command db tradeanim_tube_to_player_command
endm endm
__enum__ set $16 __enum__ set $16
enum tradeanim_16_command enum tradeanim_sent_to_ot_text_command
tradeanim_16: macro tradeanim_sent_to_ot_text: macro
db tradeanim_16_command db tradeanim_sent_to_ot_text_command
endm endm
enum tradeanim_17_command enum tradeanim_ot_bids_farewell_command
tradeanim_17: macro tradeanim_ot_bids_farewell: macro
db tradeanim_17_command db tradeanim_ot_bids_farewell_command
endm endm
enum tradeanim_18_command enum tradeanim_take_care_of_text_command
tradeanim_18: macro tradeanim_take_care_of_text: macro
db tradeanim_18_command db tradeanim_take_care_of_text_command
endm endm
enum tradeanim_19_command enum tradeanim_ot_sends_text_1_command
tradeanim_19: macro tradeanim_ot_sends_text_1: macro
db tradeanim_19_command db tradeanim_ot_sends_text_1_command
endm endm
enum tradeanim_1a_command enum tradeanim_ot_sends_text_2_command
tradeanim_1a: macro tradeanim_ot_sends_text_2: macro
db tradeanim_1a_command db tradeanim_ot_sends_text_2_command
endm endm
enum tradeanim_1b_command enum tradeanim_setup_givemon_scroll_command
tradeanim_1b: macro tradeanim_setup_givemon_scroll: macro
db tradeanim_1b_command db tradeanim_setup_givemon_scroll_command
endm endm
enum tradeanim_1c_command enum tradeanim_do_givemon_scroll_command
tradeanim_1c: macro tradeanim_do_givemon_scroll: macro
db tradeanim_1c_command db tradeanim_do_givemon_scroll_command
endm endm
enum tradeanim_1d_command enum tradeanim_1d_command
@@ -88,64 +85,58 @@ tradeanim_1e: macro
db tradeanim_1e_command db tradeanim_1e_command
endm endm
enum tradeanim_1f_command enum tradeanim_scroll_out_right_command
tradeanim_1f: macro tradeanim_scroll_out_right: macro
db tradeanim_1f_command db tradeanim_scroll_out_right_command
endm endm
enum tradeanim_20_command __enum__ set $21
tradeanim_20: macro
db tradeanim_20_command enum tradeanim_wait_80_command
tradeanim_wait_80: macro
db tradeanim_wait_80_command
endm endm
enum tradeanim_21_command enum tradeanim_wait_40_command
tradeanim_21: macro tradeanim_wait_40: macro
db tradeanim_21_command db tradeanim_wait_40_command
endm endm
enum tradeanim_22_command enum tradeanim_rocking_ball_command
tradeanim_22: macro tradeanim_rocking_ball: macro
db tradeanim_22_command db tradeanim_rocking_ball_command
endm endm
enum tradeanim_23_command enum tradeanim_drop_ball_command
tradeanim_23: macro tradeanim_drop_ball: macro
db tradeanim_23_command db tradeanim_drop_ball_command
endm endm
enum tradeanim_24_command enum tradeanim_wait_anim_command
tradeanim_24: macro tradeanim_wait_anim: macro
db tradeanim_24_command db tradeanim_wait_anim_command
endm endm
enum tradeanim_25_command __enum__ set $27
tradeanim_25: macro
db tradeanim_25_command enum tradeanim_poof_command
tradeanim_poof: macro
db tradeanim_poof_command
endm endm
enum tradeanim_26_command enum tradeanim_bulge_through_tube_command
tradeanim_26: macro tradeanim_bulge_through_tube: macro
db tradeanim_26_command db tradeanim_bulge_through_tube_command
endm endm
enum tradeanim_27_command enum tradeanim_give_trademon_sfx_command
tradeanim_27: macro tradeanim_give_trademon_sfx: macro
db tradeanim_27_command db tradeanim_give_trademon_sfx_command
endm endm
enum tradeanim_28_command enum tradeanim_get_trademon_sfx_command
tradeanim_28: macro tradeanim_get_trademon_sfx: macro
db tradeanim_28_command db tradeanim_get_trademon_sfx_command
endm
enum tradeanim_29_command
tradeanim_29: macro
db tradeanim_29_command
endm
enum tradeanim_2a_command
tradeanim_2a: macro
db tradeanim_2a_command
endm endm
enum tradeanim_end_command enum tradeanim_end_command
@@ -153,23 +144,23 @@ tradeanim_end: macro
db tradeanim_end_command db tradeanim_end_command
endm endm
enum tradeanim_2c_command enum tradeanim_animate_frontpic_command
tradeanim_2c: macro tradeanim_animate_frontpic: macro
db tradeanim_2c_command db tradeanim_animate_frontpic_command
endm endm
enum tradeanim_2d_command enum tradeanim_wait_96_command
tradeanim_2d: macro tradeanim_wait_96: macro
db tradeanim_2d_command db tradeanim_wait_96_command
endm endm
enum tradeanim_2e_command enum tradeanim_wait_80_if_ot_egg_command
tradeanim_2e: macro tradeanim_wait_80_if_ot_egg: macro
db tradeanim_2e_command db tradeanim_wait_80_if_ot_egg_command
endm endm
enum tradeanim_2f_command enum tradeanim_wait_180_if_ot_egg_command
tradeanim_2f: macro tradeanim_wait_180_if_ot_egg: macro
db tradeanim_2f_command db tradeanim_wait_180_if_ot_egg_command
endm endm

3
wram.asm
View File

@@ -959,6 +959,9 @@ BattleEnded:: ; c734
wWildMonMoves:: wWildMonMoves::
wc735:: ds 1 wc735:: ds 1
wLinkPlayer1Name:: ds NAME_LENGTH
wLinkPlayer2Name:: ds NAME_LENGTH
ds wLinkPlayer1Name - @
wc736:: ds 3 wc736:: ds 3
wWildMonPP:: wWildMonPP::
wc739:: ds 4 wc739:: ds 4