From 306ce048ad07d62bed2028bfc8f30c03f5bc8db7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Sep 2019 21:07:54 -0400 Subject: Move gflib srcs and headers to gflib subdir --- src/fldeff_cut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_cut.c') diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 3115ff231..00eed7624 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -7,7 +7,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "fldeff.h" -#include "alloc.h" +#include "malloc.h" #include "metatile_behavior.h" #include "overworld.h" #include "party_menu.h" -- cgit v1.2.3 From 8055548fa4d6707ac311e32afc9614d4603115db Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 31 Oct 2019 17:00:37 -0400 Subject: Document legendary scripts --- src/fldeff_cut.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fldeff_cut.c') diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 00eed7624..fe21ff060 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -25,7 +25,7 @@ extern struct MapPosition gPlayerFacingPosition; extern const u8 EventScript_FldEffCut[]; -extern const u8 FarawayIsland_Interior_EventScript_267EDB[]; +extern const u8 FarawayIsland_Interior_EventScript_HideMewWhenGrassCut[]; extern const u8 gFieldEffectPic_CutGrass[]; extern const u16 gFieldEffectObjectPalette6[]; @@ -584,7 +584,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) ScriptContext2_Disable(); if (IsMewPlayingHideAndSeek() == TRUE) - ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_267EDB); + ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_HideMewWhenGrassCut); } void FixLongGrassMetatilesWindowTop(s16 x, s16 y) -- cgit v1.2.3 From c40879aa3693a18c23be42cce54d52ca7afe1bca Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Dec 2019 15:25:13 -0500 Subject: Use ST_OAM constants for OamData definitions --- src/fldeff_cut.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fldeff_cut.c') diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index fe21ff060..a0160344e 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -92,10 +92,10 @@ static const struct HyperCutterUnk sHyperCutStruct[] = static const struct OamData sOamData_CutGrass = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, -- cgit v1.2.3