Mostly graphics-related functions

headers/data/ram.h

@@ -95,7 +95,7 @@ extern int TRIPLE_KICK_SUCCESSIVE_HITS;
 extern int METRONOME_NEXT_INDEX;
 extern struct tile DEFAULT_TILE_COPY;
 extern struct floor_generation_status FLOOR_GENERATION_STATUS;
-extern struct secret_bazaar_dialogue_info* SECRET_BAZAAR_DIALOGUE_INFO_PTR;
+extern struct dungeon_dialogue_info* DUNGEON_DIALOGUE_INFO_PTR;
 extern struct stairs_menu* STAIRS_MENU_PTR;
 
 #endif

headers/functions/arm9.h

@@ -461,7 +461,7 @@ void SelectWaza(int waza_id);
 void PlayBgmByIdVeneer(enum music_id music_id);
 void PlayBgmByIdVolumeVeneer(enum music_id music_id, undefined param_2, int volume);
 bool IsMePlaying(int me_id);
-void PlaySeByIdVolumeWrapper(int index);
+void PlaySeByIdVolumeWrapper(int se_id);
 void PlaySeVolumeWrapper(int index);
 void PlayBgmById(enum music_id music_id);
 void PlayBgmByIdVolume(enum music_id music_id, undefined param_2, int volume);
