diff --git a/headers/data/overlay10.h b/headers/data/overlay10.h index 1e8713d6..3868a2b9 100644 --- a/headers/data/overlay10.h +++ b/headers/data/overlay10.h @@ -92,8 +92,8 @@ extern int16_t MIRACLE_CHEST_EXP_BOOST; extern int16_t WONDER_CHEST_EXP_BOOST; extern int16_t SPAWN_CAP_WITH_MONSTER_HOUSE; extern int16_t POISON_DAMAGE_COOLDOWN; -extern int16_t ITEM_HIT_CHANCE; extern int16_t LEECH_SEED_DAMAGE_COOLDOWN; +extern int16_t ITEM_HIT_CHANCE; extern int16_t GEO_PEBBLE_DAMAGE; extern int16_t GRAVELEROCK_DAMAGE; extern int16_t RARE_FOSSIL_DAMAGE; diff --git a/headers/types/common/common.h b/headers/types/common/common.h index dca09f62..f42405e0 100644 --- a/headers/types/common/common.h +++ b/headers/types/common/common.h @@ -1361,7 +1361,6 @@ struct track_data { }; ASSERT_SIZE(struct track_data, 32); // Exact size hasn't been confirmed - // Data about a wavi container struct wavi_data { undefined field_0x0; @@ -1372,7 +1371,7 @@ struct wavi_data { undefined field_0x5; undefined field_0x6; undefined field_0x7; - int16_t num_entries; // 0x8: Number of entries in the container + int16_t num_entries; // 0x8: Number of entries in the container undefined field_0xA; undefined field_0xB; undefined field_0xC; diff --git a/symbols/arm7.yml b/symbols/arm7.yml index 8b953482..6d839808 100644 --- a/symbols/arm7.yml +++ b/symbols/arm7.yml @@ -115,6 +115,16 @@ arm7: r0: Flag to clear return: Previous value of the Interrupt Enable flags + - name: GetCurrentPlaybackTime + address: + EU-WRAM: 0x37FD21C + NA-WRAM: 0x37FD21C + description: |- + Returns the time that the current song has been playing for. Might have a more generic purpose. + + The time is obtained using a couple of RAM counters and the hardware timers for additional precision. + The game uses this value to know when a given note should stop being played. It doesn't seem to be used to keep track of the + current time instant within the song. - name: ClearIrqFlag address: EU: 0x2385ED4 @@ -127,16 +137,6 @@ arm7: Copy of the ARM9 function. See arm9.yml for more information. return: Old value of cpsr & 0x80 (0x80 if interrupts were disabled, 0x0 if they were already enabled) - - name: GetCurrentPlaybackTime - address: - EU-WRAM: 0x37FD21C - NA-WRAM: 0x37FD21C - description: |- - Returns the time that the current song has been playing for. Might have a more generic purpose. - - The time is obtained using a couple of RAM counters and the hardware timers for additional precision. - The game uses this value to know when a given note should stop being played. It doesn't seem to be used to keep track of the - current time instant within the song. - name: EnableIrqFlag address: EU: 0x2385EE8 @@ -197,6 +197,8 @@ arm7: JP-WRAM: 0x37FDD58 description: |- Copy of the ARM9 function. See arm9.yml for more information. + + return: cpsr & 0x1f (the cpsr mode bits M4-M0) - name: __divsi3 address: EU: 0x238EDB0 diff --git a/symbols/overlay10.yml b/symbols/overlay10.yml index 211e7392..d1e3c99a 100644 --- a/symbols/overlay10.yml +++ b/symbols/overlay10.yml @@ -927,6 +927,13 @@ overlay10: NA: 0x2 JP: 0x2 description: The number of turns between passive poison damage. + - name: LEECH_SEED_DAMAGE_COOLDOWN + address: + EU: 0x22C5004 + NA: 0x22C46AC + length: + NA: 0x2 + description: The number of turns between leech seed health drain. - name: ITEM_HIT_CHANCE address: EU: 0x22C5008 @@ -936,12 +943,6 @@ overlay10: NA: 0x2 JP: 0x2 description: Chance of a hurled item hitting the target (90%). - - name: LEECH_SEED_DAMAGE_COOLDOWN - address: - NA: 0x22C46AC - length: - NA: 0x2 - description: The number of turns between leech seed health drain. - name: GEO_PEBBLE_DAMAGE address: EU: 0x22C500C