From 4f3aeeb00d55578b4e48a59bcec9b52106d9b9cf Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 15 Nov 2024 00:45:43 -0500 Subject: [PATCH] Renamed bool to bool8 --- include/dg.h | 2 +- include/dg_camera.h | 2 +- include/dg_effect.h | 2 +- include/dg_object.h | 2 +- include/dg_uty.h | 2 +- include/dungeon.h | 80 ++++---- include/dungeon_mode.h | 342 +++++++++++++++++----------------- include/dungeon_mode_common.h | 22 +-- include/overlay_29_022EC608.h | 2 +- include/overlay_29_022ECDC0.h | 2 +- include/overlay_29_022EE348.h | 2 +- include/overlay_29_022EF7A0.h | 2 +- include/overlay_29_022F0590.h | 2 +- include/overlay_29_022F528C.h | 2 +- include/overlay_29_022F62A8.h | 2 +- include/overlay_29_022F7364.h | 2 +- include/overlay_29_022FC99C.h | 2 +- include/overlay_29_022FED98.h | 2 +- include/overlay_29_023000E4.h | 2 +- include/overlay_29_02302A38.h | 2 +- include/overlay_29_023047B8.h | 2 +- include/overlay_29_0230558C.h | 2 +- include/overlay_29_02305C04.h | 2 +- include/overlay_29_02307EF8.h | 2 +- include/overlay_29_0230827C.h | 2 +- include/overlay_29_02308FBC.h | 2 +- include/overlay_29_0230E8F0.h | 2 +- include/overlay_29_0230F008.h | 2 +- include/overlay_29_02311010.h | 2 +- include/overlay_29_023118B4.h | 2 +- include/overlay_29_02315118.h | 2 +- include/overlay_29_02318D34.h | 2 +- include/overlay_29_02318E4C.h | 2 +- include/overlay_29_02319F8C.h | 2 +- include/overlay_29_0231B194.h | 2 +- include/overlay_29_0231CBC8.h | 2 +- include/overlay_29_0231EDD8.h | 2 +- include/overlay_29_0231F570.h | 2 +- include/overlay_29_0231FBFC.h | 2 +- include/overlay_29_0232017C.h | 2 +- include/overlay_29_02320764.h | 2 +- include/overlay_29_02321438.h | 2 +- include/overlay_29_02325620.h | 2 +- include/overlay_29_0232800C.h | 2 +- include/overlay_29_0232A3D8.h | 2 +- include/overlay_29_0232C500.h | 2 +- include/overlay_29_0232E250.h | 4 +- include/overlay_29_0232E840.h | 2 +- include/overlay_29_02333FAC.h | 2 +- include/overlay_29_023350D8.h | 2 +- include/overlay_29_02337CA8.h | 2 +- include/overlay_29_02338548.h | 10 +- include/overlay_29_02338604.h | 8 +- include/overlay_29_02344AF8.h | 2 +- include/overlay_29_02345698.h | 2 +- include/overlay_29_02347BA4.h | 2 +- include/overlay_29_0234987C.h | 2 +- include/overlay_29_0234DDD0.h | 2 +- include/overlay_29_0234EC14.h | 2 +- include/util.h | 2 +- src/dg.c | 2 +- src/dg_camera.c | 2 +- src/dg_effect.c | 2 +- src/dg_object.c | 2 +- src/dg_uty.c | 2 +- src/overlay_29_022EC608.c | 2 +- src/overlay_29_022ECDC0.c | 2 +- src/overlay_29_022EE348.c | 2 +- src/overlay_29_022EF7A0.c | 2 +- src/overlay_29_022F0590.c | 2 +- src/overlay_29_022F528C.c | 2 +- src/overlay_29_022F62A8.c | 2 +- src/overlay_29_022F7364.c | 2 +- src/overlay_29_022FC99C.c | 2 +- src/overlay_29_022FED98.c | 2 +- src/overlay_29_022FEEB8_eu.c | 2 +- src/overlay_29_023000E4.c | 2 +- src/overlay_29_02302A38.c | 2 +- src/overlay_29_023047B8.c | 2 +- src/overlay_29_0230558C.c | 2 +- src/overlay_29_02305C04.c | 2 +- src/overlay_29_02307EF8.c | 2 +- src/overlay_29_0230827C.c | 2 +- src/overlay_29_02308340.c | 18 +- src/overlay_29_02308FBC.c | 2 +- src/overlay_29_0230E8F0.c | 2 +- src/overlay_29_0230F008.c | 2 +- src/overlay_29_02311010.c | 2 +- src/overlay_29_023118B4.c | 2 +- src/overlay_29_02315118.c | 2 +- src/overlay_29_02318D34.c | 2 +- src/overlay_29_02318E4C.c | 2 +- src/overlay_29_02319F8C.c | 2 +- src/overlay_29_0231B194.c | 2 +- src/overlay_29_0231CBC8.c | 2 +- src/overlay_29_0231EDD8.c | 2 +- src/overlay_29_0231F570.c | 2 +- src/overlay_29_0231FBFC.c | 2 +- src/overlay_29_0232017C.c | 2 +- src/overlay_29_02320764.c | 2 +- src/overlay_29_02321438.c | 2 +- src/overlay_29_02325620.c | 2 +- src/overlay_29_0232800C.c | 2 +- src/overlay_29_0232A3D8.c | 2 +- src/overlay_29_0232C500.c | 2 +- src/overlay_29_0232E250.c | 4 +- src/overlay_29_0232E840.c | 2 +- src/overlay_29_02333FAC.c | 2 +- src/overlay_29_023350D8.c | 2 +- src/overlay_29_02337CA8.c | 2 +- src/overlay_29_02338548.c | 10 +- src/overlay_29_02338604.c | 6 +- src/overlay_29_02344AF8.c | 2 +- src/overlay_29_02345698.c | 2 +- src/overlay_29_02347BA4.c | 2 +- src/overlay_29_0234987C.c | 2 +- src/overlay_29_0234DDD0.c | 2 +- src/overlay_29_0234EC14.c | 2 +- 118 files changed, 360 insertions(+), 360 deletions(-) diff --git a/include/dg.h b/include/dg.h index dd8670cc..d1d7e6ed 100644 --- a/include/dg.h +++ b/include/dg.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022E0354(struct entity *entity); +bool8 EntityIsValid__022E0354(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022E0354_H diff --git a/include/dg_camera.h b/include/dg_camera.h index 6c437468..7c376ff7 100644 --- a/include/dg_camera.h +++ b/include/dg_camera.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022E32E8(struct entity *entity); +bool8 EntityIsValid__022E32E8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022E32E8_H diff --git a/include/dg_effect.h b/include/dg_effect.h index 5c4b7118..6cfc1ca1 100644 --- a/include/dg_effect.h +++ b/include/dg_effect.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022E37B8(struct entity *entity); +bool8 EntityIsValid__022E37B8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022E37B8_H diff --git a/include/dg_object.h b/include/dg_object.h index d4fd2672..41e30e97 100644 --- a/include/dg_object.h +++ b/include/dg_object.h @@ -6,7 +6,7 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022E1A1C(struct entity *entity); +bool8 EntityIsValid__022E1A1C(struct entity *entity); void UpdateEntityPixelPos(struct entity *entity, struct pixel_position *pixel_pos); void SetEntityPixelPosXY(struct entity *entity, u32 x, u32 y); void IncrementEntityPixelPosXY(struct entity *entity, u32 x, u32 y); diff --git a/include/dg_uty.h b/include/dg_uty.h index ab2923df..e644c0f3 100644 --- a/include/dg_uty.h +++ b/include/dg_uty.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022E95F4(struct entity *entity); +bool8 EntityIsValid__022E95F4(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022E95F4_H diff --git a/include/dungeon.h b/include/dungeon.h index 2ac90c7f..d936b1cc 100644 --- a/include/dungeon.h +++ b/include/dungeon.h @@ -13,25 +13,25 @@ struct dungeon { // 0x1: Set to true with mission_destination_info::target_enemy_is_defeated. Used to ensure // the mission complete message only shows once (ie: "Yes! Knocked out challenger // [string:1]!". Set to false after the message is shown. - bool target_enemy_defeated_message; + bool8 target_enemy_defeated_message; // 0x2: Set to true when the hidden outlaw mission item is dropped. Appears to be used to check // if the message "Huh?[K] [item:] was dropped![P]Yes![K][string:1] was the outlaw!" should // be shown when target_enemy_defeated_message is true. - bool hidden_outlaw_defeated_message; + bool8 hidden_outlaw_defeated_message; // 0x3: If true and there's an active mission on the floor, the message // "You've reached a destination floor! But where is the target pokémon..." will be displayed. - bool target_monster_not_found_flag; + bool8 target_monster_not_found_flag; u8 field_0x4; - bool stepped_on_stairs; // 0x5: True if the leader just stepped on the stairs. + bool8 stepped_on_stairs; // 0x5: True if the leader just stepped on the stairs. // 0x6: If equal to 1 or 2, the floor will be advanced at the end of the turn, // unless the leader fainted. 2 is used for the leader falling through a pitfall // trap. u8 end_floor_flag; // 0x7: If set in tandem with either end_floor_flag or end_floor_no_death_check_flag, // a quicksave will occur instead of a floor advance. - bool quicksave_flag; + bool8 quicksave_flag; // 0x8: The floor will be advanced at the end of the turn. Set when quicksaving. - bool end_floor_no_death_check_flag; + bool8 end_floor_no_death_check_flag; // 0x9: If this is 0x0 (maybe false), appears to not initialize certain parts of the dungeon. // Possibly a boolean for when loading from a quicksave or resuming after being rescued? u8 field_0x9; @@ -41,17 +41,17 @@ struct dungeon { u8 field_0xd; // 0xD: Initialized to 0x0 // 0xE: If true, artificial weather abilities will be activated on this turn. // Set to false by TryActivateArtificialWeatherAbilities - bool activate_artificial_weather_flag; + bool8 activate_artificial_weather_flag; // 0xF: True if an enemy has defeated an ally on this turn and should evolve as a result // May also have a niche usage if an enemy gets enough experience to level up through // something like the Joy Ribbon? - bool should_enemy_evolve; + bool8 should_enemy_evolve; u8 field_0x10; // 0x10: Initialized to 0x0. // 0x11: True if the leader isn't doing anything right now. False if it's currently performing // an action (such as walking or attacking) - bool no_action_in_progress; - bool iq_disabled; // 0x12: IQ skills won't work in the dungeon. - bool regular_attack_reveal_traps; // 0x13: Regular attacks will reveal traps. + bool8 no_action_in_progress; + bool8 iq_disabled; // 0x12: IQ skills won't work in the dungeon. + bool8 regular_attack_reveal_traps; // 0x13: Regular attacks will reveal traps. // 0x14: If > 0, you get kicked out of the dungeon, usually because an important team member // (such as your client) fainted. enum forced_loss_reason forced_loss_reason; @@ -543,7 +543,7 @@ struct dungeon { u32 prng_preseed_23_bit; // 0x758: Whether the current floor should continue or end and why enum floor_loop_status floor_loop_status; - bool recruiting_enabled; // 0x759: Recruitment is allowed in this dungeon + bool8 recruiting_enabled; // 0x759: Recruitment is allowed in this dungeon // 0x75A: If this is 0, the game wont use GetMonsterEvoStatus when gathering information for // the monster's summary (in stuff like the team menu). u8 field_0x75a; @@ -552,23 +552,23 @@ struct dungeon { // but monsters are still alloweed to hold onto items normally. However, it does not seem to // properly add items picked up by team members to the treasure bag (making it impossible to // remove through the item menu). Additionally, items already in the bag can be used normally? - bool bag_enabled; - bool nonstory_flag; // 0x75C: Allows leader changing and continuing without the partner - bool send_home_disabled; // 0x75D: Sending teammates home is not allowed in this dungeon + bool8 bag_enabled; + bool8 nonstory_flag; // 0x75C: Allows leader changing and continuing without the partner + bool8 send_home_disabled; // 0x75D: Sending teammates home is not allowed in this dungeon // 0x75E: Disables sending home/leader changing, lose if partner faints. Set for dungeons // between DUNGEON_HIDDEN_LAND and DUNGEON_TEMPORAL_PINNACLE. - bool hidden_land_flag; + bool8 hidden_land_flag; // 0x75F: If true, the message log won't be shown and the yellow beam animation won't // appear over team members after the leader faints. It's enabled for dungeons where you don't // get penalized for fainting, but it's not used to perform that check. - bool skip_faint_animation_flag; + bool8 skip_faint_animation_flag; // 0x760: Info about the next mission destination floor, if applicable struct mission_destination_info mission_destination; u8 field_0x77c; u8 field_0x77d; // 0x77E: Appears to track if the player has already been healed by Mime Jr. to change // the dialogue. Initialized to 0 using MemZero? - bool bazaar_mime_jr_heal; + bool8 bazaar_mime_jr_heal; u8 field_0x77f; // 0x780: Controls when a monster at a certain speed stage is able to act. // Increased by 1-4 each turn, depending on the team leader's speed level: @@ -586,26 +586,26 @@ struct dungeon { u8 field_0x78a; // 0x78A: Initialized to 0x0. // 0x78B: True if the leader is running. Causes the leader's action for the next turn // to be set to action::ACTION_WALK until it hits an obstacle. - bool leader_running; + bool8 leader_running; // 0x78C: Likely related to the actions of the leader because it is set to 0 in // SetLeaderAction and this value gets bitwise or'd with 0x78B and then saved back to here. u8 field_0x78c; // 0x78D: This flag is set by the move 0x189 ("HP Gauge") which is the // effect of the Identify Orb. If true, monsters not in the team that are // holding an item will be marked by a blue exclamation mark icon. - bool identify_orb_flag; - bool pass_turn; // 0x78E: True if the leader has chosen to pass its turn - bool drought_orb_flag; // 0x78F: True if a drought orb has been used. - bool thief_alert; // 0x790: If you've stolen from Kecleon (actual dungeon state) + bool8 identify_orb_flag; + bool8 pass_turn; // 0x78E: True if the leader has chosen to pass its turn + bool8 drought_orb_flag; // 0x78F: True if a drought orb has been used. + bool8 thief_alert; // 0x790: If you've stolen from Kecleon (actual dungeon state) // 0x791: If you've stolen from Kecleon (triggers music and other events?) - bool thief_alert_event; + bool8 thief_alert_event; // 0x792: Can only be 0,1,2,3,4. Controls when to play certain special music tracks 0x7C // (1), 0x7D (2), 0xA8 (3), 0xA9 (4). Used by the Gone Pebbble to play track 0xA8, // challenge letter missions to play track 0x7C and dungeon failure to play 0xA9? u8 unk_music_flag; - bool monster_house_triggered; // 0x793: You Entered a Monster House (actual dungeon state) + bool8 monster_house_triggered; // 0x793: You Entered a Monster House (actual dungeon state) // 0x794: You entered a Monster House (triggers music and other events?) - bool monster_house_triggered_event; + bool8 monster_house_triggered_event; u8 field_0x795; // 0x796: Seems to often be 0x3E7 (999)? Somehow related to controlling or managing the // playing music? @@ -655,9 +655,9 @@ struct dungeon { // dungeon::poke_buy_kecleon_shop. u32 unk_poke_kecleon_shop_tracker; // 0x7C8: Leader standing on a Kecleon shop tile? - bool leader_standing_in_kecleon_shop; + bool8 leader_standing_in_kecleon_shop; // 0x7C9: You entered a Kecleon Shop (triggers music and maybe more?) - bool standing_in_kecleon_shop; + bool8 standing_in_kecleon_shop; u8 field_0x7ca; u8 field_0x7cb; // 0x7CC: Controls which mappa file (Time/Darkness/Sky) to load for a dungeon. When time and @@ -1126,7 +1126,7 @@ struct dungeon { u8 field_0x3e27; // 0x3E28: Related in some way to the spawn entries on the floor. Does something about them // if false, then set to true. - bool unk_spawn_entry_id_check; + bool8 unk_spawn_entry_id_check; u8 field_0x3e29; u8 field_0x3e2a; u8 field_0x3e2b; @@ -1138,17 +1138,17 @@ struct dungeon { // out which pair of wrapper and wrapped are connected. This number is saved into // statuses::wrap_pair_unique_id. Initialized to 0xA (10) u32 monster_unique_wrap_counter; - bool plus_is_active[2]; // 0x3E34: A monster on the {enemy, team} side has the ability Plus - bool minus_is_active[2]; // 0x3E36: A monster on the {enemy, team} side has the ability Minus + bool8 plus_is_active[2]; // 0x3E34: A monster on the {enemy, team} side has the ability Plus + bool8 minus_is_active[2]; // 0x3E36: A monster on the {enemy, team} side has the ability Minus // 0x3E38: If true, a monster on the floor is a decoy. - bool decoy_is_active; + bool8 decoy_is_active; // 0x3E39: If true, a monster with id 0x97 (Mew) cannot be spawned on the floor. - bool mew_cannot_spawn; + bool8 mew_cannot_spawn; // 0x3E3A: Holds the monster ID for the Deoxys form randomly selected for this floor. enum monster_id deoxys_floor_id; // 0x3E3C: Gets set to true in ChangeShayminForme. Seems to also control which sprite to // load for a Shaymin on the team? - bool shaymin_sky_form_loaded; + bool8 shaymin_sky_form_loaded; u8 field_0x3e3d; u8 field_0x3e3e; u8 field_0x3e3f; @@ -1212,7 +1212,7 @@ struct dungeon { u8 weather_damage_counter; u8 mud_sport_turns; // 0xCD5B: Number of turns left for the Mud Sport condition u8 water_sport_turns; // 0xCD5C: Number of turns left for the Water Sport condition - bool nullify_weather; // 0xCD5D: Cloud Nine/Air Lock is in effect + bool8 nullify_weather; // 0xCD5D: Cloud Nine/Air Lock is in effect u8 field_0xcd5e; u8 field_0xcd5f; // 0xCD60: Seems to be tile data for tiles within fixed rooms @@ -1390,7 +1390,7 @@ struct dungeon { u8* unk_fixed_room_pointer; // 0x12AA8: This flag is set by the move 0x191 ("Trapper") which is the effect // of the Trapper Orb. If true, the game will try to spawn a trap. - bool trapper_orb_flag; + bool8 trapper_orb_flag; u8 field_0x12aa9; // Likely padding // 0x12AAA: Location to spawn the trap by trapper_orb_flag. struct position trapper_orb_trap_pos; @@ -1476,7 +1476,7 @@ struct dungeon { // 0x12AFA: Number of normal item spawns. Does not include monster held items and additional // items in walls or Monster Houses u16 n_normal_item_spawns; - bool gravity; // 0x12AFC: Gravity is in effect + bool8 gravity; // 0x12AFC: Gravity is in effect u8 field_0x12afd; // 0x12AFE: Victories on one floor counter. s16 victory_counter; @@ -1516,10 +1516,10 @@ struct dungeon { // loaded. u32 fixed_room_monster_sprite_counter; // 0x12B24: Whether or not the kecleon shop spawn chance be boosted for the floor - bool boost_kecleon_shop_spawn_chance; + bool8 boost_kecleon_shop_spawn_chance; // 0x12B25: Whether or not the hidden stairs spawn chance be boosted for the floor // (by 20%; see HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER) - bool boost_hidden_stairs_spawn_chance; + bool8 boost_hidden_stairs_spawn_chance; u8 field_0x12b26; u8 field_0x12b27; @@ -1745,7 +1745,7 @@ struct dungeon { // 0x2CB10: Somehow related to display_data::hallucinating and seems to maybe control // the sleeping animations when the camera is pointed away from a hallucinating monster? // Initialized to 0x1. - bool unk_camera_tracker; + bool8 unk_camera_tracker; u8 field_0x2cb11; u8 field_0x2cb12; u8 field_0x2cb13; diff --git a/include/dungeon_mode.h b/include/dungeon_mode.h index 0bd2edf8..790154cf 100644 --- a/include/dungeon_mode.h +++ b/include/dungeon_mode.h @@ -23,19 +23,19 @@ struct pixel_position { struct item { // 0x0: flags: 1-byte bitfield //u8 flags_0x0; - bool f_exists : 1; // Validity flag - bool f_in_shop : 1; // In a Kecleon Shop - bool f_unpaid : 1; // Picked up from a Kecleon Shop but not paid for yet - bool f_sticky : 1; // Sticky - bool f_set : 1; // Usable by L+R - bool flag_unk5 : 1; + bool8 f_exists : 1; // Validity flag + bool8 f_in_shop : 1; // In a Kecleon Shop + bool8 f_unpaid : 1; // Picked up from a Kecleon Shop but not paid for yet + bool8 f_sticky : 1; // Sticky + bool8 f_set : 1; // Usable by L+R + bool8 flag_unk5 : 1; // For stolen items to recover from outlaws (has red X)? Could be for other items for other // types of missions? (Uncertain) - bool f_unk_mission_item1 : 1; + bool8 f_unk_mission_item1 : 1; // For stolen items to recover from outlaws (has red X)? Could be for other items for other // types of missions? (Uncertain) Definitely used temporarily when sorting the items in // storage. - bool f_unk_mission_item2 : 1; + bool8 f_unk_mission_item2 : 1; // 0x1: For bag items. 0 for none, 1 if held by the leader, 2 for the second party member, etc. u8 held_by; // 0x2: Only for stackable items. Will be 0 if unapplicable. For Poké, this is an "amount code" @@ -65,7 +65,7 @@ struct monster_stat_modifiers { // by the FIRST status in the list (when the index is 1, since 0 usually means no status). For other // statuses in the group, see the subsequent enum values in enum status_id after the first status. struct statuses { - bool roost; + bool8 roost; // 0x1: The typing in entity::types before the flying type is removed for statuses::roost // and restored to entity::types after statuses::roost ends. enum type_id original_types[2]; @@ -122,7 +122,7 @@ struct statuses { // 0x30: Set to monster::is_not_team_member of the attacker (the one causing the decoy status). u8 curse_applier_non_team_member_flag; // 0x31: True if the Pokémon is a decoy and a wild Pokémon (i.e., not an allied Pokémon). - bool enemy_decoy; + bool8 enemy_decoy; u8 curse_turns; // 0x32: Turns left for the status in statuses::curse // 0x33: Turns left until residual damage for the status in statuses::curse, if applicable u8 curse_damage_countdown; @@ -157,15 +157,15 @@ struct statuses { u8 miracle_eye_turns; // 0x4D: Turns left for the status in statuses::miracle_eye u8 magnet_rise; // 0x4E: STATUS_MAGNET_RISE if 1 u8 magnet_rise_turns; // 0x4F: Turns left for the status in statuses::magnet_rise - bool power_ears; // 0x50: STATUS_POWER_EARS - bool scanning; // 0x51: STATUS_SCANNING - bool stair_spotter; // 0x52: STATUS_STAIR_SPOTTER + bool8 power_ears; // 0x50: STATUS_POWER_EARS + bool8 scanning; // 0x51: STATUS_SCANNING + bool8 stair_spotter; // 0x52: STATUS_STAIR_SPOTTER // 0x53: Set when initally spawning a team member with the ability Pickup. - bool pickup_flag; - bool grudge; // 0x54: STATUS_GRUDGE - bool exposed; // 0x55: STATUS_EXPOSED (Foresight/Odor Sleuth) - bool type_changed; // 0x56: Flag for if the monster's type has been changed - bool boss_flag; // 0x57: Seems to be true for boss monsters + bool8 pickup_flag; + bool8 grudge; // 0x54: STATUS_GRUDGE + bool8 exposed; // 0x55: STATUS_EXPOSED (Foresight/Odor Sleuth) + bool8 type_changed; // 0x56: Flag for if the monster's type has been changed + bool8 boss_flag; // 0x57: Seems to be true for boss monsters // 0x58: Appears to be a flag for when a monster increasces their speed. Maybe only used // by the RunLeaderTurn function to know if the leader has changed their speed stage partway // through the function? @@ -178,7 +178,7 @@ struct statuses { #ifndef JAPAN // 0x5A: Possibly a flag while in action. Could also be a flag to cause the burn from // lava, heal a burn from water, and decrease hunger in the walls. - bool in_action; + bool8 in_action; #endif // 0x5B: STATUS_TERRIFIED, interestingly, appears to use 0x1 for the Foe-Fear Orb but // 0x2 for the ability Stench. The distinction only seems to exist for the game to use @@ -193,7 +193,7 @@ struct statuses { // 0 = 0.5x, 1 = 1.0x, 2 = 1.5x u8 exp_yield; // 0x60: Appears to be set when the held item of the monster is going to be used? - bool unk_item_use_action; + bool8 unk_item_use_action; // 0x61: Is initalized to 0x63 (99). Changing it from this value causes the monster to // begin rendering differently? For example, it causes entity::0xB3 to be 1 and forces // entity::0x28 to be 0. @@ -223,47 +223,47 @@ struct statuses { // A bitfield where every bit controls one of the icons that can appear on top of a monster's sprite // to represent status effects. If multiple bits are set, the shown icon cycles through them. struct status_icon_flags { - bool f_sleepless : 1; // Blue eye blinking yellow - bool f_burn : 1; // Red flame - bool f_poison : 1; // White skull - bool f_toxic : 1; // Purple skull - bool f_confused : 1; // Yellow birds - bool f_cowering : 1; // 2 green lines in circle (same as whiffer) - bool f_taunt : 1; // Fist icon - bool f_encore : 1; // Blue exclamation mark (same as low HP) + bool8 f_sleepless : 1; // Blue eye blinking yellow + bool8 f_burn : 1; // Red flame + bool8 f_poison : 1; // White skull + bool8 f_toxic : 1; // Purple skull + bool8 f_confused : 1; // Yellow birds + bool8 f_cowering : 1; // 2 green lines in circle (same as whiffer) + bool8 f_taunt : 1; // Fist icon + bool8 f_encore : 1; // Blue exclamation mark (same as low HP) // Blue shield with white sparks. Also for counter, mini counter, mist, // metal burst, aqua ring, and lucky chant - bool f_reflect : 1; - bool f_safeguard : 1; // Pink shield. Also for mirror coat - bool f_light_screen : 1; // Golden shield. Also for magic coat - bool f_protect : 1; // Green shield. Also for mirror move and vital throw - bool f_endure : 1; // Blue shield with red sparks - bool f_low_hp : 1; // Blue exclamation mark (same as encore) - bool f_curse : 1; // Red skull - bool f_embargo : 1; // Yellow exclamation mark. Also for gastro acid and snatch - bool f_sure_shot : 1; // Blue sword blinking yellow - bool f_whiffer : 1; // 2 green lines in circle (same as cowering) - bool f_set_damage : 1; // Blue sword blinking red - bool f_focus_energy : 1; // Red sword blinking yellow - bool f_blinded : 1; // Blue eye with an X - bool f_cross_eyed : 1; // Blue question mark - bool f_eyedrops : 1; // Blue eye blinking yellow with a circular wave - bool f_muzzled : 1; // Blinking red cross - bool f_grudge : 1; // Purple shield - bool f_exposed : 1; // Blue eye blinking red with a circular wave - bool f_sleep : 1; // Red Z's - bool f_lowered_stat : 1; // Yellow arrow pointing down - bool f_heal_block : 1; // Blinking green cross - bool f_miracle_eye : 1; // Blinking orange cross - bool f_red_exclamation_mark : 1; // Probably unused - bool f_magnet_rise : 1; // Purple arrow pointing up + bool8 f_reflect : 1; + bool8 f_safeguard : 1; // Pink shield. Also for mirror coat + bool8 f_light_screen : 1; // Golden shield. Also for magic coat + bool8 f_protect : 1; // Green shield. Also for mirror move and vital throw + bool8 f_endure : 1; // Blue shield with red sparks + bool8 f_low_hp : 1; // Blue exclamation mark (same as encore) + bool8 f_curse : 1; // Red skull + bool8 f_embargo : 1; // Yellow exclamation mark. Also for gastro acid and snatch + bool8 f_sure_shot : 1; // Blue sword blinking yellow + bool8 f_whiffer : 1; // 2 green lines in circle (same as cowering) + bool8 f_set_damage : 1; // Blue sword blinking red + bool8 f_focus_energy : 1; // Red sword blinking yellow + bool8 f_blinded : 1; // Blue eye with an X + bool8 f_cross_eyed : 1; // Blue question mark + bool8 f_eyedrops : 1; // Blue eye blinking yellow with a circular wave + bool8 f_muzzled : 1; // Blinking red cross + bool8 f_grudge : 1; // Purple shield + bool8 f_exposed : 1; // Blue eye blinking red with a circular wave + bool8 f_sleep : 1; // Red Z's + bool8 f_lowered_stat : 1; // Yellow arrow pointing down + bool8 f_heal_block : 1; // Blinking green cross + bool8 f_miracle_eye : 1; // Blinking orange cross + bool8 f_red_exclamation_mark : 1; // Probably unused + bool8 f_magnet_rise : 1; // Purple arrow pointing up // The following 4 bytes appear to have a different meaning, maybe they are intended to // represent icons that are always displayed and do not cycle (inferred from the difference // between the ice block and the other icons). Except for the first bit, the others do not // seem to have an effect, but the code stores the full 4 bytes as a bitwise OR of some of the // flags (see UpdateStatusIconBitfield). - bool f_freeze : 1; // Ice block + bool8 f_freeze : 1; // Ice block u8 flags_unk2 : 7; u8 field_0x5; u8 field_0x6; @@ -298,10 +298,10 @@ struct monster { enum monster_id id; // 0x2: enum monster_id apparent_id : 16; // 0x4: What's outwardly displayed if Transformed - bool is_not_team_member; // 0x6: true for enemies and allied NPCs that aren't on the team - bool is_team_leader; // 0x7 + bool8 is_not_team_member; // 0x6: true for enemies and allied NPCs that aren't on the team + bool8 is_team_leader; // 0x7 // 0x8: An ally is an NPC that isn't a normal team member, e.g. for story boss battles - bool is_ally; + bool8 is_ally; enum shopkeeper_mode shopkeeper : 8; // 0x9 u8 level; // 0xA u8 field_0xb; @@ -340,9 +340,9 @@ struct monster { u8 field_0x7a; u8 field_0x7b; enum ai_objective ai_objective : 8; // 0x7C - bool ai_not_next_to_target; // 0x7D: This NPC monster is not next to its current target - bool ai_targeting_enemy; // 0x7E: This NPC monster is targeting an enemy monster - bool ai_turning_around; // 0x7F: This NPC monster has decided to turn around + bool8 ai_not_next_to_target; // 0x7D: This NPC monster is not next to its current target + bool8 ai_targeting_enemy; // 0x7E: This NPC monster is targeting an enemy monster + bool8 ai_turning_around; // 0x7F: This NPC monster has decided to turn around // 0x80: entity::spawn_genid of the entity currently being targeted u16 ai_target_spawn_genid; u8 field_0x82; @@ -361,7 +361,7 @@ struct monster { enum tactic_id tactic : 8; // 0xA8 //struct statuses statuses; // 0xA9 / Need to be inline for alignment - bool roost; + bool8 roost; // 0xAA / 0x1: The typing in entity::types before the flying type is removed for statuses::roost // and restored to entity::types after statuses::roost ends. enum type_id original_types[2]; @@ -453,15 +453,15 @@ struct monster { u8 miracle_eye_turns; // 0xF6 / 0x4D: Turns left for the status in statuses::miracle_eye u8 magnet_rise; // 0xF7 / 0x4E: STATUS_MAGNET_RISE if 1 u8 magnet_rise_turns; // 0xF8 / 0x4F: Turns left for the status in statuses::magnet_rise - bool power_ears; // 0xF9 / 0x50: STATUS_POWER_EARS - bool scanning; // 0xFA / 0x51: STATUS_SCANNING - bool stair_spotter; // 0xFB / 0x52: STATUS_STAIR_SPOTTER + bool8 power_ears; // 0xF9 / 0x50: STATUS_POWER_EARS + bool8 scanning; // 0xFA / 0x51: STATUS_SCANNING + bool8 stair_spotter; // 0xFB / 0x52: STATUS_STAIR_SPOTTER // 0xFC / 0x53: Set when initally spawning a team member with the ability Pickup. - bool pickup_flag; - bool grudge; // 0xFD / 0x54: STATUS_GRUDGE - bool exposed; // 0xFE / 0x55: STATUS_EXPOSED (Foresight/Odor Sleuth) - bool type_changed; // 0xFF / 0x56: Flag for if the monster's type has been changed - bool boss_flag; // 0x100 / 0x57: Seems to be true for boss monsters + bool8 pickup_flag; + bool8 grudge; // 0xFD / 0x54: STATUS_GRUDGE + bool8 exposed; // 0xFE / 0x55: STATUS_EXPOSED (Foresight/Odor Sleuth) + bool8 type_changed; // 0xFF / 0x56: Flag for if the monster's type has been changed + bool8 boss_flag; // 0x100 / 0x57: Seems to be true for boss monsters // 0x101 / 0x58: Appears to be a flag for when a monster increasces their speed. Maybe only used // by the RunLeaderTurn function to know if the leader has changed their speed stage partway // through the function? @@ -474,7 +474,7 @@ struct monster { #ifndef JAPAN // 0x103 / 0x5A: Possibly a flag while in action. Could also be a flag to cause the burn from // lava, heal a burn from water, and decrease hunger in the walls. - bool in_action; + bool8 in_action; #endif // 0x104 / 0x5B: STATUS_TERRIFIED, interestingly, appears to use 0x1 for the Foe-Fear Orb but // 0x2 for the ability Stench. The distinction only seems to exist for the game to use @@ -489,7 +489,7 @@ struct monster { // 0 = 0.5x, 1 = 1.0x, 2 = 1.5x u8 exp_yield; // 0x109 / 0x60: Appears to be set when the held item of the monster is going to be used? - bool use_held_item; + bool8 use_held_item; // 0x10A / 0x61: Is initalized to 0x63 (99). Changing it from this value causes the monster to // begin rendering differently? For example, it causes entity::0xB3 to be 1 and forces // entity::0x28 to be 0. @@ -526,21 +526,21 @@ struct monster { struct fixed_point belly; // 0x146 struct fixed_point max_belly; // 0x14A: // 0x14E: If true and the monster is an ally, the AI will skip it. False for enemies. - bool ai_ally_skip; - bool ai_next_to_target; // 0x14F: This NPC monster is next to its current target + bool8 ai_ally_skip; + bool8 ai_next_to_target; // 0x14F: This NPC monster is next to its current target // 0x150: Set if monster::is_team_leader is true and belly is empty. - bool famished; - bool waiting; + bool8 famished; + bool8 waiting; // 0x152: Seems to be true if the monster has already acted this turn: attacked, used an item, // or seemingly anything other than moving/resting. Also true when the monster faints. - bool already_acted; + bool8 already_acted; // 0x153: True if this enemy should evolve. It is not enough to set this flag to evolve // an enemy monster. You also need to set dungeon::should_enemy_evolve. - bool should_evolve; + bool8 should_evolve; // 0x154: True if using a charged move. Changed together with statuses::bide. - bool using_charged_move; + bool8 using_charged_move; // 0x155: True if the target attacked a Pokemon that has STATUS_GRUDGE. - bool hit_grudge_monster; + bool8 hit_grudge_monster; u8 field_0x156; // 0 when the monster faints u8 field_0x157; // 0x158: General-purpose bitflags tracking different bits of volatile state. @@ -550,38 +550,38 @@ struct monster { // 0x15A: The previous value of state_bitflags before the last update u16 prev_state_flags; // 0x15C: Appears to control if flash fire should activate. - bool apply_flash_fire_boost; + bool8 apply_flash_fire_boost; // 0x15D: Appears to be a counter for how many times rollout has hit. Likely to be able to // determine how much extra damage consecutive rollout hits should deal. u8 rollout_hit_counter; // 0x15E: If true, the monster is warped after completing its move. - bool memento_warp_flag; + bool8 memento_warp_flag; // 0x15F: If true, the monster's special attack is dropped after the completing its move. - bool overheat_special_attack_drop_flag; + bool8 overheat_special_attack_drop_flag; // 0x160: If true, the monster's shadow is drawn. This value is initalized to 1 for every // monster except Diglett and Dugtrio. - bool display_shadow; + bool8 display_shadow; // 0x161: If true, prevents giving items to this monster. Might have a broader meaning, // such as whether the monster is a guest pokémon. - bool cannot_give_items; + bool8 cannot_give_items; // 0x162: Related to using a move and either missing or fainting. Set to 1 right before // the function for a move is called and set to 0 (sometimes) in ApplyDamage. Gets set // when the monster faints sometimes with field 0x156. When false, causes random // outcomes with the monster to fail. - bool field_0x162; + bool8 field_0x162; // 0x163: Related to controlling the number of attacks per move use. Possibly to account // for two-turn moves? - bool field_0x163; - bool took_damage_flag; // 0x164: Set after the monster took damage. + bool8 field_0x163; + bool8 took_damage_flag; // 0x164: Set after the monster took damage. // 0x165: Appears to be some sort of validity check? Where 0 is valid and 1 is invalid. // HandleFaint sets this number to 1. Also set to 1 if IsMonsterIdInNormalRange is false. - bool field_0x165; + bool8 field_0x165; // 0x166: Set after the monster attacks (true if the attack missed, false otherwise). If true // when the monster attacks, Practice Swinger will activate. - bool practice_swinger_flag; + bool8 practice_swinger_flag; // 0x167: Set to true when the monster receives a critical hit. If true when the monster // attacks, Anger Point will activate. Set to false after the monster attacks. - bool anger_point_flag; + bool8 anger_point_flag; u8 field_0x168; u8 field_0x169; // 0x16A: When not DIR_NONE, monster will turn in the specified direction and @@ -595,17 +595,17 @@ struct monster { u8 field_0x16e; u8 field_0x16f; // 0x170: Set to make the monster disappear when using the move U-turn. - bool uturn_hide_monster_flag; + bool8 uturn_hide_monster_flag; // 0x171: Some kind of visual flag? Gets set to 0 temporarily when changing Shaymin form // or when using the Gone Pebble? Also hardcoded to be set to 0 for monsters that generally // tend to float? Otherwise 1? - bool field_0x171; + bool8 field_0x171; // 0x172: Set when the leader and falling through a pitfall trap. - bool pitfall_trap_flag_0x172; + bool8 pitfall_trap_flag_0x172; // 0x173: Some kind of visual flag? - bool field_0x173; + bool8 field_0x173; // 0x174: Set when the leader and falling through a pitfall trap. - bool pitfall_trap_flag_0x174; + bool8 pitfall_trap_flag_0x174; u8 field_0x175; u8 field_0x176; // 0x177: Appears to be the direction for using sleep talk? Set to DIR_NONE when awake. @@ -776,7 +776,7 @@ struct monster { // probably controls when the ripple effect when standing on water. u8 water_shadow_ripple_tracker; // 0x221: Set if the current move being used was copied by Me First - bool me_first_flag; + bool8 me_first_flag; u8 field_0x222; u8 field_0x223; // Stat boosts from exclusive items with EXCLUSIVE_EFF_STAT_BOOST @@ -786,17 +786,17 @@ struct monster { u32 exclusive_item_effect_flags[5]; // 0x23C: Initialized to 0. Probably menu related only, seems to be set to true through the // menu. - bool field_0x23c; + bool8 field_0x23c; // 0x23F: When reviving a monster, temporarily set to true. Probably a visual indicator // of some kind? - bool unk_revive_visual_tracker; + bool8 unk_revive_visual_tracker; // 0x23E: Gets set to 0 before using an attack and gets set to 1 in LevelUp. Seems to stop // the rest of the attacks (ie from Swift Swim) from continuing. Possibly to avoid the // the monster leveling up and trying to use a move that was just overwritten by a new move? u8 field_0x23e; // 0x23F: Gets set to 1 when the move used won't use up any PP. Used to check if the // monster should lose extra PP from the ability Pressure. - bool should_not_lose_pp; + bool8 should_not_lose_pp; }; @@ -880,7 +880,7 @@ struct monster_summary { s32 exp; // 0x30 u8 offensive_stats[2]; // 0x34: {atk, sp_atk} u8 defensive_stats[2]; // 0x36: {def, sp_def} - bool is_team_leader; // 0x38 + bool8 is_team_leader; // 0x38 u8 attack_boost; // 0x39: from things like Power Band, Munch Belt u8 special_attack_boost; // 0x3A u8 defense_boost; // 0x3B @@ -895,7 +895,7 @@ struct monster_summary { u8 level_at_second_evo; // 0x44: Evolution status. In ground_mode, accounts for luminous spring being unlocked. u8 evo_status; - bool inflicted_with_gastro_acid; // 0x45 + bool8 inflicted_with_gastro_acid; // 0x45 u8 field_0x46; u8 field_0x47; u32 iq_skill_flags[3]; // 0x48 @@ -912,7 +912,7 @@ struct monster_summary { // Info about a mission destination floor struct mission_destination_info { - bool is_destination_floor; // 0x0: Whether or not the current floor is a mission destination + bool8 is_destination_floor; // 0x0: Whether or not the current floor is a mission destination enum mission_type type; // 0x1: // 0x2: The meaning of this field depends on the type field; see union mission_subtype. u8 subtype; @@ -935,15 +935,15 @@ struct mission_destination_info { enum fixed_room_id fixed_room_id; // 0x17: Related to missions where you have to obtain an item? Possibly related to the item // being picked up and/or destroyed? - bool unk_mission_item_tracker1; + bool8 unk_mission_item_tracker1; u8 field_0x18; u8 field_0x19; // 0x1A: Related to missions where you have to obtain an item? Possibly related to the item // being picked up and/or destroyed? - bool unk_mission_item_tracker2; + bool8 unk_mission_item_tracker2; // 0x1B: Will be set after the target enemy has been defeated. // If there are minions, this flag applies just to the main outlaw. - bool target_enemy_is_defeated; + bool8 target_enemy_is_defeated; }; // Contains data about a monster that spawns in a dungeon @@ -987,13 +987,13 @@ struct floor_properties { // 0xB: Whether or not dead ends are allowed in the floor layout. If false, dead ends will be // corrected during floor generation (or rather, they should be, but the implementation is // buggy) - bool allow_dead_ends; + bool8 allow_dead_ends; // 0xC: Maximum number of secondary structures that can be generated on the floor u8 max_secondary_structures; // 0xD: room_flags: 1-byte bitfield - bool f_secondary_structures : 1; // Whether secondary structures are allowed + bool8 f_secondary_structures : 1; // Whether secondary structures are allowed u8 room_flags_unk1 : 1; - bool f_room_imperfections : 1; // Whether room imperfections are allowed + bool8 f_room_imperfections : 1; // Whether room imperfections are allowed u8 room_flags_unk3 : 5; u8 field_0xe; @@ -1101,44 +1101,44 @@ struct display_data { u8 visibility_range; // 0x22: True if the pokémon currently pointed by the camera has // the status_id::STATUS_BLINKER effect - bool blinded; + bool8 blinded; // 0x23: True after using a Luminous Orb or in floors where darkness is forcefully disabled - bool luminous; + bool8 luminous; // 0x24: If false and luminous is false as well, darkness will be displayed graphically. // This is set in dungeons that aren't naturally dark, and also in some fixed room floors. - bool natural_lighting; + bool8 natural_lighting; // 0x25: True if the pokémon currently pointed by the camera has the Map Surveyor IQ skill // active - bool map_surveyor; + bool8 map_surveyor; // 0x26: True if enemies should be shown on the map. // Seems to be a dependent property computed as // (leader has Power Ears status OR leader has X-Ray Specs equipped). // This is NOT affected by the luminous flag. - bool can_see_enemies; + bool8 can_see_enemies; // 0x27: True if items are being shown on the map. Similar to can_see_enemies. - bool can_see_items; + bool8 can_see_items; // 0x28: True if traps are being shown on the map. Similar to can_see_enemies. - bool can_see_traps; + bool8 can_see_traps; // 0x29: True if the pokémon currently pointed by the camera has the // status_id::STATUS_CROSS_EYED effect. // Causes all entities to be displayed as green circles on the map. - bool hallucinating; - bool can_see_stairs; // 0x2A: True if stairs are being shown on the map + bool8 hallucinating; + bool8 can_see_stairs; // 0x2A: True if stairs are being shown on the map u8 field_0x2B; // 0x2B: Initialized to 0 u8 field_0x2C; - bool darkness; // 0x2D: True if there's darkness on the floor + bool8 darkness; // 0x2D: True if there's darkness on the floor u8 field_0x2E; // 0x2E: Initialized to 1 // 0x2F: True if the leader is being pointed by the camera right now. If false, UI digits will // be displayed in green. - bool leader_pointed; + bool8 leader_pointed; u8 field_0x30; // 0x30: Initialized to 1 // 0x31: Set to 1 when losing in a dungeon. Seems to cause display_data::0x38 to // display_data::leader_max_hp_touch_screen to become 0xFFFF (-1). - bool unk_fade_to_black_tracker; + bool8 unk_fade_to_black_tracker; u8 field_0x32; // 0x32: Initialized to 0 u8 field_0x33; // 0x33: Initialized to 0 u8 field_0x34; // 0x34: Is used, related to lighting? - bool team_menu_or_grid; // 0x35: True when the team menu is opened or while Y is being held + bool8 team_menu_or_grid; // 0x35: True when the team menu is opened or while Y is being held // Derived from internal direction in leader info block enum direction_id leader_target_direction; // 0x36 enum direction_id leader_target_direction_mirror; // 0x37 @@ -1156,10 +1156,10 @@ struct display_data { // Used during floor generation to keep track of what entities should be spawned where struct spawn_flags { - bool f_stairs : 1; - bool f_item : 1; - bool f_trap : 1; - bool f_monster : 1; + bool8 f_stairs : 1; + bool8 f_item : 1; + bool8 f_trap : 1; + bool8 f_monster : 1; u8 spawn_flags_unk4 : 4; u8 spawn_flags_unk8 : 8; }; @@ -1168,8 +1168,8 @@ struct spawn_flags { struct visibility_flags { // If f_revealed == true and f_visited == false, the tile will appear as gray on the map. // This happens, e.g., when a Luminous Orb is used. - bool f_revealed : 1; // Revealed on the map. - bool f_visited : 1; // Visited by the player + bool8 f_revealed : 1; // Revealed on the map. + bool8 f_visited : 1; // Visited by the player u8 visibility_flags_unk2 : 6; u8 visibility_flags_unk8 : 8; }; @@ -1200,30 +1200,30 @@ struct tile { //u16 terrain_flags; enum terrain_type terrain_type : 2; // This tile can be corner-cut when walking. Seemingly only used during dungeon generation. - bool f_corner_cuttable : 1; + bool8 f_corner_cuttable : 1; // Includes room tiles right next to a hallway, and branching points within corridors. // Only applies to natural halls, not ones made by Absolute Mover, not "hallways" made of // secondary terrain, etc. Used by the AI for navigation. - bool f_natural_junction : 1; + bool8 f_natural_junction : 1; // This tile is impassable, even with Absolute Mover/Mobile Scarf. Used for the map border, // key chamber walls, walls in boss battle rooms, etc. - bool f_impassable_wall : 1; - bool f_in_kecleon_shop : 1; // In a Kecleon Shop - bool f_in_monster_house : 1; // In a Monster House - bool terrain_flags_unk7 : 1; + bool8 f_impassable_wall : 1; + bool8 f_in_kecleon_shop : 1; // In a Kecleon Shop + bool8 f_in_monster_house : 1; // In a Monster House + bool8 terrain_flags_unk7 : 1; // Cannot be broken by Absolute Mover. Set naturally on key doors. - bool f_unbreakable : 1; + bool8 f_unbreakable : 1; // Tile is any type of "stairs" (normal stairs, Hidden Stairs, Warp Zone) - bool f_stairs : 1; - bool terrain_flags_unk10 : 1; - bool f_key_door : 1; // Tile is a key door - bool f_key_door_key_locked : 1; // Key door is locked and requires a Key to open + bool8 f_stairs : 1; + bool8 terrain_flags_unk10 : 1; + bool8 f_key_door : 1; // Tile is a key door + bool8 f_key_door_key_locked : 1; // Key door is locked and requires a Key to open // Key door is locked and requires an escort to open (for Sealed Chamber missions) - bool f_key_door_escort_locked : 1; - bool terrain_flags_unk14 : 1; + bool8 f_key_door_escort_locked : 1; + bool8 terrain_flags_unk14 : 1; // Tile is open terrain but unreachable from the stairs spawn point. Only set during dungeon // generation. - bool f_unreachable_from_stairs : 1; + bool8 f_unreachable_from_stairs : 1; // 0x2: Seems to be used for spawning entities during dungeon generation, and for visibility // during dungeon play @@ -1247,14 +1247,14 @@ struct tile { struct dungeon_generation_info { // 0x0: Set if the floor layout is guaranteed to be a Monster House, or the dungeon generation // algorithm fails - bool force_create_monster_house; + bool8 force_create_monster_house; // 0x1: Set if the locked door on the floor has already been opened. - bool locked_door_opened; + bool8 locked_door_opened; // 0x2: Set if a kecleon shop was properly spawned. - bool kecleon_shop_spawned; + bool8 kecleon_shop_spawned; // 0x3: When a non-zero value, the one-room orb will fail. u8 unk_one_room_flag; - bool dough_seed_extra_poke_flag; + bool8 dough_seed_extra_poke_flag; // 0x5: Room index of Monster House on the floor. 0xFF if there's no Monster House u8 monster_house_room; // 0x6: Related to when a monster from a fixed room faints. Maybe to check if the floor @@ -1297,7 +1297,7 @@ struct trap { // 0x2: flags: 1-byte bitfield //u8 flags; - bool f_unbreakable : 1; // If true, the trap can't be broken (for example, using a Trapbust Orb) + bool8 f_unbreakable : 1; // If true, the trap can't be broken (for example, using a Trapbust Orb) u8 flags_unk1 : 7; u8 field_0x3; @@ -1320,7 +1320,7 @@ struct enemy_spawn_stats { struct spawned_shopkeeper_data { enum monster_id monster_id; // 0x0: The id of the monster to spawn enum monster_behavior behavior; // 0x2: NPC behavior of the monster - bool valid; // 0x3: Indicates that this spawn data is valid + bool8 valid; // 0x3: Indicates that this spawn data is valid u8 pos_x; // 0x4 u8 pos_y; // 0x5 }; @@ -1409,52 +1409,52 @@ struct damage_calc_diag { // It seems like there's a bug in the code; aura bows do not contribute to this field. s8 item_sp_def_modifier; // 0x38: Whether or not Scope Lens or Sharpshooter boosted the critical hit rate of a move - bool scope_lens_or_sharpshooter_activated; + bool8 scope_lens_or_sharpshooter_activated; // 0x39: Whether or not the Patsy Band boosted the critical hit rate of a move - bool patsy_band_activated; + bool8 patsy_band_activated; // 0x3A: Whether or not Reflect or the Time Shield halved the damage from a physical move - bool half_physical_damage_activated; + bool8 half_physical_damage_activated; // 0x3B: Whether or not Light Screen or the Aqua Mantle halved the damage from a special move - bool half_special_damage_activated; + bool8 half_special_damage_activated; // 0x3C: Whether or not the Enhanced critical-hit rate status maxed out the critical hit rate // of a move - bool focus_energy_activated; + bool8 focus_energy_activated; // 0x3D: Whether or not Type-Advantage Master boosted the critical hit rate of a move - bool type_advantage_master_activated; + bool8 type_advantage_master_activated; // 0x3E: Whether or not a non-Normal-type move was dampened by Cloudy weather - bool cloudy_drop_activated; + bool8 cloudy_drop_activated; // 0x3F: Whether or not a Fire or Water move was affected by Rainy weather - bool rain_multiplier_activated; + bool8 rain_multiplier_activated; // 0x40: Whether or not a Fire or Water move was affected by Sunny weather - bool sunny_multiplier_activated; + bool8 sunny_multiplier_activated; // 0x41: Whether or a Fire move was dampened by Thick Fat or Heatproof - bool fire_move_ability_drop_activated; + bool8 fire_move_ability_drop_activated; // 0x42: Whether or not Flash Fire was activated at some point for Fire immunity - bool flash_fire_activated; + bool8 flash_fire_activated; // 0x43: Whether or not Levitate was activated at some point for Ground immunity - bool levitate_activated; - bool torrent_boost_activated; // 0x44: Whether or not a Water move was boosted by Torrent - bool overgrow_boost_activated; // 0x45: Whether or not a Grass move was boosted by Overgrow - bool swarm_boost_activated; // 0x46: Whether or not a Bug move was boosted by Swarm + bool8 levitate_activated; + bool8 torrent_boost_activated; // 0x44: Whether or not a Water move was boosted by Torrent + bool8 overgrow_boost_activated; // 0x45: Whether or not a Grass move was boosted by Overgrow + bool8 swarm_boost_activated; // 0x46: Whether or not a Bug move was boosted by Swarm // 0x47: Whether or not a Fire move was boosted by either Blaze or Dry Skin - bool fire_move_ability_boost_activated; + bool8 fire_move_ability_boost_activated; // 0x48: Whether or not Scrappy was activated at some point to bypass immunity - bool scrappy_activated; + bool8 scrappy_activated; // 0x49: Whether or not Super Luck boosted the critical hit rate for a move - bool super_luck_activated; + bool8 super_luck_activated; // 0x4A: Whether or not Sniper boosted the critical hit damage multiplier for a move - bool sniper_activated; - bool stab_boost_activated; // 0x4B: Whether or not STAB was activated for a move + bool8 sniper_activated; + bool8 stab_boost_activated; // 0x4B: Whether or not STAB was activated for a move // 0x4C: Whether or not an Electric move was dampened by either Mud Sport or Fog - bool electric_move_dampened; + bool8 electric_move_dampened; // 0x4D: Whether or not Water Sport was activated by a Fire move - bool water_sport_drop_activated; - bool charge_boost_activated; // 0x4E: Whether or not Charge was activated by an Electric move + bool8 water_sport_drop_activated; + bool8 charge_boost_activated; // 0x4E: Whether or not Charge was activated by an Electric move u8 field_0x4f; // 0x50: Whether or not a Ghost type's immunity to Normal/Fighting was activated at some point - bool ghost_immunity_activated; + bool8 ghost_immunity_activated; // 0x51: Whether or not a defender took less damage due to the Charging Skull Bash status - bool skull_bash_defense_boost_activated; + bool8 skull_bash_defense_boost_activated; u8 field_0x52; u8 field_0x53; }; diff --git a/include/dungeon_mode_common.h b/include/dungeon_mode_common.h index 851adc60..743697e3 100644 --- a/include/dungeon_mode_common.h +++ b/include/dungeon_mode_common.h @@ -7,28 +7,28 @@ struct move { // 0x0: flags0: 1-byte bitfield u8 flags0; - /* bool f_exists : 1; // This move will show up in the move list */ - /* bool f_subsequent_in_link_chain : 1; // This move is in a link chain, but not the first move */ - /* bool f_enabled_for_ai : 1; // AI can use this move */ - /* bool f_set : 1; // Usable by L+A */ - /* bool f_last_used : 1; // This move was the last one used (for things like Torment?) */ - /* bool f_disabled : 1; // For Torment (and maybe others) */ + /* bool8 f_exists : 1; // This move will show up in the move list */ + /* bool8 f_subsequent_in_link_chain : 1; // This move is in a link chain, but not the first move */ + /* bool8 f_enabled_for_ai : 1; // AI can use this move */ + /* bool8 f_set : 1; // Usable by L+A */ + /* bool8 f_last_used : 1; // This move was the last one used (for things like Torment?) */ + /* bool8 f_disabled : 1; // For Torment (and maybe others) */ /* u8 flags0_unk6 : 2; */ u8 field_0x1; // 0x2: flags2: 2-byte bitfield u16 flags2; - /* bool f_sealed : 1; // Sealed by a Seal Trap. Also prevents AI from using this move */ + /* bool8 f_sealed : 1; // Sealed by a Seal Trap. Also prevents AI from using this move */ /* u16 flags2_unk1 : 2; */ - /* bool f_consume_pp : 1; // This move will consume PP this turn */ - /* bool f_consume_2_pp : 1; // Consume 2 PP this turn. No effect unless f_consume_pp is set */ + /* bool8 f_consume_pp : 1; // This move will consume PP this turn */ + /* bool8 f_consume_2_pp : 1; // Consume 2 PP this turn. No effect unless f_consume_pp is set */ /* u16 flags2_unk5 : 1; */ /* // Consume 4 PP this turn. No effect unless f_consume_pp is set, overrides f_consume_2_pp */ - /* bool f_consume_4_pp : 1; */ + /* bool8 f_consume_4_pp : 1; */ /* u16 flags2_unk7 : 1; */ /* u16 flags2_unk8 : 1; */ - /* bool f_exclusive_item_pp_boost : 1; // A PP-boosting exclusive item is in effect */ + /* bool8 f_exclusive_item_pp_boost : 1; // A PP-boosting exclusive item is in effect */ /* u16 flags3_unk10 : 6; */ enum move_id id : 16; // 0x4 diff --git a/include/overlay_29_022EC608.h b/include/overlay_29_022EC608.h index 67c3da90..d076c29c 100644 --- a/include/overlay_29_022EC608.h +++ b/include/overlay_29_022EC608.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022EC608(struct entity *entity); +bool8 EntityIsValid__022EC608(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022EC608_H diff --git a/include/overlay_29_022ECDC0.h b/include/overlay_29_022ECDC0.h index c002bc46..0f82c01b 100644 --- a/include/overlay_29_022ECDC0.h +++ b/include/overlay_29_022ECDC0.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022ECDC0(struct entity *entity); +bool8 EntityIsValid__022ECDC0(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022ECDC0_H diff --git a/include/overlay_29_022EE348.h b/include/overlay_29_022EE348.h index 1e40ed3e..78695c3e 100644 --- a/include/overlay_29_022EE348.h +++ b/include/overlay_29_022EE348.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022EE348(struct entity *entity); +bool8 EntityIsValid__022EE348(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022EE348_H diff --git a/include/overlay_29_022EF7A0.h b/include/overlay_29_022EF7A0.h index b40d6509..c7ed8851 100644 --- a/include/overlay_29_022EF7A0.h +++ b/include/overlay_29_022EF7A0.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022EF7A0(struct entity *entity); +bool8 EntityIsValid__022EF7A0(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022EF7A0_H diff --git a/include/overlay_29_022F0590.h b/include/overlay_29_022F0590.h index 9d2886c7..07607397 100644 --- a/include/overlay_29_022F0590.h +++ b/include/overlay_29_022F0590.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022F0590(struct entity *entity); +bool8 EntityIsValid__022F0590(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022F0590_H diff --git a/include/overlay_29_022F528C.h b/include/overlay_29_022F528C.h index 5ea04e92..d35cc361 100644 --- a/include/overlay_29_022F528C.h +++ b/include/overlay_29_022F528C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022F528C(struct entity *entity); +bool8 EntityIsValid__022F528C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022F528C_H diff --git a/include/overlay_29_022F62A8.h b/include/overlay_29_022F62A8.h index ce48fed0..a3d0aea9 100644 --- a/include/overlay_29_022F62A8.h +++ b/include/overlay_29_022F62A8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022F62A8(struct entity *entity); +bool8 EntityIsValid__022F62A8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022F62A8_H diff --git a/include/overlay_29_022F7364.h b/include/overlay_29_022F7364.h index e6d7fa14..324a9744 100644 --- a/include/overlay_29_022F7364.h +++ b/include/overlay_29_022F7364.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022F7364(struct entity *entity); +bool8 EntityIsValid__022F7364(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022F7364_H diff --git a/include/overlay_29_022FC99C.h b/include/overlay_29_022FC99C.h index 1103863e..be002edd 100644 --- a/include/overlay_29_022FC99C.h +++ b/include/overlay_29_022FC99C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022FC99C(struct entity *entity); +bool8 EntityIsValid__022FC99C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022FC99C_H diff --git a/include/overlay_29_022FED98.h b/include/overlay_29_022FED98.h index 699f8f91..43e87b4d 100644 --- a/include/overlay_29_022FED98.h +++ b/include/overlay_29_022FED98.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__022FED98(struct entity *entity); +bool8 EntityIsValid__022FED98(struct entity *entity); #endif //PMDSKY_OVERLAY_29_022FED98_H diff --git a/include/overlay_29_023000E4.h b/include/overlay_29_023000E4.h index 3b35c5c7..f79c851e 100644 --- a/include/overlay_29_023000E4.h +++ b/include/overlay_29_023000E4.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__023000E4(struct entity *entity); +bool8 EntityIsValid__023000E4(struct entity *entity); #endif //PMDSKY_OVERLAY_29_023000E4_H diff --git a/include/overlay_29_02302A38.h b/include/overlay_29_02302A38.h index cfab89f4..cb982494 100644 --- a/include/overlay_29_02302A38.h +++ b/include/overlay_29_02302A38.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02302A38(struct entity *entity); +bool8 EntityIsValid__02302A38(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02302A38_H diff --git a/include/overlay_29_023047B8.h b/include/overlay_29_023047B8.h index ec4cea2f..96139a7a 100644 --- a/include/overlay_29_023047B8.h +++ b/include/overlay_29_023047B8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__023047B8(struct entity *entity); +bool8 EntityIsValid__023047B8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_023047B8_H diff --git a/include/overlay_29_0230558C.h b/include/overlay_29_0230558C.h index f4b1b648..cc4a9f9f 100644 --- a/include/overlay_29_0230558C.h +++ b/include/overlay_29_0230558C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0230558C(struct entity *entity); +bool8 EntityIsValid__0230558C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0230558C_H diff --git a/include/overlay_29_02305C04.h b/include/overlay_29_02305C04.h index 52260090..63a11c7d 100644 --- a/include/overlay_29_02305C04.h +++ b/include/overlay_29_02305C04.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02305C04(struct entity *entity); +bool8 EntityIsValid__02305C04(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02305C04_H diff --git a/include/overlay_29_02307EF8.h b/include/overlay_29_02307EF8.h index 4a9f7760..cdc3f044 100644 --- a/include/overlay_29_02307EF8.h +++ b/include/overlay_29_02307EF8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02307EF8(struct entity *entity); +bool8 EntityIsValid__02307EF8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02307EF8_H diff --git a/include/overlay_29_0230827C.h b/include/overlay_29_0230827C.h index 28eb2bb4..c663f4e9 100644 --- a/include/overlay_29_0230827C.h +++ b/include/overlay_29_0230827C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0230827C(struct entity *entity); +bool8 EntityIsValid__0230827C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0230827C_H diff --git a/include/overlay_29_02308FBC.h b/include/overlay_29_02308FBC.h index 72523494..cab2b17a 100644 --- a/include/overlay_29_02308FBC.h +++ b/include/overlay_29_02308FBC.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02308FBC(struct entity *entity); +bool8 EntityIsValid__02308FBC(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02308FBC_H diff --git a/include/overlay_29_0230E8F0.h b/include/overlay_29_0230E8F0.h index a13a75ed..756453b7 100644 --- a/include/overlay_29_0230E8F0.h +++ b/include/overlay_29_0230E8F0.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0230E8F0(struct entity *entity); +bool8 EntityIsValid__0230E8F0(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0230E8F0_H diff --git a/include/overlay_29_0230F008.h b/include/overlay_29_0230F008.h index e972988d..46096d7b 100644 --- a/include/overlay_29_0230F008.h +++ b/include/overlay_29_0230F008.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0230F008(struct entity *entity); +bool8 EntityIsValid__0230F008(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0230F008_H diff --git a/include/overlay_29_02311010.h b/include/overlay_29_02311010.h index 798edbf3..0a639832 100644 --- a/include/overlay_29_02311010.h +++ b/include/overlay_29_02311010.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02311010(struct entity *entity); +bool8 EntityIsValid__02311010(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02311010_H diff --git a/include/overlay_29_023118B4.h b/include/overlay_29_023118B4.h index 1d0046d0..23a5d4e4 100644 --- a/include/overlay_29_023118B4.h +++ b/include/overlay_29_023118B4.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__023118B4(struct entity *entity); +bool8 EntityIsValid__023118B4(struct entity *entity); #endif //PMDSKY_OVERLAY_29_023118B4_H diff --git a/include/overlay_29_02315118.h b/include/overlay_29_02315118.h index 25a6ddc8..fb15f0b0 100644 --- a/include/overlay_29_02315118.h +++ b/include/overlay_29_02315118.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02315118(struct entity *entity); +bool8 EntityIsValid__02315118(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02315118_H diff --git a/include/overlay_29_02318D34.h b/include/overlay_29_02318D34.h index 6c9bd8c3..c1540e0f 100644 --- a/include/overlay_29_02318D34.h +++ b/include/overlay_29_02318D34.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02318D34(struct entity *entity); +bool8 EntityIsValid__02318D34(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02318D34_H diff --git a/include/overlay_29_02318E4C.h b/include/overlay_29_02318E4C.h index 3bf7fcab..f0758f34 100644 --- a/include/overlay_29_02318E4C.h +++ b/include/overlay_29_02318E4C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02318E4C(struct entity *entity); +bool8 EntityIsValid__02318E4C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02318E4C_H diff --git a/include/overlay_29_02319F8C.h b/include/overlay_29_02319F8C.h index 6ea6cf83..3b241b79 100644 --- a/include/overlay_29_02319F8C.h +++ b/include/overlay_29_02319F8C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02319F8C(struct entity *entity); +bool8 EntityIsValid__02319F8C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02319F8C_H diff --git a/include/overlay_29_0231B194.h b/include/overlay_29_0231B194.h index d312eb03..cc260d7f 100644 --- a/include/overlay_29_0231B194.h +++ b/include/overlay_29_0231B194.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0231B194(struct entity *entity); +bool8 EntityIsValid__0231B194(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0231B194_H diff --git a/include/overlay_29_0231CBC8.h b/include/overlay_29_0231CBC8.h index 6045c62a..a6202563 100644 --- a/include/overlay_29_0231CBC8.h +++ b/include/overlay_29_0231CBC8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0231CBC8(struct entity *entity); +bool8 EntityIsValid__0231CBC8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0231CBC8_H diff --git a/include/overlay_29_0231EDD8.h b/include/overlay_29_0231EDD8.h index 5008e543..6177c7c1 100644 --- a/include/overlay_29_0231EDD8.h +++ b/include/overlay_29_0231EDD8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0231EDD8(struct entity *entity); +bool8 EntityIsValid__0231EDD8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0231EDD8_H diff --git a/include/overlay_29_0231F570.h b/include/overlay_29_0231F570.h index 8d4fb4e1..9c76cc10 100644 --- a/include/overlay_29_0231F570.h +++ b/include/overlay_29_0231F570.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0231F570(struct entity *entity); +bool8 EntityIsValid__0231F570(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0231F570_H diff --git a/include/overlay_29_0231FBFC.h b/include/overlay_29_0231FBFC.h index 713b2a57..222aaa66 100644 --- a/include/overlay_29_0231FBFC.h +++ b/include/overlay_29_0231FBFC.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0231FBFC(struct entity *entity); +bool8 EntityIsValid__0231FBFC(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0231FBFC_H diff --git a/include/overlay_29_0232017C.h b/include/overlay_29_0232017C.h index 6f4a654d..d239fa45 100644 --- a/include/overlay_29_0232017C.h +++ b/include/overlay_29_0232017C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0232017C(struct entity *entity); +bool8 EntityIsValid__0232017C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232017C_H diff --git a/include/overlay_29_02320764.h b/include/overlay_29_02320764.h index 5fa388b8..2a48a3f3 100644 --- a/include/overlay_29_02320764.h +++ b/include/overlay_29_02320764.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02320764(struct entity *entity); +bool8 EntityIsValid__02320764(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02320764_H diff --git a/include/overlay_29_02321438.h b/include/overlay_29_02321438.h index 1d1730fa..72752e2c 100644 --- a/include/overlay_29_02321438.h +++ b/include/overlay_29_02321438.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02321438(struct entity *entity); +bool8 EntityIsValid__02321438(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02321438_H diff --git a/include/overlay_29_02325620.h b/include/overlay_29_02325620.h index 83fc34f8..749863f6 100644 --- a/include/overlay_29_02325620.h +++ b/include/overlay_29_02325620.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02325620(struct entity *entity); +bool8 EntityIsValid__02325620(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02325620_H diff --git a/include/overlay_29_0232800C.h b/include/overlay_29_0232800C.h index 6b6d6cf3..d629c338 100644 --- a/include/overlay_29_0232800C.h +++ b/include/overlay_29_0232800C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValidMoveEffects__0232800C(struct entity *entity); +bool8 EntityIsValidMoveEffects__0232800C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232800C_H diff --git a/include/overlay_29_0232A3D8.h b/include/overlay_29_0232A3D8.h index c59f43c4..3ef95bc8 100644 --- a/include/overlay_29_0232A3D8.h +++ b/include/overlay_29_0232A3D8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValidMoveEffects__0232A3D8(struct entity *entity); +bool8 EntityIsValidMoveEffects__0232A3D8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232A3D8_H diff --git a/include/overlay_29_0232C500.h b/include/overlay_29_0232C500.h index 61543685..9de2c69f 100644 --- a/include/overlay_29_0232C500.h +++ b/include/overlay_29_0232C500.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValidMoveEffects__0232C500(struct entity *entity); +bool8 EntityIsValidMoveEffects__0232C500(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232C500_H diff --git a/include/overlay_29_0232E250.h b/include/overlay_29_0232E250.h index 8cd50c24..e0cb7dd2 100644 --- a/include/overlay_29_0232E250.h +++ b/include/overlay_29_0232E250.h @@ -7,13 +7,13 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValidMoveEffects__0232E250(struct entity *entity); +bool8 EntityIsValidMoveEffects__0232E250(struct entity *entity); // Move effect: Defend Order // attacker: attacker pointer // defender: defender pointer // move: move // item_id: item ID // return: whether the move was successfully used -bool DoMoveDefendOrder(struct entity* attacker, struct entity* defender, struct move* move, enum item_id item_id); +bool8 DoMoveDefendOrder(struct entity* attacker, struct entity* defender, struct move* move, enum item_id item_id); #endif //PMDSKY_OVERLAY_29_0232E250_H diff --git a/include/overlay_29_0232E840.h b/include/overlay_29_0232E840.h index ad7a1180..a296b330 100644 --- a/include/overlay_29_0232E840.h +++ b/include/overlay_29_0232E840.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0232E840(struct entity *entity); +bool8 EntityIsValid__0232E840(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232E840_H diff --git a/include/overlay_29_02333FAC.h b/include/overlay_29_02333FAC.h index 8e4e99e0..7f4efca2 100644 --- a/include/overlay_29_02333FAC.h +++ b/include/overlay_29_02333FAC.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02333FAC(struct entity *entity); +bool8 EntityIsValid__02333FAC(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02333FAC_H diff --git a/include/overlay_29_023350D8.h b/include/overlay_29_023350D8.h index f3cd81d8..0c85c445 100644 --- a/include/overlay_29_023350D8.h +++ b/include/overlay_29_023350D8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__023350D8(struct entity *entity); +bool8 EntityIsValid__023350D8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_023350D8_H diff --git a/include/overlay_29_02337CA8.h b/include/overlay_29_02337CA8.h index 9a71615e..90852104 100644 --- a/include/overlay_29_02337CA8.h +++ b/include/overlay_29_02337CA8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02337CA8(struct entity *entity); +bool8 EntityIsValid__02337CA8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02337CA8_H diff --git a/include/overlay_29_02338548.h b/include/overlay_29_02338548.h index f96ad389..6c6896eb 100644 --- a/include/overlay_29_02338548.h +++ b/include/overlay_29_02338548.h @@ -5,15 +5,15 @@ // Gets the boost_kecleon_shop_spawn_chance field on the dungeon struct. // return: bool -bool ShouldBoostKecleonShopSpawnChance(void); +bool8 ShouldBoostKecleonShopSpawnChance(void); // Sets the boost_kecleon_shop_spawn_chance field on the dungeon struct to the given value. -// boost: bool to set the flag to -void SetShouldBoostKecleonShopSpawnChance(bool boost); +// boost: bool8 to set the flag to +void SetShouldBoostKecleonShopSpawnChance(bool8 boost); // Sets the boost_kecleon_shop_spawn_chance field on the dungeon struct depending on if a team member has the exclusive item effect for more kecleon shops. void UpdateShouldBoostKecleonShopSpawnChance(void); // Gets the dough_seed_extra_money_flag field on the dungeon struct. -bool GetDoughSeedFlag(void); +bool8 GetDoughSeedFlag(void); // Sets the dough_seed_extra_money_flag field on the dungeon struct to the given value. -void SetDoughSeedFlag(bool flag); +void SetDoughSeedFlag(bool8 flag); #endif //PMDSKY_OVERLAY_29_02338548_H diff --git a/include/overlay_29_02338604.h b/include/overlay_29_02338604.h index fec44719..e0355ed7 100644 --- a/include/overlay_29_02338604.h +++ b/include/overlay_29_02338604.h @@ -4,11 +4,11 @@ #include "util.h" // Checks if the current floor is the Secret Bazaar. -bool IsSecretBazaar(); +bool8 IsSecretBazaar(); // Gets the boost_hidden_stairs_spawn_chance field on the dungeon struct. -bool ShouldBoostHiddenStairsSpawnChance(); +bool8 ShouldBoostHiddenStairsSpawnChance(); // Sets the boost_hidden_stairs_spawn_chance field on the dungeon struct to the given value. -// should_boost: bool to set the flag to -void SetShouldBoostHiddenStairsSpawnChance(bool should_boost); +// should_boost: bool8 to set the flag to +void SetShouldBoostHiddenStairsSpawnChance(bool8 should_boost); #endif //PMDSKY_OVERLAY_29_02338604_H diff --git a/include/overlay_29_02344AF8.h b/include/overlay_29_02344AF8.h index 67f135fb..94930e82 100644 --- a/include/overlay_29_02344AF8.h +++ b/include/overlay_29_02344AF8.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02344AF8(struct entity *entity); +bool8 EntityIsValid__02344AF8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02344AF8_H diff --git a/include/overlay_29_02345698.h b/include/overlay_29_02345698.h index 281673ea..511943e4 100644 --- a/include/overlay_29_02345698.h +++ b/include/overlay_29_02345698.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02345698(struct entity *entity); +bool8 EntityIsValid__02345698(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02345698_H diff --git a/include/overlay_29_02347BA4.h b/include/overlay_29_02347BA4.h index 23b11660..ac8dfe36 100644 --- a/include/overlay_29_02347BA4.h +++ b/include/overlay_29_02347BA4.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__02347BA4(struct entity *entity); +bool8 EntityIsValid__02347BA4(struct entity *entity); #endif //PMDSKY_OVERLAY_29_02347BA4_H diff --git a/include/overlay_29_0234987C.h b/include/overlay_29_0234987C.h index 741596fa..801e8923 100644 --- a/include/overlay_29_0234987C.h +++ b/include/overlay_29_0234987C.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0234987C(struct entity *entity); +bool8 EntityIsValid__0234987C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0234987C_H diff --git a/include/overlay_29_0234DDD0.h b/include/overlay_29_0234DDD0.h index f6b8623e..2b6bf1a8 100644 --- a/include/overlay_29_0234DDD0.h +++ b/include/overlay_29_0234DDD0.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0234DDD0(struct entity *entity); +bool8 EntityIsValid__0234DDD0(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0234DDD0_H diff --git a/include/overlay_29_0234EC14.h b/include/overlay_29_0234EC14.h index dd753092..9b33f642 100644 --- a/include/overlay_29_0234EC14.h +++ b/include/overlay_29_0234EC14.h @@ -6,6 +6,6 @@ // Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity). // entity: entity pointer // return: bool -bool EntityIsValid__0234EC14(struct entity *entity); +bool8 EntityIsValid__0234EC14(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0234EC14_H diff --git a/include/util.h b/include/util.h index 83b16503..bc3fbe89 100644 --- a/include/util.h +++ b/include/util.h @@ -3,7 +3,7 @@ typedef s32 fx32_8; // 32-bit signed fixed-point number with 8 fraction bits typedef u32 ufx32_8; // 32-bit unsigned fixed-point number with 8 fraction bits -typedef u8 bool; +typedef u8 bool8; // RGBA8 structure. Sometimes alpha is ignored and only used for padding struct rgba { diff --git a/src/dg.c b/src/dg.c index 518590c5..8a4b89e8 100644 --- a/src/dg.c +++ b/src/dg.c @@ -2,7 +2,7 @@ // file starts at 0x022dea5c -bool EntityIsValid__022E0354(struct entity *entity) +bool8 EntityIsValid__022E0354(struct entity *entity) { if (entity == NULL) { diff --git a/src/dg_camera.c b/src/dg_camera.c index aa890777..b39d72a2 100644 --- a/src/dg_camera.c +++ b/src/dg_camera.c @@ -2,7 +2,7 @@ // file starts at 0x022e26b68 -bool EntityIsValid__022E32E8(struct entity *entity) +bool8 EntityIsValid__022E32E8(struct entity *entity) { if (entity == NULL) { diff --git a/src/dg_effect.c b/src/dg_effect.c index 2aa19c08..c166d472 100644 --- a/src/dg_effect.c +++ b/src/dg_effect.c @@ -2,7 +2,7 @@ // file starts at 0x022e35e4 -bool EntityIsValid__022E37B8(struct entity *entity) +bool8 EntityIsValid__022E37B8(struct entity *entity) { if (entity == NULL) { diff --git a/src/dg_object.c b/src/dg_object.c index 8619d655..05a6639c 100644 --- a/src/dg_object.c +++ b/src/dg_object.c @@ -2,7 +2,7 @@ // file starts at 0x022e1608 -bool EntityIsValid__022E1A1C(struct entity *entity) +bool8 EntityIsValid__022E1A1C(struct entity *entity) { if (entity == NULL) { diff --git a/src/dg_uty.c b/src/dg_uty.c index 234bf911..3fa6e2de 100644 --- a/src/dg_uty.c +++ b/src/dg_uty.c @@ -2,7 +2,7 @@ // file starts at 0x022e9020 -bool EntityIsValid__022E95F4(struct entity *entity) +bool8 EntityIsValid__022E95F4(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022EC608.c b/src/overlay_29_022EC608.c index 66f763d7..a21ba539 100644 --- a/src/overlay_29_022EC608.c +++ b/src/overlay_29_022EC608.c @@ -1,6 +1,6 @@ #include "overlay_29_022EC608.h" -bool EntityIsValid__022EC608(struct entity *entity) +bool8 EntityIsValid__022EC608(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022ECDC0.c b/src/overlay_29_022ECDC0.c index b31ba745..440ae11c 100644 --- a/src/overlay_29_022ECDC0.c +++ b/src/overlay_29_022ECDC0.c @@ -1,6 +1,6 @@ #include "overlay_29_022ECDC0.h" -bool EntityIsValid__022ECDC0(struct entity *entity) +bool8 EntityIsValid__022ECDC0(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022EE348.c b/src/overlay_29_022EE348.c index 86b5fa4d..fcaf3e4c 100644 --- a/src/overlay_29_022EE348.c +++ b/src/overlay_29_022EE348.c @@ -1,6 +1,6 @@ #include "overlay_29_022EE348.h" -bool EntityIsValid__022EE348(struct entity *entity) +bool8 EntityIsValid__022EE348(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022EF7A0.c b/src/overlay_29_022EF7A0.c index dc823065..576f0897 100644 --- a/src/overlay_29_022EF7A0.c +++ b/src/overlay_29_022EF7A0.c @@ -1,6 +1,6 @@ #include "overlay_29_022EF7A0.h" -bool EntityIsValid__022EF7A0(struct entity *entity) +bool8 EntityIsValid__022EF7A0(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022F0590.c b/src/overlay_29_022F0590.c index 5aa1d342..1c93d8eb 100644 --- a/src/overlay_29_022F0590.c +++ b/src/overlay_29_022F0590.c @@ -1,6 +1,6 @@ #include "overlay_29_022F0590.h" -bool EntityIsValid__022F0590(struct entity *entity) +bool8 EntityIsValid__022F0590(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022F528C.c b/src/overlay_29_022F528C.c index 56ec49f6..e42932b2 100644 --- a/src/overlay_29_022F528C.c +++ b/src/overlay_29_022F528C.c @@ -1,6 +1,6 @@ #include "overlay_29_022F528C.h" -bool EntityIsValid__022F528C(struct entity *entity) +bool8 EntityIsValid__022F528C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022F62A8.c b/src/overlay_29_022F62A8.c index 7dfffffd..8853267f 100644 --- a/src/overlay_29_022F62A8.c +++ b/src/overlay_29_022F62A8.c @@ -1,6 +1,6 @@ #include "overlay_29_022F62A8.h" -bool EntityIsValid__022F62A8(struct entity *entity) +bool8 EntityIsValid__022F62A8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022F7364.c b/src/overlay_29_022F7364.c index 924cdefa..7d9ce87f 100644 --- a/src/overlay_29_022F7364.c +++ b/src/overlay_29_022F7364.c @@ -1,6 +1,6 @@ #include "overlay_29_022F7364.h" -bool EntityIsValid__022F7364(struct entity *entity) +bool8 EntityIsValid__022F7364(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022FC99C.c b/src/overlay_29_022FC99C.c index 147f33d4..ec28ca0f 100644 --- a/src/overlay_29_022FC99C.c +++ b/src/overlay_29_022FC99C.c @@ -1,6 +1,6 @@ #include "overlay_29_022FC99C.h" -bool EntityIsValid__022FC99C(struct entity *entity) +bool8 EntityIsValid__022FC99C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022FED98.c b/src/overlay_29_022FED98.c index f4dc395a..5ed257b5 100644 --- a/src/overlay_29_022FED98.c +++ b/src/overlay_29_022FED98.c @@ -1,7 +1,7 @@ #include "overlay_29_022FED98.h" #ifndef EUROPE -bool EntityIsValid__022FED98(struct entity *entity) +bool8 EntityIsValid__022FED98(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_022FEEB8_eu.c b/src/overlay_29_022FEEB8_eu.c index ecec3f95..2212dcfb 100644 --- a/src/overlay_29_022FEEB8_eu.c +++ b/src/overlay_29_022FEEB8_eu.c @@ -1,7 +1,7 @@ #include "overlay_29_022FED98.h" #ifdef EUROPE -bool EntityIsValid__022FED98(struct entity *entity) +bool8 EntityIsValid__022FED98(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_023000E4.c b/src/overlay_29_023000E4.c index c0434c5a..e2aafb11 100644 --- a/src/overlay_29_023000E4.c +++ b/src/overlay_29_023000E4.c @@ -1,6 +1,6 @@ #include "overlay_29_023000E4.h" -bool EntityIsValid__023000E4(struct entity *entity) +bool8 EntityIsValid__023000E4(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02302A38.c b/src/overlay_29_02302A38.c index 775a12d6..e6567560 100644 --- a/src/overlay_29_02302A38.c +++ b/src/overlay_29_02302A38.c @@ -1,6 +1,6 @@ #include "overlay_29_02302A38.h" -bool EntityIsValid__02302A38(struct entity *entity) +bool8 EntityIsValid__02302A38(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_023047B8.c b/src/overlay_29_023047B8.c index 3a88c6e7..052055d4 100644 --- a/src/overlay_29_023047B8.c +++ b/src/overlay_29_023047B8.c @@ -1,6 +1,6 @@ #include "overlay_29_023047B8.h" -bool EntityIsValid__023047B8(struct entity *entity) +bool8 EntityIsValid__023047B8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0230558C.c b/src/overlay_29_0230558C.c index eae20416..b26334ac 100644 --- a/src/overlay_29_0230558C.c +++ b/src/overlay_29_0230558C.c @@ -1,6 +1,6 @@ #include "overlay_29_0230558C.h" -bool EntityIsValid__0230558C(struct entity *entity) +bool8 EntityIsValid__0230558C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02305C04.c b/src/overlay_29_02305C04.c index ab97bb2f..8dbcb047 100644 --- a/src/overlay_29_02305C04.c +++ b/src/overlay_29_02305C04.c @@ -1,6 +1,6 @@ #include "overlay_29_02305C04.h" -bool EntityIsValid__02305C04(struct entity *entity) +bool8 EntityIsValid__02305C04(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02307EF8.c b/src/overlay_29_02307EF8.c index 9b01d3ec..d4650d45 100644 --- a/src/overlay_29_02307EF8.c +++ b/src/overlay_29_02307EF8.c @@ -1,6 +1,6 @@ #include "overlay_29_02307EF8.h" -bool EntityIsValid__02307EF8(struct entity *entity) +bool8 EntityIsValid__02307EF8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0230827C.c b/src/overlay_29_0230827C.c index a239882f..d23b9896 100644 --- a/src/overlay_29_0230827C.c +++ b/src/overlay_29_0230827C.c @@ -1,6 +1,6 @@ #include "overlay_29_0230827C.h" -bool EntityIsValid__0230827C(struct entity *entity) +bool8 EntityIsValid__0230827C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02308340.c b/src/overlay_29_02308340.c index 59c02dc4..c5871e18 100644 --- a/src/overlay_29_02308340.c +++ b/src/overlay_29_02308340.c @@ -11,22 +11,22 @@ extern struct dungeon *DUNGEON_PTR[]; -extern void EndFrozenClassStatus(struct entity * pokemon, struct entity *target, bool log); -extern bool ShouldRunMonsterAi(struct entity *pokemon); -extern bool CheckVariousConditions(struct entity *pokemon); +extern void EndFrozenClassStatus(struct entity * pokemon, struct entity *target, bool8 log); +extern bool8 ShouldRunMonsterAi(struct entity *pokemon); +extern bool8 CheckVariousConditions(struct entity *pokemon); extern void SubstitutePlaceholderStringTags(u8 *buffer, struct entity *entity, u32 param_3); extern void LogMessageByIdWithPopupCheckUser(struct entity *pokemon, u32 message_id); extern void AiDecideUseItem(struct entity *pokemon); -extern bool HasStatusThatPreventsActing(struct entity *pokemon); +extern bool8 HasStatusThatPreventsActing(struct entity *pokemon); extern void ClearMonsterActionFields(struct action_data *action_pointer); extern void SetActionPassTurnOrWalk(struct action_data *action_pointer, s16 species); extern u32 DungeonRandInt(u32 cap); -extern bool IqSkillIsEnabled(struct entity *pokemon, enum iq_skill_id iq_skill); +extern bool8 IqSkillIsEnabled(struct entity *pokemon, enum iq_skill_id iq_skill); extern void ChooseAiMove(struct entity *pokemon); -extern bool GetCanMoveFlag(s16 index); -extern void AiMovement(struct entity *pokemon, bool show_run_away_effect); +extern bool8 GetCanMoveFlag(s16 index); +extern void AiMovement(struct entity *pokemon, bool8 show_run_away_effect); extern void SetDecoyAiTracker(struct entity* entity); -extern bool CanSeeTarget(struct entity *entity, struct entity *target_entity); +extern bool8 CanSeeTarget(struct entity *entity, struct entity *target_entity); static inline struct monster *GetEntInfo(struct entity *ent) { @@ -70,7 +70,7 @@ void RunMonsterAi(struct entity *pokemon, u32 unused) for (s32 i = 0; i < DUNGEON_MAX_POKEMON; i++) { struct entity *target = DUNGEON_PTR[0]->active_monster_ptrs[i]; - bool entity_is_valid; + bool8 entity_is_valid; if (target == NULL) { entity_is_valid = FALSE; diff --git a/src/overlay_29_02308FBC.c b/src/overlay_29_02308FBC.c index a710b7b5..6848b5f4 100644 --- a/src/overlay_29_02308FBC.c +++ b/src/overlay_29_02308FBC.c @@ -1,6 +1,6 @@ #include "overlay_29_02308FBC.h" -bool EntityIsValid__02308FBC(struct entity *entity) +bool8 EntityIsValid__02308FBC(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0230E8F0.c b/src/overlay_29_0230E8F0.c index 338abc59..ab9c13bd 100644 --- a/src/overlay_29_0230E8F0.c +++ b/src/overlay_29_0230E8F0.c @@ -1,6 +1,6 @@ #include "overlay_29_0230E8F0.h" -bool EntityIsValid__0230E8F0(struct entity *entity) +bool8 EntityIsValid__0230E8F0(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0230F008.c b/src/overlay_29_0230F008.c index f0a8691b..2a1a5158 100644 --- a/src/overlay_29_0230F008.c +++ b/src/overlay_29_0230F008.c @@ -1,6 +1,6 @@ #include "overlay_29_0230F008.h" -bool EntityIsValid__0230F008(struct entity *entity) +bool8 EntityIsValid__0230F008(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02311010.c b/src/overlay_29_02311010.c index d19dcb16..d93368e0 100644 --- a/src/overlay_29_02311010.c +++ b/src/overlay_29_02311010.c @@ -1,6 +1,6 @@ #include "overlay_29_02311010.h" -bool EntityIsValid__02311010(struct entity *entity) +bool8 EntityIsValid__02311010(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_023118B4.c b/src/overlay_29_023118B4.c index 1dbe5d98..5737834a 100644 --- a/src/overlay_29_023118B4.c +++ b/src/overlay_29_023118B4.c @@ -1,6 +1,6 @@ #include "overlay_29_023118B4.h" -bool EntityIsValid__023118B4(struct entity *entity) +bool8 EntityIsValid__023118B4(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02315118.c b/src/overlay_29_02315118.c index 694f61bf..01e67f90 100644 --- a/src/overlay_29_02315118.c +++ b/src/overlay_29_02315118.c @@ -1,6 +1,6 @@ #include "overlay_29_02315118.h" -bool EntityIsValid__02315118(struct entity *entity) +bool8 EntityIsValid__02315118(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02318D34.c b/src/overlay_29_02318D34.c index c1279a0c..290ac09d 100644 --- a/src/overlay_29_02318D34.c +++ b/src/overlay_29_02318D34.c @@ -1,6 +1,6 @@ #include "overlay_29_02318D34.h" -bool EntityIsValid__02318D34(struct entity *entity) +bool8 EntityIsValid__02318D34(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02318E4C.c b/src/overlay_29_02318E4C.c index 8dd3b919..9f986c7e 100644 --- a/src/overlay_29_02318E4C.c +++ b/src/overlay_29_02318E4C.c @@ -1,6 +1,6 @@ #include "overlay_29_02318E4C.h" -bool EntityIsValid__02318E4C(struct entity *entity) +bool8 EntityIsValid__02318E4C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02319F8C.c b/src/overlay_29_02319F8C.c index 27d224c9..19eb47fd 100644 --- a/src/overlay_29_02319F8C.c +++ b/src/overlay_29_02319F8C.c @@ -1,6 +1,6 @@ #include "overlay_29_02319F8C.h" -bool EntityIsValid__02319F8C(struct entity *entity) +bool8 EntityIsValid__02319F8C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0231B194.c b/src/overlay_29_0231B194.c index e41829ca..c4c1c0ab 100644 --- a/src/overlay_29_0231B194.c +++ b/src/overlay_29_0231B194.c @@ -1,6 +1,6 @@ #include "overlay_29_0231B194.h" -bool EntityIsValid__0231B194(struct entity *entity) +bool8 EntityIsValid__0231B194(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0231CBC8.c b/src/overlay_29_0231CBC8.c index 3076fcc9..0e2645d8 100644 --- a/src/overlay_29_0231CBC8.c +++ b/src/overlay_29_0231CBC8.c @@ -1,6 +1,6 @@ #include "overlay_29_0231CBC8.h" -bool EntityIsValid__0231CBC8(struct entity *entity) +bool8 EntityIsValid__0231CBC8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0231EDD8.c b/src/overlay_29_0231EDD8.c index 35377f59..cd333418 100644 --- a/src/overlay_29_0231EDD8.c +++ b/src/overlay_29_0231EDD8.c @@ -1,6 +1,6 @@ #include "overlay_29_0231EDD8.h" -bool EntityIsValid__0231EDD8(struct entity *entity) +bool8 EntityIsValid__0231EDD8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0231F570.c b/src/overlay_29_0231F570.c index 07a81cdc..a9862b25 100644 --- a/src/overlay_29_0231F570.c +++ b/src/overlay_29_0231F570.c @@ -1,6 +1,6 @@ #include "overlay_29_0231F570.h" -bool EntityIsValid__0231F570(struct entity *entity) +bool8 EntityIsValid__0231F570(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0231FBFC.c b/src/overlay_29_0231FBFC.c index 1acba007..adbe46d8 100644 --- a/src/overlay_29_0231FBFC.c +++ b/src/overlay_29_0231FBFC.c @@ -1,6 +1,6 @@ #include "overlay_29_0231FBFC.h" -bool EntityIsValid__0231FBFC(struct entity *entity) +bool8 EntityIsValid__0231FBFC(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232017C.c b/src/overlay_29_0232017C.c index ff0b08db..fd7ae13d 100644 --- a/src/overlay_29_0232017C.c +++ b/src/overlay_29_0232017C.c @@ -1,6 +1,6 @@ #include "overlay_29_0232017C.h" -bool EntityIsValid__0232017C(struct entity *entity) +bool8 EntityIsValid__0232017C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02320764.c b/src/overlay_29_02320764.c index 9de4d42d..bfc21ede 100644 --- a/src/overlay_29_02320764.c +++ b/src/overlay_29_02320764.c @@ -1,6 +1,6 @@ #include "overlay_29_02320764.h" -bool EntityIsValid__02320764(struct entity *entity) +bool8 EntityIsValid__02320764(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02321438.c b/src/overlay_29_02321438.c index 8b141bdd..39a84151 100644 --- a/src/overlay_29_02321438.c +++ b/src/overlay_29_02321438.c @@ -1,6 +1,6 @@ #include "overlay_29_02321438.h" -bool EntityIsValid__02321438(struct entity *entity) +bool8 EntityIsValid__02321438(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02325620.c b/src/overlay_29_02325620.c index 0e1158bc..29aba3dc 100644 --- a/src/overlay_29_02325620.c +++ b/src/overlay_29_02325620.c @@ -1,6 +1,6 @@ #include "overlay_29_02325620.h" -bool EntityIsValid__02325620(struct entity *entity) +bool8 EntityIsValid__02325620(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232800C.c b/src/overlay_29_0232800C.c index e4c8af68..59b94695 100644 --- a/src/overlay_29_0232800C.c +++ b/src/overlay_29_0232800C.c @@ -1,6 +1,6 @@ #include "overlay_29_0232800C.h" -bool EntityIsValidMoveEffects__0232800C(struct entity *entity) +bool8 EntityIsValidMoveEffects__0232800C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232A3D8.c b/src/overlay_29_0232A3D8.c index 5895b659..92335f0f 100644 --- a/src/overlay_29_0232A3D8.c +++ b/src/overlay_29_0232A3D8.c @@ -1,6 +1,6 @@ #include "overlay_29_0232A3D8.h" -bool EntityIsValidMoveEffects__0232A3D8(struct entity *entity) +bool8 EntityIsValidMoveEffects__0232A3D8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232C500.c b/src/overlay_29_0232C500.c index 435ea976..bfa5e2a8 100644 --- a/src/overlay_29_0232C500.c +++ b/src/overlay_29_0232C500.c @@ -1,6 +1,6 @@ #include "overlay_29_0232C500.h" -bool EntityIsValidMoveEffects__0232C500(struct entity *entity) +bool8 EntityIsValidMoveEffects__0232C500(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232E250.c b/src/overlay_29_0232E250.c index b2220444..6f2b8571 100644 --- a/src/overlay_29_0232E250.c +++ b/src/overlay_29_0232E250.c @@ -5,7 +5,7 @@ extern s32 SPATK_STAT_IDX; extern void BoostDefensiveStat(struct entity* user, struct entity* target, s32 stat_idx, s16 n_stages); -bool EntityIsValidMoveEffects__0232E250(struct entity *entity) +bool8 EntityIsValidMoveEffects__0232E250(struct entity *entity) { if (entity == NULL) { @@ -14,7 +14,7 @@ bool EntityIsValidMoveEffects__0232E250(struct entity *entity) return entity->type != ENTITY_NOTHING; } -bool DoMoveDefendOrder(struct entity* attacker, struct entity* defender, struct move* move, enum item_id item_id) +bool8 DoMoveDefendOrder(struct entity* attacker, struct entity* defender, struct move* move, enum item_id item_id) { BoostDefensiveStat(attacker, defender, ATK_STAT_IDX, 1); BoostDefensiveStat(attacker, defender, SPATK_STAT_IDX, 1); diff --git a/src/overlay_29_0232E840.c b/src/overlay_29_0232E840.c index 2362e166..ace8b8e7 100644 --- a/src/overlay_29_0232E840.c +++ b/src/overlay_29_0232E840.c @@ -1,6 +1,6 @@ #include "overlay_29_0232E840.h" -bool EntityIsValid__0232E840(struct entity *entity) +bool8 EntityIsValid__0232E840(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02333FAC.c b/src/overlay_29_02333FAC.c index 74269bc1..c73dbe8c 100644 --- a/src/overlay_29_02333FAC.c +++ b/src/overlay_29_02333FAC.c @@ -1,6 +1,6 @@ #include "overlay_29_02333FAC.h" -bool EntityIsValid__02333FAC(struct entity *entity) +bool8 EntityIsValid__02333FAC(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_023350D8.c b/src/overlay_29_023350D8.c index a2e21360..282b6dd3 100644 --- a/src/overlay_29_023350D8.c +++ b/src/overlay_29_023350D8.c @@ -1,6 +1,6 @@ #include "overlay_29_023350D8.h" -bool EntityIsValid__023350D8(struct entity *entity) +bool8 EntityIsValid__023350D8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02337CA8.c b/src/overlay_29_02337CA8.c index cc8cfef6..9f470638 100644 --- a/src/overlay_29_02337CA8.c +++ b/src/overlay_29_02337CA8.c @@ -1,6 +1,6 @@ #include "overlay_29_02337CA8.h" -bool EntityIsValid__02337CA8(struct entity *entity) +bool8 EntityIsValid__02337CA8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02338548.c b/src/overlay_29_02338548.c index fa6e5171..f64c620c 100644 --- a/src/overlay_29_02338548.c +++ b/src/overlay_29_02338548.c @@ -3,14 +3,14 @@ #include "dungeon.h" extern struct dungeon* DUNGEON_PTR[]; -bool TeamMemberHasExclusiveItemEffectActive(u8); +bool8 TeamMemberHasExclusiveItemEffectActive(u8); -bool ShouldBoostKecleonShopSpawnChance(void) +bool8 ShouldBoostKecleonShopSpawnChance(void) { return DUNGEON_PTR[0]->boost_kecleon_shop_spawn_chance; } -void SetShouldBoostKecleonShopSpawnChance(bool boost) +void SetShouldBoostKecleonShopSpawnChance(bool8 boost) { DUNGEON_PTR[0]->boost_kecleon_shop_spawn_chance=boost; } @@ -23,13 +23,13 @@ void UpdateShouldBoostKecleonShopSpawnChance(void) } } -bool GetDoughSeedFlag(void) +bool8 GetDoughSeedFlag(void) { return DUNGEON_PTR[0]->gen_info.dough_seed_extra_poke_flag; } -void SetDoughSeedFlag(bool flag) +void SetDoughSeedFlag(bool8 flag) { DUNGEON_PTR[0]->gen_info.dough_seed_extra_poke_flag=flag; } diff --git a/src/overlay_29_02338604.c b/src/overlay_29_02338604.c index fcc5216e..b605e0db 100644 --- a/src/overlay_29_02338604.c +++ b/src/overlay_29_02338604.c @@ -4,18 +4,18 @@ extern struct dungeon* DUNGEON_PTR[]; -bool IsSecretBazaar() +bool8 IsSecretBazaar() { return DUNGEON_PTR[0]->gen_info.fixed_room_id==FIXED_SECRET_BAZAAR; } -bool ShouldBoostHiddenStairsSpawnChance() +bool8 ShouldBoostHiddenStairsSpawnChance() { return DUNGEON_PTR[0]->boost_hidden_stairs_spawn_chance; } -void SetShouldBoostHiddenStairsSpawnChance(bool should_boost) +void SetShouldBoostHiddenStairsSpawnChance(bool8 should_boost) { DUNGEON_PTR[0]->boost_hidden_stairs_spawn_chance=should_boost; } diff --git a/src/overlay_29_02344AF8.c b/src/overlay_29_02344AF8.c index 8f04ff5a..fda91343 100644 --- a/src/overlay_29_02344AF8.c +++ b/src/overlay_29_02344AF8.c @@ -1,6 +1,6 @@ #include "overlay_29_02344AF8.h" -bool EntityIsValid__02344AF8(struct entity *entity) +bool8 EntityIsValid__02344AF8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02345698.c b/src/overlay_29_02345698.c index 36920cca..341888e3 100644 --- a/src/overlay_29_02345698.c +++ b/src/overlay_29_02345698.c @@ -1,6 +1,6 @@ #include "overlay_29_02345698.h" -bool EntityIsValid__02345698(struct entity *entity) +bool8 EntityIsValid__02345698(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_02347BA4.c b/src/overlay_29_02347BA4.c index e51cfa6e..c4060787 100644 --- a/src/overlay_29_02347BA4.c +++ b/src/overlay_29_02347BA4.c @@ -1,6 +1,6 @@ #include "overlay_29_02347BA4.h" -bool EntityIsValid__02347BA4(struct entity *entity) +bool8 EntityIsValid__02347BA4(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0234987C.c b/src/overlay_29_0234987C.c index 5d19146b..07f0bfd1 100644 --- a/src/overlay_29_0234987C.c +++ b/src/overlay_29_0234987C.c @@ -1,6 +1,6 @@ #include "overlay_29_0234987C.h" -bool EntityIsValid__0234987C(struct entity *entity) +bool8 EntityIsValid__0234987C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0234DDD0.c b/src/overlay_29_0234DDD0.c index a676bd11..bc4072cf 100644 --- a/src/overlay_29_0234DDD0.c +++ b/src/overlay_29_0234DDD0.c @@ -1,6 +1,6 @@ #include "overlay_29_0234DDD0.h" -bool EntityIsValid__0234DDD0(struct entity *entity) +bool8 EntityIsValid__0234DDD0(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0234EC14.c b/src/overlay_29_0234EC14.c index b3eef3a9..055dd68b 100644 --- a/src/overlay_29_0234EC14.c +++ b/src/overlay_29_0234EC14.c @@ -1,6 +1,6 @@ #include "overlay_29_0234EC14.h" -bool EntityIsValid__0234EC14(struct entity *entity) +bool8 EntityIsValid__0234EC14(struct entity *entity) { if (entity == NULL) {