ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 15:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename functions

Browse Source
This commit is contained in:
PikalaxALT 2017-10-28 21:43:06 -04:00
parent 00f4bba6d8
commit bbda7125f6
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/rom4.s
View File

@ -841,7 +841,7 @@ sub_8084CCC: @ 8084CCC
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8122CBC bl GetHealLocationPointer
adds r4, r0, 0 adds r4, r0, 0
cmp r4, 0 cmp r4, 0
beq _08084CFA beq _08084CFA
@ -885,7 +885,7 @@ Overworld_SetHealLocationWarp: @ 8084D1C
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8122CBC bl GetHealLocationPointer
adds r5, r0, 0 adds r5, r0, 0
cmp r5, 0 cmp r5, 0
beq _08084D50 beq _08084D50
@ -1187,7 +1187,7 @@ sub_8084F6C: @ 8084F6C
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8122CBC bl GetHealLocationPointer
adds r5, r0, 0 adds r5, r0, 0
cmp r5, 0 cmp r5, 0
beq _08084FA0 beq _08084FA0

2
include/heal_location.h
View File

@ -20,4 +20,6 @@ struct HealLocation
// Exported ROM declarations // Exported ROM declarations
const struct HealLocation *GetHealLocationPointer(u32 loc);
#endif //GUARD_HEAL_LOCATION_H #endif //GUARD_HEAL_LOCATION_H

18
src/heal_location.c
View File

@ -15,7 +15,7 @@
// .rodata // .rodata
const struct HealLocation gUnknown_0859F53C[] = { static const struct HealLocation sSpawnLocations[] = {
HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 4, 2), HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 4, 2),
HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F, 4, 2), HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F, 4, 2),
HEAL_LOCATION(PETALBURG_CITY, 20, 17), HEAL_LOCATION(PETALBURG_CITY, 20, 17),
@ -40,17 +40,17 @@ const struct HealLocation gUnknown_0859F53C[] = {
HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST, 3, 52) HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST, 3, 52)
}; };
#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(gUnknown_0859F53C)) #define NUM_HEAL_LOCATIONS (ARRAY_COUNT(sSpawnLocations))
// .text // .text
u32 sub_8122C5C(u16 mapGroup, u16 mapNum) static u32 GetHealLocationIndexFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
{ {
u32 i; u32 i;
for (i = 0; i < NUM_HEAL_LOCATIONS; i ++) for (i = 0; i < NUM_HEAL_LOCATIONS; i ++)
{ {
if (gUnknown_0859F53C[i].group == mapGroup && gUnknown_0859F53C[i].map == mapNum) if (sSpawnLocations[i].group == mapGroup && sSpawnLocations[i].map == mapNum)
{ {
return i + 1; return i + 1;
} }
@ -58,19 +58,19 @@ u32 sub_8122C5C(u16 mapGroup, u16 mapNum)
return 0; return 0;
} }
const struct HealLocation *sub_8122C94(u16 mapGroup, u16 mapNum) const struct HealLocation *GetHealLocationPointerFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
{ {
u32 loc; u32 loc;
loc = sub_8122C5C(mapGroup, mapNum); loc = GetHealLocationIndexFromMapGroupAndNum(mapGroup, mapNum);
if (loc == 0) if (loc == 0)
{ {
return NULL; return NULL;
} }
return &gUnknown_0859F53C[loc - 1]; return &sSpawnLocations[loc - 1];
} }
const struct HealLocation *sub_8122CBC(u32 loc) const struct HealLocation *GetHealLocationPointer(u32 loc)
{ {
if (loc == 0) if (loc == 0)
{ {
@ -80,5 +80,5 @@ const struct HealLocation *sub_8122CBC(u32 loc)
{ {
return NULL; return NULL;
} }
return &gUnknown_0859F53C[loc - 1]; return &sSpawnLocations[loc - 1];
} }