pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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

File diff suppressed because it is too large Load Diff

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