diff --git a/headers/data/ram.h b/headers/data/ram.h index 371116b2..3b06a553 100644 --- a/headers/data/ram.h +++ b/headers/data/ram.h @@ -64,10 +64,10 @@ extern struct mem_arena* GROUND_MEMORY_ARENA_1_PTR; extern struct mem_arena* GROUND_MEMORY_ARENA_2_PTR; extern bool LOCK_NOTIFY_ARRAY[20]; extern struct mem_arena GROUND_MEMORY_ARENA_1; -extern struct dungeon_button_input DUNGEON_BUTTON_INPUT; extern struct mem_block GROUND_MEMORY_ARENA_1_BLOCKS[52]; extern uint8_t GROUND_MEMORY_ARENA_1_MEMORY[408324]; extern struct sentry_duty SENTRY_DUTY_STRUCT; +extern struct dungeon_button_input DUNGEON_BUTTON_INPUT; extern bool TURNING_ON_THE_SPOT_FLAG; extern struct loaded_attack_sprite_data* LOADED_ATTACK_SPRITE_DATA; extern enum mobility_type MOBILITY_TYPE_TO_DUNGEON_MOBILITY_TYPE[8]; diff --git a/headers/functions/arm9.h b/headers/functions/arm9.h index 65df6295..2619bca7 100644 --- a/headers/functions/arm9.h +++ b/headers/functions/arm9.h @@ -1010,6 +1010,7 @@ bool IsSpecialEpisodeDungeon(enum dungeon_id dungeon_id); enum item_id RetrieveFromItemList1(undefined* dungeon_info, undefined4 param_2); bool IsForbiddenFloor(undefined* dungeon_info, undefined4 param_2, undefined4 param_3, undefined4 param_4); +void Copy16BitsTo(undefined* write_info, void* buf_write); void Copy16BitsFrom(undefined* read_info, void* buf_read); enum item_id RetrieveFromItemList2(undefined* dungeon_info, undefined4 param_2); bool IsInvalidForMission(enum dungeon_id dungeon_id); @@ -1146,6 +1147,7 @@ void EnableAllLearnableIqSkills(uint32_t* iq_skills_flags, enum monster_id monst int monster_iq); bool IqSkillFlagTest(uint32_t* iq_skill_flags, enum iq_skill_id iq_id); enum iq_skill_id GetNextIqSkill(enum monster_id monster_id, int monster_iq); +bool ExplorerMazeMonsterExists(void); void GetExplorerMazeTeamName(char* buffer); struct ground_monster* GetExplorerMazeMonster(uint8_t entry_number); undefined4 WriteMonsterInfoToSave(void* start_addr, uint32_t total_len); @@ -1154,6 +1156,7 @@ void WriteMonsterToSave(undefined* write_info, struct ground_monster* monster); void ReadMonsterFromSave(undefined* read_info, struct ground_monster* monster); void GetEvolutionPossibilities(struct ground_monster* monster, undefined* evo); int GetMonsterEvoStatus(struct ground_monster* monster); +bool HandleShedinjaEvolution(int16_t* member_idx, enum monster_id monster_id); void CopyTacticString(char* buffer, enum tactic_id tactic_id); void GetStatBoostsForMonsterSummary(struct monster_summary* monster_summary, enum monster_id monster_id, struct item* item, int iq, diff --git a/symbols/arm9.yml b/symbols/arm9.yml index da1ff5c3..c51279c7 100644 --- a/symbols/arm9.yml +++ b/symbols/arm9.yml @@ -9581,6 +9581,16 @@ arm9: r0: dungeon_info others: ? return: bool + - name: Copy16BitsTo + address: + EU: 0x20518FC + NA: 0x20515C4 + JP: 0x2051914 + description: |- + Writes 16 bits of data from buffer_write to write_info. + + r0: write_info + r1: buffer_write - name: Copy16BitsFrom address: EU: 0x2051924 @@ -10974,6 +10984,15 @@ arm9: r0: Monster ID r1: Monster IQ return: ID of the next skill learned by the monster, or IQ_NONE if the monster won't learn any more skills. + - name: ExplorerMazeMonsterExists + address: + EU: 0x2059320 + NA: 0x2058FA4 + JP: 0x20592A0 + description: |- + Returns true if there is Explorer Maze monster data in TEAM_MEMBER_TABLE_PTR->explorer_maze_monsters. + + return: True if there is Explorer Maze monster data in TEAM_MEMBER_TABLE_PTR->explorer_maze_monsters, false otherwise. - name: GetExplorerMazeTeamName address: EU: 0x20593DC @@ -11059,6 +11078,17 @@ arm9: r0: ground_monster return: evo_status + - name: HandleShedinjaEvolution + address: + EU: 0x205A604 + NA: 0x205A288 + JP: 0x205A584 + description: |- + Checks to see if the player just evolved a Nincada into Ninjask. If so, adds a Shedinja to the player's team. + + r0: pointer to current team member index + r1: monster_id + return: true - name: CopyTacticString address: EU: 0x205A7AC diff --git a/symbols/overlay26.yml b/symbols/overlay26.yml index 87d1530a..31028ac2 100644 --- a/symbols/overlay26.yml +++ b/symbols/overlay26.yml @@ -18,6 +18,7 @@ overlay26: address: EU: 0x238B960 NA: 0x238AE20 + JP: 0x238C380 length: NA: 0x8C description: |- @@ -40,6 +41,7 @@ overlay26: address: EU: 0x238BAA0 NA: 0x238AF60 + JP: 0x238C4C0 length: NA: 0x4 description: "Note: unverified, ported from Irdkwia's notes" @@ -47,6 +49,7 @@ overlay26: address: EU: 0x238BAA4 NA: 0x238AF64 + JP: 0x238C4C4 length: NA: 0x4 description: "Note: unverified, ported from Irdkwia's notes" @@ -54,6 +57,7 @@ overlay26: address: EU: 0x238BAA8 NA: 0x238AF68 + JP: 0x238C4C8 length: NA: 0x4 description: "Note: unverified, ported from Irdkwia's notes" @@ -61,6 +65,7 @@ overlay26: address: EU: 0x238BAAC NA: 0x238AF6C + JP: 0x238C4CC length: NA: 0x4 description: "Note: unverified, ported from Irdkwia's notes" @@ -68,6 +73,7 @@ overlay26: address: EU: 0x238BAB0 NA: 0x238AF70 + JP: 0x238C4D0 length: NA: 0x4 description: "Note: unverified, ported from Irdkwia's notes" diff --git a/symbols/overlay29.yml b/symbols/overlay29.yml index 7ead0416..f7dc3b21 100644 --- a/symbols/overlay29.yml +++ b/symbols/overlay29.yml @@ -361,6 +361,8 @@ overlay29: - name: GetAndStoreButtonInput address: EU: 0x22E13A4 + NA: 0x22E0A64 + JP: 0x22E20F4 description: |- Gets and stores the button input for the current frame in DUNGEON_BUTTON_INPUT. @@ -7357,6 +7359,8 @@ overlay29: - name: GetPaletteBaseAddress address: EU: 0x23362B0 + NA: 0x2335864 + JP: 0x2336C34 description: |- Gets the palette base address for a 3D element loaded from a WTE file. Takes the same parameters as were used in the specified file's ProcessWte call. diff --git a/symbols/ram.yml b/symbols/ram.yml index 460703ca..97018de7 100644 --- a/symbols/ram.yml +++ b/symbols/ram.yml @@ -642,15 +642,6 @@ ram: Including the allocator metadata, this arena occupies 0x64000 bytes of space. type: struct mem_arena - - name: DUNGEON_BUTTON_INPUT - address: - EU: 0x237D294 - length: - EU: 0xE - description: |- - [Runtime] Stores information about the user's current button input in dungeon mode. - - type: struct dungeon_button_input - name: GROUND_MEMORY_ARENA_1_BLOCKS address: NA: 0x2324FDC @@ -671,6 +662,19 @@ ram: NA: 0x237A5D0 length: NA: 0x38D4 + - name: DUNGEON_BUTTON_INPUT + address: + EU: 0x237D294 + NA: 0x237C694 + JP: 0x237D914 + length: + EU: 0xE + NA: 0xE + JP: 0xE + description: |- + [Runtime] Stores information about the user's current button input in dungeon mode. + + type: struct dungeon_button_input - name: TURNING_ON_THE_SPOT_FLAG address: EU: 0x237D5A6