From 80e95a204723eea4bb5fe914dd44f78a66552c03 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 1 Jan 2017 22:39:54 -0800 Subject: braille puzzle stuff --- src/fldeff_strength.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 3cc33e3c1..4da04326a 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -20,7 +20,7 @@ extern u8 UseStrengthScript[]; bool8 SetUpFieldMove_Strength(void) { - if (sub_81474C8()) + if (ShouldDoBrailleStrengthEffect()) { gScriptResult = gUnknown_03005CE0; gUnknown_0300485C = sub_808AB90; @@ -62,9 +62,9 @@ bool8 FldEff_UseStrength(void) static void sub_811AA9C(void) { - if (sub_81474C8()) + if (ShouldDoBrailleStrengthEffect()) { - sub_8147514(); + DoBrailleStrengthEffect(); } else { -- cgit v1.2.3 From 648c6c7093f5173694562929f615380f297ad306 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 13:41:12 +0100 Subject: Move `gStringVar` declarations to text.h --- src/fldeff_strength.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 4da04326a..03b928eb6 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -4,6 +4,7 @@ #include "pokemon.h" #include "script.h" #include "task.h" +#include "text.h" static void sub_811AA18(void); static void sub_811AA38(void); -- cgit v1.2.3 From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/fldeff_strength.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 03b928eb6..dedb62a90 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -1,6 +1,6 @@ #include "global.h" -#include "field_effect.h" #include "asm.h" +#include "field_effect.h" #include "pokemon.h" #include "script.h" #include "task.h" -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- src/fldeff_strength.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index dedb62a90..9166cb3dd 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -5,6 +5,8 @@ #include "script.h" #include "task.h" #include "text.h" +#include "braille_puzzles.h" +#include "rom6.h" static void sub_811AA18(void); static void sub_811AA38(void); -- cgit v1.2.3 From 3d5864529e93265ea1711b638a4ab7b3d563086d Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 22 Mar 2017 06:04:41 +0100 Subject: label changes for clarity --- src/fldeff_strength.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 9166cb3dd..e7e7473d0 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -12,9 +12,9 @@ static void sub_811AA18(void); static void sub_811AA38(void); static void sub_811AA9C(void); -extern u32 gUnknown_0202FF84; +extern u32 gUnknown_0202FF84[]; -extern u8 gUnknown_03005CE0; +extern u8 gLastFieldPokeMenuOpened; extern u16 gScriptResult; extern void (*gUnknown_0300485C)(void); extern void (*gUnknown_03005CE4)(void); @@ -25,7 +25,7 @@ bool8 SetUpFieldMove_Strength(void) { if (ShouldDoBrailleStrengthEffect()) { - gScriptResult = gUnknown_03005CE0; + gScriptResult = gLastFieldPokeMenuOpened; gUnknown_0300485C = sub_808AB90; gUnknown_03005CE4 = sub_811AA38; } @@ -33,7 +33,7 @@ bool8 SetUpFieldMove_Strength(void) { if (npc_before_player_of_type(87) != TRUE) return 0; - gScriptResult = gUnknown_03005CE0; + gScriptResult = gLastFieldPokeMenuOpened; gUnknown_0300485C = sub_808AB90; gUnknown_03005CE4 = sub_811AA18; } @@ -43,13 +43,13 @@ bool8 SetUpFieldMove_Strength(void) static void sub_811AA18(void) { - gUnknown_0202FF84 = gUnknown_03005CE0; + gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened; ScriptContext1_SetupScript(UseStrengthScript); } static void sub_811AA38(void) { - gUnknown_0202FF84 = gUnknown_03005CE0; + gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened; FieldEffectStart(40); } @@ -59,7 +59,7 @@ bool8 FldEff_UseStrength(void) gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16; gTasks[taskId].data[9] = (u32)sub_811AA9C; - GetMonNickname(&gPlayerParty[gUnknown_0202FF84], gStringVar1); + GetMonNickname(&gPlayerParty[gUnknown_0202FF84[0]], gStringVar1); return FALSE; } -- cgit v1.2.3 From ddc846fa6a0d9a13cfba6f52488a66f6f4562a2d Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 27 Apr 2017 15:43:31 +0200 Subject: Sort includes --- src/fldeff_strength.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index e7e7473d0..f9db40a67 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -1,12 +1,12 @@ #include "global.h" #include "asm.h" +#include "braille_puzzles.h" #include "field_effect.h" #include "pokemon.h" +#include "rom6.h" #include "script.h" #include "task.h" #include "text.h" -#include "braille_puzzles.h" -#include "rom6.h" static void sub_811AA18(void); static void sub_811AA38(void); -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/fldeff_strength.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index f9db40a67..8381e6f01 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -1,5 +1,6 @@ +#include "pokemon_menu.h" +#include "party_menu.h" #include "global.h" -#include "asm.h" #include "braille_puzzles.h" #include "field_effect.h" #include "pokemon.h" -- cgit v1.2.3 From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:01:42 +0200 Subject: Sort includes --- src/fldeff_strength.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 8381e6f01..1de9ee8ca 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -1,9 +1,9 @@ -#include "pokemon_menu.h" -#include "party_menu.h" #include "global.h" #include "braille_puzzles.h" #include "field_effect.h" +#include "party_menu.h" #include "pokemon.h" +#include "pokemon_menu.h" #include "rom6.h" #include "script.h" #include "task.h" -- cgit v1.2.3 From 8435b8835a9b5c5348b2849e943e36ffdd8c76b3 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 15 Jun 2017 03:34:11 -0400 Subject: move player_pc data to C file and do a lot of labeling --- src/fldeff_strength.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index f9db40a67..a831676b8 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -16,7 +16,7 @@ extern u32 gUnknown_0202FF84[]; extern u8 gLastFieldPokeMenuOpened; extern u16 gScriptResult; -extern void (*gUnknown_0300485C)(void); +extern void (*gFieldCallback)(void); extern void (*gUnknown_03005CE4)(void); extern u8 UseStrengthScript[]; @@ -26,7 +26,7 @@ bool8 SetUpFieldMove_Strength(void) if (ShouldDoBrailleStrengthEffect()) { gScriptResult = gLastFieldPokeMenuOpened; - gUnknown_0300485C = sub_808AB90; + gFieldCallback = sub_808AB90; gUnknown_03005CE4 = sub_811AA38; } else @@ -34,7 +34,7 @@ bool8 SetUpFieldMove_Strength(void) if (npc_before_player_of_type(87) != TRUE) return 0; gScriptResult = gLastFieldPokeMenuOpened; - gUnknown_0300485C = sub_808AB90; + gFieldCallback = sub_808AB90; gUnknown_03005CE4 = sub_811AA18; } -- cgit v1.2.3