Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
4570fa0
aaa
assidion2 Jun 7, 2026
531e62d
aaaMerge branch 'master' of https://github.com/UsernameFodder/pmdsky-…
assidion2 Jun 7, 2026
2da053d
aaa
assidion2 Jun 7, 2026
0683913
aaa
assidion2 Jun 7, 2026
64c096b
aaa
assidion2 Jun 7, 2026
33fe952
aaa
assidion2 Jun 7, 2026
0503a70
aaa
assidion2 Jun 7, 2026
9825d35
aaa
assidion2 Jun 7, 2026
a638af3
aaa
assidion2 Jun 12, 2026
5ffa25f
aaa
assidion2 Jun 12, 2026
567ccd2
aaa
assidion2 Jun 12, 2026
63f179c
aaa
assidion2 Jun 12, 2026
8892475
aaa
assidion2 Jun 12, 2026
c26ee74
aaa
assidion2 Jun 13, 2026
200e1b7
aaa
assidion2 Jun 13, 2026
ab73edc
aaa
assidion2 Jun 13, 2026
a8a7d30
aaa
assidion2 Jun 13, 2026
0a9ed9f
aaa
assidion2 Jun 13, 2026
f489e44
aaa
assidion2 Jun 13, 2026
43dc1ec
aaa
assidion2 Jun 13, 2026
dbcfd34
aaa
assidion2 Jun 13, 2026
415cae8
aaa
assidion2 Jun 13, 2026
5db767b
aaa
assidion2 Jun 13, 2026
cebbaed
aaa
assidion2 Jun 13, 2026
ac0d314
aaa
assidion2 Jun 13, 2026
2ff8090
aaa
assidion2 Jun 13, 2026
f0658ea
aaa
assidion2 Jun 17, 2026
9dfe789
aaa
assidion2 Jun 17, 2026
957b360
aaaMerge branch 'master' of https://github.com/UsernameFodder/pmdsky-…
assidion2 Jun 18, 2026
272e768
aaa
assidion2 Jun 20, 2026
4f096c0
aaaMerge branch 'master' of https://github.com/UsernameFodder/pmdsky-…
assidion2 Jun 20, 2026
6f01a57
aaa
assidion2 Jun 20, 2026
4d5e32b
aaaMerge branch 'master' of https://github.com/UsernameFodder/pmdsky-…
assidion2 Jun 20, 2026
555506b
aaa
assidion2 Jun 22, 2026
9b06076
aaa
assidion2 Jun 22, 2026
37aed59
aaa
assidion2 Jun 22, 2026
2740c49
aaa
assidion2 Jun 22, 2026
8d62f1e
aaa
assidion2 Jun 22, 2026
a5ef11a
aaa
assidion2 Jun 22, 2026
006190b
aaa
assidion2 Jun 23, 2026
21a410f
aaa
assidion2 Jun 23, 2026
6db4cc7
aaa
assidion2 Jun 23, 2026
00e7910
aaa
assidion2 Jun 27, 2026
0a0ba11
aaa
assidion2 Jun 27, 2026
e900bb1
aaa
assidion2 Jun 27, 2026
3fff17f
aaa
assidion2 Jun 27, 2026
a24b8ee
aaa
assidion2 Jun 28, 2026
b45a0d9
aaa
assidion2 Jun 28, 2026
d323317
aaa
assidion2 Jun 28, 2026
ee0fc4e
aaa
assidion2 Jun 28, 2026
7b23ba4
aaa
assidion2 Jun 28, 2026
c8f985f
aaa
assidion2 Jun 28, 2026
a3664bf
aaa
assidion2 Jun 28, 2026
d728f83
aaaMerge branch 'master' of https://github.com/UsernameFodder/pmdsky-…
assidion2 Jun 28, 2026
b4665db
aaa
assidion2 Jun 28, 2026
9d696e2
aaa
assidion2 Jun 28, 2026
141a8e4
aaa
assidion2 Jun 29, 2026
faab3be
aaa
assidion2 Jun 29, 2026
b17781f
aaa
assidion2 Jun 29, 2026
b780599
aaa
assidion2 Jun 29, 2026
453e17c
aaa
assidion2 Jun 29, 2026
048f471
Update arm9.h
assidion2 Jun 30, 2026
d78a3a7
aaa
assidion2 Jun 30, 2026
cbe4a5d
aaa
assidion2 Jun 30, 2026
d092eeb
aaa
assidion2 Jun 30, 2026
edb8b9e
Update arm9.yml
assidion2 Jul 2, 2026
cbf3a8f
aaa
assidion2 Jul 3, 2026
b167d94
aaa
assidion2 Jul 4, 2026
d041a32
aaaMerge branch 'master' of https://github.com/assidion2/pmdsky-debug
assidion2 Jul 4, 2026
abaef05
aaa
assidion2 Jul 4, 2026
a55024d
aaa
assidion2 Jul 4, 2026
0c08e34
aaa
assidion2 Jul 4, 2026
f130286
aaa
assidion2 Jul 4, 2026
585bd1e
aaa
assidion2 Jul 4, 2026
4429428
aaa
assidion2 Jul 4, 2026
778226b
aaa
assidion2 Jul 4, 2026
316b1e9
aaa
assidion2 Jul 4, 2026
f9702a2
aaa
assidion2 Jul 4, 2026
32467c8
aaa
assidion2 Jul 4, 2026
96f2149
aaa
assidion2 Jul 4, 2026
ff6924a
aaa
assidion2 Jul 4, 2026
f32c22e
aaa
assidion2 Jul 4, 2026
593d2c3
aaa
assidion2 Jul 4, 2026
d5519b3
aaa
assidion2 Jul 5, 2026
855844f
aaa
assidion2 Jul 5, 2026
59e1ca8
aaa
assidion2 Jul 5, 2026
5aa7a0b
aaa
assidion2 Jul 5, 2026
faa36a1
aaa
assidion2 Jul 5, 2026
1af0a00
aaa
assidion2 Jul 5, 2026
edc1502
aaa
assidion2 Jul 5, 2026
fdc2526
aaa
assidion2 Jul 5, 2026
1758f5f
Update headers/types/common/common.h
assidion2 Jul 7, 2026
dbf6c29
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
ed38263
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
47cb260
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
ce63ccd
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
a2738ae
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
d6e8565
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
51a9416
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
e640fcc
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
2c75cb8
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
fcd32e0
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
86fdba4
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
c121c58
Update symbols/overlay26.yml
assidion2 Jul 7, 2026
e787774
aaa
assidion2 Jul 13, 2026
2e8c9e1
aaaMerge branch 'master' of https://github.com/assidion2/pmdsky-debug
assidion2 Jul 13, 2026
bea9367
aaa
assidion2 Jul 13, 2026
a6e03f5
aaa
assidion2 Jul 13, 2026
bcca3c2
aaa
assidion2 Jul 13, 2026
e1a576b
aaa
assidion2 Jul 13, 2026
a3a2e14
aaa
assidion2 Jul 14, 2026
99f0dbf
Update symbols/overlay29.yml
assidion2 Jul 15, 2026
442cccd
Update symbols/overlay29.yml
assidion2 Jul 15, 2026
b16f8a5
aaa
assidion2 Jul 15, 2026
fcd9acd
aaa
assidion2 Jul 27, 2026
3821338
aaa
assidion2 Jul 27, 2026
5af39ff
aaa
assidion2 Jul 27, 2026
02e3ad7
aaa
assidion2 Jul 27, 2026
a720c02
aaa
assidion2 Jul 27, 2026
785d523
aaa
assidion2 Jul 27, 2026
ff75b59
aaa
assidion2 Jul 27, 2026
6a88fdd
aaa
assidion2 Jul 27, 2026
02e30f3
aaa
assidion2 Jul 27, 2026
5835415
aaa
assidion2 Jul 28, 2026
d8895c0
aaa
assidion2 Jul 28, 2026
14a74de
aaa
assidion2 Jul 28, 2026
856034a
aaa
assidion2 Jul 28, 2026
2e9eec6
aaa
assidion2 Jul 28, 2026
a5f8265
aaa
assidion2 Jul 28, 2026
c2fc249
aaa
assidion2 Jul 30, 2026
e83d155
aaa
assidion2 Jul 31, 2026
128c38f
aaa
assidion2 Aug 17, 2026
288d9d2
aaa
assidion2 Aug 17, 2026
dd0aab8
aaa
assidion2 Aug 18, 2026
9988981
aaa
assidion2 Aug 18, 2026
d0cce40
aaa
assidion2 Aug 18, 2026
89a3db5
aaa
assidion2 Aug 18, 2026
0fdef3a
aaa
assidion2 Aug 18, 2026
2b0342a
aaa
assidion2 Aug 18, 2026
bb55823
Update release.yml
assidion2 Aug 22, 2026
881982e
Update overlay10.yml
assidion2 Aug 22, 2026
eb8aae2
aaa
assidion2 Aug 23, 2026
8c7eddb
aaa
assidion2 Aug 23, 2026
f98262b
aaa
assidion2 Aug 23, 2026
5a25a75
aaaRevert "aaa"
assidion2 Aug 23, 2026
72b80a1
aaaRevert "aaa"
assidion2 Aug 23, 2026
12e23cc
aaaRevert "aaa"
assidion2 Aug 23, 2026
b558334
ov10
assidion2 Aug 23, 2026
541690f
Revert "aaa"
assidion2 Aug 23, 2026
630e81c
new edits
assidion2 Aug 23, 2026
f341b40
aaaMerge branch 'master' of https://github.com/assidion2/pmdsky-debug
assidion2 Aug 23, 2026
88fcd03
pre-update
assidion2 Aug 26, 2026
75dab7f
aaaMerge branch 'master' of https://github.com/UsernameFodder/pmdsky-…
assidion2 Aug 26, 2026
e88dfd3
pre-update
assidion2 Sep 5, 2026
361779c
aaa
assidion2 Sep 5, 2026
244f9f7
aaa
assidion2 Sep 5, 2026
aa4abb0
aaa
assidion2 Sep 5, 2026
63f0751
aaa
assidion2 Sep 5, 2026
30b07a5
aaa
assidion2 Sep 5, 2026
b2b0977
aaa
assidion2 Sep 5, 2026
3531fd7
aaa
assidion2 Sep 5, 2026
bd4e605
aaa
assidion2 Sep 5, 2026
5955807
aaa
assidion2 Sep 5, 2026
53e419b
aaa
assidion2 Sep 5, 2026
9de6668
aaa
assidion2 Sep 5, 2026
1d726b3
aaa
assidion2 Sep 6, 2026
3d62cd5
aaa
assidion2 Sep 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions headers/data/overlay29.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ extern struct exclusive_item_effect_id_8 EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOO
extern struct exclusive_item_effect_id_8 EXCL_ITEM_EFFECTS_WEATHER_MOVE_SPEED_BOOST[8];
extern struct exclusive_item_effect_id_8 EXCL_ITEM_EFFECTS_WEATHER_NO_STATUS[8];
extern uint32_t AI_THROWN_ITEM_ACTION_CHOICE_COUNT;
extern uint32_t EXPLOSION_FIXED_DAMAGES[3];
extern struct exclusive_item_effect_id_8 EXCL_ITEM_EFFECTS_EVASION_BOOST[8];
extern struct tile DEFAULT_TILE;
extern bool HIDDEN_STAIRS_SPAWN_BLOCKED;
Expand Down
2 changes: 1 addition & 1 deletion headers/data/overlay31.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ extern struct window_params DUNGEON_WINDOW_PARAMS_3;
extern struct window_params DUNGEON_WINDOW_PARAMS_4;
extern struct simple_menu_id_item DUNGEON_MAIN_MENU_ITEMS[8];
extern char DUNGEON_MENU_SWITCH_STR1[12];
extern struct window_params DUNGEON_WINDOW_PARAMS_5;
extern struct window_params STAIRS_INFO_WINDOW_PARAMS;
extern struct window_params DUNGEON_WINDOW_PARAMS_6;
extern struct window_params DUNGEON_WINDOW_PARAMS_7;
extern struct simple_menu_id_item STAIRS_MENU_ITEMS_NORMAL[4];
Expand Down
1 change: 1 addition & 0 deletions headers/data/ram.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ extern uint32_t FRAMES_SINCE_LAUNCH_TIMES_THREE;
extern uint32_t OSI_VRAM_EXCLUSIVE;
extern uint16_t OSI_VRAM_LOCK_ID[9];
extern struct alarm_callback_info CALLBACK_TABLE[8];
extern struct effect_control EFFECT_CONTROL;
extern struct mem_arena* GROUND_MEMORY_ARENA_1_PTR;
extern struct mem_arena* GROUND_MEMORY_ARENA_2_PTR;
extern bool LOCK_NOTIFY_ARRAY[20];
Expand Down
4 changes: 2 additions & 2 deletions headers/functions/arm9.h
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,8 @@ void LoadWazaP2(void);
void UnloadCurrentWazaP(void);
char* GetMoveName(enum move_id move_id);
void FormatMoveString(char* string, struct move* move, undefined* type_print);
void FormatMoveStringMore(undefined* param_1, int param_2, struct move* move,
undefined* type_print);
void FormatMoveStringMore(struct preprocessor_args* preprocessor_args, uint8_t pos,
struct move* move, undefined* type_print);
void InitMove(struct move* move, enum move_id move_id);
void InitMoveCheckId(struct move* move, enum move_id move_id);
void GetInfoMoveGround(struct ground_move* move, enum move_id move_id);
Expand Down
6 changes: 6 additions & 0 deletions headers/functions/overlay10.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ bool IsInventoryMenuState3(int window_id);
void CreateInventoryMenuOuter(int n_items, int param_2, int param_3, uint8_t* param_4,
undefined* param_5, undefined* param_6, uint32_t param_7);
void LoadPaletteBase(uint8_t sprite_index, bool is_4bpp, uint8_t start_4bpp);
void TerminateAllEffects(void);
void TerminateEffect(int unique_id, bool not_special_wan_file);
void TerminateEffectWrapper(int unique_id);
enum wan_offset_type GetEffectAnimationWanOffset(int anim_id);
void PlayEffect(struct live_effect* effect, enum screen screen);
int GetLiveEffectIdx(int unique_id);
bool DisplayEffect(struct live_effect* effect, struct vec2_16* camera_pos);
bool ScreenEffectActive(enum screen screen);
bool BlockingAnimationInProgress(int unique_id);
struct effect_animation* GetEffectAnimation(int anim_id);
Expand Down
44 changes: 31 additions & 13 deletions headers/functions/overlay29.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ bool ItemIsActive(struct entity* entity, enum item_id item_id);
int GetVisibilityRange(void);
void RevealWholeFloor(struct entity* entity);
bool DungeonScreenEffectActive(void);
int PlayEffectAnimationEntity(struct entity* entity, int effect_id, bool blocking,
int PlayEffectAnimationEntity(struct entity* entity, int effect_id, bool wait,
enum wan_offset_type wan_offset, uint8_t finish_cur_effects_first,
bool play_if_two_turn_invisible, enum direction_id effect_dir,
uint16_t* custom_oam_adjustment_info);
int PlayEffectAnimationPos(struct position* pos, int effect_id, bool blocking);
int PlayEffectAnimationPixelPos(struct pixel_position* pixel_pos, int effect_id, bool blocking);
int PlayEffectAnimationPos(struct position* pos, int effect_id, bool wait);
int PlayEffectAnimationPixelPos(struct pixel_position* pixel_pos, int effect_id, bool wait);
void FinishPlayingEffectAnimations(bool wait_for_non_blocking);
void CopyStatusIconFlags(struct status_icon_flags* dst, struct entity* src);
void UpdateStatusIconFlags(struct entity* entity);
Expand All @@ -89,6 +89,7 @@ void PlayDefensiveStatMultiplierDownEffect(struct entity* entity, int stat_index
void PlayHitChanceUpEffect(struct entity* entity, int stat_index);
void PlayHitChanceDownEffect(struct entity* entity, int stat_index);
void PlaySeByIdIfShouldDisplayEntity(struct entity* entity, int se_id);
void PlayItemThrowSfx(struct entity* user, enum item_category category);
void PlayMissSfx(struct entity* attacker, struct entity* defender);
void PlayStairsSfx(void);
bool ShouldDisplayEntityAdvanced(struct entity* entity);
Expand Down Expand Up @@ -144,6 +145,7 @@ bool FindFarthestUnoccupiedTileWithin2(struct position* pos_out, struct position
bool random_room);
bool FindUnoccupiedTileWithin3(struct position* pos_out, struct position* origin, bool random_room);
uint8_t TickStatusTurnCounter(uint8_t* counter);
void GetCurvedProjectileTargetPos(struct position* target_pos, struct entity* user);
void AdvanceFrame(undefined param_1);
void UnkMapRelatedFunc(int switch_case, undefined4 param_2);
void AnimateWaterShadows(void);
Expand Down Expand Up @@ -277,6 +279,11 @@ void UseThrowableItem(struct entity* user);
void TalkToTeamMemberInFront(struct entity* entity);
void PlayerUseMove(struct entity* entity);
void UseRegularAttackOrStruggle(struct entity* entity);
struct entity* GetShopkeeperIfTalkable(struct entity* leader);
void HandleShopTransaction(bool always_transact);
void TrySellToShop(bool param_1);
uint8_t TryBuyFromShop(bool param_1);
void TriggerThiefAlert(void);
void ResetDamageData(struct damage_data* damage);
void FreeLoadedAttackSpriteAndMore(void);
uint16_t SetAndLoadCurrentAttackAnimation(enum pack_file_id pack_id, uint16_t file_index);
Expand All @@ -295,7 +302,7 @@ void SwapMonsterWanFileIndex(int src_id, int dst_id);
void LoadMonsterSprite(enum monster_id monster_id, undefined param_2);
void DeleteMonsterSpriteFile(enum monster_id monster_id);
void DeleteAllMonsterSpriteFiles(void);
bool CanMonsterBeAddedToTeam(struct entity* entity);
bool MonsterCannotBeAddedToTeam(struct entity* entity);
void EuFaintCheck(bool non_team_member_fainted, bool set_unk_byte);
void HandleFaint(struct entity* fainted_entity, union damage_source damage_source,
struct entity* killer);
Expand Down Expand Up @@ -324,6 +331,7 @@ void RestorePpAllMovesSetFlags(struct entity* entity);
bool CheckTeamMemberIdxVeneer(int member_idx);
bool CheckMonsterTeamMemberIdx(struct entity* entity);
bool IsMonsterIdInNormalRangeVeneer(enum monster_id monster_id);
void ActivateTerrainEffects(struct entity* entity);
void BoostIQ(struct entity* entity, int iq_boost, bool suppress_logs);
void MakeMonsterIdleInDirection2(struct entity* entity, enum direction_id direction);
bool ShouldMonsterHeadToStairs(struct entity* entity);
Expand Down Expand Up @@ -389,9 +397,11 @@ enum mobility_type GetMobilityTypeCheckSlip(enum monster_id species, bool walk_o
enum mobility_type GetMobilityTypeCheckSlipAndFloating(struct entity* monster,
enum monster_id species);
bool IsInvalidSpawnTile(enum monster_id monster_id, struct tile* tile);
bool CannotMoveToTile(struct entity* monster, struct position* tile_pos);
enum mobility_type GetMobilityTypeAfterIqSkills(struct entity* monster,
enum mobility_type mobility_type);
bool CanMoveThroughWalls(struct entity* monster);
bool CannotStandOnTileNoMonsterCheck(struct entity* monster, struct position* tile_pos);
bool CannotStandOnTile(struct entity* monster, struct position* tile_pos);
int CalcSpeedStage(struct entity* entity, int counter_weight);
int CalcSpeedStageWrapper(struct entity* entity);
Expand All @@ -414,6 +424,7 @@ bool MonsterHasNegativeStatus(struct entity* monster, bool check_held_item);
bool IsMonsterSleeping(struct entity* monster);
bool MonsterHasQuarterHp(struct entity* monster);
bool CheckVariousStatuses2(struct entity* entity, bool blind_check);
bool CanBeTalkedTo(struct entity* monster);
bool HasStatusThatPreventsOutlawEscaping(struct entity* monster);
bool CheckVariousConditions(struct entity* entity);
bool CheckVariousStatuses(struct entity* entity);
Expand Down Expand Up @@ -475,6 +486,7 @@ void DisplayMonster(struct entity* entity);
void AnimateFlyingMoves(struct entity* entity);
void ChangeMonsterAnimation(struct entity* monster, int8_t animation_id,
enum direction_id direction);
void MakeMonsterIdleInDirectionIfValid(struct entity* monster, enum direction_id direction);
void ChangeMonsterAnimationToIdle(struct entity* monster, enum direction_id direction);
void ChangeMonsterAnimationToHurt(struct entity* monster, enum direction_id direction);
uint8_t GetIdleAnimationId(struct entity* entity);
Expand Down Expand Up @@ -515,9 +527,10 @@ struct entity* GetLeaderIfVisible(struct entity* monster);
void RunMonsterAi(struct entity* monster, int unused);
void ApplyDamageAndEffects(struct entity* attacker, struct entity* defender,
struct damage_data* damage_data, bool false_swipe, bool exp_on_faint,
union damage_source damage_source, bool defender_response);
union damage_source damage_source, bool defender_response, bool fissure);
bool ApplyDamage(struct entity* attacker, struct entity* defender, struct damage_data* damage_data,
bool false_swipe, bool exp_on_faint, union damage_source damage_source);
bool false_swipe, bool exp_on_faint, union damage_source damage_source,
bool fissure);
bool AftermathCheck(struct entity* attacker, struct entity* defender,
union damage_source damage_source);
enum type_matchup GetTypeMatchupBothTypes(struct entity* attacker, struct entity* defender,
Expand All @@ -537,25 +550,25 @@ void CalcDamage(struct entity* attacker, struct entity* defender, enum type_id a
fx32_8 damage_mult_fp, enum move_id move_id, bool full_calc);
void ApplyDamageAndEffectsWrapper(struct entity* monster, int damage, enum damage_message message,
union damage_source damage_source);
void CalcRecoilDamageFixed(struct entity* attacker, int fixed_damage, undefined4 param_3,
void CalcRecoilDamageFixed(struct entity* attacker, int fixed_damage, bool exp_on_faint,
struct damage_data* damage_out, enum move_id move_id,
enum type_id attack_type, union damage_source damage_source,
enum damage_message damage_message, undefined4 param_9,
undefined4 param_10);
enum damage_message damage_message, bool defender_response,
bool fissure);
void CalcDamageFixed(struct entity* attacker, struct entity* defender, int fixed_damage,
bool exp_on_faint, struct damage_data* damage_out, enum type_id attack_type,
enum move_category move_category, union damage_source damage_source,
enum damage_message damage_message, undefined4 param_10, undefined4 param_11);
enum damage_message damage_message, bool defender_response, bool fissure);
void CalcDamageFixedNoCategory(struct entity* attacker, struct entity* defender, int fixed_damage,
bool exp_on_faint, struct damage_data* damage_out,
enum type_id attack_type, union damage_source damage_source,
enum damage_message damage_message, undefined4 param_9,
undefined4 param_10);
enum damage_message damage_message, bool defender_response,
bool fissure);
void CalcDamageFixedWrapper(struct entity* attacker, struct entity* defender, int fixed_damage,
bool exp_on_faint, struct damage_data* damage_out,
enum type_id attack_type, enum move_category move_category,
union damage_source damage_source, enum damage_message damage_message,
undefined4 param_10, undefined4 param_11);
bool defender_response, bool fissure);
void UpdateShopkeeperModeAfterAttack(struct entity* attacker, struct entity* defender);
void UpdateShopkeeperModeAfterTrap(struct entity* shopkeeper, bool non_team_member);
void ResetDamageCalcDiagnostics(void);
Expand Down Expand Up @@ -811,6 +824,11 @@ void TryExplosion(struct entity* user, struct entity* target, struct position* p
enum type_id attack_type, union damage_source damage_source);
void TryAftermathExplosion(struct entity* user, struct entity* target, struct position* pos,
int radius, enum type_id attack_type, union damage_source damage_source);
void CalcExplosionDamage(struct entity* user, struct entity* target, enum type_id attack_type,
enum move_id move_id, uint32_t base_fixed_damage);
void CalcAftermathExplosionDamage(struct entity* user, struct entity* target,
enum type_id attack_type, enum move_id move_id,
uint32_t base_fixed_damage);
void TryWarp(struct entity* user, struct entity* target, enum warp_type warp_type,
struct position* position);
void EnsureCanStandCurrentTile(struct entity* entity);
Expand Down
1 change: 1 addition & 0 deletions headers/functions/overlay31.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ void StairsMenu(struct entity* leader, bool leave_minimap_closed_after);
void InitStairsMenu(struct entity* leader);
void StairsSubheadingCallback(int window_id);
int StairsMenuLoop(void);
void StairsDescriptionCallback(int window_id);
void CloseMainStairsMenu(void);
void FreeStairsMenu(void);
bool EntityIsValidOverlay31(struct entity* entity);
Expand Down
80 changes: 76 additions & 4 deletions headers/types/common/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -1671,19 +1671,91 @@ ASSERT_SIZE(struct alarm_callback_info, 12);

