summaryrefslogtreecommitdiff
path: root/include/rom6.h
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-07-05 20:32:12 -0700
committerDiegoisawesome <diego@domoreaweso.me>2018-07-05 20:32:12 -0700
commit5189442bcc1122fe10013d497dc132d0e410fc66 (patch)
tree15cdd1e67b483ceed3a3fad99b4aad7934695f5d /include/rom6.h
parentefebc51972b23ddffa2700b1dd6895d4728646a3 (diff)
parentcdacc2771426a8e4ec5ccc5d7ba0d8d7c4224c36 (diff)
Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut
Diffstat (limited to 'include/rom6.h')
-rw-r--r--include/rom6.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rom6.h b/include/rom6.h
index 058504fe2..629df57fe 100644
--- a/include/rom6.h
+++ b/include/rom6.h
@@ -12,7 +12,7 @@ void UpdateFrontierManiac(u16 days);
void UpdateFrontierGambler(u16 days);
void SetShoalItemFlag(u16 days);
-bool8 npc_before_player_of_type(u8);
+bool8 SetLastTalkedObjectInFrontOfPlayer(u8);
u8 oei_task_add(void);
#endif //GUARD_ROM6_H