@@ -529,6 +529,8 @@ void SetAndPlayAnimationForAnimationControl(struct animation_control* anim_ctrl,
 void SwitchAnimationControlToNextFrame(struct animation_control* anim_ctrl);
 void LoadAnimationFrameAndIncrementInAnimationControl(struct animation_control* anim_ctrl,
                                                       struct wan_animation_frame* anim_frame);
+void DisplayAnimationControlCurrentFrame(struct animation_control* anim_ctrl);
+void DisplayAndSwitchAnimationControlCurrentFrame(struct animation_control* anim_ctrl);
 void FillOamAdjustmentInfo(struct animation_control* dst, uint16_t* src);
 uint32_t AnimationControlGetAllocForMaxFrame(struct animation_control* anim_ctrl);
 void DeleteWanTableEntry(struct wan_table* wan_table, int wan_id);

headers/functions/overlay29.h

@@ -30,13 +30,15 @@ void ResetDungeonColorPalette(void);
 struct trap* GetTrapInfo(struct entity* trap_entity);
 struct item* GetItemInfo(struct entity* item_entity);
 struct tile* GetTileAtEntity(struct entity* entity);
+void DisplayMonstersAndItems(void);
 void UpdateEntityPixelPos(struct entity* entity, struct pixel_position* pixel_pos);
 void SetEntityPixelPosXY(struct entity* entity, uint32_t x, uint32_t y);
 void IncrementEntityPixelPosXY(struct entity* entity, uint32_t x, uint32_t y);
 struct entity* CreateEnemyEntity(enum monster_id monster_id);
 struct entity* SpawnTrap(enum trap_id trap_id, struct position* position, uint8_t team,
                          uint8_t flags);
 struct entity* SpawnItemEntity(struct position* position);
+void CreateTemporaryEntity(struct entity* entity);
 bool ShouldMinimapDisplayEntity(struct entity* entity);
 bool ShouldDisplayEntity(struct entity* entity, undefined param_2);
 bool ShouldDisplayEntityWrapper(struct entity* entity);
@@ -61,6 +63,7 @@ int PlayEffectAnimationEntity(struct entity* entity, int effect_id, bool play_no
 int PlayEffectAnimationPos(struct position* pos, int effect_id, bool play_now);
 int PlayEffectAnimationPixelPos(struct pixel_position* pixel_pos, int effect_id, bool play_now);
 void AnimationDelayOrSomething(undefined param_1);
+void CopyStatusIconFlags(struct status_icon_flags* dst, struct entity* src);
 void UpdateStatusIconFlags(struct entity* entity);
 void PlayQuestionMarkEffect(struct entity* entity);
 void PlayExclamationPointEffect(struct entity* entity);
@@ -113,12 +116,14 @@ void AssignTopScreenHandlers(void** funcs, top_screen_status_fn_t init_func,
 void HandleTopScreenFades(void);
 int FreeTopScreen(void);
 void DungeonChangeTopScreenType(int top_screen_type);
+void DrawDungeonControlsText(int window_id);
 enum direction_id GetDirectionTowardsPosition(struct position* origin, struct position* target);
 int GetChebyshevDistance(struct position* position_a, struct position* position_b);
 bool IsPositionActuallyInSight(struct position* origin, struct position* target,
                                bool user_has_dropeye);
 bool IsPositionInSight(struct position* origin, struct position* target, bool user_has_dropeye);
 bool IsPositionWithinTwoTiles(struct position* origin, struct position* target);
+bool DisplayThrownItemShadow(int16_t x, int16_t y);
 struct entity* GetLeader(void);
 struct monster* GetLeaderMonster(void);
 bool GetRandomTile(struct position* pos_out, bool exclude_key_doors);
@@ -191,6 +196,7 @@ bool AreLateGameTrapsEnabledWrapper(void);
 void SpawnTraps(void);
 void SpawnEnemyTrapAtPos(enum trap_id trap_id, int16_t x, int16_t y, uint8_t flags,
                          bool is_visible);
+void CreateTrapAndStairsHallucinations(void);
 void PrepareTrapperTrap(struct entity* entity, enum trap_id trap_id, uint8_t team);
 bool CanLayTrap(struct position* pos);
 bool TrySpawnTrap(struct position* pos, enum trap_id trap_id, uint8_t team, bool visible);
@@ -224,6 +230,8 @@ void RevealTrapsNearby(struct entity* monster);
 bool RevealTrapAtPos(int x, int y);
 void CheckBossFightVictory(struct entity* fainted_entity, enum monster_behavior behavior,
                            bool change_music);
+void ChangeTeamAnimationsToIdle(void);
+bool IsFloorOver2(void);
 bool ShouldRunMonsterAi(struct entity* monster);
 bool DebugRecruitingEnabled(void);
 void TryActivateIqBooster(void);
@@ -236,6 +244,7 @@ bool TalkToSecretBazaarNpcWithYesNoMenu(int string_id, struct entity* shopkeeper
                                         struct simple_menu_id_item* menu_items);
 void MakeTargetFaceUserAndIdle(struct entity* target, struct entity* user);
 void SubtractMoneyCarriedWithSfx(int amount);
+void MakeSecretBazaarNpcsIdleInDirection(enum direction_id dir);
 void ReopenMinimap(void);
 void GonePebbleGradualPaletteShift(struct rgba* palette, uint32_t param_2);
 bool TalkToSecretBazaarNpc(int string_id, struct entity* shopkeeper, enum portrait_emotion emotion,
@@ -295,7 +304,7 @@ bool CheckTeamMemberIdxVeneer(int member_idx);
 bool CheckMonsterTeamMemberIdx(struct entity* entity);
 bool IsMonsterIdInNormalRangeVeneer(enum monster_id monster_id);
 void BoostIQ(struct entity* entity, int iq_boost, bool suppress_logs);
-void ChangeMonsterAnimationToIdle(struct entity* entity, enum direction_id direction);
+void MakeMonsterIdleInDirection2(struct entity* entity, enum direction_id direction);
 bool ShouldMonsterHeadToStairs(struct entity* entity);
 void DisplayLinkedMovesWarnings(struct entity* entity, int move_slot);
 bool MewSpawnCheck(enum monster_id monster_id, bool fail_if_mew);
@@ -359,7 +368,7 @@ bool IsInvalidSpawnTile(enum monster_id monster_id, struct tile* tile);
 enum mobility_type GetMobilityTypeAfterIqSkills(struct entity* monster,
                                                 enum mobility_type mobility_type);
 bool CanMoveThroughWalls(struct entity* monster);
-bool CannotStandOnTile(struct entity* monster, struct tile* tile);
+bool CannotStandOnTile(struct entity* monster, struct position* tile_pos);
 int CalcSpeedStage(struct entity* entity, int counter_weight);
 int CalcSpeedStageWrapper(struct entity* entity);
 int GetNumberOfAttacks(struct entity* entity);
@@ -438,9 +447,14 @@ void GetMonsterMoves(struct move_id_16* out_moves, enum monster_id monster_id, i
 void EvolveMonster(struct entity* user, struct entity* target, enum monster_id new_monster_id);
 void DisplayMonsterShadow(bool display_shadow, enum shadow_type shadow_type, bool yellow_circle,
                           int16_t x, int16_t y);
+void DisplayMonster(struct entity* entity);
+void AnimateFlyingMoves(struct entity* entity);
 void ChangeMonsterAnimation(struct entity* monster, int8_t animation_id,
                             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);
+void MakeMonsterIdleInDirection(struct entity* entity, enum direction_id direction);
 void DetermineAllMonsterShadow(void);
 enum shadow_type DetermineMonsterShadow(struct entity* monster);
 bool DisplayActions(struct entity* param_1);
@@ -994,6 +1008,8 @@ void GenerateCleanItem(struct item* item, enum item_id item_id);
 void TryLeaderItemPickUp(struct position* position, bool flag);
 bool SpawnItem(struct position* position, struct item* item, bool flag);
 void RemoveGroundItem(struct position* position, bool update_shop_counters);
+bool DisplayItem(struct entity* item, bool hallucinate, bool on_floor, enum direction_id dir,
+                 bool priority);
 void SpawnDroppedItemWrapper(struct entity* entity, struct position* pos, struct item* item,
                              undefined4 param_4);
 void SpawnDroppedItem(struct entity* entity, struct entity* item_entity, struct item* item,
@@ -1006,6 +1022,9 @@ void AddHeldItemToBag(struct monster* monster);
 void RemoveEmptyItemsInBagWrapper(void);
 void GenerateItem(struct item* item, enum item_id item_id, uint16_t quantity,
                   enum gen_item_stickiness sticky_type);
+void HandleRegularProjectileThrow(struct entity* user, struct item* item,
+                                  struct position* start_pos, enum direction dir,
+                                  struct projectile_throw_info* projectile_throw_info);
 void HandleCurvedProjectileThrow(struct entity* user, struct item* item, struct position* start_pos,
                                  struct position* target_pos,
                                  struct projectile_throw_info* projectile_throw_info);
@@ -1105,10 +1124,11 @@ void DisplayMessage2(struct portrait_params* portrait, int message_id, bool wait
 bool YesNoMenu(undefined param_1, int string_id, int default_option, undefined param_4);
 void CloseMinimap(void);
 void DisplayMessageInternal(int message_id, bool wait_for_input, struct portrait_params* portrait,
-                            undefined4 param_4, undefined4 param_5, undefined4 param_6);
+                            undefined4 param_4, struct preprocessor_args* preprocessor_args,
+                            undefined4 param_6);
 void PrintMissionCompleteString(int string_id, undefined4 param_2, undefined4 param_3,
                                 undefined4 param_4, undefined1 param_5);
-void InitSecretBazaarDialogueInfo(void);
+void InitDungeonDialogueInfo(void);
 void OpenMenu(undefined param_1, undefined param_2, bool open_bag);
 void StairsMenuAfterStep(struct entity* leader, bool leave_minimap_closed_after);
 int DungeonModeSetupAndShowNameKeyboard(char* str_keyboard_result, char* buffer,

headers/types/common/graphics.h

@@ -10,7 +10,9 @@
 // Mentioned under the name of "AnimeCtrl" in a debug message.
 struct animation_control {
     uint16_t some_bitfield;
-    undefined2 field1_0x2;
+    uint16_t unk_flags1 : 4;
+    uint16_t no_auto_frame_switch : 1;
+    uint16_t unk_flags2 : 11;
     undefined2 field2_0x4;
     uint16_t anim_frame_duration;
     undefined2 field4_0x8;

headers/types/dungeon_mode/dungeon_mode.h

@@ -233,7 +233,7 @@ struct statuses {
     // A value of 1 mean "high up" (Fly/Bounce). A value of 2 means some other condition like
     // Dig, Shadow Force, etc. Other values are treated as invalid. Also used for the move
     // Seismic Toss when throwing up the target.
-    uint8_t two_turn_move_invincible;
+    struct two_turn_invincibility_8 two_turn_move_invincible;
     // 0x63: Related to handling AI when a decoy is present on the floor?
     // Seems to only be 0, 1, 2
     undefined decoy_ai_tracker;
@@ -526,7 +526,9 @@ struct monster {
     struct position pixel_pos;  // 0x182: The monster's graphical position on screen?
     undefined field_0x186;
     undefined field_0x187;
-    int elevation_mirror; // 0x188: Mirror of the elevation field in struct entity
+    // 0x188: Works the same as the elevation field in struct entity, but is not
+    // tied to it.
+    int elevation2;
     // 0x18C: Bitflags that cause non-damaging exclusive items to trigger on the
     // attacker after they have completed their move. For example, the Eclipse Robe
     // (Darkrai exclusive item) may afflict attacking enemies with the nightmare
@@ -708,7 +710,7 @@ struct entity {
     enum entity_type type;                  // 0x0
     struct position pos;                    // 0x4
     struct position prev_pos;               // 0x8
-    struct pixel_position pixel_pos;        // 0xC
+    struct pixel_position pixel_pos;        // 0xC: Shifted left by 8
     struct pixel_position pixel_pos_mirror; // 0x14: Monsters only?
     // 0x1C: Graphical parameter for evelation above the ground. Last byte behaves weirdly.
     int elevation;
@@ -2577,7 +2579,7 @@ struct dungeon_button_input {
 };
 ASSERT_SIZE(struct dungeon_button_input, 14);
 
-struct secret_bazaar_dialogue_info {
+struct dungeon_dialogue_info {
     undefined field_0x0[16];
     int8_t dialogue_window_id;     // 0x10
     int8_t menu_window_id;         // 0x11
@@ -2599,7 +2601,7 @@ struct secret_bazaar_dialogue_info {
     struct simple_menu_id_item* menu_items; // 0x470
     undefined4 field_0x474;
 };
-ASSERT_SIZE(struct secret_bazaar_dialogue_info, 1144);
+ASSERT_SIZE(struct dungeon_dialogue_info, 1144);
 
 // Temporary struct used by TryRecruit.
 struct recruit_info {

symbols/arm9.yml

@@ -5021,6 +5021,20 @@ arm9:
 
         r0: animation_control
         r1: animation_frame
+    - name: DisplayAnimationControlCurrentFrame
+      address:
+        EU: 0x201C660
+      description: |-
+        Displays the current frame of the animation_control struct.
+
+        r0: animation_control
+    - name: DisplayAndSwitchAnimationControlCurrentFrame
+      address:
+        EU: 0x201CFF8
+      description: |-
+        Displays the current frame of the animation_control struct and switches it afterwards if applicable.
+
+        r0: animation_control
     - name: FillOamAdjustmentInfo
       aliases:
         - FillOamAttributeInfo