struct effect_animation {
enum effect_file_type file_type; // 0x0
int file_index; // 0x4: File index in pack 3 (effect.bin)
int palette_num; // 0x8
uint32_t file_index; // 0x4: File index in pack 3 (effect.bin)
uint32_t palette_num; // 0x8
// 0xC: Some sort of index into the file. Related animations are grouped together into the same
// file and indexed with this. Is used as the animation_key parameter in
// SetAnimationForAnimationControl.
int animation_index;
uint32_t animation_index;
int se_id; // 0x10: Sound effect id, passed to PlaySeByIdVolume
int field_0x14; // 0x14: Seemingly always 0
undefined4 field_0x14; // 0x14: Seemingly always 0
uint8_t is_screen_effect; // 0x18: Seems to always be 1 for screen effects, unused otherwise
struct wan_offset_type_8 wan_offset; // 0x19
uint8_t is_non_blocking; // 0x1A
uint8_t repeat; // 0x1B: If non-zero, makes the animation repeat a bunch of times
};
ASSERT_SIZE(struct effect_animation, 28);

struct live_effect_unk_substruct {
undefined field_0x0[64];
};
ASSERT_SIZE(struct live_effect_unk_substruct, 64);

// Represents an effect animation that is currently playing
struct live_effect {
enum screen screen; // 0x0
undefined4 field_0x4;
enum effect_file_type file_type; // 0x8
int unique_id; // 0xC: -1 if no effect playing
undefined4 field_0x10;
uint32_t effect_id; // 0x14
undefined4 field_0x18; // Seemingly always 0
undefined4 field_0x1c;
struct vec2_16 pos; // 0x20: Absolute pixel coordinates of effect
undefined4 field_0x24;
undefined4 field_0x28;
undefined4 field_0x2c;
uint16_t oam_adjustment_info[6]; // 0x30
uint32_t some_bitfield; // 0x3C
enum effect_file_type file_type_copy; // 0x40: Seemingly a copy of file_type
int file_index; // 0x44: File index in pack 3 (effect.bin)
uint32_t palette_num; // 0x48
undefined4 field_0x4c;
uint32_t animation_index; // 0x50: See struct effect_animation
undefined4 field_0x54;
int se_id; // 0x58
undefined4 field_0x5c; // Seemingly always 0
uint8_t is_non_blocking; // 0x60
uint8_t repeat; // 0x61: If non-zero, makes the animation repeat a bunch of times
undefined2 field_0x62;
int16_t wan_id; // 0x64: Entry in wan_table
undefined2 field_0x66;
struct animation_control anim_ctrl; // 0x68
undefined2 field_0xe4;
undefined field_0xe6;
undefined field_0xe7;
struct live_effect_unk_substruct field_0xe8;
undefined2 field_0x128;
undefined2 field_0x12a;
undefined2 field_0x12c;
undefined2 field_0x12e;
undefined2 field_0x130;
undefined2 field_0x132;
undefined2 field_0x134;
struct vec2_16 delta_pos; // 0x136: Values to add every frame to pos
undefined field_0x13a;
undefined field_0x13b;
};
ASSERT_SIZE(struct live_effect, 316);

