diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
| commit | 8c5d8a550780ec370f340ad2537c5ec418740839 (patch) | |
| tree | b2763c4d325426183f9f7d9aefc27d0e2d9c9d9a /src/easy_chat.c | |
| parent | 86a26c9282f03c751fc67e7da6e0d4014f69a688 (diff) | |
| parent | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index b21b00368..e43ba751f 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -216,15 +216,15 @@ void unref_sub_80EB684(u8 arg0, u16 arg1) { { case 5: c = 6; - ptr = (u16*)((void *)&gSaveBlock1.tvShows.shows[arg1] + 0x04); + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x04); break; case 7: c = 2; - ptr = (u16*)((void *)&gSaveBlock1.tvShows.shows[arg1] + 0x1C); + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x1C); break; case 8: c = 1; - ptr = (u16*)((void *)&gSaveBlock1.tvShows.shows[arg1] + 0x02); + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x02); break; default: @@ -471,7 +471,7 @@ static u16 sub_80EB9D8(void) { { const u16 dexNum = SpeciesToNationalPokedexNum(*speciesList); - const u8 local2 = sub_8090D90(dexNum, 0); + const u8 local2 = GetNationalPokedexFlag(dexNum, 0); if (local2) { |