diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /asm/rom4.s | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'asm/rom4.s')
| -rw-r--r-- | asm/rom4.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 0aaea22c8..734f8acc1 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -8,7 +8,7 @@ thumb_func_start sub_8084620 sub_8084620: @ 8084620 push {r4,lr} - ldr r0, =gUnknown_08271857 + ldr r0, =EverGrandeCity_HallOfFame_EventScript_271857 bl ScriptContext2_RunNewScript ldr r0, =gSaveBlock1Ptr ldr r4, [r0] @@ -64,7 +64,7 @@ sub_808469C: @ 808469C bl FlagClear ldr r0, =0x00000888 bl FlagClear - ldr r0, =gUnknown_08271862 + ldr r0, =EverGrandeCity_HallOfFame_EventScript_271862 bl ScriptContext2_RunNewScript pop {r0} bx r0 @@ -419,7 +419,7 @@ get_mapdata_header: @ 80849A8 b _080849C6 .pool _080849BC: - ldr r0, =gUnknown_08481DD4 + ldr r0, =gMapAttributes subs r1, 0x1 lsls r1, 2 adds r1, r0 @@ -535,7 +535,7 @@ _08084A8A: get_mapheader_by_bank_and_number: @ 8084A90 lsls r0, 16 lsls r1, 16 - ldr r2, =gUnknown_08486578 + ldr r2, =gMapGroups lsrs r0, 14 adds r0, r2 ldr r0, [r0] @@ -841,7 +841,7 @@ sub_8084CCC: @ 8084CCC sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - bl sub_8122CBC + bl GetHealLocationPointer adds r4, r0, 0 cmp r4, 0 beq _08084CFA @@ -885,7 +885,7 @@ Overworld_SetHealLocationWarp: @ 8084D1C sub sp, 0x8 lsls r0, 24 lsrs r0, 24 - bl sub_8122CBC + bl GetHealLocationPointer adds r5, r0, 0 cmp r5, 0 beq _08084D50 @@ -1187,7 +1187,7 @@ sub_8084F6C: @ 8084F6C sub sp, 0x8 lsls r0, 24 lsrs r0, 24 - bl sub_8122CBC + bl GetHealLocationPointer adds r5, r0, 0 cmp r5, 0 beq _08084FA0 |