diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-06 00:35:03 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-06 00:39:20 -0800 |
| commit | d75c71970719db126bef05b89bc6a43e138e5483 (patch) | |
| tree | c8660c633c8f8e1d7f845327a925c53188fdf264 /asm | |
| parent | a5f060bc1b3e79d136a7c93790606763bae6e05f (diff) | |
define pokemon size record data in C
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/pokedex.s | 6 | ||||
| -rw-r--r-- | asm/rom_800D42C.s | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asm/pokedex.s b/asm/pokedex.s index 24488fe3f..8fd971840 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -719,8 +719,8 @@ GetPokemonCategory: @ 8090D3C _08090D50: .4byte gPokedexEntries thumb_func_end GetPokemonCategory - thumb_func_start sub_8090D54 -sub_8090D54: @ 8090D54 + thumb_func_start GetPokedexHeightWeight +GetPokedexHeightWeight: @ 8090D54 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -754,7 +754,7 @@ _08090D88: bx r1 .align 2, 0 _08090D8C: .4byte gPokedexEntries - thumb_func_end sub_8090D54 + thumb_func_end GetPokedexHeightWeight thumb_func_start sub_8090D90 sub_8090D90: @ 8090D90 diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s index 47be2eaf0..57a727072 100644 --- a/asm/rom_800D42C.s +++ b/asm/rom_800D42C.s @@ -57653,7 +57653,7 @@ _0802AA08: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8090D54 + bl GetPokedexHeightWeight ldrh r1, [r4] lsls r0, 16 lsrs r0, 16 |