dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename remaining field effect callbacks

Browse Source
This commit is contained in:
PikalaxALT
2020-03-02 09:51:21 -05:00
parent a7966b5047
commit 875dde7a0c
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_effect_helpers.s
+9 -9
View File
@@ -1369,8 +1369,8 @@ _080DB800: .4byte gFieldEffectObjectTemplatePointers
_080DB804: .4byte gSprites
thumb_func_end FldEff_JumpLongGrass
thumb_func_start sub_80DB808
sub_80DB808: @ 80DB808
thumb_func_start FldEff_ShortGrass
FldEff_ShortGrass: @ 80DB808
push {r4-r6,lr}
ldr r6, _080DB89C @ =gFieldEffectArguments
ldrb r0, [r6]
@@ -1449,7 +1449,7 @@ _080DB89C: .4byte gFieldEffectArguments
_080DB8A0: .4byte gObjectEvents
_080DB8A4: .4byte gFieldEffectObjectTemplatePointers
_080DB8A8: .4byte gSprites
thumb_func_end sub_80DB808
thumb_func_end FldEff_ShortGrass
thumb_func_start sub_80DB8AC
sub_80DB8AC: @ 80DB8AC
@@ -2310,8 +2310,8 @@ _080DBF48: .4byte gFieldEffectArguments
_080DBF4C: .4byte gSprites
thumb_func_end oei_ripples
thumb_func_start sub_80DBF50
sub_80DBF50: @ 80DBF50
thumb_func_start FldEff_HotSpringsWater
FldEff_HotSpringsWater: @ 80DBF50
push {r4-r6,lr}
ldr r6, _080DBFE4 @ =gFieldEffectArguments
ldrb r0, [r6]
@@ -2390,7 +2390,7 @@ _080DBFE4: .4byte gFieldEffectArguments
_080DBFE8: .4byte gObjectEvents
_080DBFEC: .4byte gFieldEffectObjectTemplatePointers
_080DBFF0: .4byte gSprites
thumb_func_end sub_80DBF50
thumb_func_end FldEff_HotSpringsWater
thumb_func_start sub_80DBFF4
sub_80DBFF4: @ 80DBFF4
@@ -3723,11 +3723,11 @@ _080DC9D0:
_080DC9D8: .4byte 0x00001004
thumb_func_end sub_80DC99C
thumb_func_start sub_80DC9DC
sub_80DC9DC: @ 80DC9DC
thumb_func_start FldEff_BerryTreeGrowthSparkle
FldEff_BerryTreeGrowthSparkle: @ 80DC9DC
movs r0, 0
bx lr
thumb_func_end sub_80DC9DC
thumb_func_end FldEff_BerryTreeGrowthSparkle
thumb_func_start ShowTreeDisguiseFieldEffect
ShowTreeDisguiseFieldEffect: @ 80DC9E0
data/field_effect_scripts.s
+4 -4
View File
@@ -165,7 +165,7 @@ gFldEffScript_Unknown22:: @ 81D987B
end
gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885
callnative sub_80DC9DC
callnative FldEff_BerryTreeGrowthSparkle
end
gFldEffScript_DeepSandFootprints:: @ 81D988B
@@ -224,7 +224,7 @@ gFldEffScript_UseRockSmash:: @ 81D98E4
end
gFldEffScript_UseStrength:: @ 81D98EA
callnative sub_80D0860
callnative FldEff_UseStrength
end
gFldEffScript_UseDig:: @ 81D98F0
@@ -236,11 +236,11 @@ gFldEffScript_SandPile:: @ 81D98F6
end
gFldEffScript_ShortGrass:: @ 81D9900
loadfadedpal_callnative gUnknown_83A5348, sub_80DB808
loadfadedpal_callnative gUnknown_83A5348, FldEff_ShortGrass
end
gFldEffScript_HotSpringsWater:: @ 81D990A
loadfadedpal_callnative gUnknown_83A5348, sub_80DBF50
loadfadedpal_callnative gUnknown_83A5348, FldEff_HotSpringsWater
end
gFldEffScript_UseWaterfall:: @ 81D9914
include/fldeff.h
+1 -1
View File
@@ -37,7 +37,7 @@ bool32 FldEffPoison_IsActive(void);
// strength
bool8 SetUpFieldMove_Strength(void);
bool8 sub_80D0860(void);
bool8 FldEff_UseStrength(void);
// teleport
bool8 SetUpFieldMove_Teleport(void);
src/field_effect.c
+1
View File
@@ -3899,6 +3899,7 @@ void Task_FldEffUnk45(u8 taskId)
}
}
// Bug: Return value should be u32, not void
void FldEff_Unk45(void)
{
BlendPalettes(0xFFFFFFFF, 0x10, RGB_WHITE);
src/fldeff_strength.c
+7 -7
View File
@@ -8,8 +8,8 @@
#include "event_scripts.h"
#include "constants/event_objects.h"
static void FldEff_UseStrength(void);
static void sub_80D08A8(void);
static void FieldCB_UseStrength(void);
static void ShowMonCB_UseStrength(void);
bool8 SetUpFieldMove_Strength(void)
{
@@ -21,25 +21,25 @@ bool8 SetUpFieldMove_Strength(void)
{
gSpecialVar_Result = GetCursorSelectionMonId();
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = FldEff_UseStrength;
gPostMenuFieldCallback = FieldCB_UseStrength;
return TRUE;
}
}
static void FldEff_UseStrength(void)
static void FieldCB_UseStrength(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
ScriptContext1_SetupScript(EventScript_FldEffStrength);
}
bool8 sub_80D0860(void)
bool8 FldEff_UseStrength(void)
{
u8 taskId = CreateFieldEffectShowMon();
FLDEFF_SET_FUNC_TO_DATA(sub_80D08A8);
FLDEFF_SET_FUNC_TO_DATA(ShowMonCB_UseStrength);
GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
return FALSE;
}
static void sub_80D08A8(void)
static void ShowMonCB_UseStrength(void)
{
FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
EnableBothScriptContexts();