diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-15 22:20:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 22:20:16 -0400 |
| commit | dda361afb7e2abafc15a498968580be6d1a83cfe (patch) | |
| tree | 46e7d19c2aec0e65ab446c7916e5d8aeb38bfe48 /src/rom6.c | |
| parent | c8213423cefc83310bc62ca8bcc17d7b6b42e442 (diff) | |
| parent | 0a779312c8a5911620ef43eaefbecdbac9fa7b33 (diff) | |
Merge pull request #326 from ProjectRevoTPP/master
move player_pc data to C file and restructure/label the file
Diffstat (limited to 'src/rom6.c')
| -rw-r--r-- | src/rom6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rom6.c b/src/rom6.c index a2b52c9aa..a8233eb5b 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -14,7 +14,7 @@ extern u16 gScriptLastTalked; extern u32 gUnknown_0202FF84[]; extern struct MapPosition gUnknown_0203923C; -extern void (*gUnknown_0300485C)(void); +extern void (*gFieldCallback)(void); extern u8 gLastFieldPokeMenuOpened; extern void (*gUnknown_03005CE4)(void); extern u8 UseRockSmashScript[]; @@ -122,7 +122,7 @@ bool8 SetUpFieldMove_RockSmash(void) { if (npc_before_player_of_type(0x56) == TRUE) { - gUnknown_0300485C = sub_808AB90; + gFieldCallback = sub_808AB90; gUnknown_03005CE4 = sub_810B53C; return TRUE; } @@ -159,7 +159,7 @@ int SetUpFieldMove_Dig(void) { if (sub_80CA1C8() == TRUE) { - gUnknown_0300485C = sub_808AB90; + gFieldCallback = sub_808AB90; gUnknown_03005CE4 = sub_810B5D8; return TRUE; } |