summaryrefslogtreecommitdiff
path: root/asm/friend_area_action_menu.s
diff options
context:
space:
mode:
authorDennis <dhilhorst2000@gmail.com>2021-07-26 06:11:01 +0200
committerGitHub <noreply@github.com>2021-07-25 21:11:01 -0700
commit645c45431b0e091234699c3706ff90d1654cfb57 (patch)
tree412551a72247c0d9b21049d5addcbe34014419d3 /asm/friend_area_action_menu.s
parentbad7f7f688253c87c2cb2d063ea57c884cb6adff (diff)
Pokemon related decomp (#47)
* decompile last function in pokemon_1.s * some pokemon related decomp * more decomp * decomp another function * decompile function * another one * decompile GetPokemonLevelData * decompile more * more decomp * more structure and decomp * decomp another function (need to do some renaming) * rename some stuff * I cant do anything without committing these 2 files
Diffstat (limited to 'asm/friend_area_action_menu.s')
-rw-r--r--asm/friend_area_action_menu.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/friend_area_action_menu.s b/asm/friend_area_action_menu.s
index f984e29..3c0a469 100644
--- a/asm/friend_area_action_menu.s
+++ b/asm/friend_area_action_menu.s
@@ -512,7 +512,7 @@ _0802782C:
movs r2, 0x8
ldrsh r0, [r1, r2]
adds r1, 0x14
- bl sub_808D7DC
+ bl PeekPokemonItem
movs r0, 0x3
bl sub_8027184
b _080278AE
@@ -538,7 +538,7 @@ _08027868:
movs r2, 0x8
ldrsh r0, [r1, r2]
adds r1, 0x14
- bl sub_808D7DC
+ bl PeekPokemonItem
movs r0, 0x4
bl sub_8027184
b _080278AE
@@ -707,7 +707,7 @@ _080279F0:
movs r2, 0x8
ldrsh r0, [r1, r2]
adds r1, 0x14
- bl sub_808D800
+ bl GivePokemonItem
bl nullsub_104
_08027A0E:
movs r0, 0x2