Finish porting pokemon_jump from Emerald

This commit is contained in:
PikalaxALT
2020-02-18 16:39:44 -05:00
parent f65e07fb1f
commit 5c530e1330
19 changed files with 805 additions and 1500 deletions
+1 -2
View File
@@ -148,8 +148,7 @@ struct PokemonJumpResults // possibly used in the game itself?
u16 field2;
u16 excellentsInRow;
u16 field6;
u16 field8;
u16 fieldA;
u32 field8;
u32 bestJumpScore;
};
+7
View File
@@ -0,0 +1,7 @@
#ifndef GUARD_MINIGAME_COUNTDOWN_H
#define GUARD_MINIGAME_COUNTDOWN_H
void StartMinigameCountdown(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority);
bool32 IsMinigameCountdownRunning(void);
#endif //GUARD_MINIGAME_COUNTDOWN_H
+4 -25
View File
@@ -179,33 +179,12 @@ void sub_814B348(struct PokemonJump2 *, int);
void sub_814AF0C(struct PokemonJump2 *, int);
void sub_814ADCC(struct PokemonJump2 *, struct PokemonJump1_MonInfo *,s16, s16, u8);
void sub_814B240(struct PokemonJump2 *,s16, s16, u8);
void sub_814AFE8(struct PokemonJump2 *, u8 multiplayerId);
void sub_814B080(struct PokemonJump2 *, u8 multiplayerId);
int sub_814B010(struct PokemonJump2 *, int multiplayerId);
void sub_814AFE8(struct PokemonJump2 *, int multiplayerId);
void sub_814B080(struct PokemonJump2 *, int multiplayerId);
bool32 sub_814B010(struct PokemonJump2 *, int multiplayerId);
void sub_814B0A8(struct PokemonJump2 *);
void sub_814B134(struct PokemonJump2 *);
void sub_814B168(struct PokemonJump2 *, int multiplayerId);
int sub_814B190(struct PokemonJump2 *);
bool32 sub_802EC98(u8 spriteId);
bool32 sub_802EE30(u8 spriteId);
u8 sub_802EFA8(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority);
void Task_ShowPokemonJumpRecords(u8 taskId);
void TruncateToFirstWordOnly(u8 *str);
void sub_802CB7C(struct Sprite *sprite);
void sub_802CC40(struct Sprite *sprite);
void sub_802CD08(struct Sprite *sprite);
void sub_802CDD4(struct Sprite *sprite);
void sub_802E500(u16 windowId, int width);
void sub_802E6D0(u8 taskId);
void sub_802E83C(u8 taskId);
void sub_802E8C8(u8 taskId);
void sub_802EA50(u8 taskId);
void sub_802EAB0(u8 taskId);
void sub_802EB98(u8 taskId);
void sub_802EDCC(u8 spriteId1, u8 spriteId2, u8 spriteId3);
void sub_802EE5C(struct Sprite *sprite);
void sub_802EF50(u16 tileTag, u16 palTag);
void sub_802EFFC(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2);
bool32 sub_814B190(struct PokemonJump2 *);
#endif // GUARD_POKEMON_JUMP_H
+4
View File
@@ -1136,5 +1136,9 @@ extern const u8 gText_FilledStorageSpace2[];
extern const u8 gText_CantHoldMore[];
extern const u8 gText_SpacePoints2[];
extern const u8 gText_SpaceTimes3[];
extern const u8 gText_JumpsInARow[];
extern const u8 gText_BestScore2[];
extern const u8 gText_ExcellentsInARow[];
extern const u8 gText_PkmnJumpRecords[];
#endif //GUARD_STRINGS_H