diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-02-11 00:38:59 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-02-10 21:38:59 -0800 |
| commit | f21587ea9eb1190ac2136d72deb7929c1e1169eb (patch) | |
| tree | bf39287a8b3906a6e2b47197e323047272b3d5a4 /src/rom4.c | |
| parent | c78e787f934f03bfffcf93ac69d92271d7d8036d (diff) | |
misc labels and memcpy/set cleanups (#232)
* some labels and enumerate player speeds
* clear up speed enums
* GetPlayerSpeed
* oops
* start decompiling mauville_old_man.c
* formatting
* decompile more of mauville_old_man.c
* someone fix this please
* formatting
* make ROM build again
* formatting again
* make ROM match again
* label, document, reorganize, and clean up battle_ai.c
* move stuff to battle.h and get rid of battle_2000000
* various changes
* labeling
* minor labels and formatting
* contest ai labels and misc stuff
Diffstat (limited to 'src/rom4.c')
| -rw-r--r-- | src/rom4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rom4.c b/src/rom4.c index 05396cfc3..37c6b84ad 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -55,7 +55,7 @@ extern struct WarpData gUnknown_02029808; extern struct UnkPlayerStruct gUnknown_02029810; extern u16 gUnknown_02029814; extern bool8 gUnknown_02029816; -extern struct LinkPlayerMapObject gLinkPlayerMapObjects[]; +extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; extern u8 gUnknown_03000580[]; extern u16 (*gUnknown_03000584)(u32); @@ -104,7 +104,6 @@ extern const struct WarpData gDummyWarpData; extern s32 gUnknown_0839ACE8; extern u32 gUnknown_08216694[]; - void DoWhiteOut(void) { ScriptContext2_RunNewScript(EventScript_LeagueWhiteOut); @@ -2304,7 +2303,7 @@ void ZeroLinkPlayerMapObject(struct LinkPlayerMapObject *linkPlayerMapObj) void strange_npc_table_clear(void) { - memset(gLinkPlayerMapObjects, 0, 16); + memset(gLinkPlayerMapObjects, 0, sizeof(gLinkPlayerMapObjects)); } void ZeroMapObject(struct MapObject *mapObj) |