Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-20 17:34:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

name field move functions

Browse Source
This commit is contained in:
YamaArashi
2016-10-18 13:54:26 -07:00
parent d3f5f73d13
commit bb2e1caa17
7 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asm/rom5_part2.s
View File

@@ -42728,8 +42728,8 @@ _080A24FA:
bx r0
thumb_func_end sub_80A2490
thumb_func_start sub_80A2504
sub_80A2504: @ 80A2504
thumb_func_start SetUpFieldMove_Cut
SetUpFieldMove_Cut: @ 80A2504
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -42836,7 +42836,7 @@ _080A25DE:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80A2504
thumb_func_end SetUpFieldMove_Cut
thumb_func_start sub_80A25E8
sub_80A25E8: @ 80A25E8

24
asm/rom6.s
View File

@@ -280,8 +280,8 @@ _0810B4FC: .4byte gTasks
_0810B500: .4byte gPlayerAvatar
thumb_func_end sub_810B4CC
thumb_func_start hm_prepare_rocksmash
hm_prepare_rocksmash: @ 810B504
thumb_func_start SetUpFieldMove_RockSmash
SetUpFieldMove_RockSmash: @ 810B504
push {lr}
movs r0, 0x56
bl npc_before_player_of_type
@@ -307,7 +307,7 @@ _0810B52C: .4byte gUnknown_0300485C
_0810B530: .4byte sub_808AB90
_0810B534: .4byte gUnknown_03005CE4
_0810B538: .4byte sub_810B53C
thumb_func_end hm_prepare_rocksmash
thumb_func_end SetUpFieldMove_RockSmash
thumb_func_start sub_810B53C
sub_810B53C: @ 810B53C
@@ -363,8 +363,8 @@ sub_810B58C: @ 810B58C
bx r0
thumb_func_end sub_810B58C
thumb_func_start sub_810B5A4
sub_810B5A4: @ 810B5A4
thumb_func_start SetUpFieldMove_Dig
SetUpFieldMove_Dig: @ 810B5A4
push {lr}
bl sub_80CA1C8
lsls r0, 24
@@ -389,7 +389,7 @@ _0810B5C8: .4byte gUnknown_0300485C
_0810B5CC: .4byte sub_808AB90
_0810B5D0: .4byte gUnknown_03005CE4
_0810B5D4: .4byte sub_810B5D8
thumb_func_end sub_810B5A4
thumb_func_end SetUpFieldMove_Dig
thumb_func_start sub_810B5D8
sub_810B5D8: @ 810B5D8
@@ -3137,8 +3137,8 @@ _0810CBAC:
bx r1
thumb_func_end sub_810CB68
thumb_func_start sub_810CBB4
sub_810CBB4: @ 810CBB4
thumb_func_start SetUpFieldMove_Flash
SetUpFieldMove_Flash: @ 810CBB4
push {lr}
ldr r0, _0810CBDC
ldrb r0, [r0, 0x15]
@@ -3169,7 +3169,7 @@ _0810CBF4:
_0810CBF6:
pop {r1}
bx r1
thumb_func_end sub_810CBB4
thumb_func_end SetUpFieldMove_Flash
thumb_func_start sub_810CBFC
sub_810CBFC: @ 810CBFC
@@ -30999,8 +30999,8 @@ _0811A992:
_0811A998: .4byte gLandmarkLists
thumb_func_end sub_811A920
thumb_func_start sub_811A99C
sub_811A99C: @ 811A99C
thumb_func_start SetUpFieldMove_Strength
SetUpFieldMove_Strength: @ 811A99C
push {lr}
bl sub_81474C8
lsls r0, 24
@@ -31055,7 +31055,7 @@ _0811AA08: .4byte gUnknown_0300485C
_0811AA0C: .4byte sub_808AB90
_0811AA10: .4byte gUnknown_03005CE4
_0811AA14: .4byte sub_811AA18
thumb_func_end sub_811A99C
thumb_func_end SetUpFieldMove_Strength
thumb_func_start sub_811AA18
sub_811AA18: @ 811AA18

28
asm/rom_80859BC.s
View File

