diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 02:01:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 02:01:55 -0400 |
| commit | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (patch) | |
| tree | 291912dbcf0f77d6c88b7e691efa18dcd9d4bc53 /src/rom6.c | |
| parent | 515ae5e00f2661559583a4720d9944755e23d141 (diff) | |
| parent | d507cdcebb39e2ec43c4d0f756570a5734fcb42e (diff) | |
Merge pull request #241 from ProjectRevoTPP/master
decompile fldeff_cut.c, script_pokemon_util_80C4BF0.c, document save.c, move data to C files, decompile the next 3 functions in item_use.c, and a lot of labeling
Diffstat (limited to 'src/rom6.c')
| -rw-r--r-- | src/rom6.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/rom6.c b/src/rom6.c index 581bd46b4..037516489 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -8,19 +8,17 @@ #include "sound.h" #include "sprite.h" #include "task.h" +#include "rom6.h" +#include "braille_puzzles.h" extern u16 gScriptLastTalked; extern u32 gUnknown_0202FF84[]; extern struct MapPosition gUnknown_0203923C; extern void (*gUnknown_0300485C)(void); -extern u8 gUnknown_03005CE0; +extern u8 gLastFieldPokeMenuOpened; extern void (*gUnknown_03005CE4)(void); extern u8 UseRockSmashScript[]; -extern bool8 ShouldDoBrailleDigEffect(void); -extern void DoBrailleDigEffect(void); -extern void sub_8053014(void); -extern void sub_8059BF4(void); extern void sub_808AB90(void); extern void task08_080A1C44(u8); extern u8 sub_80CA1C8(void); @@ -136,7 +134,7 @@ bool8 SetUpFieldMove_RockSmash(void) static void sub_810B53C(void) { - gUnknown_0202FF84[0] = gUnknown_03005CE0; + gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened; ScriptContext1_SetupScript(UseRockSmashScript); } @@ -175,7 +173,7 @@ static void sub_810B5D8(void) { sub_8053014(); FieldEffectStart(0x26); - gUnknown_0202FF84[0] = gUnknown_03005CE0; + gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened; } int FldEff_UseDig(void) |