diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-03 18:11:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 18:11:57 -0400 |
| commit | 7ea0d462c49360351006f246f0a300aaa765a843 (patch) | |
| tree | c930fe4733b8ae2bc02940ae6a35fbf73f933aca /src/main.c | |
| parent | cbe13acff18405e99827df7c4a772d20b851f33b (diff) | |
| parent | 5afd2d5bfb1ec117d80898d9ad1c2529d28a091c (diff) | |
Merge pull request #22 from DizzyEggg/clean_up
bring pokeemerald to usable state
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index 61280f5a7..7c8075a6f 100644 --- a/src/main.c +++ b/src/main.c @@ -22,7 +22,7 @@ extern void rfu_REQ_stopMode(void); extern void rfu_waitREQComplete(void); extern bool32 sub_8087634(void); extern bool32 sub_80875C8(void); -extern void ClearObjectCopyRequests(void); +extern void ClearSpriteCopyRequests(void); extern void PlayTimeCounter_Update(void); extern void MapMusicMain(void); extern void EnableInterrupts(u16); @@ -159,7 +159,7 @@ void AgbMain() if (sub_80875C8() == 1) { gMain.newKeys = 0; - ClearObjectCopyRequests(); + ClearSpriteCopyRequests(); gUnknown_030022B4 = 1; UpdateLinkAndCallCallbacks(); gUnknown_030022B4 = 0; @@ -217,7 +217,7 @@ void SeedRngAndSetTrainerId(void) gTrainerId = val; } -u16 GetTrainerId(void) +u16 GetGeneratedTrainerIdLower(void) { return gTrainerId; } |