diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2019-06-23 18:47:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 18:47:35 +0530 |
| commit | 99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch) | |
| tree | 3a712d3039d152616af58a45a13d82c40a87e58f /asm/script_pokemon_util_80BF8FC.s | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/script_pokemon_util_80BF8FC.s')
| -rw-r--r-- | asm/script_pokemon_util_80BF8FC.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index eec41cf11..26c113dfd 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -112,14 +112,14 @@ sub_80BF9BC: @ 80BF9BC subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _080BF9FC @ =c2_exit_to_overworld_2_switch + ldr r3, _080BF9FC @ =CB2_ReturnToField movs r4, 0 str r4, [sp] bl sub_8134738 movs r0, 0x3 bl sub_8138B38 - ldr r1, _080BFA00 @ =gUnknown_3005020 - ldr r0, _080BFA04 @ =sub_807DD24 + ldr r1, _080BFA00 @ =gFieldCallback + ldr r0, _080BFA04 @ =FieldCallback_ReturnToEventScript2 str r0, [r1] add sp, 0x4 pop {r4} @@ -129,9 +129,9 @@ sub_80BF9BC: @ 80BF9BC _080BF9F0: .4byte gPlayerParty _080BF9F4: .4byte gSpecialVar_0x8004 _080BF9F8: .4byte gPlayerPartyCount -_080BF9FC: .4byte c2_exit_to_overworld_2_switch -_080BFA00: .4byte gUnknown_3005020 -_080BFA04: .4byte sub_807DD24 +_080BF9FC: .4byte CB2_ReturnToField +_080BFA00: .4byte gFieldCallback +_080BFA04: .4byte FieldCallback_ReturnToEventScript2 thumb_func_end sub_80BF9BC thumb_func_start ScrSpecial_CountPokemonMoves |