@@ -10333,7 +10333,7 @@ _0808AA2C:
bl BeginNormalPaletteFade
b _0808AADA
.align 2, 0
_0808AA78: .4byte gUnknown_0839F58C
_0808AA78: .4byte gFieldMoveFuncs
_0808AA7C: .4byte gUnknown_0202FFA8
_0808AA80: .4byte gTasks
_0808AA84: .4byte sub_808AB34
@@ -10384,7 +10384,7 @@ _0808AADA:
pop {r0}
bx r0
.align 2, 0
_0808AAE4: .4byte gUnknown_0839F58C
_0808AAE4: .4byte gFieldMoveFuncs
_0808AAE8: .4byte gTasks
_0808AAEC: .4byte sub_808ABF4
thumb_func_end PokemonMenu_FieldMove
@@ -10567,8 +10567,8 @@ _0808AC40: .4byte gUnknown_0202FF84
_0808AC44: .4byte gUnknown_03005CE0
thumb_func_end sub_808AC2C
thumb_func_start sub_808AC48
sub_808AC48: @ 808AC48
thumb_func_start SetUpFieldMove_Surf
SetUpFieldMove_Surf: @ 808AC48
push {lr}
bl PartyHasMonWithSurf
lsls r0, 24
@@ -10598,7 +10598,7 @@ _0808AC84:
_0808AC86:
pop {r1}
bx r1
thumb_func_end sub_808AC48
thumb_func_end SetUpFieldMove_Surf
thumb_func_start sub_808AC8C
sub_808AC8C: @ 808AC8C
@@ -10616,8 +10616,8 @@ _0808ACA0: .4byte gUnknown_0202FF84
_0808ACA4: .4byte gUnknown_03005CE0
thumb_func_end sub_808AC8C
thumb_func_start sub_808ACA8
sub_808ACA8: @ 808ACA8
thumb_func_start SetUpFieldMove_Fly
SetUpFieldMove_Fly: @ 808ACA8
push {lr}
bl sub_8147588
lsls r0, 24
@@ -10663,7 +10663,7 @@ _0808ACFC: .4byte gUnknown_0300485C
_0808AD00: .4byte sub_808AB90
_0808AD04: .4byte gUnknown_03005CE4
_0808AD08: .4byte sub_808AC8C
thumb_func_end sub_808ACA8
thumb_func_end SetUpFieldMove_Fly
thumb_func_start sub_808AD0C
sub_808AD0C: @ 808AD0C
@@ -10761,8 +10761,8 @@ _0808ADC0: .4byte gUnknown_0202FF84
_0808ADC4: .4byte gUnknown_03005CE0
thumb_func_end sub_808ADAC
thumb_func_start sub_808ADC8
sub_808ADC8: @ 808ADC8
thumb_func_start SetUpFieldMove_Dive
SetUpFieldMove_Dive: @ 808ADC8
push {lr}
bl sub_8068F18
ldr r1, _0808ADE0
@@ -10791,7 +10791,7 @@ _0808ADF8: .4byte gUnknown_0300485C
_0808ADFC: .4byte sub_808AB90
_0808AE00: .4byte gUnknown_03005CE4
_0808AE04: .4byte sub_808ADAC
thumb_func_end sub_808ADC8
thumb_func_end SetUpFieldMove_Dive
thumb_func_start sub_808AE08
sub_808AE08: @ 808AE08
@@ -10809,8 +10809,8 @@ _0808AE1C: .4byte gUnknown_0202FF84
_0808AE20: .4byte gUnknown_03005CE0
thumb_func_end sub_808AE08
thumb_func_start hm_prepare_waterfall
hm_prepare_waterfall: @ 808AE24
thumb_func_start SetUpFieldMove_Waterfall
SetUpFieldMove_Waterfall: @ 808AE24
push {r4,lr}
sub sp, 0x4
mov r4, sp
@@ -10856,7 +10856,7 @@ _0808AE82:
pop {r4}
pop {r1}
bx r1
thumb_func_end hm_prepare_waterfall
thumb_func_end SetUpFieldMove_Waterfall
thumb_func_start sub_808AE8C
sub_808AE8C: @ 808AE8C

6
asm/rom_80B5054.s
View File

@@ -35270,8 +35270,8 @@ _080C62BE:
bx r0
thumb_func_end sub_80C6280
thumb_func_start sub_80C62C4
sub_80C62C4: @ 80C62C4
thumb_func_start SetUpFieldMove_SecretPower
SetUpFieldMove_SecretPower: @ 80C62C4
push {r4,lr}
bl sub_80BB63C
ldr r0, _080C6318
@@ -35362,7 +35362,7 @@ _080C638C: .4byte gUnknown_0300485C
_080C6390: .4byte sub_808AB90
_080C6394: .4byte gUnknown_03005CE4
_080C6398: .4byte sub_80C660C
thumb_func_end sub_80C62C4
thumb_func_end SetUpFieldMove_SecretPower
thumb_func_start sub_80C639C
sub_80C639C: @ 80C639C

