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/rom_8094928.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/rom_8094928.c')
| -rw-r--r-- | src/rom_8094928.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/rom_8094928.c b/src/rom_8094928.c index 95847eda4..74daec64d 100644 --- a/src/rom_8094928.c +++ b/src/rom_8094928.c @@ -1,6 +1,10 @@ #include "global.h" #include "pokemon.h" +#define UNK_201606C_ARRAY (unk_2000000 + 0x1606C) // lazy define but whatever. + +extern u8 unk_2000000[]; + extern struct PokemonStorage gPokemonStorage; extern u8 IsLinkDoubleBattle(void); extern u8 IsDoubleBattle(void); @@ -13,14 +17,14 @@ extern u8 gUnknown_02038470[3]; extern u8 sub_803FBBC(void); extern u16 gUnknown_02024A6A[]; -void unref_sub_8094928(void *ptr) +void unref_sub_8094928(struct PokemonStorage *ptr) { - memcpy(ptr, &gPokemonStorage, 0x83d0); + *ptr = gPokemonStorage; } -void unref_sub_8094940(void *ptr) +void unref_sub_8094940(struct PokemonStorage *ptr) { - memcpy(&gPokemonStorage, ptr, 0x83d0); + gPokemonStorage = *ptr; } void sub_8094958(void) @@ -30,7 +34,7 @@ void sub_8094958(void) void sub_8094978(u8 arg1, u8 arg2) { - sub_8094A74((((u8(*)[3]) 0x0201606c))[arg1], arg2, arg1); + sub_8094A74((UNK_201606C_ARRAY) + arg1 * 3, arg2, arg1); } void sub_8094998(u8 arg[3], u8 player_number) |