// Contains information about how effects should be played, and the ones that are currently active.
struct effect_control {
struct live_effect live_effects[32]; // 0x0
uint32_t next_unique_id; // 0x2780
uint32_t is_ground_mode; // 0x2784
// 0x2788: Entry in wan_table for file 1 if ground mode, file 292 if dungeon mode
uint16_t wan_entry;
undefined field_0x278a;
undefined field_0x278b;
undefined4 field_0x278c;
undefined2 field_0x2790;
undefined field_0x2792[12];
bool screen_effect_active[2]; // 0x279E: Index 0 is for SCREEN_MAIN, 1 for SCREEN_SUB
undefined field_0x27a0;
undefined field_0x27a1;
undefined field_0x27a2;
undefined field_0x27a3;
};
ASSERT_SIZE(struct effect_control, 10148);

#endif
1 change: 1 addition & 0 deletions headers/types/common/enums.h
Original file line number Diff line number Diff line change
Expand Up @@ -4396,6 +4396,7 @@ enum wan_offset_type {
WAN_OFFSET_HAND_LEFT = 1,
WAN_OFFSET_HAND_RIGHT = 2,
WAN_OFFSET_CENTER = 3,
WAN_OFFSET_NONE = 4,
};

// This is sometimes stored as an 8-bit integer
Expand Down
4 changes: 2 additions & 2 deletions headers/types/dungeon_mode/dungeon_mode_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ ASSERT_SIZE(struct monster_summary, 120);

// Parameters used when throwing a projectile item.
struct projectile_throw_info {
uint8_t field_0x0;
bool pierce; // 0x0
uint8_t field_0x1;
int16_t field_0x2;
int16_t max_range; // 0x2
};
ASSERT_SIZE(struct projectile_throw_info, 4);

Expand Down
2 changes: 1 addition & 1 deletion headers/types/files/rescue.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ASSERT_SIZE(struct rescue_monster_tables, 2944);
// by the selected mission_weighted_category, and GenerateMission converts the template into a
// mission struct. 0x1560 in rescue.bin
struct mission_templates_table {
struct mission_template[600];
struct mission_template mission_templates[600];
// This is the perfect size for a mission_category, but not for a template...
uint16_t unused[4];
};
Expand Down
4 changes: 2 additions & 2 deletions symbols/arm9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3774,8 +3774,8 @@ arm9:
description: |-
Note: unverified, ported from Irdkwia's notes

r0: ???
r1: ???
r0: preprocessor_args pointer
r1: position in preprocessor_args id_vals array
r2: move
r3: type_print
- name: InitMove
Expand Down
Loading
Loading