Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
assidion2 authored and assidion2 committed Aug 25, 2024
2 parents 30c6411 + 0363689 commit 3050386
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions headers/data/literals.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ extern const struct data_processing_instruction TOP_MENU_MUSIC_ID;

// Overlay 29
extern const struct data_processing_instruction NECTAR_IQ_BOOST;
extern const struct data_processing_instruction COMPRESSED_SPRITE_BUFFER_SIZE;

// Overlay 9
extern const struct data_processing_instruction TOP_MENU_RETURN_MUSIC_ID;
Expand Down
1 change: 1 addition & 0 deletions headers/data/overlay29.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ extern uint32_t OFFSET_OF_DUNGEON_FLOOR_PROPERTIES;
extern int32_t SPAWN_RAND_MAX;
extern uint32_t DUNGEON_PRNG_LCG_MULTIPLIER;
extern uint32_t DUNGEON_PRNG_LCG_INCREMENT_SECONDARY;
extern int32_t ATTACK_SPRITE_BUFFER_SIZE;
extern enum monster_id KECLEON_FEMALE_ID;
extern enum monster_id KECLEON_MALE_ID;
extern int32_t MSG_ID_SLOW_START;
Expand Down
6 changes: 6 additions & 0 deletions symbols/literals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ overlay29:
NA: 0x231C384
JP: 0x231D850
description: IQ boost from ingesting Nectar.
- name: COMPRESSED_SPRITE_BUFFER_SIZE
address:
EU: 0x234CB6C
NA: 0x234BF6C
JP: 0x234D1D0
description: Size of the buffer to store the current sprite to decompress.
overlay34:
versions:
- EU
Expand Down
10 changes: 10 additions & 0 deletions symbols/overlay29.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8674,6 +8674,16 @@ overlay29:
EU: 0x4
NA: 0x4
description: "The increment for the dungeon PRNG's secondary LCGs, 2531011 (0x269EC3). This happens to be the same increment that the Microsoft Visual C++ runtime library uses in its implementation of the rand() function."
- name: ATTACK_SPRITE_BUFFER_SIZE
address:
EU: 0x22F7890
NA: 0x22F6ED8
JP: 0x22F84A8
length:
EU: 0x4
NA: 0x4
JP: 0x4
description: Size of the buffer used to store the current attack sprite file.
- name: KECLEON_FEMALE_ID
address:
EU: 0x22F7DBC
Expand Down

0 comments on commit 3050386

Please sign in to comment.