diff options
Diffstat (limited to 'asm/script_pokemon_util_80BF8FC.s')
| -rw-r--r-- | asm/script_pokemon_util_80BF8FC.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index b8da48f65..eec41cf11 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -105,7 +105,7 @@ sub_80BF9BC: @ 80BF9BC push {r4,lr} sub sp, 0x4 ldr r0, _080BF9F0 @ =gPlayerParty - ldr r1, _080BF9F4 @ =gUnknown_20370C0 + ldr r1, _080BF9F4 @ =gSpecialVar_0x8004 ldrb r1, [r1] ldr r2, _080BF9F8 @ =gPlayerPartyCount ldrb r2, [r2] @@ -127,7 +127,7 @@ sub_80BF9BC: @ 80BF9BC bx r0 .align 2, 0 _080BF9F0: .4byte gPlayerParty -_080BF9F4: .4byte gUnknown_20370C0 +_080BF9F4: .4byte gSpecialVar_0x8004 _080BF9F8: .4byte gPlayerPartyCount _080BF9FC: .4byte c2_exit_to_overworld_2_switch _080BFA00: .4byte gUnknown_3005020 @@ -137,13 +137,13 @@ _080BFA04: .4byte sub_807DD24 thumb_func_start ScrSpecial_CountPokemonMoves ScrSpecial_CountPokemonMoves: @ 80BFA08 push {r4,r5,lr} - ldr r1, _080BFA44 @ =gUnknown_20370D0 + ldr r1, _080BFA44 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] movs r4, 0 adds r5, r1, 0 _080BFA14: - ldr r0, _080BFA48 @ =gUnknown_20370C0 + ldr r0, _080BFA48 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -167,15 +167,15 @@ _080BFA32: pop {r0} bx r0 .align 2, 0 -_080BFA44: .4byte gUnknown_20370D0 -_080BFA48: .4byte gUnknown_20370C0 +_080BFA44: .4byte gSpecialVar_Result +_080BFA48: .4byte gSpecialVar_0x8004 _080BFA4C: .4byte gPlayerParty thumb_func_end ScrSpecial_CountPokemonMoves thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 push {r4,r5,lr} - ldr r0, _080BFA90 @ =gUnknown_20370C0 + ldr r0, _080BFA90 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 adds r5, r1, 0 @@ -203,7 +203,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 pop {r0} bx r0 .align 2, 0 -_080BFA90: .4byte gUnknown_20370C0 +_080BFA90: .4byte gSpecialVar_0x8004 _080BFA94: .4byte gPlayerParty _080BFA98: .4byte gSpecialVar_0x8005 _080BFA9C: .4byte gStringVar1 @@ -338,7 +338,7 @@ sub_80BFBA8: @ 80BFBA8 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080BFC08 @ =gUnknown_20370C0 + ldr r0, _080BFC08 @ =gSpecialVar_0x8004 mov r8, r0 ldrh r0, [r0] movs r6, 0x64 @@ -359,7 +359,7 @@ sub_80BFBA8: @ 80BFBA8 cmp r4, 0x2 bhi _080BFBFC _080BFBDA: - ldr r0, _080BFC08 @ =gUnknown_20370C0 + ldr r0, _080BFC08 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -382,7 +382,7 @@ _080BFBFC: pop {r0} bx r0 .align 2, 0 -_080BFC08: .4byte gUnknown_20370C0 +_080BFC08: .4byte gSpecialVar_0x8004 _080BFC0C: .4byte gPlayerParty _080BFC10: .4byte gSpecialVar_0x8005 thumb_func_end sub_80BFBA8 @@ -390,7 +390,7 @@ _080BFC10: .4byte gSpecialVar_0x8005 thumb_func_start sub_80BFC14 sub_80BFC14: @ 80BFC14 push {lr} - ldr r0, _080BFC38 @ =gUnknown_20370C0 + ldr r0, _080BFC38 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -401,22 +401,22 @@ sub_80BFC14: @ 80BFC14 adds r1, r0, 0 cmp r1, 0 beq _080BFC44 - ldr r1, _080BFC40 @ =gUnknown_20370D0 + ldr r1, _080BFC40 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] b _080BFC48 .align 2, 0 -_080BFC38: .4byte gUnknown_20370C0 +_080BFC38: .4byte gSpecialVar_0x8004 _080BFC3C: .4byte gPlayerParty -_080BFC40: .4byte gUnknown_20370D0 +_080BFC40: .4byte gSpecialVar_Result _080BFC44: - ldr r0, _080BFC4C @ =gUnknown_20370D0 + ldr r0, _080BFC4C @ =gSpecialVar_Result strh r1, [r0] _080BFC48: pop {r0} bx r0 .align 2, 0 -_080BFC4C: .4byte gUnknown_20370D0 +_080BFC4C: .4byte gSpecialVar_Result thumb_func_end sub_80BFC14 .align 2, 0 @ Don't pad with nop. |