diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/fldeff_cut.c | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'src/fldeff_cut.c')
| -rw-r--r-- | src/fldeff_cut.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 8fde74852..e837dbd45 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,22 +1,25 @@ #include "global.h" -#include "asm.h" +#include "fldeff_cut.h" #include "field_camera.h" #include "field_effect.h" #include "field_player_avatar.h" +#include "fieldmap.h" #include "map_obj_lock.h" #include "metatile_behavior.h" #include "metatile_behaviors.h" +#include "pokemon_menu.h" #include "rom4.h" #include "rom6.h" #include "script.h" #include "songs.h" #include "sound.h" #include "sprite.h" +#include "task.h" #include "trig.h" extern u8 gCutGrassSpriteArray[8]; // seems to be an array of 8 sprite IDs -extern void (*gUnknown_0300485C)(void); +extern void (*gFieldCallback)(void); extern void (*gUnknown_03005CE4)(void); extern struct SpriteTemplate gSpriteTemplate_CutGrass; @@ -28,18 +31,6 @@ extern u32 gUnknown_0202FF84[]; extern u8 UseCutScript; -extern void sub_808AB90(void); // unknown args -extern void sub_805BCC0(s16 x, s16 y); - -void sub_80A2634(void); -void sub_80A25E8(void); -void sub_80A2684(void); -void sub_80A27A8(s16, s16); -void sub_80A28F4(s16, s16); -void objc_8097BBC(struct Sprite *sprite); -void sub_80A2AB8(void); -void sub_80A2B00(void); // unknown args - bool8 SetUpFieldMove_Cut(void) { s16 x, y; @@ -48,7 +39,7 @@ bool8 SetUpFieldMove_Cut(void) if(npc_before_player_of_type(0x52) == TRUE) // is in front of tree? { - gUnknown_0300485C = sub_808AB90; + gFieldCallback = sub_808AB90; gUnknown_03005CE4 = sub_80A2634; return TRUE; } @@ -67,7 +58,7 @@ bool8 SetUpFieldMove_Cut(void) if(MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE) { - gUnknown_0300485C = sub_808AB90; + gFieldCallback = sub_808AB90; gUnknown_03005CE4 = sub_80A25E8; return TRUE; } |