dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more symbol name fixes

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-04 00:00:21 +08:00
parent 49a1de36d3
commit b6a166c459
18 changed files with 4874 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/.fuse_hidden00001c3c00000003
+2244
View File
File diff suppressed because it is too large Load Diff
asm/.fuse_hidden00001c3c00000005
+2244
View File
File diff suppressed because it is too large Load Diff
asm/berry_pouch.s
+1 -1
View File
@@ -1694,7 +1694,7 @@ _0813DA9E:
ldr r4, _0813DAE0 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r0, _0813DAE4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
asm/field_specials.s
+1 -1
View File
@@ -2753,7 +2753,7 @@ sub_80CBADC: @ 80CBADC
ldr r4, _080CBB20 @ =gUnknown_3005378
adds r1, r4, 0
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r1, _080CBB24 @ =gUnknown_2039A18
ldrh r0, [r4]
strh r0, [r1]
asm/item_menu.s
+7 -7
View File
@@ -2313,7 +2313,7 @@ _08108FA0:
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -2353,7 +2353,7 @@ _08108FE4:
adds r3, r5, 0
adds r3, 0x8
adds r2, r3
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -2830,7 +2830,7 @@ sub_81093B8: @ 81093B8
mov r2, sp
adds r2, 0x16
add r1, sp, 0x14
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
mov r2, r8
ldrb r0, [r2]
movs r1, 0x10
@@ -2942,7 +2942,7 @@ sub_81094B0: @ 81094B0
adds r1, r2, r1
adds r3, 0x8
adds r2, r3
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldrb r0, [r4]
bl ListMenuGetYCoordForPrintingArrowCursor
adds r1, r0, 0
@@ -2967,7 +2967,7 @@ sub_81094B0: @ 81094B0
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -3001,7 +3001,7 @@ _08109558:
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -4573,7 +4573,7 @@ sub_810A288: @ 810A288
adds r6, 0x2
mov r1, sp
adds r2, r6, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r0, [r0]
ldrh r1, [r6]
asm/item_pc.s
+3 -3
View File
@@ -1403,7 +1403,7 @@ sub_810DEA0: @ 810DEA0
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -1436,7 +1436,7 @@ _0810DF20:
ldrb r0, [r6]
ldr r1, _0810DF44 @ =gUnknown_203ADD0
adds r2, r1, 0x2
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -1630,7 +1630,7 @@ sub_810E0B4: @ 810E0B4
ldr r7, _0810E120 @ =gUnknown_203ADD0
adds r2, r7, 0x2
adds r1, r7, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
movs r5, 0x20
negs r5, r5
ldrb r0, [r4]
asm/learn_move.s
+1 -1
View File
@@ -736,7 +736,7 @@ _080E4C7E:
adds r1, r2, r3
ldr r6, _080E4CD4 @ =0x00000a6a
adds r2, r6
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
bl FreeAllWindowBuffers
ldr r0, _080E4CD8 @ =gPlayerParty
ldr r5, [r7]
asm/list_menu.s
+3 -3
View File
@@ -563,8 +563,8 @@ _081072CA:
_081072D0: .4byte gTasks+0x8
thumb_func_end sub_81072AC
thumb_func_start get_coro_args_x18_x1A
get_coro_args_x18_x1A: @ 81072D4
thumb_func_start ListMenuGetScrollAndRow
ListMenuGetScrollAndRow: @ 81072D4
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -588,7 +588,7 @@ _081072F6:
bx r0
.align 2, 0
_081072FC: .4byte gTasks+0x8
thumb_func_end get_coro_args_x18_x1A
thumb_func_end ListMenuGetScrollAndRow
thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
ListMenuGetYCoordForPrintingArrowCursor: @ 8107300
asm/player_pc.s
+1 -1
View File
@@ -1142,7 +1142,7 @@ sub_80EBF40: @ 80EBF40
mov r8, r1
adds r1, r7, 0
mov r2, r8
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r6, r0
asm/pokedex_screen.s
+6 -6
View File
@@ -593,7 +593,7 @@ _081029D0:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
bl sub_806E25C
cmp r0, 0
beq _081029F4
@@ -627,7 +627,7 @@ _08102A14:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r0, _08102A4C @ =gMain
ldrh r1, [r0, 0x2E]
movs r3, 0x1
@@ -1367,7 +1367,7 @@ _0810307C:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
bl sub_81039F0
ldr r1, [r4]
adds r1, 0x60
@@ -1385,7 +1385,7 @@ _08103098:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r0, _081030F0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r3, 0x1
@@ -1687,7 +1687,7 @@ _08103344:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
bl sub_81039F0
ldr r1, [r4]
adds r1, 0x60
@@ -1706,7 +1706,7 @@ _08103362:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r0, _081033C4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
asm/shop.s
+1 -1
View File
@@ -2170,7 +2170,7 @@ sub_809BBC0: @ 809BBC0
ldr r7, _0809BC08 @ =gUnknown_2039942
subs r2, r7, 0x2
adds r1, r7, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r4, r0
asm/teachy_tv.s
+4 -4
View File
@@ -238,7 +238,7 @@ sub_815B2C0: @ 815B2C0
ldr r4, _0815B324 @ =gTeachyTV_StaticResources+6
adds r2, r4, 0x2
adds r1, r4, 0
bl get_coro_args_x18_x1A
bl ListMenuGetScrollAndRow
ldr r0, _0815B328 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
@@ -1186,8 +1186,8 @@ _0815BA4E:
bx r0
thumb_func_end sub_815BA30
thumb_func_start TeachyTvTaskFunction
TeachyTvTaskFunction: @ 815BA54
thumb_func_start TeachyTvPostBattleFadeControl
TeachyTvPostBattleFadeControl: @ 815BA54
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -1223,7 +1223,7 @@ _0815BA90: .4byte gPaletteFade
_0815BA94: .4byte gUnknown_8479390
_0815BA98: .4byte gTeachyTV_StaticResources
_0815BA9C: .4byte sub_815B4EC
thumb_func_end TeachyTvTaskFunction
thumb_func_end TeachyTvPostBattleFadeControl
thumb_func_start sub_815BAA0
sub_815BAA0: @ 815BAA0