diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-24 08:44:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 08:44:21 -0500 |
| commit | bb8c712f75e6ed5ec66b2ee94c6da1157693c284 (patch) | |
| tree | dc8d135873f6a7cc8ca1fad8bb5d1a7a84e4b0f7 /asm/field_map_obj.s | |
| parent | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (diff) | |
| parent | 2b2dfa7e49a0d28983a4e516ca44aee8cb7c66bb (diff) | |
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
Diffstat (limited to 'asm/field_map_obj.s')
| -rw-r--r-- | asm/field_map_obj.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 8787ff647..8c782d3dd 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -376,7 +376,7 @@ sub_805E080: @ 805E080 str r0, [sp, 0x8] adds r0, r6, 0 adds r1, r7, 0 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldr r1, [r0, 0x4] lsls r0, r4, 1 adds r0, r4 @@ -4294,7 +4294,7 @@ _0805FD90: .4byte gMapHeader _0805FD94: adds r0, r2, 0 adds r1, r3, 0 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldr r0, [r0, 0x4] ldr r1, [r0, 0x4] _0805FDA0: |