12
asm/rom_81258BC.s
View File

@@ -2221,8 +2221,8 @@ nullsub_78: @ 812BFB0
bx lr
thumb_func_end nullsub_78
thumb_func_start sub_812BFB4
sub_812BFB4: @ 812BFB4
thumb_func_start SetUpFieldMove_SweetScent
SetUpFieldMove_SweetScent: @ 812BFB4
ldr r1, _0812BFC4
ldr r0, _0812BFC8
str r0, [r1]
@@ -2236,7 +2236,7 @@ _0812BFC4: .4byte gUnknown_0300485C
_0812BFC8: .4byte sub_808AB90
_0812BFCC: .4byte gUnknown_03005CE4
_0812BFD0: .4byte sub_812BFD4
thumb_func_end sub_812BFB4
thumb_func_end SetUpFieldMove_SweetScent
thumb_func_start sub_812BFD4
sub_812BFD4: @ 812BFD4
@@ -18237,8 +18237,8 @@ sub_8133CA4: @ 8133CA4
_08133CC8: .4byte gUnknown_030007B0
thumb_func_end sub_8133CA4
thumb_func_start sub_8133CCC
sub_8133CCC: @ 8133CCC
thumb_func_start SetUpFieldMove_SoftBoiled
SetUpFieldMove_SoftBoiled: @ 8133CCC
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -18283,7 +18283,7 @@ _08133D1E:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8133CCC
thumb_func_end SetUpFieldMove_SoftBoiled
thumb_func_start unref_sub_8133D28
unref_sub_8133D28: @ 8133D28

6
asm/rom_813BA94.s
View File

@@ -29320,8 +29320,8 @@ _0814A33C:
_0814A370: .4byte gUnknown_084170F4
thumb_func_end sub_814A2EC
thumb_func_start sub_814A374
sub_814A374: @ 814A374
thumb_func_start SetUpFieldMove_Teleport
SetUpFieldMove_Teleport: @ 814A374
push {lr}
ldr r0, _0814A38C
ldrb r0, [r0, 0x17]
@@ -29350,7 +29350,7 @@ _0814A3A4: .4byte gUnknown_0300485C
_0814A3A8: .4byte sub_808AB90
_0814A3AC: .4byte gUnknown_03005CE4
_0814A3B0: .4byte hm_teleport_run_dp02scr
thumb_func_end sub_814A374
thumb_func_end SetUpFieldMove_Teleport
thumb_func_start hm_teleport_run_dp02scr
hm_teleport_run_dp02scr: @ 814A3B4

30
data/data2.s
View File

@@ -11575,21 +11575,21 @@ gUnknown_0839F584:: @ 839F584
.4byte Unknown_39F580
.align 2
gUnknown_0839F58C:: @ 839F58C
.4byte sub_80A2504, 0x6
.4byte sub_810CBB4, 0x9
.4byte hm_prepare_rocksmash, 0x9
.4byte sub_811A99C, 0x9
.4byte sub_808AC48, 0x7
.4byte sub_808ACA8, 0x9
.4byte sub_808ADC8, 0x9
.4byte hm_prepare_waterfall, 0x9
.4byte sub_814A374, 0x9
.4byte sub_810B5A4, 0x9
.4byte sub_80C62C4, 0x9
.4byte sub_8133CCC, 0x10
.4byte sub_8133CCC, 0x10
.4byte sub_812BFB4, 0x9
gFieldMoveFuncs:: @ 839F58C
.4byte SetUpFieldMove_Cut, 0x6
.4byte SetUpFieldMove_Flash, 0x9
.4byte SetUpFieldMove_RockSmash, 0x9
.4byte SetUpFieldMove_Strength, 0x9
.4byte SetUpFieldMove_Surf, 0x7
.4byte SetUpFieldMove_Fly, 0x9
.4byte SetUpFieldMove_Dive, 0x9
.4byte SetUpFieldMove_Waterfall, 0x9
.4byte SetUpFieldMove_Teleport, 0x9
.4byte SetUpFieldMove_Dig, 0x9
.4byte SetUpFieldMove_SecretPower, 0x9
.4byte SetUpFieldMove_SoftBoiled, 0x10
.4byte SetUpFieldMove_SoftBoiled, 0x10
.4byte SetUpFieldMove_SweetScent, 0x9
.align 2
gUnknown_0839F5FC:: @ 839F5FC