Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-25 07:24:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove needless ifdefs, fix Japanese build

Browse Source
This commit is contained in:
chordtoll 2024-10-23 19:07:42 -07:00
parent 52831afb66
commit 79a4a360df
No known key found for this signature in database
GPG Key ID: 6F33950B44755770
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/dungeon.h
View File

@ -1016,6 +1016,10 @@ struct dungeon {
u8 field_0x3b1c;
u8 field_0x3b1d;
u8 field_0x3b1e;
// TODO Something is omitted from the dungeon struct in JP, but it is not known what is missing.
// For the time being, take out these unknown fields from JP to allow JP usage of this struct to match.
// As more functions are decomped, move this conditional up the struct until we find where the actual difference is in the struct.
#ifndef JAPAN
u8 field_0x3b1f;
u8 field_0x3b20;
u8 field_0x3b21;
@ -1101,6 +1105,7 @@ struct dungeon {
u8 field_0x3b71;
u8 field_0x3b72;
u8 field_0x3b73;
#endif
// 0x3B74: Unknown array, likely one entry per monster species. This might be related to
// the IQ skill Exp. Go-Getter so the AI knows which monsters to prioritize.
u8 unknown_array_0x3B74[600];
@ -1372,11 +1377,7 @@ struct dungeon {
// TODO Something is omitted from the dungeon struct in JP, but it is not known what is missing.
// For the time being, take some bytes out of this array to allow JP usage of this struct to match.
#ifdef JAPAN
u8 unknown_file_buffer_0x12162[2268];
#else
u8 unknown_file_buffer_0x12162[2352];
#endif
// 0x12A92: Unknown array, probably related to unknown_tile_matrix
// since they get initialized together.
u16 unknown_array_0x12A92[9];

8
src/overlay_29_02338604.c
View File

@ -12,18 +12,10 @@ u8 IsSecretBazaar()
u8 ShouldBoostHiddenStairsSpawnChance()
{
#ifdef JAPAN
return DUNGEON_PTR[0]->boost_hidden_stairs_spawn_chance;
#else
return DUNGEON_PTR[0]->boost_hidden_stairs_spawn_chance;
#endif
}
void SetShouldBoostHiddenStairsSpawnChance(u8 should_boost)
{
#ifdef JAPAN
DUNGEON_PTR[0]->boost_hidden_stairs_spawn_chance=should_boost;
#else
DUNGEON_PTR[0]->boost_hidden_stairs_spawn_chance=should_boost;
#endif
}