Skip to content

Commit

Permalink
Implement suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
Frostbyte0x70 committed Nov 14, 2023
1 parent 1c90eb3 commit 3e28dbf
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion headers/data/overlay10.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ extern int16_t WONDER_CHEST_EXP_BOOST;
extern int16_t SPAWN_CAP_WITH_MONSTER_HOUSE;
extern int16_t POISON_DAMAGE_COOLDOWN;
extern int16_t LEECH_SEED_DAMAGE_COOLDOWN;
extern int16_t ITEM_HIT_CHANCE;
extern int16_t THROWN_ITEM_HIT_CHANCE;
extern int16_t GEO_PEBBLE_DAMAGE;
extern int16_t GRAVELEROCK_DAMAGE;
extern int16_t RARE_FOSSIL_DAMAGE;
Expand Down
14 changes: 14 additions & 0 deletions symbols/arm7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ arm7:
No params.
- name: HardwareInterrupt
address:
EU: 0x2383670
NA: 0x2383670
EU-WRAM: 0x37FB488
NA-WRAM: 0x37FB488
description: |-
Expand All @@ -82,6 +84,8 @@ arm7:
No params.
- name: ReturnFromInterrupt
address:
EU: 0x23836DC
NA: 0x23836DC
EU-WRAM: 0x37FB4F4
NA-WRAM: 0x37FB4F4
description: |-
Expand All @@ -90,6 +94,8 @@ arm7:
No params.
- name: AudioInterrupt
address:
EU: 0x2383824
NA: 0x2383824
EU-WRAM: 0x37FB63C
NA-WRAM: 0x37FB63C
description: |-
Expand All @@ -100,6 +106,8 @@ arm7:
r0: Index of the function to jump to
- name: ClearImeFlag
address:
EU: 0x2383AC0
NA: 0x2383AC0
EU-WRAM: 0x37FB8D8
NA-WRAM: 0x37FB8D8
description: |-
Expand All @@ -108,6 +116,8 @@ arm7:
return: Previous IME value
- name: ClearIeFlag
address:
EU: 0x2383B10
NA: 0x2383B10
EU-WRAM: 0x37FB928
NA-WRAM: 0x37FB928
description: |-
Expand All @@ -117,6 +127,8 @@ arm7:
return: Previous value of the Interrupt Enable flags
- name: GetCurrentPlaybackTime
address:
EU: 0x2385404
NA: 0x2385404
EU-WRAM: 0x37FD21C
NA-WRAM: 0x37FD21C
description: |-
Expand All @@ -125,6 +137,8 @@ arm7:
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.
return: Playback time. Units unknown.
- name: ClearIrqFlag
address:
EU: 0x2385ED4
Expand Down
4 changes: 4 additions & 0 deletions symbols/arm9/itcm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ itcm:
return: key
- name: HardwareInterrupt
address:
EU: 0x20B52A8
NA: 0x20B4968
EU-ITCM: 0x1FF95E8
NA-ITCM: 0x1FF95E8
description: |-
Expand All @@ -277,6 +279,8 @@ itcm:
No params.
- name: ReturnFromInterrupt
address:
EU: 0x20B5310
NA: 0x20B49D0
EU-ITCM: 0x1FF9650
NA-ITCM: 0x1FF9650
description: |-
Expand Down
2 changes: 1 addition & 1 deletion symbols/overlay10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ overlay10:
length:
NA: 0x2
description: The number of turns between leech seed health drain.
- name: ITEM_HIT_CHANCE
- name: THROWN_ITEM_HIT_CHANCE
address:
EU: 0x22C5008
NA: 0x22C46B0
Expand Down
2 changes: 1 addition & 1 deletion symbols/overlay29.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7554,7 +7554,7 @@ overlay29:
description: |-
Determines if a hurled projectile will impact on a target or if the target will dodge it instead.
Contains a random chance using ITEM_HIT_CHANCE, as well as some additional checks involving certain items (Whiff Specs, Lockon Specs and Dodge Scarf), exclusive item effects (EXCLUSIVE_EFF_THROWN_ITEM_PROTECTION) or pokémon (Kecleon, clients, secret bazaar NPCs).
Contains a random chance using THROWN_ITEM_HIT_CHANCE, as well as some additional checks involving certain items (Whiff Specs, Lockon Specs and Dodge Scarf), exclusive item effects (EXCLUSIVE_EFF_THROWN_ITEM_PROTECTION) or pokémon (Kecleon, clients, secret bazaar NPCs).
r0: Monster that throws the item
r1: Target monster
Expand Down

0 comments on commit 3e28dbf

Please sign in to comment.