dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

asm party and fldeff clean-up

Browse Source
This commit is contained in:
DizzyEggg
2018-12-24 21:59:05 +01:00
parent 980b055bf0
commit 442b1826a2
34 changed files with 7399 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/field_specials.h
+2
View File
@@ -15,7 +15,9 @@ bool32 sub_8138168(void);
bool32 sub_81381B0(void);
bool32 sub_81381F8(void);
bool32 CountSSTidalStep(u16 delta);
u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
void sub_813A128(void);
void sub_813A878(u8 a0);
u8 sub_813BADC(u8 a0);
#endif // GUARD_FIELD_SPECIALS_H
include/fldeff.h
+61
View File
@@ -0,0 +1,61 @@
#ifndef GUARD_FLDEFF_H
#define GUARD_FLDEFF_H
// cut
bool8 SetUpFieldMove_Cut(void);
bool8 FldEff_UseCutOnGrass(void);
bool8 FldEff_UseCutOnTree(void);
bool8 FldEff_CutGrass(void);
void sub_80D423C(s16 x, s16 y);
void sub_80D42B8(s16 x, s16 y);
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
// groundshake
bool8 sub_81BE66C(void);
void sub_81BE6AC(void);
void sub_81BE6B8(void);
void sub_81BE72C(void);
void sub_81BE79C(void);
void sub_81BE7F4(void);
void sub_81BE994(void);
// escalator
void sub_80E1558(u8 var);
void sub_80E1570(void);
bool8 sub_80E1584(void);
// soft-boiled
bool8 SetUpFieldMove_SoftBoiled(void);
void sub_81615A8(u8 taskId);
void sub_8161560(u8 taskId);
// flash
bool8 SetUpFieldMove_Flash(void);
void c2_change_map(void);
bool8 GetMapPairFadeToType(u8 a1, u8 a2);
bool8 GetMapPairFadeFromType(u8 a1, u8 a2);
// strength
bool8 SetUpFieldMove_Strength(void);
bool8 sub_8145E2C(void);
// sweet scent
bool8 SetUpFieldMove_SweetScent(void);
bool8 FldEff_SweetScent(void);
// teleport
bool8 SetUpFieldMove_Teleport(void);
bool8 FldEff_UseTeleport(void);
// dig
bool8 SetUpFieldMove_Dig(void);
bool8 FldEff_UseDig(void);
// rock smash
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
u8 oei_task_add(void);
bool8 SetUpFieldMove_RockSmash(void);
bool8 FldEff_UseRockSmash(void);
#endif // GUARD_FLDEFF_H
include/fldeff_cut.h
-13
View File
@@ -1,13 +0,0 @@
#ifndef GUARD_FLDEFF_CUT_H
#define GUARD_FLDEFF_CUT_H
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
bool8 SetUpFieldMove_Cut(void);
bool8 FldEff_UseCutOnGrass(void);
bool8 FldEff_UseCutOnTree(void);
bool8 FldEff_CutGrass(void);
void sub_80D423C(s16 x, s16 y);
void sub_80D42B8(s16 x, s16 y);
#endif // GUARD_FLDEFF_CUT_H
include/fldeff_groundshake.h
-6
View File
@@ -1,6 +0,0 @@
#ifndef GUARD_FLDEFF_GROUNDSHAKE_H
#define GUARD_FLDEFF_GROUNDSHAKE_H
void sub_81BE72C(void);
#endif // GUARD_FLDEFF_GROUNDSHAKE_H
include/fldeff_softboiled.h
-7
View File
@@ -1,7 +0,0 @@
#ifndef GUARD_FLDEFF_SOFTBOILED_H
#define GUARD_FLDEFF_SOFTBOILED_H
void sub_81615A8(u8 taskId);
void sub_8161560(u8 taskId);
#endif // GUARD_FLDEFF_SOFTBOILED_H
include/graphics.h
+7
View File
@@ -4793,4 +4793,11 @@ extern const u32 gCableCarDoor_Gfx[];
extern const u32 gCableCarCord_Gfx[];
extern const u16 gCableCar_Pal[];
// Party menu
extern const u32 gPartyMenuPokeball_Gfx[];
extern const u32 gPartyMenuPokeballSmall_Gfx[];
extern const u32 gStatusPal_Icons[];
extern const u32 gPartyMenuPokeball_Pal[];
extern const u32 gStatusPal_Icons[];
#endif //GUARD_GRAPHICS_H
include/party_menu.h
+3 -7
View File
@@ -48,7 +48,7 @@ extern MainCallback gPostMenuFieldCallback;
extern u8 gSelectedOrderFromParty[4];
extern u8 gUnknown_0203CF00[3];
extern const u16 gUnknown_0861500C[]; // tutor table
extern const u16 gTutorMoves[];
void sub_81B0FCC(u8 slot, u8 b);
bool8 IsMultiBattle(void);
@@ -64,11 +64,7 @@ u8 sub_81B205C(struct Pokemon *mon);
void display_pokemon_menu_message(u32 stringID);
void sub_81B47E0(u8 taskId);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 sub_81B5820(void);
bool8 sub_81B5884(void);
void sub_81B58A8(void);
bool8 hm_prepare_waterfall(void);
bool8 sub_81B5974(void);
void LoadHeldItemIcons(void);
void sub_81B5D4C(u8 *a, u8 *b, u8 c);
void sub_81B617C(void);
@@ -77,8 +73,8 @@ void sub_81B67C8(u8 taskId, TaskFunc task);
void dp05_ether(u8 taskId, TaskFunc task);
void dp05_pp_up(u8 taskId, TaskFunc task);
u16 ItemIdToBattleMoveId(u16 item);
bool8 sub_81B6D14(u16 move);
bool8 pokemon_has_move(struct Pokemon *mon, u16 move);
bool8 IsMoveHm(u16 move);
bool8 MonKnowsMove(struct Pokemon *mon, u16 move);
void sub_81B6DC4(u8 taskId, TaskFunc task);
void dp05_rare_candy(u8 taskId, TaskFunc task);
void sub_81B79E8(u8 taskId, TaskFunc task);
include/rom6.h
-18
View File
@@ -1,18 +0,0 @@
#ifndef GUARD_ROM6_H
#define GUARD_ROM6_H
void OpenPokeblockCase(u8, void(void));
u8 GetLeadMonIndex(void);
u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
void sub_813BADC(bool8);
bool8 sub_813B9C0(void);
void UpdateMirageRnd(u16 days);
void UpdateBirchState(u16 days);
void UpdateFrontierManiac(u16 days);
void UpdateFrontierGambler(u16 days);
void SetShoalItemFlag(u16 days);
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
u8 oei_task_add(void);
#endif //GUARD_ROM6_H
include/strings.h
+63
View File
@@ -1921,4 +1921,67 @@ extern const u8 gDaycareText_GetAlong[];
extern const u8 gDaycareText_DontLikeOther[];
extern const u8 gDaycareText_PlayOther[];
// party menu
extern const u8 gUnknown_085E9E43[];
extern const u8 gUnknown_085EA010[];
extern const u8 gUnknown_085EA02A[];
extern const u8 gUnknown_085E9E55[];
extern const u8 gUnknown_085E9E64[];
extern const u8 gUnknown_085E9E79[];
extern const u8 gUnknown_085E9E8F[];
extern const u8 gUnknown_085E9EBC[];
extern const u8 gUnknown_085E9ED4[];
extern const u8 gUnknown_085E9EE9[];
extern const u8 gUnknown_085E9FDB[];
extern const u8 gUnknown_085EA046[];
extern const u8 gUnknown_085EA05B[];
extern const u8 gUnknown_085E9F01[];
extern const u8 gUnknown_085E9F58[];
extern const u8 gUnknown_085E9F6F[];
extern const u8 gUnknown_085E9F81[];
extern const u8 gUnknown_085E9F90[];
extern const u8 gUnknown_085E9FA7[];
extern const u8 gUnknown_085E9FC2[];
extern const u8 gUnknown_085E9EA6[];
extern const u8 gUnknown_085E9F16[];
extern const u8 gUnknown_085E9F2A[];
extern const u8 gUnknown_085E9F42[];
extern const u8 gUnknown_085E9FF9[];
extern const u8 gUnknown_085EA073[];
extern const u8 gUnknown_085EA091[];
extern const u8 gUnknown_085EA099[];
extern const u8 gUnknown_085EA09E[];
extern const u8 gUnknown_085EA0A4[];
extern const u8 gUnknown_085EA0AB[];
extern const u8 gUnknown_085EA0E7[];
extern const u8 gUnknown_085EA0B1[];
extern const u8 gUnknown_085EA0B6[];
extern const u8 gUnknown_085EA0BF[];
extern const u8 gUnknown_085EA0C5[];
extern const u8 gUnknown_085EA0CF[];
extern const u8 gUnknown_085EA0D7[];
extern const u8 gUnknown_085EA0DC[];
extern const u8 gText_Take[];
extern const u8 gText_Mail[];
extern const u8 gText_Take2[];
extern const u8 gText_Read2[];
extern const u8 gText_Cancel2[];
extern const u8 gText_Shift[];
extern const u8 gText_SendOut[];
extern const u8 gText_Enter[];
extern const u8 gText_NoEntry[];
extern const u8 gText_Store[];
extern const u8 gText_Register[];
extern const u8 gText_Trade4[];
extern const u8 gText_Summary5[];
extern const u8 gText_Switch2[];
extern const u8 gText_Item[];
extern const u8 gText_NotPkmnOtherTrainerWants[];
extern const u8 gText_ThatIsntAnEgg[];
extern const u8 gText_PkmnCantBeTradedNow[];
extern const u8 gText_OtherTrainersPkmnCantBeTraded[];
extern const u8 gText_EggCantBeTradedNow[];
extern const u8 gText_OtherTrainerCantAcceptPkmn[];
extern const u8 gText_CantTradeWithTrainer[];
#endif //GUARD_STRINGS_H