mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 11:44:17 +01:00
Merge pull request #475 from DizzyEggg/learn
asm party and fldeff clean-up
This commit is contained in:
Diegoisawesome
GitHub
commit
a54aa03d20
@ -5,50 +5,6 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start AnimTask_GetReturnPowerLevel
|
||||
AnimTask_GetReturnPowerLevel: @ 815F8A0
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
ldr r3, =gBattleAnimArgs
|
||||
movs r2, 0
|
||||
strh r2, [r3, 0xE]
|
||||
ldr r1, =gAnimFriendship
|
||||
ldrb r0, [r1]
|
||||
ldrb r1, [r1]
|
||||
adds r0, r1, 0
|
||||
subs r0, 0x3D
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r2, r1, 0
|
||||
cmp r0, 0x1E
|
||||
bhi _0815F8C4
|
||||
movs r0, 0x1
|
||||
strh r0, [r3, 0xE]
|
||||
_0815F8C4:
|
||||
adds r0, r2, 0
|
||||
subs r0, 0x5C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x6C
|
||||
bhi _0815F8D4
|
||||
movs r0, 0x2
|
||||
strh r0, [r3, 0xE]
|
||||
_0815F8D4:
|
||||
lsls r0, r1, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0xC8
|
||||
bls _0815F8E0
|
||||
movs r0, 0x3
|
||||
strh r0, [r3, 0xE]
|
||||
_0815F8E0:
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end AnimTask_GetReturnPowerLevel
|
||||
|
||||
thumb_func_start sub_815F8F4
|
||||
sub_815F8F4: @ 815F8F4
|
||||
|
||||
@ -1,649 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 1
|
||||
gUnknown_0861500C:: @ 861500C
|
||||
.2byte 0x0005, 0x000e, 0x0019, 0x0022, 0x0026, 0x0044, 0x0045, 0x0066, 0x0076, 0x0087, 0x008a, 0x0056, 0x0099, 0x009d, 0x00a4, 0x00df
|
||||
.2byte 0x00cd, 0x00f4, 0x00ad, 0x00c4, 0x00cb, 0x00bd, 0x0008, 0x00cf, 0x00d6, 0x0081, 0x006f, 0x0009, 0x0007, 0x00d2
|
||||
|
||||
.align 2
|
||||
gUnknown_08615048:: @ 8615048
|
||||
.4byte 0x00000000, 0x25b4409a, 0x25b4409a, 0x25b4409a, 0x37b4e0ff, 0x37b4e0ff, 0x37b4e0ff, 0x05fdc0fd
|
||||
.4byte 0x05fdc0fd, 0x05fdc0fd, 0x00000000, 0x00000000, 0x03944490, 0x00000000, 0x00000000, 0x23944092
|
||||
.4byte 0x03b44090, 0x03b44090, 0x03b44090, 0x07bc48b8, 0x07bc48b8, 0x03b44090, 0x03b44090, 0x01946098
|
||||
.4byte 0x01946098, 0x0fb5c8fd, 0x0fb5c8fd, 0x27b5e0fa, 0x27b5e0fa, 0x05b440b8, 0x05b440b8, 0x3dfce0fd
|
||||
.4byte 0x05b440b8, 0x05b440b8, 0x3dfce0fd, 0x1df7cffd, 0x1df7cffd, 0x03944098, 0x03944098, 0x1df7ccfd
|
||||
.4byte 0x1df7ccfd, 0x03944090, 0x03944090, 0x01944092, 0x01944092, 0x0194409a, 0x219440ba, 0x219440ba
|
||||
.4byte 0x03944090, 0x03944090, 0x01b46098, 0x01b46098, 0x07be4498, 0x07be4498, 0x03fec0fd, 0x23fec0fd
|
||||
.4byte 0x1ff6e1fd, 0x1ff6e1fd, 0x03944098, 0x03944098, 0x059c4098, 0x05fc41fd, 0x05fcc1fd, 0x19d6cdfd
|
||||
.4byte 0x19d6cdfd, 0x19d6cdfd, 0x19f4e1fd, 0x19f4e1fd, 0x19f4e1fd, 0x01944092, 0x01944092, 0x0194409a
|
||||
.4byte 0x019c4092, 0x019c4092, 0x15b5f1f9, 0x15b5f1f9, 0x35b5f1fd, 0x03944098, 0x03944098, 0x03be4c98
|
||||
.4byte 0x23feccfd, 0x03954890, 0x03954890, 0x03b6409a, 0x03b44098, 0x03b44098, 0x019c4098, 0x019c4098
|
||||
.4byte 0x19f4d088, 0x19f4d088, 0x039c5090, 0x039c5090, 0x01965480, 0x01965480, 0x19d6d5fd, 0x01b67098
|
||||
.4byte 0x19d6cdfd, 0x19d6cdfd, 0x21bc409a, 0x21bc409a, 0x03955880, 0x03955880, 0x01975490, 0x01975490
|
||||
.4byte 0x19bce0ff, 0x19bce0ff, 0x03b4e1fd, 0x1bf4e1fd, 0x1dffe4ff, 0x01955080, 0x01955080, 0x01bd60ba
|
||||
.4byte 0x39bde0ff, 0x05bfcffd, 0x0196409a, 0x39fce0fd, 0x039c4090, 0x039c4090, 0x039c4090, 0x039c4090
|
||||
.4byte 0x039e4890, 0x039e4c90, 0x19f64dfd, 0x239440b2, 0x01fec5fd, 0x1bf4c8fd, 0x19b4c0fd, 0x219460da
|
||||
.4byte 0x019c4098, 0x00000000, 0x019c4898, 0x019c4498, 0x00000000, 0x03b44098, 0x03bc4098, 0x03b44898
|
||||
.4byte 0x03b44098, 0x039e4c90, 0x019d6098, 0x019d60d8, 0x019d6098, 0x219d60de, 0x03946090, 0x1dffe1fd
|
||||
.4byte 0x03bc4090, 0x03b44890, 0x03b44090, 0x039c4898, 0x039c4898, 0x3bfcc898, 0x1bfecdfd, 0x3fffffff
|
||||
.4byte 0x01b440ba, 0x21b440ba, 0x21b440ba, 0x07b54098, 0x27b54098, 0x3fb5e0fd, 0x01fce0ff, 0x21fce0ff
|
||||
.4byte 0x21fce0ff, 0x3ff5c098, 0x3ff5c098, 0x03b44490, 0x03b44490, 0x0bd5c093, 0x0bd5c093, 0x01944098
|
||||
.4byte 0x01944098, 0x03944090, 0x01944890, 0x01944890, 0x07b548fd, 0x05bf4ffd, 0x05bf4cfd, 0x07b74ffd
|
||||
.4byte 0x07b74ffd, 0x03964c90, 0x03964c90, 0x07944898, 0x1f94c8fd, 0x1f94c8fd, 0x01944092, 0x07fdc0dd
|
||||
.4byte 0x07fdc0dd, 0x1df7f0fd, 0x05bcc1fd, 0x05944092, 0x05944092, 0x05944092, 0x3ff4cdfd, 0x01944092
|
||||
.4byte 0x01944092, 0x03944490, 0x05f5c098, 0x05f5c0fd, 0x03b64498, 0x03b64498, 0x03be4c90, 0x23feccfd
|
||||
.4byte 0x07964c90, 0x00000000, 0x00000000, 0x03b64c98, 0x059570b8, 0x059570b8, 0x05b76cb8, 0x239464b2
|
||||
.4byte 0x05b57098, 0x1df4c9fd, 0x1df4e9fd, 0x079d4892, 0x239440b2, 0x05b56098, 0x219460fa, 0x27fec4b2
|
||||
.4byte 0x3ff5c1ff, 0x3ff5e1ff, 0x05b56098, 0x05b56098, 0x05bc6098, 0x05bc6098, 0x05b57098, 0x07b44890
|
||||
.4byte 0x07b448d0, 0x03bc40fd, 0x03bc4098, 0x03b460b0, 0x03b444b8, 0x03b444b8, 0x039c4098, 0x05b540b8
|
||||
.4byte 0x05b560b8, 0x079e4c90, 0x03b64c98, 0x00000000, 0x03b460fc, 0x03b460fc, 0x01fec5fd, 0x1bf4c8fd
|
||||
.4byte 0x19b4c0fd, 0x1dffe9fd, 0x05bdcffd, 0x03b64898, 0x03b64098, 0x03be4098, 0x01b46098, 0x01b46098
|
||||
.4byte 0x31b4e8fd, 0x03be4c98, 0x03b64c90, 0x07b64592, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2bb4c0ff, 0x2bb4c0ff, 0x2bb4c0ff
|
||||
.4byte 0x03b460ff, 0x3bb4e0ff, 0x3bb4e0ff, 0x05bd4098, 0x05fde0fd, 0x05fde0fd, 0x01b640b8, 0x01b640b8
|
||||
.4byte 0x27bd4898, 0x27bd4898, 0x00000000, 0x00000000, 0x03944090, 0x00000000, 0x03944090, 0x019c409a
|
||||
.4byte 0x19fcc09a, 0x19fcc1ff, 0x0595509a, 0x27b7509e, 0x27b7509e, 0x21b44090, 0x23b44092, 0x21b44490
|
||||
.4byte 0x03b440b0, 0x03b440b0, 0x0194409a, 0x29b4c0ff, 0x1fffe5fd, 0x03bc4090, 0x03bc4090, 0x039e4090
|
||||
.4byte 0x039e4090, 0x059d4098, 0x059d4098, 0x07bf4c98, 0x07bf4c98, 0x3fffe9fd, 0x01b67490, 0x01b67490
|
||||
.4byte 0x1df5f898, 0x01b47098, 0x39f6c5fd, 0x01bc4090, 0x01bc6090, 0x039e4090, 0x21bc40ba, 0x23bc40ba
|
||||
.4byte 0x039c4090, 0x03be4098, 0x23bc4090, 0x23bc4090, 0x01b46098, 0x03b46098, 0x33b46098, 0x19f4e1fd
|
||||
.4byte 0x19f4e1fd, 0x03b44898, 0x03b44898, 0x05b56098, 0x05b57098, 0x05bd6098, 0x05bd6098, 0x05bd6098
|
||||
.4byte 0x29b4c0fb, 0x29b4c0ff, 0x019c4098, 0x059d5098, 0x07977498, 0x07977498, 0x07bd4098, 0x039e4498
|
||||
.4byte 0x1bfec4fd, 0x0fb5c9fd, 0x0fb5c9fd, 0x09fee0ff, 0x1bf6c5fd, 0x1bf6e5fd, 0x03b64498, 0x03b64498
|
||||
.4byte 0x00000000, 0x019e4498, 0x19fee5fd, 0x23b6409a, 0x39fce0fd, 0x39fce0fd, 0x39fce0fd, 0x1df5d4b8
|
||||
.4byte 0x1df5d4b8, 0x21b4409a, 0x1dffc0fd, 0x1dffe0fd, 0x1dffe0fd, 0x019c4098, 0x03bc4098, 0x03bc4098
|
||||
.4byte 0x23be6cba, 0x019e4c98, 0x01be4d98, 0x23b44098, 0x3ffde8ff, 0x01be6098, 0x25b56098, 0x25b56098
|
||||
.4byte 0x3dfde8fd, 0x079e4898, 0x0bf6c9fd, 0x0bf6c9fd, 0x01b66098, 0x01b66098, 0x21b4609a, 0x21b460da
|
||||
.4byte 0x1dfe4c98, 0x1dfe4c98, 0x1dfe4c98, 0x21b46098, 0x25b56098, 0x27b56098, 0x00000000, 0x2ffff098
|
||||
.4byte 0x2ffff098, 0x1df7f8fd, 0x0dfff8fd, 0x0df7f8fd, 0x07be6898, 0x3fb7e8ff, 0x23be6898, 0x23be4c98
|
||||
.4byte 0x23be4c98, 0x1ffecd98, 0x1bfeecfd, 0x059f4490
|
||||
|
||||
.align 2
|
||||
gUnknown_086156B8:: @ 86156B8
|
||||
.4byte 0x000011f0, 0x000021e1, 0x000003c2
|
||||
|
||||
.align 2
|
||||
gUnknown_086156C4:: @ 86156C4
|
||||
.4byte BlitBitmapToPartyWindow_Default1, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c
|
||||
|
||||
.align 2
|
||||
gUnknown_086156E4:: @ 86156E4
|
||||
.4byte BlitBitmapToPartyWindow_Default2, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d
|
||||
|
||||
.align 2
|
||||
gUnknown_08615704:: @ 8615704
|
||||
.4byte 0x32142810, 0x22103432, 0x1c6c1268, 0x19661b88, 0x346c2a68, 0x31663388, 0x4c6c4268, 0x49664b88
|
||||
.4byte 0x646c5a68, 0x61666388, 0x7c6c7268, 0x79667b88, 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32
|
||||
.4byte 0x1c6c1268, 0x19661b88, 0x3c6c3268, 0x39663b88, 0x5c6c5268, 0x59665b88, 0x7c6c7268, 0x79667b88
|
||||
.4byte 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32, 0x246a1a68, 0x21662388, 0x3c6a3268, 0x39663b88
|
||||
.4byte 0x5c6a5268, 0x59665b88, 0x746a6a68, 0x71667388, 0x2a142010, 0x1a102c32, 0x2c6a2268, 0x29662b88
|
||||
.4byte 0x446a3a68, 0x41664388, 0x72146810, 0x62107432, 0x746a6a68, 0x71667388, 0x8c6a8268, 0x89668b88
|
||||
|
||||
.align 1
|
||||
gUnknown_086157C4:: @ 86157C4
|
||||
.incbin "graphics/interface/unknown_6157C4.bin"
|
||||
|
||||
.align 1
|
||||
gUnknown_086157E0:: @ 86157E0
|
||||
.incbin "graphics/interface/unknown_6157E0.bin"
|
||||
|
||||
gUnknown_086157FC:: @ 86157FC
|
||||
.byte 0x00, 0x03, 0x02, 0x00
|
||||
|
||||
gUnknown_08615800:: @ 8615800
|
||||
.byte 0x01, 0x06, 0x00, 0x0b, 0x0c, 0x01, 0x02, 0x03, 0x01, 0x08, 0x09, 0x00, 0x01, 0x02, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_08615810:: @ 8615810
|
||||
window_template 0x00, 0x01, 0x03, 0x0a, 0x07, 0x03, 0x0063
|
||||
window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x04, 0x00a9
|
||||
window_template 0x00, 0x0c, 0x04, 0x12, 0x03, 0x05, 0x00df
|
||||
window_template 0x00, 0x0c, 0x07, 0x12, 0x03, 0x06, 0x0115
|
||||
window_template 0x00, 0x0c, 0x0a, 0x12, 0x03, 0x07, 0x014b
|
||||
window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0181
|
||||
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_08615850:: @ 8615850
|
||||
window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063
|
||||
window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9
|
||||
window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x05, 0x00ef
|
||||
window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125
|
||||
window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b
|
||||
window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0191
|
||||
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_08615890:: @ 8615890
|
||||
window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063
|
||||
window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9
|
||||
window_template 0x00, 0x0c, 0x02, 0x12, 0x03, 0x05, 0x00ef
|
||||
window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125
|
||||
window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b
|
||||
window_template 0x00, 0x0c, 0x0c, 0x12, 0x03, 0x08, 0x0191
|
||||
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_086158D0:: @ 86158D0
|
||||
window_template 0x00, 0x01, 0x02, 0x0a, 0x07, 0x03, 0x0063
|
||||
window_template 0x00, 0x0c, 0x03, 0x12, 0x03, 0x05, 0x00a9
|
||||
window_template 0x00, 0x0c, 0x06, 0x12, 0x03, 0x06, 0x00df
|
||||
window_template 0x02, 0x01, 0x0b, 0x0a, 0x07, 0x04, 0x0115
|
||||
window_template 0x02, 0x0c, 0x0c, 0x12, 0x03, 0x07, 0x016b
|
||||
window_template 0x02, 0x0c, 0x0f, 0x12, 0x03, 0x08, 0x01a1
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_08615908:: @ 8615908
|
||||
window_template 0x00, 0x18, 0x11, 0x06, 0x02, 0x03, 0x01c7
|
||||
|
||||
.align 2
|
||||
gUnknown_08615910:: @ 8615910
|
||||
window_template 0x00, 0x18, 0x12, 0x06, 0x02, 0x03, 0x01c7
|
||||
|
||||
.align 2
|
||||
gUnknown_08615918:: @ 8615918
|
||||
window_template 0x00, 0x18, 0x10, 0x06, 0x02, 0x03, 0x01d3
|
||||
|
||||
.align 2
|
||||
gUnknown_08615920:: @ 8615920
|
||||
window_template 0x02, 0x01, 0x11, 0x15, 0x02, 0x0f, 0x024f
|
||||
|
||||
.align 2
|
||||
gUnknown_08615928:: @ 8615928
|
||||
window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0279
|
||||
|
||||
.align 2
|
||||
gUnknown_08615930:: @ 8615930
|
||||
window_template 0x02, 0x01, 0x11, 0x14, 0x02, 0x0f, 0x0299
|
||||
|
||||
.align 2
|
||||
gUnknown_08615938:: @ 8615938
|
||||
window_template 0x02, 0x01, 0x11, 0x12, 0x02, 0x0f, 0x0299
|
||||
|
||||
.align 2
|
||||
gUnknown_08615940:: @ 8615940
|
||||
window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0299
|
||||
|
||||
.align 2
|
||||
gUnknown_08615948:: @ 8615948
|
||||
window_template 0x02, 0x01, 0x0f, 0x14, 0x04, 0x0f, 0x0299
|
||||
|
||||
.align 2
|
||||
gUnknown_08615950:: @ 8615950
|
||||
window_template 0x02, 0x17, 0x0d, 0x06, 0x06, 0x0e, 0x039d
|
||||
|
||||
.align 2
|
||||
gUnknown_08615958:: @ 8615958
|
||||
window_template 0x02, 0x15, 0x0d, 0x08, 0x06, 0x0e, 0x039d
|
||||
|
||||
.align 2
|
||||
gUnknown_08615960:: @ 8615960
|
||||
window_template 0x02, 0x13, 0x0b, 0x0a, 0x08, 0x0e, 0x02e9
|
||||
|
||||
.align 2
|
||||
gUnknown_08615968:: @ 8615968
|
||||
window_template 0x02, 0x15, 0x09, 0x05, 0x04, 0x0e, 0x02e9
|
||||
|
||||
.align 2
|
||||
gUnknown_08615970:: @ 8615970
|
||||
window_template 0x02, 0x13, 0x01, 0x0a, 0x0b, 0x0e, 0x02e9
|
||||
window_template 0x02, 0x02, 0x0f, 0x1b, 0x04, 0x0e, 0x01df
|
||||
window_template 0x02, 0x00, 0x0d, 0x12, 0x03, 0x0c, 0x039d
|
||||
|
||||
gUnknown_08615988:: @ 8615988
|
||||
.byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21
|
||||
.byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x3b, 0x3c, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3d, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f
|
||||
.byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30
|
||||
|
||||
gUnknown_086159CE:: @ 86159CE
|
||||
.byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21
|
||||
.byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x2a, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f
|
||||
.byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30
|
||||
|
||||
gUnknown_08615A14:: @ 8615A14
|
||||
.byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x34, 0x35, 0x33, 0x33, 0x33
|
||||
.byte 0x33, 0x33, 0x33, 0x36, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39
|
||||
|
||||
gUnknown_08615A4A:: @ 8615A4A
|
||||
.byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21
|
||||
.byte 0x21, 0x21, 0x21, 0x32, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39
|
||||
|
||||
gUnknown_08615A80:: @ 8615A80
|
||||
.byte 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x1f, 0x25, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x27
|
||||
|
||||
gUnknown_08615AB6:: @ 8615AB6
|
||||
.byte 0x0b, 0x0c
|
||||
|
||||
gUnknown_08615AB8:: @ 8615AB8
|
||||
.byte 0x09, 0x0a
|
||||
|
||||
gUnknown_08615ABA:: @ 8615ABA
|
||||
.byte 0x04, 0x05, 0x06
|
||||
|
||||
gUnknown_08615ABD:: @ 8615ABD
|
||||
.byte 0x01, 0x07, 0x08
|
||||
|
||||
gUnknown_08615AC0:: @ 8615AC0
|
||||
.byte 0x01, 0x0b, 0x0c
|
||||
|
||||
gUnknown_08615AC3:: @ 8615AC3
|
||||
.byte 0x3b, 0x3c
|
||||
|
||||
gUnknown_08615AC5:: @ 8615AC5
|
||||
.byte 0x4b, 0x4c
|
||||
|
||||
gUnknown_08615AC7:: @ 8615AC7
|
||||
.byte 0x39, 0x3a
|
||||
|
||||
gUnknown_08615AC9:: @ 8615AC9
|
||||
.byte 0x49, 0x4a
|
||||
|
||||
gUnknown_08615ACB:: @ 8615ACB
|
||||
.byte 0x59, 0x5a
|
||||
|
||||
gUnknown_08615ACD:: @ 8615ACD
|
||||
.byte 0x34, 0x35, 0x36
|
||||
|
||||
gUnknown_08615AD0:: @ 8615AD0
|
||||
.byte 0x44, 0x45, 0x46
|
||||
|
||||
gUnknown_08615AD3:: @ 8615AD3
|
||||
.byte 0x54, 0x55, 0x56
|
||||
|
||||
gUnknown_08615AD6:: @ 8615AD6
|
||||
.byte 0x74, 0x75, 0x76
|
||||
|
||||
gUnknown_08615AD9:: @ 8615AD9
|
||||
.byte 0x84, 0x85, 0x86
|
||||
|
||||
gUnknown_08615ADC:: @ 8615ADC
|
||||
.byte 0x94, 0x95, 0x96
|
||||
|
||||
gUnknown_08615ADF:: @ 8615ADF
|
||||
.byte 0x64, 0x65, 0x66
|
||||
|
||||
gUnknown_08615AE2:: @ 8615AE2
|
||||
.byte 0x31, 0x37, 0x38
|
||||
|
||||
gUnknown_08615AE5:: @ 8615AE5
|
||||
.byte 0x41, 0x47, 0x48
|
||||
|
||||
gUnknown_08615AE8:: @ 8615AE8
|
||||
.byte 0x51, 0x57, 0x58
|
||||
|
||||
gUnknown_08615AEB:: @ 8615AEB
|
||||
.byte 0x61, 0x67, 0x68
|
||||
|
||||
gUnknown_08615AEE:: @ 8615AEE
|
||||
.byte 0xa1, 0xa7, 0xa8
|
||||
|
||||
gUnknown_08615AF1:: @ 8615AF1
|
||||
.byte 0x11, 0x1b, 0x1c
|
||||
|
||||
.align 2
|
||||
gUnknown_08615AF4:: @ 8615AF4
|
||||
.4byte gUnknown_085E9E43
|
||||
.4byte gUnknown_085EA010
|
||||
.4byte gUnknown_085EA02A
|
||||
.4byte gUnknown_085E9E55
|
||||
.4byte gUnknown_085E9E64
|
||||
.4byte gUnknown_085E9E79
|
||||
.4byte gUnknown_085E9E8F
|
||||
.4byte gUnknown_085E9EBC
|
||||
.4byte gUnknown_085E9ED4
|
||||
.4byte gUnknown_085E9EE9
|
||||
.4byte gUnknown_085E9FDB
|
||||
.4byte gUnknown_085EA046
|
||||
.4byte gUnknown_085EA05B
|
||||
.4byte gUnknown_085E9F01
|
||||
.4byte gUnknown_085E9F58
|
||||
.4byte gUnknown_085E9F6F
|
||||
.4byte gUnknown_085E9F81
|
||||
.4byte gUnknown_085E9F90
|
||||
.4byte gUnknown_085E9FA7
|
||||
.4byte gUnknown_085E9FC2
|
||||
.4byte gText_EmptyString2
|
||||
.4byte gUnknown_085E9EA6
|
||||
.4byte gUnknown_085E9F16
|
||||
.4byte gUnknown_085E9F2A
|
||||
.4byte gUnknown_085E9F42
|
||||
.4byte gUnknown_085E9FF9
|
||||
.4byte gUnknown_085EA073
|
||||
|
||||
gUnknown_08615B60:: @ 8615B60
|
||||
.4byte gUnknown_085EA091
|
||||
.4byte gUnknown_085EA099
|
||||
.4byte gUnknown_085EA09E
|
||||
.4byte gUnknown_085EA0A4
|
||||
.4byte gUnknown_085EA0AB
|
||||
.4byte gUnknown_085EA0E7
|
||||
.4byte gUnknown_085EA0B1
|
||||
.4byte gUnknown_085EA0B6
|
||||
.4byte gUnknown_085EA0BF
|
||||
.4byte gUnknown_085EA0C5
|
||||
.4byte gUnknown_085EA0CF
|
||||
.4byte gUnknown_085EA0D7
|
||||
.4byte gUnknown_085EA0DC
|
||||
|
||||
.align 1
|
||||
gUnknown_08615B94:: @ 8615B94
|
||||
.2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071
|
||||
.2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068
|
||||
.2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d
|
||||
.2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123
|
||||
|
||||
.align 2
|
||||
gUnknown_08615C08:: @ 8615C08
|
||||
.4byte gText_Summary5, sub_81B37FC
|
||||
.4byte gText_Switch2, brm_switch
|
||||
.4byte gText_Cancel2, brm_cancel_1
|
||||
.4byte gText_Item, sub_81B4134
|
||||
.4byte gMenuText_Give, sub_81B4198
|
||||
.4byte gText_Take, sub_81B4724
|
||||
.4byte gText_Mail, sub_81B4A08
|
||||
.4byte gText_Take2, brm_take_2
|
||||
.4byte gText_Read2, sub_81B4A6C
|
||||
.4byte gText_Cancel2, sub_81B4D78
|
||||
.4byte gText_Shift, brm_shift_sendout
|
||||
.4byte gText_SendOut, brm_shift_sendout
|
||||
.4byte gText_Enter, sub_81B4E8C
|
||||
.4byte gText_NoEntry, sub_81B4FA8
|
||||
.4byte gText_Store, sub_81B50AC
|
||||
.4byte gText_Register, sub_81B50C8
|
||||
.4byte gText_Trade4, brm_trade_1
|
||||
.4byte gText_Trade4, sub_81B52E4
|
||||
.4byte gMenuText_Toss, sub_81B47E0
|
||||
.4byte gMoveNames+195, sub_81B5470
|
||||
.4byte gMoveNames+1924, sub_81B5470
|
||||
.4byte gMoveNames+3237, sub_81B5470
|
||||
.4byte gMoveNames+910, sub_81B5470
|
||||
.4byte gMoveNames+741, sub_81B5470
|
||||
.4byte gMoveNames+247, sub_81B5470
|
||||
.4byte gMoveNames+3783, sub_81B5470
|
||||
.4byte gMoveNames+1651, sub_81B5470
|
||||
.4byte gMoveNames+1300, sub_81B5470
|
||||
.4byte gMoveNames+1183, sub_81B5470
|
||||
.4byte gMoveNames+3770, sub_81B5470
|
||||
.4byte gMoveNames+2704, sub_81B5470
|
||||
.4byte gMoveNames+1755, sub_81B5470
|
||||
.4byte gMoveNames+2990, sub_81B5470
|
||||
|
||||
gUnknown_08615D10:: @ 8615D10
|
||||
.byte 0x00, 0x01, 0x02
|
||||
|
||||
gUnknown_08615D13:: @ 8615D13
|
||||
.byte 0x0a, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D16:: @ 8615D16
|
||||
.byte 0x0b, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D19:: @ 8615D19
|
||||
.byte 0x00, 0x02
|
||||
|
||||
gUnknown_08615D1B:: @ 8615D1B
|
||||
.byte 0x0c, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D1E:: @ 8615D1E
|
||||
.byte 0x0d, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D21:: @ 8615D21
|
||||
.byte 0x0e, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D24:: @ 8615D24
|
||||
.byte 0x04, 0x05, 0x09
|
||||
|
||||
gUnknown_08615D27:: @ 8615D27
|
||||
.byte 0x08, 0x07, 0x09
|
||||
|
||||
gUnknown_08615D2A:: @ 8615D2A
|
||||
.byte 0x0f, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D2D:: @ 8615D2D
|
||||
.byte 0x10, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D30:: @ 8615D30
|
||||
.byte 0x11, 0x00, 0x02
|
||||
|
||||
gUnknown_08615D33:: @ 8615D33
|
||||
.byte 0x05, 0x12, 0x02
|
||||
|
||||
.align 2
|
||||
gUnknown_08615D38:: @ 8615D38
|
||||
.4byte NULL, gUnknown_08615D10, gUnknown_08615D13, gUnknown_08615D16, gUnknown_08615D1B, gUnknown_08615D1E, gUnknown_08615D21, gUnknown_08615D19
|
||||
.4byte gUnknown_08615D24, gUnknown_08615D27, gUnknown_08615D2A, gUnknown_08615D2D, gUnknown_08615D30, gUnknown_08615D33
|
||||
|
||||
gUnknown_08615D70:: @ 8615D70
|
||||
.byte 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03
|
||||
|
||||
.align 1
|
||||
gUnknown_08615D7E:: @ 8615D7E
|
||||
.2byte 0x000f, 0x0094, 0x00f9, 0x0046, 0x0039, 0x0013, 0x0123, 0x007f, 0x0064, 0x005b, 0x0122, 0x00d0, 0x0087, 0x00e6, 0x000e
|
||||
|
||||
.align 2
|
||||
gUnknown_08615D9C:: @ 8615D9C
|
||||
.4byte SetUpFieldMove_Cut, 0x00000007
|
||||
.4byte SetUpFieldMove_Flash, 0x0000000d
|
||||
.4byte SetUpFieldMove_RockSmash, 0x0000000d
|
||||
.4byte SetUpFieldMove_Strength, 0x0000000d
|
||||
.4byte sub_81B5820, 0x00000008
|
||||
.4byte sub_81B5884, 0x0000000d
|
||||
.4byte sub_81B5974, 0x0000000d
|
||||
.4byte hm_prepare_waterfall, 0x0000000d
|
||||
.4byte SetUpFieldMove_Teleport, 0x0000000d
|
||||
.4byte SetUpFieldMove_Dig, 0x0000000d
|
||||
.4byte SetUpFieldMove_SecretPower, 0x0000000d
|
||||
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
|
||||
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
|
||||
.4byte SetUpFieldMove_SweetScent, 0x0000000d
|
||||
|
||||
.align 2
|
||||
gUnknown_08615E0C:: @ 8615E0C
|
||||
.4byte gText_NotPkmnOtherTrainerWants
|
||||
.4byte gText_ThatIsntAnEgg
|
||||
.4byte gText_PkmnCantBeTradedNow
|
||||
.4byte gText_PkmnCantBeTradedNow
|
||||
.4byte gText_OtherTrainersPkmnCantBeTraded
|
||||
.4byte gText_EggCantBeTradedNow
|
||||
.4byte gText_OtherTrainerCantAcceptPkmn
|
||||
.4byte gText_CantTradeWithTrainer
|
||||
.4byte gText_CantTradeWithTrainer
|
||||
|
||||
.align 2
|
||||
gUnknown_08615E30:: @ 8615E30
|
||||
.incbin "graphics/interface/hold_icons.4bpp"
|
||||
|
||||
.align 2
|
||||
gUnknown_08615E70:: @ 8615E70
|
||||
.incbin "graphics/interface/hold_icons.gbapal"
|
||||
|
||||
.align 2
|
||||
gOamData_8615E90:: @ 8615E90
|
||||
.2byte 0x0000, 0x0000, 0x0400, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615E98:: @ 8615E98
|
||||
.2byte 0x0000, 0x0001, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615EA0:: @ 8615EA0
|
||||
.2byte 0x0001, 0x0001, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_8615EA8:: @ 8615EA8
|
||||
.4byte gSpriteAnim_8615E98
|
||||
.4byte gSpriteAnim_8615EA0
|
||||
|
||||
.align 2
|
||||
gUnknown_08615EB0:: @ 8615EB0
|
||||
obj_tiles gUnknown_08615E30, 0x40, 55120
|
||||
|
||||
.align 2
|
||||
gUnknown_08615EB8:: @ 8615EB8
|
||||
obj_pal gUnknown_08615E70, 55120
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8615EC0:: @ 8615EC0
|
||||
spr_template 0xd750, 0xd750, gOamData_8615E90, gSpriteAnimTable_8615EA8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gOamData_8615ED8:: @ 8615ED8
|
||||
.2byte 0x0000, 0x8000, 0x0400, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615EE0:: @ 8615EE0
|
||||
.2byte 0x0000, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615EE8:: @ 8615EE8
|
||||
.2byte 0x0010, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_8615EF0:: @ 8615EF0
|
||||
.4byte gSpriteAnim_8615EE0
|
||||
.4byte gSpriteAnim_8615EE8
|
||||
|
||||
.align 2
|
||||
gUnknown_08615EF8:: @ 8615EF8
|
||||
obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200
|
||||
|
||||
.align 2
|
||||
gUnknown_08615F00:: @ 8615F00
|
||||
obj_pal gPartyMenuPokeball_Pal, 1200
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8615F08:: @ 8615F08
|
||||
spr_template 0x04b0, 0x04b0, gOamData_8615ED8, gSpriteAnimTable_8615EF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gOamData_8615F20:: @ 8615F20
|
||||
.2byte 0x0000, 0x4000, 0x0800, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615F28:: @ 8615F28
|
||||
.2byte 0x0000, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615F30:: @ 8615F30
|
||||
.2byte 0x0004, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615F38:: @ 8615F38
|
||||
.2byte 0x0008, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615F40:: @ 8615F40
|
||||
.2byte 0x000c, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615F48:: @ 8615F48
|
||||
.2byte 0x0010, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615F50:: @ 8615F50
|
||||
.2byte 0x0014, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_8615F58:: @ 8615F58
|
||||
.4byte gSpriteAnim_8615F28
|
||||
.4byte gSpriteAnim_8615F30
|
||||
.4byte gSpriteAnim_8615F38
|
||||
.4byte gSpriteAnim_8615F40
|
||||
.4byte gSpriteAnim_8615F48
|
||||
.4byte gSpriteAnim_8615F50
|
||||
|
||||
.align 2
|
||||
gUnknown_08615F70:: @ 8615F70
|
||||
obj_tiles gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8615F78:: @ 8615F78
|
||||
spr_template 0x04b1, 0x04b0, gOamData_8615F20, gSpriteAnimTable_8615F58, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gOamData_8615F90:: @ 8615F90
|
||||
.2byte 0x4000, 0x4000, 0x0400, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615F98:: @ 8615F98
|
||||
.2byte 0x0000, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615FA0:: @ 8615FA0
|
||||
.2byte 0x0004, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615FA8:: @ 8615FA8
|
||||
.2byte 0x0008, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615FB0:: @ 8615FB0
|
||||
.2byte 0x000c, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615FB8:: @ 8615FB8
|
||||
.2byte 0x0010, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615FC0:: @ 8615FC0
|
||||
.2byte 0x0014, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615FC8:: @ 8615FC8
|
||||
.2byte 0x0018, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8615FD0:: @ 8615FD0
|
||||
.2byte 0x001c, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_8615FD8:: @ 8615FD8
|
||||
.4byte gSpriteAnim_8615F98
|
||||
.4byte gSpriteAnim_8615FA0
|
||||
.4byte gSpriteAnim_8615FA8
|
||||
.4byte gSpriteAnim_8615FB0
|
||||
.4byte gSpriteAnim_8615FB8
|
||||
.4byte gSpriteAnim_8615FC0
|
||||
.4byte gSpriteAnim_8615FC8
|
||||
.4byte gSpriteAnim_8615FD0
|
||||
|
||||
.align 2
|
||||
gUnknown_08615FF8:: @ 8615FF8
|
||||
obj_tiles gStatusGfx_Icons, 0x400, 1202
|
||||
|
||||
.align 2
|
||||
gUnknown_08616000:: @ 8616000
|
||||
obj_pal gStatusPal_Icons, 1202
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8616008:: @ 8616008
|
||||
spr_template 0x04b2, 0x04b2, gOamData_8615F90, gSpriteAnimTable_8615FD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
gUnknown_08616020:: @ 8616020
|
||||
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_08616028:: @ 8616028
|
||||
.4byte gText_HP4
|
||||
.4byte gText_Attack3
|
||||
.4byte gText_Defense3
|
||||
.4byte gText_SpAtk4
|
||||
.4byte gText_SpDef4
|
||||
.4byte gText_Speed2
|
||||
|
||||
.align 1
|
||||
gUnknown_08616040:: @ 8616040
|
||||
.2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071
|
||||
.2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068
|
||||
.2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d
|
||||
.2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123
|
||||
|
||||
@ -15,7 +15,13 @@ bool32 sub_8138168(void);
|
||||
bool32 sub_81381B0(void);
|
||||
bool32 sub_81381F8(void);
|
||||
bool32 CountSSTidalStep(u16 delta);
|
||||
u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
|
||||
void sub_813A128(void);
|
||||
void sub_813A878(u8 a0);
|
||||
u8 sub_813BADC(u8 a0);
|
||||
bool8 sub_813B9C0(void);
|
||||
void SetShoalItemFlag(u16 v0);
|
||||
void UpdateFrontierManiac(u16 a0);
|
||||
void UpdateFrontierGambler(u16 a0);
|
||||
|
||||
#endif // GUARD_FIELD_SPECIALS_H
|
||||
|
||||
61
include/fldeff.h
Normal file
61
include/fldeff.h
Normal file
@ -0,0 +1,61 @@
|
||||
#ifndef GUARD_FLDEFF_H
|
||||
#define GUARD_FLDEFF_H
|
||||
|
||||
// cut
|
||||
bool8 SetUpFieldMove_Cut(void);
|
||||
bool8 FldEff_UseCutOnGrass(void);
|
||||
bool8 FldEff_UseCutOnTree(void);
|
||||
bool8 FldEff_CutGrass(void);
|
||||
void sub_80D423C(s16 x, s16 y);
|
||||
void sub_80D42B8(s16 x, s16 y);
|
||||
|
||||
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
|
||||
|
||||
// groundshake
|
||||
bool8 sub_81BE66C(void);
|
||||
void sub_81BE6AC(void);
|
||||
void sub_81BE6B8(void);
|
||||
void sub_81BE72C(void);
|
||||
void sub_81BE79C(void);
|
||||
void sub_81BE7F4(void);
|
||||
void sub_81BE994(void);
|
||||
|
||||
// escalator
|
||||
void sub_80E1558(u8 var);
|
||||
void sub_80E1570(void);
|
||||
bool8 sub_80E1584(void);
|
||||
|
||||
// soft-boiled
|
||||
bool8 SetUpFieldMove_SoftBoiled(void);
|
||||
void sub_81615A8(u8 taskId);
|
||||
void sub_8161560(u8 taskId);
|
||||
|
||||
// flash
|
||||
bool8 SetUpFieldMove_Flash(void);
|
||||
void c2_change_map(void);
|
||||
bool8 GetMapPairFadeToType(u8 a1, u8 a2);
|
||||
bool8 GetMapPairFadeFromType(u8 a1, u8 a2);
|
||||
|
||||
// strength
|
||||
bool8 SetUpFieldMove_Strength(void);
|
||||
bool8 sub_8145E2C(void);
|
||||
|
||||
// sweet scent
|
||||
bool8 SetUpFieldMove_SweetScent(void);
|
||||
bool8 FldEff_SweetScent(void);
|
||||
|
||||
// teleport
|
||||
bool8 SetUpFieldMove_Teleport(void);
|
||||
bool8 FldEff_UseTeleport(void);
|
||||
|
||||
// dig
|
||||
bool8 SetUpFieldMove_Dig(void);
|
||||
bool8 FldEff_UseDig(void);
|
||||
|
||||
// rock smash
|
||||
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
|
||||
u8 oei_task_add(void);
|
||||
bool8 SetUpFieldMove_RockSmash(void);
|
||||
bool8 FldEff_UseRockSmash(void);
|
||||
|
||||
#endif // GUARD_FLDEFF_H
|
||||
@ -1,13 +0,0 @@
|
||||
#ifndef GUARD_FLDEFF_CUT_H
|
||||
#define GUARD_FLDEFF_CUT_H
|
||||
|
||||
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
|
||||
|
||||
bool8 SetUpFieldMove_Cut(void);
|
||||
bool8 FldEff_UseCutOnGrass(void);
|
||||
bool8 FldEff_UseCutOnTree(void);
|
||||
bool8 FldEff_CutGrass(void);
|
||||
void sub_80D423C(s16 x, s16 y);
|
||||
void sub_80D42B8(s16 x, s16 y);
|
||||
|
||||
#endif // GUARD_FLDEFF_CUT_H
|
||||
@ -1,6 +0,0 @@
|
||||
#ifndef GUARD_FLDEFF_GROUNDSHAKE_H
|
||||
#define GUARD_FLDEFF_GROUNDSHAKE_H
|
||||
|
||||
void sub_81BE72C(void);
|
||||
|
||||
#endif // GUARD_FLDEFF_GROUNDSHAKE_H
|
||||
@ -1,7 +0,0 @@
|
||||
#ifndef GUARD_FLDEFF_SOFTBOILED_H
|
||||
#define GUARD_FLDEFF_SOFTBOILED_H
|
||||
|
||||
void sub_81615A8(u8 taskId);
|
||||
void sub_8161560(u8 taskId);
|
||||
|
||||
#endif // GUARD_FLDEFF_SOFTBOILED_H
|
||||
@ -4797,4 +4797,11 @@ extern const u32 gCableCarDoor_Gfx[];
|
||||
extern const u32 gCableCarCord_Gfx[];
|
||||
extern const u16 gCableCar_Pal[];
|
||||
|
||||
// Party menu
|
||||
extern const u32 gPartyMenuPokeball_Gfx[];
|
||||
extern const u32 gPartyMenuPokeballSmall_Gfx[];
|
||||
extern const u32 gStatusPal_Icons[];
|
||||
extern const u32 gPartyMenuPokeball_Pal[];
|
||||
extern const u32 gStatusPal_Icons[];
|
||||
|
||||
#endif //GUARD_GRAPHICS_H
|
||||
|
||||
@ -48,7 +48,7 @@ extern MainCallback gPostMenuFieldCallback;
|
||||
extern u8 gSelectedOrderFromParty[4];
|
||||
extern u8 gUnknown_0203CF00[3];
|
||||
|
||||
extern const u16 gUnknown_0861500C[]; // tutor table
|
||||
extern const u16 gTutorMoves[];
|
||||
|
||||
void sub_81B0FCC(u8 slot, u8 b);
|
||||
bool8 IsMultiBattle(void);
|
||||
@ -64,11 +64,7 @@ u8 sub_81B205C(struct Pokemon *mon);
|
||||
void display_pokemon_menu_message(u32 stringID);
|
||||
void sub_81B47E0(u8 taskId);
|
||||
bool8 FieldCallback_PrepareFadeInFromMenu(void);
|
||||
bool8 sub_81B5820(void);
|
||||
bool8 sub_81B5884(void);
|
||||
void sub_81B58A8(void);
|
||||
bool8 hm_prepare_waterfall(void);
|
||||
bool8 sub_81B5974(void);
|
||||
void LoadHeldItemIcons(void);
|
||||
void sub_81B5D4C(u8 *a, u8 *b, u8 c);
|
||||
void sub_81B617C(void);
|
||||
@ -77,8 +73,8 @@ void sub_81B67C8(u8 taskId, TaskFunc task);
|
||||
void dp05_ether(u8 taskId, TaskFunc task);
|
||||
void dp05_pp_up(u8 taskId, TaskFunc task);
|
||||
u16 ItemIdToBattleMoveId(u16 item);
|
||||
bool8 sub_81B6D14(u16 move);
|
||||
bool8 pokemon_has_move(struct Pokemon *mon, u16 move);
|
||||
bool8 IsMoveHm(u16 move);
|
||||
bool8 MonKnowsMove(struct Pokemon *mon, u16 move);
|
||||
void sub_81B6DC4(u8 taskId, TaskFunc task);
|
||||
void dp05_rare_candy(u8 taskId, TaskFunc task);
|
||||
void sub_81B79E8(u8 taskId, TaskFunc task);
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
#ifndef GUARD_ROM6_H
|
||||
#define GUARD_ROM6_H
|
||||
|
||||
void OpenPokeblockCase(u8, void(void));
|
||||
u8 GetLeadMonIndex(void);
|
||||
u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
|
||||
void sub_813BADC(bool8);
|
||||
bool8 sub_813B9C0(void);
|
||||
void UpdateMirageRnd(u16 days);
|
||||
void UpdateBirchState(u16 days);
|
||||
void UpdateFrontierManiac(u16 days);
|
||||
void UpdateFrontierGambler(u16 days);
|
||||
void SetShoalItemFlag(u16 days);
|
||||
|
||||
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
|
||||
u8 oei_task_add(void);
|
||||
|
||||
#endif //GUARD_ROM6_H
|
||||
@ -1921,4 +1921,67 @@ extern const u8 gDaycareText_GetAlong[];
|
||||
extern const u8 gDaycareText_DontLikeOther[];
|
||||
extern const u8 gDaycareText_PlayOther[];
|
||||
|
||||
// party menu
|
||||
extern const u8 gUnknown_085E9E43[];
|
||||
extern const u8 gUnknown_085EA010[];
|
||||
extern const u8 gUnknown_085EA02A[];
|
||||
extern const u8 gUnknown_085E9E55[];
|
||||
extern const u8 gUnknown_085E9E64[];
|
||||
extern const u8 gUnknown_085E9E79[];
|
||||
extern const u8 gUnknown_085E9E8F[];
|
||||
extern const u8 gUnknown_085E9EBC[];
|
||||
extern const u8 gUnknown_085E9ED4[];
|
||||
extern const u8 gUnknown_085E9EE9[];
|
||||
extern const u8 gUnknown_085E9FDB[];
|
||||
extern const u8 gUnknown_085EA046[];
|
||||
extern const u8 gUnknown_085EA05B[];
|
||||
extern const u8 gUnknown_085E9F01[];
|
||||
extern const u8 gUnknown_085E9F58[];
|
||||
extern const u8 gUnknown_085E9F6F[];
|
||||
extern const u8 gUnknown_085E9F81[];
|
||||
extern const u8 gUnknown_085E9F90[];
|
||||
extern const u8 gUnknown_085E9FA7[];
|
||||
extern const u8 gUnknown_085E9FC2[];
|
||||
extern const u8 gUnknown_085E9EA6[];
|
||||
extern const u8 gUnknown_085E9F16[];
|
||||
extern const u8 gUnknown_085E9F2A[];
|
||||
extern const u8 gUnknown_085E9F42[];
|
||||
extern const u8 gUnknown_085E9FF9[];
|
||||
extern const u8 gUnknown_085EA073[];
|
||||
extern const u8 gUnknown_085EA091[];
|
||||
extern const u8 gUnknown_085EA099[];
|
||||
extern const u8 gUnknown_085EA09E[];
|
||||
extern const u8 gUnknown_085EA0A4[];
|
||||
extern const u8 gUnknown_085EA0AB[];
|
||||
extern const u8 gUnknown_085EA0E7[];
|
||||
extern const u8 gUnknown_085EA0B1[];
|
||||
extern const u8 gUnknown_085EA0B6[];
|
||||
extern const u8 gUnknown_085EA0BF[];
|
||||
extern const u8 gUnknown_085EA0C5[];
|
||||
extern const u8 gUnknown_085EA0CF[];
|
||||
extern const u8 gUnknown_085EA0D7[];
|
||||
extern const u8 gUnknown_085EA0DC[];
|
||||
extern const u8 gText_Take[];
|
||||
extern const u8 gText_Mail[];
|
||||
extern const u8 gText_Take2[];
|
||||
extern const u8 gText_Read2[];
|
||||
extern const u8 gText_Cancel2[];
|
||||
extern const u8 gText_Shift[];
|
||||
extern const u8 gText_SendOut[];
|
||||
extern const u8 gText_Enter[];
|
||||
extern const u8 gText_NoEntry[];
|
||||
extern const u8 gText_Store[];
|
||||
extern const u8 gText_Register[];
|
||||
extern const u8 gText_Trade4[];
|
||||
extern const u8 gText_Summary5[];
|
||||
extern const u8 gText_Switch2[];
|
||||
extern const u8 gText_Item[];
|
||||
extern const u8 gText_NotPkmnOtherTrainerWants[];
|
||||
extern const u8 gText_ThatIsntAnEgg[];
|
||||
extern const u8 gText_PkmnCantBeTradedNow[];
|
||||
extern const u8 gText_OtherTrainersPkmnCantBeTraded[];
|
||||
extern const u8 gText_EggCantBeTradedNow[];
|
||||
extern const u8 gText_OtherTrainerCantAcceptPkmn[];
|
||||
extern const u8 gText_CantTradeWithTrainer[];
|
||||
|
||||
#endif //GUARD_STRINGS_H
|
||||
|
||||
@ -193,7 +193,8 @@ SECTIONS {
|
||||
src/trader.o(.text);
|
||||
src/starter_choose.o(.text);
|
||||
src/wallclock.o(.text);
|
||||
src/rom6.o(.text);
|
||||
src/fldeff_rocksmash.o(.text);
|
||||
src/fldeff_dig.o(.text);
|
||||
src/pokeblock.o(.text);
|
||||
src/fldeff_flash.o(.text);
|
||||
src/post_battle_event_funcs.o(.text);
|
||||
@ -582,7 +583,7 @@ SECTIONS {
|
||||
src/list_menu.o(.rodata);
|
||||
src/save_location.o(.rodata);
|
||||
src/item_icon.o(.rodata);
|
||||
data/party_menu.o(.rodata);
|
||||
src/party_menu.o(.rodata);
|
||||
src/battle_tent.o(.rodata);
|
||||
src/unk_text_util_2.o(.rodata);
|
||||
src/unk_81BAD84.o(.rodata);
|
||||
|
||||
@ -4887,3 +4887,18 @@ static void sub_815F7C4(struct Sprite *sprite)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void AnimTask_GetReturnPowerLevel(u8 taskId)
|
||||
{
|
||||
gBattleAnimArgs[7] = 0;
|
||||
if (gAnimFriendship < 60)
|
||||
gBattleAnimArgs[7] = 0;
|
||||
if (gAnimFriendship > 60 && gAnimFriendship < 92)
|
||||
gBattleAnimArgs[7] = 1;
|
||||
if (gAnimFriendship > 91 && gAnimFriendship < 201)
|
||||
gBattleAnimArgs[7] = 2;
|
||||
if (gAnimFriendship > 200)
|
||||
gBattleAnimArgs[7] = 3;
|
||||
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
|
||||
@ -37,9 +37,9 @@
|
||||
#include "gym_leader_rematch.h"
|
||||
#include "battle_pike.h"
|
||||
#include "battle_pyramid.h"
|
||||
#include "fldeff.h"
|
||||
#include "fldeff_misc.h"
|
||||
#include "field_control_avatar.h"
|
||||
#include "fldeff_groundshake.h"
|
||||
#include "constants/map_types.h"
|
||||
#include "constants/battle_frontier.h"
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
#include "global.h"
|
||||
#include "rom6.h"
|
||||
#include "event_data.h"
|
||||
#include "rtc.h"
|
||||
#include "time_events.h"
|
||||
#include "field_specials.h"
|
||||
#include "lottery_corner.h"
|
||||
#include "dewford_trend.h"
|
||||
#include "tv.h"
|
||||
|
||||
5783
src/data/pokemon/tutor_learnsets.h
Normal file
5783
src/data/pokemon/tutor_learnsets.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@
|
||||
#include "field_screen_effect.h"
|
||||
#include "field_weather.h"
|
||||
#include "fieldmap.h"
|
||||
#include "fldeff_groundshake.h"
|
||||
#include "fldeff.h"
|
||||
#include "gpu_regs.h"
|
||||
#include "main.h"
|
||||
#include "menu.h"
|
||||
|
||||
@ -1310,7 +1310,7 @@ bool8 PartyHasMonWithSurf(void)
|
||||
{
|
||||
if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) == SPECIES_NONE)
|
||||
break;
|
||||
if (pokemon_has_move(&gPlayerParty[i], MOVE_SURF))
|
||||
if (MonKnowsMove(&gPlayerParty[i], MOVE_SURF))
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3193,7 +3193,7 @@ void sub_813AEB4(void)
|
||||
i = 0;
|
||||
do
|
||||
{
|
||||
if (gUnknown_0861500C[i] == gUnknown_085B320C[temp2])
|
||||
if (gTutorMoves[i] == gUnknown_085B320C[temp2])
|
||||
{
|
||||
gSpecialVar_0x8005 = i;
|
||||
break;
|
||||
@ -3206,7 +3206,7 @@ void sub_813AEB4(void)
|
||||
i = 0;
|
||||
do
|
||||
{
|
||||
if (gUnknown_0861500C[i] == gUnknown_085B31F8[temp2])
|
||||
if (gTutorMoves[i] == gUnknown_085B31F8[temp2])
|
||||
{
|
||||
gSpecialVar_0x8005 = i;
|
||||
break;
|
||||
@ -3817,7 +3817,7 @@ void sub_813B9A0(void)
|
||||
}
|
||||
}
|
||||
|
||||
bool32 sub_813B9C0(void)
|
||||
bool8 sub_813B9C0(void)
|
||||
{
|
||||
static const u16 gUnknown_085B3444[] = {
|
||||
MAP_OLDALE_TOWN_POKEMON_CENTER_1F,
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
#include "global.h"
|
||||
#include "bg.h"
|
||||
#include "fieldmap.h"
|
||||
#include "fldeff.h"
|
||||
#include "fldeff_misc.h"
|
||||
#include "fldeff_cut.h"
|
||||
#include "fldeff_groundshake.h"
|
||||
#include "frontier_util.h"
|
||||
#include "menu.h"
|
||||
#include "overworld.h"
|
||||
|
||||
@ -5,12 +5,11 @@
|
||||
#include "field_effect.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "fieldmap.h"
|
||||
#include "fldeff_cut.h"
|
||||
#include "fldeff.h"
|
||||
#include "alloc.h"
|
||||
#include "metatile_behavior.h"
|
||||
#include "overworld.h"
|
||||
#include "party_menu.h"
|
||||
#include "rom6.h"
|
||||
#include "script.h"
|
||||
#include "sound.h"
|
||||
#include "sprite.h"
|
||||
|
||||
63
src/fldeff_dig.c
Normal file
63
src/fldeff_dig.c
Normal file
@ -0,0 +1,63 @@
|
||||
#include "global.h"
|
||||
#include "braille_puzzles.h"
|
||||
#include "field_effect.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "fldeff.h"
|
||||
#include "item_use.h"
|
||||
#include "overworld.h"
|
||||
#include "party_menu.h"
|
||||
#include "sprite.h"
|
||||
#include "constants/field_effects.h"
|
||||
|
||||
// static functions
|
||||
static void hm2_dig(void);
|
||||
static void sub_8135780(void);
|
||||
|
||||
// text
|
||||
bool8 SetUpFieldMove_Dig(void)
|
||||
{
|
||||
if (CanUseEscapeRopeOnCurrMap() == TRUE)
|
||||
{
|
||||
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
|
||||
gPostMenuFieldCallback = hm2_dig;
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
static void hm2_dig(void)
|
||||
{
|
||||
Overworld_ResetStateAfterDigEscRope();
|
||||
FieldEffectStart(FLDEFF_USE_DIG);
|
||||
gFieldEffectArguments[0] = GetCursorSelectionMonId();
|
||||
}
|
||||
|
||||
bool8 FldEff_UseDig(void)
|
||||
{
|
||||
u8 taskId = oei_task_add();
|
||||
|
||||
gTasks[taskId].data[8] = (u32)sub_8135780 >> 16;
|
||||
gTasks[taskId].data[9] = (u32)sub_8135780;
|
||||
if (!ShouldDoBrailleDigEffect())
|
||||
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void sub_8135780(void)
|
||||
{
|
||||
u8 taskId;
|
||||
|
||||
FieldEffectActiveListRemove(FLDEFF_USE_DIG);
|
||||
if (ShouldDoBrailleDigEffect())
|
||||
{
|
||||
DoBrailleDigEffect();
|
||||
}
|
||||
else
|
||||
{
|
||||
taskId = CreateTask(task08_080A1C44, 8);
|
||||
gTasks[taskId].data[0] = 0;
|
||||
}
|
||||
}
|
||||
@ -2,11 +2,12 @@
|
||||
#include "field_camera.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "fieldmap.h"
|
||||
#include "fldeff.h"
|
||||
#include "task.h"
|
||||
|
||||
static EWRAM_DATA u8 sEscalatorAnim_TaskId = 0;
|
||||
|
||||
void sub_80E12E8(u8 taskId, const s16 *list, u16 c)
|
||||
static void sub_80E12E8(u8 taskId, const s16 *list, u16 c)
|
||||
{
|
||||
s16 r5 = gTasks[taskId].data[4] - 1;
|
||||
s16 r3 = gTasks[taskId].data[5] - 1;
|
||||
@ -60,7 +61,7 @@ static const u16 gUnknown_08589AD2[] = {0x2A0, 0x2A2, 0x2A4};
|
||||
static const u16 gUnknown_08589AD8[] = {0x2A1, 0x2A3, 0x2A5};
|
||||
static const u16 gUnknown_08589ADE[] = {0x2A8, 0x2AA, 0x2AC};
|
||||
|
||||
void sub_80E1444(u8 taskId)
|
||||
static void sub_80E1444(u8 taskId)
|
||||
{
|
||||
s16 *data = gTasks[taskId].data;
|
||||
|
||||
@ -100,7 +101,7 @@ void sub_80E1444(u8 taskId)
|
||||
}
|
||||
}
|
||||
|
||||
u8 sub_80E150C(u16 var)
|
||||
static u8 sub_80E150C(u16 var)
|
||||
{
|
||||
u8 taskId = CreateTask(sub_80E1444, 0);
|
||||
s16 *data = gTasks[taskId].data;
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
#include "event_data.h"
|
||||
#include "event_scripts.h"
|
||||
#include "field_effect.h"
|
||||
#include "fldeff.h"
|
||||
#include "gpu_regs.h"
|
||||
#include "main.h"
|
||||
#include "overworld.h"
|
||||
#include "palette.h"
|
||||
#include "party_menu.h"
|
||||
#include "rom6.h"
|
||||
#include "script.h"
|
||||
#include "sound.h"
|
||||
#include "sprite.h"
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
#include "event_data.h"
|
||||
#include "event_object_movement.h"
|
||||
#include "field_camera.h"
|
||||
#include "fldeff.h"
|
||||
#include "alloc.h"
|
||||
#include "random.h"
|
||||
#include "roulette_util.h"
|
||||
@ -10,6 +11,7 @@
|
||||
#include "sprite.h"
|
||||
#include "task.h"
|
||||
#include "constants/flags.h"
|
||||
#include "constants/maps.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
// structures
|
||||
@ -126,12 +128,13 @@ EWRAM_DATA struct Struct203CF18 *gUnknown_0203CF18 = NULL;
|
||||
// text
|
||||
bool8 sub_81BE66C(void)
|
||||
{
|
||||
if (!(gSaveBlock1Ptr->location.mapGroup == 0x0 && gSaveBlock1Ptr->location.mapNum == 0x1A))
|
||||
return 0;
|
||||
if (!(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE111) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE111)))
|
||||
return FALSE;
|
||||
else
|
||||
return FlagGet(FLAG_0x14E);
|
||||
}
|
||||
|
||||
void sub_81BE698(u8 taskId)
|
||||
static void sub_81BE698(u8 taskId)
|
||||
{
|
||||
sub_8151E50(&(gUnknown_0203CF18->unk4));
|
||||
}
|
||||
@ -148,7 +151,8 @@ void sub_81BE6B8(void)
|
||||
gUnknown_0203CF18 = NULL;
|
||||
return;
|
||||
}
|
||||
if(!(gSaveBlock1Ptr->location.mapGroup == 0x0 && gSaveBlock1Ptr->location.mapNum == 0x1A) || !FlagGet(FLAG_0x14E))
|
||||
|
||||
if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(ROUTE111) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(ROUTE111) || !FlagGet(FLAG_0x14E))
|
||||
return;
|
||||
|
||||
gUnknown_0203CF18 = (struct Struct203CF18 *)AllocZeroed(sizeof(struct Struct203CF18));
|
||||
@ -160,10 +164,13 @@ void sub_81BE6B8(void)
|
||||
|
||||
void sub_81BE72C(void)
|
||||
{
|
||||
if(!(gSaveBlock1Ptr->location.mapGroup == 0x0 && gSaveBlock1Ptr->location.mapNum == 0x1A) || !FlagGet(FLAG_0x14E) || gUnknown_0203CF18 == NULL)
|
||||
if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(ROUTE111) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(ROUTE111)
|
||||
|| !FlagGet(FLAG_0x14E) || gUnknown_0203CF18 == NULL)
|
||||
return;
|
||||
|
||||
if( FuncIsActiveTask(sub_81BE698))
|
||||
DestroyTask(gUnknown_0203CF18->taskId);
|
||||
|
||||
sub_8151D28(&(gUnknown_0203CF18->unk4), 1, 1);
|
||||
sub_8151C50(&(gUnknown_0203CF18->unk4), 1, 1);
|
||||
Free(gUnknown_0203CF18);
|
||||
@ -233,9 +240,8 @@ static void sp136_strengh_sound(u8 a, u8 b, u8 c, u8 d)
|
||||
|
||||
static void sub_81BE900(u8 taskId)
|
||||
{
|
||||
s16 *data;
|
||||
s16 *data = gTasks[taskId].data;
|
||||
|
||||
data = gTasks[taskId].data;
|
||||
data[1]++;
|
||||
if ((data[1] % data[3]) == 0)
|
||||
{
|
||||
@ -255,9 +261,7 @@ static void sub_81BE900(u8 taskId)
|
||||
|
||||
static void sub_81BE968(void)
|
||||
{
|
||||
u8 taskId;
|
||||
|
||||
taskId = FindTaskIdByFunc(sub_81BE9C0);
|
||||
u8 taskId = FindTaskIdByFunc(sub_81BE9C0);
|
||||
if (taskId != 0xFF)
|
||||
gTasks[taskId].data[0]++;
|
||||
}
|
||||
@ -272,11 +276,9 @@ void sub_81BE994(void)
|
||||
|
||||
static void sub_81BE9C0(u8 taskId)
|
||||
{
|
||||
u16 *data;
|
||||
u16 *data = gTasks[taskId].data;
|
||||
|
||||
data = gTasks[taskId].data;
|
||||
data[1]++;
|
||||
if(data[1] == 1000 || data[0] == 17)
|
||||
if (++data[1] == 1000 || data[0] == 17)
|
||||
gTasks[taskId].func = sub_81BEA00;
|
||||
}
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
#include "script.h"
|
||||
#include "sound.h"
|
||||
#include "task.h"
|
||||
#include "rom6.h"
|
||||
#include "strings.h"
|
||||
#include "party_menu.h"
|
||||
#include "fieldmap.h"
|
||||
#include "field_effect.h"
|
||||
#include "field_camera.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "fldeff.h"
|
||||
#include "fldeff_misc.h"
|
||||
#include "secret_base.h"
|
||||
#include "event_data.h"
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
#include "event_scripts.h"
|
||||
#include "field_effect.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "fldeff.h"
|
||||
#include "item_use.h"
|
||||
#include "overworld.h"
|
||||
#include "party_menu.h"
|
||||
#include "rom6.h"
|
||||
#include "script.h"
|
||||
#include "sound.h"
|
||||
#include "sprite.h"
|
||||
@ -26,8 +26,6 @@ static void sub_813552C(u8 taskId);
|
||||
static void sub_813561C(u8 taskId);
|
||||
static void sub_81356C4(void);
|
||||
static void sub_8135714(void);
|
||||
static void hm2_dig(void);
|
||||
static void sub_8135780(void);
|
||||
|
||||
// extern RAM loc
|
||||
extern struct MapPosition gPlayerFacingPosition;
|
||||
@ -162,51 +160,3 @@ static void sub_8135714(void)
|
||||
FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
|
||||
EnableBothScriptContexts();
|
||||
}
|
||||
|
||||
bool8 SetUpFieldMove_Dig(void)
|
||||
{
|
||||
if (CanUseEscapeRopeOnCurrMap() == TRUE)
|
||||
{
|
||||
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
|
||||
gPostMenuFieldCallback = hm2_dig;
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
static void hm2_dig(void)
|
||||
{
|
||||
Overworld_ResetStateAfterDigEscRope();
|
||||
FieldEffectStart(FLDEFF_USE_DIG);
|
||||
gFieldEffectArguments[0] = GetCursorSelectionMonId();
|
||||
}
|
||||
|
||||
bool8 FldEff_UseDig(void)
|
||||
{
|
||||
u8 taskId = oei_task_add();
|
||||
|
||||
gTasks[taskId].data[8] = (u32)sub_8135780 >> 16;
|
||||
gTasks[taskId].data[9] = (u32)sub_8135780;
|
||||
if (!ShouldDoBrailleDigEffect())
|
||||
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void sub_8135780(void)
|
||||
{
|
||||
u8 taskId;
|
||||
|
||||
FieldEffectActiveListRemove(FLDEFF_USE_DIG);
|
||||
if (ShouldDoBrailleDigEffect())
|
||||
{
|
||||
DoBrailleDigEffect();
|
||||
}
|
||||
else
|
||||
{
|
||||
taskId = CreateTask(task08_080A1C44, 8);
|
||||
gTasks[taskId].data[0] = 0;
|
||||
}
|
||||
}
|
||||
@ -2,8 +2,8 @@
|
||||
#include "event_data.h"
|
||||
#include "event_scripts.h"
|
||||
#include "field_effect.h"
|
||||
#include "fldeff.h"
|
||||
#include "party_menu.h"
|
||||
#include "rom6.h"
|
||||
#include "script.h"
|
||||
#include "string_util.h"
|
||||
#include "task.h"
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
#include "field_player_avatar.h"
|
||||
#include "field_screen_effect.h"
|
||||
#include "field_weather.h"
|
||||
#include "fldeff.h"
|
||||
#include "palette.h"
|
||||
#include "party_menu.h"
|
||||
#include "rom6.h"
|
||||
#include "script.h"
|
||||
#include "sound.h"
|
||||
#include "sprite.h"
|
||||
@ -21,8 +21,6 @@ static void FieldCallback_SweetScent(void);
|
||||
static void StartSweetScentFieldEffect(void);
|
||||
static void TrySweetScentEncounter(u8 taskId);
|
||||
static void FailSweetScentEncounter(u8 taskId);
|
||||
void sub_81BE6B8(void);
|
||||
void sub_81BE72C(void);
|
||||
|
||||
bool8 SetUpFieldMove_SweetScent(void)
|
||||
{
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
#include "global.h"
|
||||
#include "field_effect.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "fldeff.h"
|
||||
#include "party_menu.h"
|
||||
#include "overworld.h"
|
||||
#include "rom6.h"
|
||||
#include "task.h"
|
||||
#include "constants/field_effects.h"
|
||||
|
||||
|
||||
@ -5,7 +5,9 @@
|
||||
#include "global.h"
|
||||
#include "main.h"
|
||||
#include "overworld.h"
|
||||
#include "rom6.h"
|
||||
#include "fldeff.h"
|
||||
#include "field_specials.h"
|
||||
#include "pokeblock.h"
|
||||
#include "event_data.h"
|
||||
#include "script.h"
|
||||
#include "random.h"
|
||||
|
||||
1495
src/party_menu.c
1495
src/party_menu.c
File diff suppressed because it is too large
Load Diff
@ -2143,7 +2143,7 @@ static void sub_81C174C(u8 taskId)
|
||||
|
||||
static bool8 sub_81C18A8(void)
|
||||
{
|
||||
if (pssData->firstMoveIndex == MAX_MON_MOVES || pssData->newMove == MOVE_NONE || sub_81B6D14(pssData->summary.moves[pssData->firstMoveIndex]) != 1)
|
||||
if (pssData->firstMoveIndex == MAX_MON_MOVES || pssData->newMove == MOVE_NONE || IsMoveHm(pssData->summary.moves[pssData->firstMoveIndex]) != 1)
|
||||
return TRUE;
|
||||
else
|
||||
return FALSE;
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
#include "overworld.h"
|
||||
#include "constants/flags.h"
|
||||
#include "event_data.h"
|
||||
#include "rom6.h"
|
||||
#include "secret_base.h"
|
||||
#include "string_util.h"
|
||||
#include "international_string_util.h"
|
||||
@ -20,6 +19,8 @@
|
||||
#include "constants/songs.h"
|
||||
#include "m4a.h"
|
||||
#include "field_effect.h"
|
||||
#include "field_specials.h"
|
||||
#include "fldeff.h"
|
||||
#include "region_map.h"
|
||||
#include "constants/region_map_sections.h"
|
||||
#include "heal_location.h"
|
||||
|
||||
@ -1713,8 +1713,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
|
||||
u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL);
|
||||
if (!species)
|
||||
break;
|
||||
// UB: GetMonData() arguments don't match function definition
|
||||
if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) && pokemon_has_move(&gPlayerParty[i], moveId) == TRUE)
|
||||
if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) && MonKnowsMove(&gPlayerParty[i], moveId) == TRUE)
|
||||
{
|
||||
gSpecialVar_Result = i;
|
||||
gSpecialVar_0x8004 = species;
|
||||
|
||||
@ -16,11 +16,13 @@
|
||||
#include "overworld.h"
|
||||
#include "fieldmap.h"
|
||||
#include "field_camera.h"
|
||||
#include "field_specials.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "field_screen_effect.h"
|
||||
#include "field_weather.h"
|
||||
#include "event_object_movement.h"
|
||||
#include "field_effect.h"
|
||||
#include "fldeff.h"
|
||||
#include "fldeff_misc.h"
|
||||
#include "metatile_behavior.h"
|
||||
#include "map_name_popup.h"
|
||||
@ -32,7 +34,6 @@
|
||||
#include "event_data.h"
|
||||
#include "battle.h"
|
||||
#include "battle_setup.h"
|
||||
#include "rom6.h"
|
||||
#include "decoration.h"
|
||||
#include "link.h"
|
||||
#include "tv.h"
|
||||
|
||||
3
src/tv.c
3
src/tv.c
@ -6,6 +6,8 @@
|
||||
#include "event_data.h"
|
||||
#include "fieldmap.h"
|
||||
#include "field_camera.h"
|
||||
#include "field_specials.h"
|
||||
#include "fldeff.h"
|
||||
#include "strings.h"
|
||||
#include "string_util.h"
|
||||
#include "international_string_util.h"
|
||||
@ -24,7 +26,6 @@
|
||||
#include "event_scripts.h"
|
||||
#include "shop.h"
|
||||
#include "lilycove_lady.h"
|
||||
#include "rom6.h"
|
||||
#include "pokedex.h"
|
||||
#include "event_object_movement.h"
|
||||
#include "text.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user