fix merge conflicts, evo scene
This commit is contained in:
DizzyEggg
@@ -3,7 +3,168 @@
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE004:: @ 85CE004
|
||||
.2byte 0x0000, 0x0004, 0x0010, 0x0004
|
||||
.2byte 0x0020, 0x0004, 0x0030, 0x0004
|
||||
.2byte 0x0040, 0x0004, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE01C:: @ 85CE01C
|
||||
.4byte gUnknown_085CE004
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE020:: @ 85CE020
|
||||
spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
|
||||
|
||||
.align 2
|
||||
spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
|
||||
|
||||
.align 2
|
||||
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE068:: @ 85CE068
|
||||
.2byte 0x0000, 0x0028, 0x0010, 0x0008
|
||||
.2byte 0x0020, 0x0028, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE078:: @ 85CE078
|
||||
.4byte gUnknown_085CE068
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE07C:: @ 85CE07C
|
||||
spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
|
||||
|
||||
.align 2
|
||||
spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
|
||||
|
||||
.align 2
|
||||
spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE0C4:: @ 85CE0C4
|
||||
.2byte 0x0180, 0x0180, 0x0000, 0x0000
|
||||
.2byte 0xffe0, 0x0018, 0x0500, 0x0000
|
||||
.2byte 0x0018, 0xffe0, 0x0500, 0x0000
|
||||
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE0E4:: @ 85CE0E4
|
||||
.2byte 0x0030, 0x0030, 0x0000, 0x0000
|
||||
.2byte 0x0020, 0x0020, 0x0600, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE0FC:: @ 85CE0FC
|
||||
.4byte gUnknown_085CE0C4
|
||||
.4byte gUnknown_085CE0E4
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE104:: @ 85CE104
|
||||
spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
|
||||
|
||||
.align 2
|
||||
spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE134:: @ 85CE134
|
||||
.2byte 0x0000, 0x0003, 0x0010, 0x0003
|
||||
.2byte 0x0020, 0x0003, 0x0030, 0x0003
|
||||
.2byte 0x0040, 0x0003, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE14C:: @ 85CE14C
|
||||
.4byte gUnknown_085CE134
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE150:: @ 85CE150
|
||||
spr_template 0x272b, 0x272b, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE168:: @ 85CE168
|
||||
.2byte 0x0000, 0x0003, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE170:: @ 85CE170
|
||||
.4byte gUnknown_085CE168
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE174:: @ 85CE174
|
||||
.2byte 0xfff9, 0xfff9, 0x10fd, 0x0000
|
||||
.2byte 0x0007, 0x0007, 0x1003, 0x0000
|
||||
.2byte 0x7ffe, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE18C:: @ 85CE18C
|
||||
.4byte gUnknown_085CE174
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE190:: @ 85CE190
|
||||
spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1A8:: @ 85CE1A8
|
||||
.2byte 0x0000, 0x0008, 0x0010, 0x0010, 0x0020, 0x0004, 0x0030, 0x0004, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1BC:: @ 85CE1BC
|
||||
.4byte gUnknown_085CE1A8
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1C0:: @ 85CE1C0
|
||||
.2byte 0x0200, 0x0200, 0x0000, 0x0000
|
||||
.2byte 0xffe0, 0xffe0, 0x0800, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1D8:: @ 85CE1D8
|
||||
.4byte gUnknown_085CE1C0
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1DC:: @ 85CE1DC
|
||||
spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1F4:: @ 85CE1F4
|
||||
.2byte 0x0000, 0x0180, 0x0000, 0x0000
|
||||
.2byte 0x0010, 0x0000, 0x1400, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE20C:: @ 85CE20C
|
||||
.2byte 0x0140, 0x0180, 0x0000, 0x0000
|
||||
.2byte 0xfff0, 0x0000, 0x1300, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE224:: @ 85CE224
|
||||
.4byte gUnknown_085CE1F4
|
||||
.4byte gUnknown_085CE20C
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE22C:: @ 85CE22C
|
||||
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
|
||||
|
||||
.align 2
|
||||
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
|
||||
|
||||
.align 2
|
||||
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE274:: @ 85CE274
|
||||
.2byte 0x0000, 0x0002, 0x0008, 0x0002
|
||||
.2byte 0x0010, 0x0002, 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE284:: @ 85CE284
|
||||
.4byte gUnknown_085CE274
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE288:: @ 85CE288
|
||||
spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
|
||||
|
||||
gUnknown_085CE2A0:: @ 85CE2A0
|
||||
.incbin "baserom.gba", 0x5ce2a0, 0xb0
|
||||
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gLinkOpponentBufferCommands:: @ 831C7B4
|
||||
.4byte dp01t_00_2_getattr
|
||||
.4byte sub_8065900
|
||||
.4byte sub_806590C
|
||||
.4byte sub_8066284
|
||||
.4byte sub_80662F8
|
||||
.4byte sub_8066448
|
||||
.4byte sub_8066624
|
||||
.4byte sub_8066748
|
||||
.4byte sub_8066A58
|
||||
.4byte sub_8066B94
|
||||
.4byte sub_8066C40
|
||||
.4byte sub_8066CEC
|
||||
.4byte sub_8066CF8
|
||||
.4byte sub_8066D04
|
||||
.4byte sub_8066D10
|
||||
.4byte sub_8066D1C
|
||||
.4byte sub_8066FF4
|
||||
.4byte sub_806704C
|
||||
.4byte sub_8067058
|
||||
.4byte sub_8067064
|
||||
.4byte sub_8067070
|
||||
.4byte sub_806707C
|
||||
.4byte sub_8067088
|
||||
.4byte sub_8067094
|
||||
.4byte sub_80670A0
|
||||
.4byte sub_8067190
|
||||
.4byte sub_806719C
|
||||
.4byte sub_8067214
|
||||
.4byte sub_806727C
|
||||
.4byte sub_8067288
|
||||
.4byte sub_8067294
|
||||
.4byte sub_80672A0
|
||||
.4byte sub_80672AC
|
||||
.4byte sub_80672B8
|
||||
.4byte sub_80672C4
|
||||
.4byte sub_80672D0
|
||||
.4byte sub_80672DC
|
||||
.4byte sub_80672E8
|
||||
.4byte sub_8067304
|
||||
.4byte sub_806733C
|
||||
.4byte sub_8067354
|
||||
.4byte sub_806737C
|
||||
.4byte sub_80673EC
|
||||
.4byte sub_80673F8
|
||||
.4byte sub_806743C
|
||||
.4byte sub_8067498
|
||||
.4byte sub_80674D4
|
||||
.4byte sub_8067508
|
||||
.4byte sub_8067718
|
||||
.4byte sub_8067874
|
||||
.4byte sub_80678C4
|
||||
.4byte sub_80678D0
|
||||
.4byte sub_8067930
|
||||
.4byte sub_80679A4
|
||||
.4byte sub_80679C4
|
||||
.4byte sub_80679D0
|
||||
.4byte nullsub_92
|
||||
@@ -1,65 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gLinkPartnerBufferCommands:: @ 85C9A94
|
||||
.4byte dp01t_00_4_getattr
|
||||
.4byte sub_814C038
|
||||
.4byte sub_814C044
|
||||
.4byte sub_814CA98
|
||||
.4byte sub_814CB0C
|
||||
.4byte sub_814CC28
|
||||
.4byte sub_814CE14
|
||||
.4byte sub_814CF30
|
||||
.4byte sub_814D0E4
|
||||
.4byte sub_814D0F0
|
||||
.4byte sub_814D19C
|
||||
.4byte sub_814D288
|
||||
.4byte sub_814D294
|
||||
.4byte sub_814D2A0
|
||||
.4byte sub_814D2AC
|
||||
.4byte sub_814D2B8
|
||||
.4byte sub_814D590
|
||||
.4byte sub_814D5E8
|
||||
.4byte sub_814D5F4
|
||||
.4byte sub_814D600
|
||||
.4byte sub_814D60C
|
||||
.4byte sub_814D618
|
||||
.4byte sub_814D624
|
||||
.4byte sub_814D630
|
||||
.4byte sub_814D63C
|
||||
.4byte sub_814D72C
|
||||
.4byte sub_814D738
|
||||
.4byte sub_814D7B0
|
||||
.4byte sub_814D818
|
||||
.4byte sub_814D824
|
||||
.4byte sub_814D830
|
||||
.4byte sub_814D83C
|
||||
.4byte sub_814D848
|
||||
.4byte sub_814D854
|
||||
.4byte sub_814D860
|
||||
.4byte sub_814D86C
|
||||
.4byte sub_814D878
|
||||
.4byte sub_814D884
|
||||
.4byte sub_814D8A0
|
||||
.4byte sub_814D8D8
|
||||
.4byte sub_814D8F0
|
||||
.4byte dp01t_29_4_blink
|
||||
.4byte sub_814D988
|
||||
.4byte sub_814D994
|
||||
.4byte sub_814D9D8
|
||||
.4byte sub_814DA34
|
||||
.4byte dp01t_2E_4_battle_intro
|
||||
.4byte sub_814DAA8
|
||||
.4byte sub_814DDD8
|
||||
.4byte sub_814DEE4
|
||||
.4byte sub_814DF34
|
||||
.4byte sub_814DF40
|
||||
.4byte sub_814DFA0
|
||||
.4byte sub_814E014
|
||||
.4byte sub_814E034
|
||||
.4byte sub_814E040
|
||||
.4byte nullsub_113
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gOpponentBufferCommands:: @ 831C6C8
|
||||
.4byte dp01t_00_7_getattr
|
||||
.4byte dp01t_01_2_read_pokmon_data_slice
|
||||
.4byte dp01t_02_7_setattr
|
||||
.4byte sub_80611B0
|
||||
.4byte sub_8061224
|
||||
.4byte sub_806137C
|
||||
.4byte sub_806156C
|
||||
.4byte sub_8061690
|
||||
.4byte sub_80618D8
|
||||
.4byte sub_8061AF0
|
||||
.4byte sub_8061B9C
|
||||
.4byte sub_8061C48
|
||||
.4byte sub_8061C54
|
||||
.4byte sub_8061C60
|
||||
.4byte sub_8061C6C
|
||||
.4byte sub_8061C78
|
||||
.4byte sub_8061F34
|
||||
.4byte sub_8061F90
|
||||
.4byte sub_8061F9C
|
||||
.4byte sub_8061FAC
|
||||
.4byte sub_8061FB8
|
||||
.4byte sub_806215C
|
||||
.4byte sub_8062188
|
||||
.4byte sub_8062288
|
||||
.4byte sub_8062294
|
||||
.4byte sub_8062384
|
||||
.4byte sub_8062390
|
||||
.4byte sub_8062408
|
||||
.4byte sub_8062470
|
||||
.4byte sub_806247C
|
||||
.4byte sub_8062488
|
||||
.4byte sub_8062494
|
||||
.4byte sub_80624A0
|
||||
.4byte sub_80624AC
|
||||
.4byte sub_80624B8
|
||||
.4byte sub_80624C4
|
||||
.4byte sub_80624D0
|
||||
.4byte sub_80624DC
|
||||
.4byte sub_80624F8
|
||||
.4byte sub_8062530
|
||||
.4byte sub_8062548
|
||||
.4byte dp01t_29_7_blink
|
||||
.4byte sub_80625E0
|
||||
.4byte sub_80625EC
|
||||
.4byte sub_8062630
|
||||
.4byte sub_806268C
|
||||
.4byte dp01t_2E_7_battle_intro
|
||||
.4byte sub_80626FC
|
||||
.4byte dp01t_30_7_0803D67C
|
||||
.4byte sub_8062A74
|
||||
.4byte sub_8062AC4
|
||||
.4byte sub_8062AD0
|
||||
.4byte dp01t_34_7_move_anim_start_t3
|
||||
.4byte sub_8062B98
|
||||
.4byte sub_8062BA4
|
||||
.4byte sub_8062BB0
|
||||
.4byte nullsub_91
|
||||
|
||||
.align 2
|
||||
.byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
|
||||
@@ -1,69 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gPlayerBufferCommands:: @ 831C514
|
||||
.4byte dp01t_00_1_getattr
|
||||
.4byte sub_805A614
|
||||
.4byte dp01t_02_1_setattr
|
||||
.4byte sub_805B0F0
|
||||
.4byte sub_805B164
|
||||
.4byte sub_805B1CC
|
||||
.4byte sub_805B3D4
|
||||
.4byte sub_805B4F0
|
||||
.4byte dp01t_08_1_8032428
|
||||
.4byte sub_805B9F8
|
||||
.4byte sub_805BAB8
|
||||
.4byte sub_805BBA4
|
||||
.4byte sub_805BBC4
|
||||
.4byte sub_805BC18
|
||||
.4byte sub_805BC78
|
||||
.4byte dp01t_0F_1_move_anim
|
||||
.4byte sub_805BF80
|
||||
.4byte dp01t_11_1_message_for_player_only
|
||||
.4byte dp01t_12_6_battle_menu
|
||||
.4byte sub_805C0B0
|
||||
.4byte dp01t_14_5_move_menu_pokedude
|
||||
.4byte sub_805C248
|
||||
.4byte sub_805C2AC
|
||||
.4byte sub_805C3EC
|
||||
.4byte sub_805C410
|
||||
.4byte sub_805C528
|
||||
.4byte sub_805C5C4
|
||||
.4byte sub_805C63C
|
||||
.4byte sub_805C6A4
|
||||
.4byte sub_805C710
|
||||
.4byte sub_805C71C
|
||||
.4byte sub_805C7D0
|
||||
.4byte sub_805C800
|
||||
.4byte sub_805C80C
|
||||
.4byte sub_805C820
|
||||
.4byte sub_805C834
|
||||
.4byte sub_805C848
|
||||
.4byte sub_805C85C
|
||||
.4byte sub_805C878
|
||||
.4byte sub_805C8B0
|
||||
.4byte sub_805C8C8
|
||||
.4byte dp01t_29_1_blink
|
||||
.4byte sub_805C960
|
||||
.4byte sub_805C96C
|
||||
.4byte sub_805C9B0
|
||||
.4byte sub_805CA0C
|
||||
.4byte dp01t_2E_1_battle_intro
|
||||
.4byte dp01t_2F_1_pokemon_enter
|
||||
.4byte sub_805CD74
|
||||
.4byte sub_805CE80
|
||||
.4byte sub_805CED0
|
||||
.4byte dp01t_33_1_enemy_move
|
||||
.4byte sub_805CF54
|
||||
.4byte dp01t_35_1_link_standby_message_and_free_vram
|
||||
.4byte sub_805D02C
|
||||
.4byte sub_805D094
|
||||
.4byte nullsub_22
|
||||
|
||||
.align 2
|
||||
gUnknown_0831C5F8:: @ 831C5F8
|
||||
.byte 0x00, 0x02, 0x03, 0x01, 0x48, 0x48, 0x20, 0x5a
|
||||
.byte 0x50, 0x50, 0x50, 0x58
|
||||
@@ -1,71 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gPlayerPartnerBufferCommands:: @ 8617170
|
||||
.4byte dp01t_00_3_getattr
|
||||
.4byte sub_81BC484
|
||||
.4byte sub_81BC490
|
||||
.4byte sub_81BCEE4
|
||||
.4byte sub_81BCF58
|
||||
.4byte sub_81BD074
|
||||
.4byte sub_81BD260
|
||||
.4byte sub_81BD37C
|
||||
.4byte sub_81BD5BC
|
||||
.4byte sub_81BD5C8
|
||||
.4byte sub_81BD674
|
||||
.4byte sub_81BD760
|
||||
.4byte sub_81BD76C
|
||||
.4byte sub_81BD778
|
||||
.4byte sub_81BD784
|
||||
.4byte sub_81BD790
|
||||
.4byte sub_81BDA4C
|
||||
.4byte sub_81BDAA0
|
||||
.4byte sub_81BDAAC
|
||||
.4byte sub_81BDABC
|
||||
.4byte sub_81BDAC8
|
||||
.4byte sub_81BDB70
|
||||
.4byte sub_81BDB7C
|
||||
.4byte sub_81BDC04
|
||||
.4byte sub_81BDC10
|
||||
.4byte sub_81BDD00
|
||||
.4byte sub_81BDD9C
|
||||
.4byte sub_81BDE14
|
||||
.4byte sub_81BDE7C
|
||||
.4byte sub_81BDE88
|
||||
.4byte sub_81BDE94
|
||||
.4byte sub_81BDEA0
|
||||
.4byte sub_81BDEAC
|
||||
.4byte sub_81BDEB8
|
||||
.4byte sub_81BDEC4
|
||||
.4byte sub_81BDED0
|
||||
.4byte sub_81BDEDC
|
||||
.4byte sub_81BDEE8
|
||||
.4byte sub_81BDF04
|
||||
.4byte sub_81BDF3C
|
||||
.4byte sub_81BDF54
|
||||
.4byte dp01t_29_3_blink
|
||||
.4byte sub_81BDFEC
|
||||
.4byte sub_81BDFF8
|
||||
.4byte sub_81BE03C
|
||||
.4byte sub_81BE098
|
||||
.4byte dp01t_2E_3_battle_intro
|
||||
.4byte sub_81BE10C
|
||||
.4byte dp01t_30_3_80EB11C
|
||||
.4byte sub_81BE4E0
|
||||
.4byte sub_81BE530
|
||||
.4byte sub_81BE53C
|
||||
.4byte sub_81BE59C
|
||||
.4byte sub_81BE604
|
||||
.4byte sub_81BE610
|
||||
.4byte sub_81BE61C
|
||||
.4byte nullsub_128
|
||||
|
||||
.align 2
|
||||
@ apparently unused data
|
||||
.byte 0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e
|
||||
.byte 0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35
|
||||
.byte 0xc5, 0x2c, 0x15, 0x7f, 0xb5, 0x56, 0x9d, 0x53
|
||||
.byte 0x3b, 0x43, 0xda, 0x36, 0x79, 0x2a, 0x0e, 0x53
|
||||
@@ -1,65 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gRecordedOpponentBufferCommands:: @ 860AE90
|
||||
.4byte sub_8187224
|
||||
.4byte sub_8187A44
|
||||
.4byte sub_8187A50
|
||||
.4byte sub_81883C8
|
||||
.4byte sub_818843C
|
||||
.4byte sub_818858C
|
||||
.4byte sub_8188768
|
||||
.4byte sub_818888C
|
||||
.4byte sub_8188A40
|
||||
.4byte sub_8188A4C
|
||||
.4byte sub_8188AF8
|
||||
.4byte sub_8188BA4
|
||||
.4byte sub_8188BB0
|
||||
.4byte sub_8188BBC
|
||||
.4byte sub_8188BC8
|
||||
.4byte sub_8188BD4
|
||||
.4byte sub_8188E90
|
||||
.4byte sub_8188EE4
|
||||
.4byte sub_8188EF0
|
||||
.4byte sub_8188F14
|
||||
.4byte sub_8188F20
|
||||
.4byte sub_8188F7C
|
||||
.4byte sub_8188F88
|
||||
.4byte sub_8188FC4
|
||||
.4byte sub_8188FD0
|
||||
.4byte sub_81890C0
|
||||
.4byte sub_81890CC
|
||||
.4byte sub_8189144
|
||||
.4byte sub_81891AC
|
||||
.4byte sub_81891B8
|
||||
.4byte sub_81891C4
|
||||
.4byte sub_81891D0
|
||||
.4byte sub_81891DC
|
||||
.4byte sub_81891E8
|
||||
.4byte sub_81891F4
|
||||
.4byte sub_8189200
|
||||
.4byte sub_818920C
|
||||
.4byte sub_8189218
|
||||
.4byte sub_8189234
|
||||
.4byte sub_818926C
|
||||
.4byte sub_8189284
|
||||
.4byte sub_81892AC
|
||||
.4byte sub_818931C
|
||||
.4byte sub_8189328
|
||||
.4byte sub_818936C
|
||||
.4byte sub_81893C8
|
||||
.4byte sub_8189404
|
||||
.4byte sub_8189438
|
||||
.4byte sub_8189648
|
||||
.4byte sub_81897A4
|
||||
.4byte sub_81897F4
|
||||
.4byte sub_8189800
|
||||
.4byte sub_8189860
|
||||
.4byte sub_81898C8
|
||||
.4byte sub_81898D4
|
||||
.4byte sub_81898E0
|
||||
.4byte nullsub_119
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gRecordedPlayerBufferCommands:: @ 860AF74
|
||||
.4byte sub_818A5EC
|
||||
.4byte sub_818AE0C
|
||||
.4byte sub_818AE18
|
||||
.4byte sub_818B86C
|
||||
.4byte sub_818B8E0
|
||||
.4byte sub_818B9FC
|
||||
.4byte sub_818BBE8
|
||||
.4byte sub_818BD04
|
||||
.4byte sub_818BFAC
|
||||
.4byte sub_818BFB8
|
||||
.4byte sub_818C064
|
||||
.4byte sub_818C150
|
||||
.4byte sub_818C15C
|
||||
.4byte sub_818C168
|
||||
.4byte sub_818C174
|
||||
.4byte sub_818C180
|
||||
.4byte sub_818C43C
|
||||
.4byte sub_818C490
|
||||
.4byte sub_818C4D8
|
||||
.4byte sub_818C52C
|
||||
.4byte sub_818C538
|
||||
.4byte sub_818C594
|
||||
.4byte sub_818C5A0
|
||||
.4byte sub_818C5DC
|
||||
.4byte sub_818C5E8
|
||||
.4byte sub_818C6E8
|
||||
.4byte sub_818C6F4
|
||||
.4byte sub_818C76C
|
||||
.4byte sub_818C7D4
|
||||
.4byte sub_818C7E0
|
||||
.4byte sub_818C7EC
|
||||
.4byte sub_818C7F8
|
||||
.4byte sub_818C804
|
||||
.4byte sub_818C810
|
||||
.4byte sub_818C81C
|
||||
.4byte sub_818C828
|
||||
.4byte sub_818C834
|
||||
.4byte sub_818C840
|
||||
.4byte sub_818C85C
|
||||
.4byte sub_818C894
|
||||
.4byte sub_818C8AC
|
||||
.4byte sub_818C8D4
|
||||
.4byte sub_818C944
|
||||
.4byte sub_818C950
|
||||
.4byte sub_818C994
|
||||
.4byte sub_818C9F0
|
||||
.4byte dp01t_2E_2_battle_intro
|
||||
.4byte sub_818CA64
|
||||
.4byte sub_818CD30
|
||||
.4byte sub_818CE3C
|
||||
.4byte sub_818CE8C
|
||||
.4byte sub_818CE98
|
||||
.4byte sub_818CEF8
|
||||
.4byte sub_818CF60
|
||||
.4byte sub_818CF6C
|
||||
.4byte sub_818CF78
|
||||
.4byte nullsub_121
|
||||
@@ -1,228 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gSafariBufferCommands:: @ 85CDF20
|
||||
.4byte sub_81597AC
|
||||
.4byte sub_81597B8
|
||||
.4byte sub_81597C4
|
||||
.4byte sub_81597D0
|
||||
.4byte sub_81597DC
|
||||
.4byte sub_81597E8
|
||||
.4byte sub_81597F4
|
||||
.4byte sub_8159800
|
||||
.4byte sub_81598E0
|
||||
.4byte sub_81598EC
|
||||
.4byte sub_81598F8
|
||||
.4byte sub_8159904
|
||||
.4byte sub_8159910
|
||||
.4byte sub_8159964
|
||||
.4byte sub_81599C4
|
||||
.4byte sub_81599D0
|
||||
.4byte dp01t_10_6_message
|
||||
.4byte dp01t_11_6_message_for_player_only
|
||||
.4byte sub_8159A94
|
||||
.4byte sub_8159AFC
|
||||
.4byte sub_8159B08
|
||||
.4byte sub_8159B14
|
||||
.4byte sub_8159B54
|
||||
.4byte sub_8159B60
|
||||
.4byte sub_8159B6C
|
||||
.4byte sub_8159B78
|
||||
.4byte sub_8159B84
|
||||
.4byte sub_8159BC0
|
||||
.4byte sub_8159BCC
|
||||
.4byte sub_8159BD8
|
||||
.4byte sub_8159BE4
|
||||
.4byte sub_8159BF0
|
||||
.4byte sub_8159BFC
|
||||
.4byte sub_8159C08
|
||||
.4byte sub_8159C14
|
||||
.4byte sub_8159C20
|
||||
.4byte sub_8159C2C
|
||||
.4byte sub_8159C38
|
||||
.4byte sub_8159C44
|
||||
.4byte sub_8159C50
|
||||
.4byte sub_8159C5C
|
||||
.4byte sub_8159C68
|
||||
.4byte sub_8159C74
|
||||
.4byte sub_8159C80
|
||||
.4byte dp01t_34_6_move_anim_start_t3
|
||||
.4byte sub_8159D20
|
||||
.4byte dp01t_2E_6_battle_intro
|
||||
.4byte sub_8159D90
|
||||
.4byte sub_8159DEC
|
||||
.4byte sub_8159DF8
|
||||
.4byte sub_8159E04
|
||||
.4byte sub_8159E10
|
||||
.4byte sub_8159E1C
|
||||
.4byte sub_8159E78
|
||||
.4byte sub_8159E84
|
||||
.4byte sub_8159E90
|
||||
.4byte nullsub_115
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE004:: @ 85CE004
|
||||
.2byte 0x0000, 0x0004, 0x0010, 0x0004
|
||||
.2byte 0x0020, 0x0004, 0x0030, 0x0004
|
||||
.2byte 0x0040, 0x0004, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE01C:: @ 85CE01C
|
||||
.4byte gUnknown_085CE004
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE020:: @ 85CE020
|
||||
spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
|
||||
|
||||
.align 2
|
||||
spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
|
||||
|
||||
.align 2
|
||||
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE068:: @ 85CE068
|
||||
.2byte 0x0000, 0x0028, 0x0010, 0x0008
|
||||
.2byte 0x0020, 0x0028, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE078:: @ 85CE078
|
||||
.4byte gUnknown_085CE068
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE07C:: @ 85CE07C
|
||||
spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
|
||||
|
||||
.align 2
|
||||
spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
|
||||
|
||||
.align 2
|
||||
spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE0C4:: @ 85CE0C4
|
||||
.2byte 0x0180, 0x0180, 0x0000, 0x0000
|
||||
.2byte 0xffe0, 0x0018, 0x0500, 0x0000
|
||||
.2byte 0x0018, 0xffe0, 0x0500, 0x0000
|
||||
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE0E4:: @ 85CE0E4
|
||||
.2byte 0x0030, 0x0030, 0x0000, 0x0000
|
||||
.2byte 0x0020, 0x0020, 0x0600, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE0FC:: @ 85CE0FC
|
||||
.4byte gUnknown_085CE0C4
|
||||
.4byte gUnknown_085CE0E4
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE104:: @ 85CE104
|
||||
spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
|
||||
|
||||
.align 2
|
||||
spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE134:: @ 85CE134
|
||||
.2byte 0x0000, 0x0003, 0x0010, 0x0003
|
||||
.2byte 0x0020, 0x0003, 0x0030, 0x0003
|
||||
.2byte 0x0040, 0x0003, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE14C:: @ 85CE14C
|
||||
.4byte gUnknown_085CE134
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE150:: @ 85CE150
|
||||
spr_template 0x272b, 0x272b, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE168:: @ 85CE168
|
||||
.2byte 0x0000, 0x0003, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE170:: @ 85CE170
|
||||
.4byte gUnknown_085CE168
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE174:: @ 85CE174
|
||||
.2byte 0xfff9, 0xfff9, 0x10fd, 0x0000
|
||||
.2byte 0x0007, 0x0007, 0x1003, 0x0000
|
||||
.2byte 0x7ffe, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE18C:: @ 85CE18C
|
||||
.4byte gUnknown_085CE174
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE190:: @ 85CE190
|
||||
spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1A8:: @ 85CE1A8
|
||||
.2byte 0x0000, 0x0008, 0x0010, 0x0010, 0x0020, 0x0004, 0x0030, 0x0004, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1BC:: @ 85CE1BC
|
||||
.4byte gUnknown_085CE1A8
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1C0:: @ 85CE1C0
|
||||
.2byte 0x0200, 0x0200, 0x0000, 0x0000
|
||||
.2byte 0xffe0, 0xffe0, 0x0800, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1D8:: @ 85CE1D8
|
||||
.4byte gUnknown_085CE1C0
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1DC:: @ 85CE1DC
|
||||
spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE1F4:: @ 85CE1F4
|
||||
.2byte 0x0000, 0x0180, 0x0000, 0x0000
|
||||
.2byte 0x0010, 0x0000, 0x1400, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE20C:: @ 85CE20C
|
||||
.2byte 0x0140, 0x0180, 0x0000, 0x0000
|
||||
.2byte 0xfff0, 0x0000, 0x1300, 0x0000
|
||||
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE224:: @ 85CE224
|
||||
.4byte gUnknown_085CE1F4
|
||||
.4byte gUnknown_085CE20C
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE22C:: @ 85CE22C
|
||||
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
|
||||
|
||||
.align 2
|
||||
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
|
||||
|
||||
.align 2
|
||||
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE274:: @ 85CE274
|
||||
.2byte 0x0000, 0x0002, 0x0008, 0x0002
|
||||
.2byte 0x0010, 0x0002, 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE284:: @ 85CE284
|
||||
.4byte gUnknown_085CE274
|
||||
|
||||
.align 2
|
||||
gUnknown_085CE288:: @ 85CE288
|
||||
spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
|
||||
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gWallyBufferCommands:: @ 85DFDC0
|
||||
.4byte dp01t_00_5_getattr
|
||||
.4byte sub_81693C0
|
||||
.4byte sub_81693CC
|
||||
.4byte sub_8169E20
|
||||
.4byte sub_8169E2C
|
||||
.4byte sub_8169E38
|
||||
.4byte sub_8169E44
|
||||
.4byte sub_8169EC8
|
||||
.4byte dp01t_07_6_
|
||||
.4byte sub_816A060
|
||||
.4byte sub_816A06C
|
||||
.4byte sub_816A078
|
||||
.4byte sub_816A084
|
||||
.4byte sub_816A0D8
|
||||
.4byte sub_816A138
|
||||
.4byte sub_816A144
|
||||
.4byte sub_816A3B8
|
||||
.4byte dp01t_11_5_message_for_player_only
|
||||
.4byte dp01t_12_1_battle_menu
|
||||
.4byte sub_816A4D8
|
||||
.4byte sub_816A4E4
|
||||
.4byte sub_816A57C
|
||||
.4byte sub_816A5BC
|
||||
.4byte sub_816A5C8
|
||||
.4byte sub_816A5D4
|
||||
.4byte sub_816A6D4
|
||||
.4byte sub_816A6E0
|
||||
.4byte sub_816A6EC
|
||||
.4byte sub_816A6F8
|
||||
.4byte sub_816A704
|
||||
.4byte sub_816A710
|
||||
.4byte sub_816A71C
|
||||
.4byte sub_816A728
|
||||
.4byte sub_816A734
|
||||
.4byte sub_816A740
|
||||
.4byte sub_816A74C
|
||||
.4byte sub_816A758
|
||||
.4byte sub_816A764
|
||||
.4byte sub_816A770
|
||||
.4byte sub_816A77C
|
||||
.4byte sub_816A788
|
||||
.4byte sub_816A794
|
||||
.4byte sub_816A804
|
||||
.4byte sub_816A810
|
||||
.4byte sub_816A840
|
||||
.4byte sub_816A89C
|
||||
.4byte dp01t_2E_5_battle_intro
|
||||
.4byte sub_816A90C
|
||||
.4byte sub_816AC78
|
||||
.4byte sub_816ACFC
|
||||
.4byte sub_816AD08
|
||||
.4byte sub_816AD14
|
||||
.4byte sub_816AD20
|
||||
.4byte sub_816AD7C
|
||||
.4byte sub_816AD88
|
||||
.4byte sub_816AD94
|
||||
.4byte nullsub_118
|
||||
Reference in New Issue
Block a user