sovereignx/include
psf af12697845
Adds OW_BERRY_IMMORTAL (#5187)
* Added OW_BERRY_IMMORTAL
Added cases for OW_BERRY_IMMORTAL

* removed one preproc

* removed other preproc

* Fixed identation

* Set config to FALSE

* Update include/config/overworld.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187#discussion_r1720747388

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Reordered condition per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187\#discussion_r1720747652

* Update include/config/overworld.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-20 07:23:33 -04:00
..
config Adds OW_BERRY_IMMORTAL (#5187) 2024-08-20 07:23:33 -04:00
constants Removed all instances of gBitTable[x] (#5123) 2024-08-17 10:28:09 -05:00
gba Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-04-20 13:23:14 -04:00
test Merge branch '_RHH/master' into _RHH/upcoming 2024-07-21 13:36:07 -04:00
agb_flash.h
AgbRfu_LinkManager.h
apprentice.h Renaming Script Contexts 2022-08-15 15:18:12 -04:00
bard_music.h Review changes 2022-10-27 11:26:09 -03:00
battle.h Removed all instances of gBitTable[x] (#5123) 2024-08-17 10:28:09 -05:00
battle_ai_main.h Changes score adjustments to tempScore increases (#4987) 2024-07-17 23:36:15 +02:00
battle_ai_switch_items.h Dynamic Move Types in Summary Screen/Battle (#5084) 2024-08-08 11:08:50 +02:00
battle_ai_util.h Changes score adjustments to tempScore increases (#4987) 2024-07-17 23:36:15 +02:00
battle_anim.h Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
battle_anim_scripts.h Refactor move animations (#4683) 2024-06-02 08:18:13 +02:00
battle_arena.h Add some missing battle arena constants 2022-08-11 12:02:56 -04:00
battle_bg.h Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
battle_controllers.h Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131) 2024-08-11 17:55:51 +02:00
battle_debug.h
battle_dome.h health bar update 2023-08-07 10:29:02 +02:00
battle_dynamax.h Refactors residual damage (#4945) 2024-07-13 12:12:40 +02:00
battle_factory.h Add bugfix for Battle Factory trainer IVs 2022-03-30 09:37:03 -04:00
battle_factory_screen.h
battle_gfx_sfx_util.h ally switch fix elevation shadow and direction on opposing side (#4451) 2024-04-26 16:54:23 +02:00
battle_gimmick.h Gimmick Refactor (#4449) 2024-06-22 22:25:40 +02:00
battle_interface.h Gimmick Refactor (#4449) 2024-06-22 22:25:40 +02:00
battle_main.h Fix speed ties (#4780) 2024-08-03 17:29:47 +02:00
battle_message.h Dynamax messages (#3581) 2023-11-21 19:18:18 +01:00
battle_pike.h
battle_pyramid.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
battle_pyramid_bag.h
battle_records.h
battle_script_commands.h Gimmick Refactor (#4449) 2024-06-22 22:25:40 +02:00
battle_scripts.h some gen 9 move anims + fickle beam rework (#5159) 2024-08-14 17:20:18 +02:00
battle_setup.h Port pokefirered's Vs. Seeker to pokeemerald (#3256) 2023-11-26 18:58:43 +01:00
battle_tent.h
battle_terastal.h Gimmick Refactor (#4449) 2024-06-22 22:25:40 +02:00
battle_tower.h Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug 2024-08-07 12:42:45 +02:00
battle_transition.h Refactor mugshots (#4000) 2024-01-16 00:45:13 +01:00
battle_transition_frontier.h
battle_tv.h
battle_util.h Change GET_MOVE_TYPE to a function (#5090) 2024-08-05 22:02:31 -04:00
battle_util2.h
battle_z_move.h Gimmick Refactor (#4449) 2024-06-22 22:25:40 +02:00
berry.h Remove unused function 2024-01-04 16:04:00 +00:00
berry_blender.h
berry_crush.h
berry_fix_program.h
berry_powder.h
berry_tag_screen.h
bike.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
birch_pc.h Refactor dex completion (again) (#3937) 2024-01-11 13:35:31 -03:00
braille_puzzles.h
cable_club.h
clear_save_data_menu.h
clock.h Fixed Cheat Start not initiating time-based events (#3446) 2023-10-22 21:03:54 +02:00
coins.h
confetti_util.h
contest.h Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
contest_ai.h
contest_effect.h Move data unification (#3999) 2024-01-29 08:51:32 -03:00
contest_link.h
contest_painting.h
contest_util.h
coord_event_weather.h
credits.h Remove ewram in headers 2023-08-10 20:11:07 -04:00
crt0.h Allocate initialized sections for EWRAM and IWRAM (#3892) 2024-01-02 14:24:52 +00:00
data.h Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131) 2024-08-11 17:55:51 +02:00
daycare.h Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
debug.h Added support for XY's Sky Battles (#2950) 2023-11-26 16:59:44 +01:00
decompress.h Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo 2024-03-25 16:03:56 -03:00
decoration.h Remove ewram in headers 2023-08-10 20:11:07 -04:00
decoration_inventory.h
dewford_trend.h
digit_obj_util.h Document some generic argument names 2022-05-31 14:34:25 -04:00
diploma.h
dodrio_berry_picking.h
dynamic_placeholder_text_util.h
easy_chat.h Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 2023-04-13 17:05:48 -04:00
egg_hatch.h
ereader_helpers.h Clean up some trainer hill 2022-03-31 12:54:07 -04:00
ereader_screen.h
event_data.h Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 2023-06-16 21:25:16 -04:00
event_object_lock.h
event_object_movement.h Split Pokémon Object Events from Following Pokémon functionality (#4761) 2024-06-13 22:46:27 +02:00
event_scripts.h FRLG+ whiteout message (#4967) 2024-08-02 08:28:05 -07:00
evolution_graphics.h Document some generic argument names 2022-05-31 14:34:25 -04:00
evolution_scene.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
expansion_intro.h [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
fake_rtc.h Added OW_USE_FAKE_RTC and OW_ALTERED_TIME_RATIO (#4910) 2024-07-10 20:58:01 +02:00
faraway_island.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
field_camera.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
field_control_avatar.h Treat map data as const 2023-03-08 12:00:30 -05:00
field_door.h
field_effect.h Cleanup pt4 2023-06-18 01:45:04 -04:00
field_effect_helpers.h Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
field_message_box.h
field_player_avatar.h Cleanup pt2 2023-06-17 23:45:44 -04:00
field_poison.h
field_screen_effect.h FRLG+ whiteout message (#4967) 2024-08-02 08:28:05 -07:00
field_special_scene.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
field_specials.h Merge branch 'feature/dynmulti' into feature/dynmulti-expansion 2023-12-26 14:22:49 +01:00
field_tasks.h
field_weather.h PR feedback - 32 bit params, multiline condition formatting 2024-06-03 00:10:10 -04:00
fieldmap.h Move battle tests off the heap (#3414) 2023-10-13 16:31:10 -03:00
fldeff.h Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 2023-06-16 21:25:16 -04:00
fldeff_misc.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
follower_helper.h Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-06-01 20:17:19 -04:00
fonts.h Narrower fonts 2024-04-25 18:40:37 +01:00
fpmath.h Refactor damage formula to match Gen5+ (#3196) 2023-08-11 16:28:38 -04:00
frontier_pass.h
frontier_util.h Change Battle Frontier validation to species flag (#4341) 2024-05-03 13:32:06 -04:00
global.berry.h Remove leftover code for myself 2024-01-04 16:12:39 +00:00
global.fieldmap.h Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug 2024-08-14 12:33:04 +02:00
global.h Added OW_USE_FAKE_RTC and OW_ALTERED_TIME_RATIO (#4910) 2024-07-10 20:58:01 +02:00
global.tv.h VANILLA_POKEMON_NAME_LENGTH 2024-04-25 18:40:37 +01:00
graphics.h Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
gym_leader_rematch.h
hall_of_fame.h
heal_location.h FRLG+ whiteout message (#4967) 2024-08-02 08:28:05 -07:00
image_processing_effects.h
international_string_util.h Species Simplifier™ - Part 3 (#3562) 2023-12-08 15:05:10 +01:00
intro.h [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
intro_credits_graphics.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
item.h Added config to prevent unobtainable Pokemon from being shiny (#4735) 2024-06-29 22:07:14 +02:00
item_ball.h Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
item_icon.h Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +02:00
item_menu.h Add Mulch effects 2023-12-03 13:17:34 +01:00
item_menu_icons.h
item_use.h Merge branch 'upcoming' into berryexpansion 2023-12-29 14:32:10 +01:00
landmark.h
level_caps.h Pre-1.8 tweaks (#4275) 2024-03-12 12:21:03 +01:00
libgcnmultiboot.h
librfu.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
lilycove_lady.h
link.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
link_rfu.h Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 2023-02-15 14:11:03 -03:00
list_menu.h Fix center crash (#4725) 2024-06-05 11:52:42 +02:00
load_save.h Save-compatible SaveBlock3 (#4112) 2024-02-10 18:14:36 +01:00
lottery_corner.h
m4a.h
mail.h Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
main.h Test moves, items, and abilities in battle 2023-02-01 13:53:57 +00:00
main_menu.h removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation 2022-09-02 12:10:11 +02:00
map_name_popup.h
match_call.h
math_util.h
mauville_old_man.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
menu.h first stab at making configable BW map pop-ups in expansion 2024-04-15 16:56:14 -04:00
menu_helpers.h Document some generic argument names 2022-05-31 14:34:25 -04:00
menu_specialized.h Use window constants for move relearner 2022-09-29 12:10:10 -04:00
metaprogram.h Replaces VARARG_8 uses with recursive macros (#4232) 2024-04-05 18:42:11 +01:00
metatile_behavior.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mini_printf.h [debug] add support for mgba printf 2022-09-06 13:40:31 +02:00
minigame_countdown.h
mirage_tower.h
mon_markings.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
money.h Allow users to increase MAX_MONEY (#4943) 2024-07-13 11:16:34 +02:00
move_relearner.h Move Relearner now displays move category (#5081) 2024-08-06 23:58:18 +02:00
multiboot.h
multiboot_pokemon_colosseum.h
mystery_event_menu.h
mystery_event_msg.h
mystery_event_script.h
mystery_gift.h
mystery_gift_client.h
mystery_gift_link.h
mystery_gift_menu.h Use window constants in mystery_gift_menu 2022-09-29 15:48:19 -04:00
mystery_gift_server.h
mystery_gift_view.h
naming_screen.h
new_game.h
option_menu.h
overworld.h Fixed outstanding UB with -fanalyzer on modern 2023-07-21 15:51:03 -04:00
palette.h Optimize/get rid of unused palette vars/functions (#4841) 2024-08-04 21:41:55 -04:00
palette_util.h
party_menu.h Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-01-17 18:11:35 -03:00
pc_screen_effect.h
play_time.h
player_pc.h
pokeball.h Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-01-17 18:11:35 -03:00
pokeblock.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
pokedex.h - Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. (#4193) 2024-02-15 10:23:11 +01:00
pokedex_area_region_map.h
pokedex_area_screen.h Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
pokedex_cry_screen.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
pokedex_plus_hgss.h [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
pokemon.h Merge branch '_RHH/master' into _RHH/upcoming 2024-08-12 16:24:04 -04:00
pokemon_animation.h
pokemon_icon.h Species Simplifier™ - Part 3 (#3562) 2023-12-08 15:05:10 +01:00
pokemon_jump.h
pokemon_size_record.h
pokemon_sprite_visualizer.h Make Pokémon Sprite Visualizer name official (#4745) 2024-06-09 12:12:35 -04:00
pokemon_storage_system.h Implemented OW_IGNORE_EGGS_ON_HEAL (#4888) 2024-07-04 16:03:42 +02:00
pokemon_summary_screen.h Move Descriptions in battle (#4152) 2024-05-31 12:10:03 +02:00
pokenav.h Add PokéNav too 2023-12-12 23:20:22 +01:00
random.h Fix Switch AI Bug: AI never switching out when it could be OHKO'd (#5089) 2024-08-07 15:58:39 +02:00
rayquaza_scene.h
record_mixing.h
recorded_battle.h Optional high-quality RNG (#3780) 2023-12-22 17:39:15 +00:00
region_map.h Use window constants in region_map 2022-09-29 13:11:38 -04:00
reload_save.h
reset_rtc_screen.h
reshow_battle_screen.h Ally Switch (#3533) 2023-12-20 15:26:28 +01:00
roamer.h Add support for multiple roamers (#4762) 2024-06-15 11:17:32 +02:00
rotating_gate.h
rotating_tile_puzzle.h
roulette.h
rtc.h PR feedback - 32 bit params, multiline condition formatting 2024-06-03 00:10:10 -04:00
safari_zone.h
save.h Save-compatible SaveBlock3 (#4112) 2024-02-10 18:14:36 +01:00
save_location.h
scanline_effect.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
script.h [script-command] add dynmultichoice 2023-01-17 21:49:06 +01:00
script_menu.h Merge branch 'feature/dynmulti' into feature/dynmulti-expansion 2023-12-26 14:22:49 +01:00
script_movement.h
script_pokemon_util.h Add createmon Script Cmd, Support for 2v1Wild Battles (#4688) 2024-06-13 19:11:36 +02:00
secret_base.h Renaming Script Contexts 2022-08-15 15:18:12 -04:00
shop.h Remove ewram in headers 2023-08-10 20:11:07 -04:00
siirtc.h Renamed time amounts 2023-09-20 19:04:50 -03:00
slot_machine.h
sound.h Review changes 2022-07-29 15:38:23 -04:00
start_menu.h Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
starter_choose.h Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
strings.h Created PokeNav COMPOUND_STRINGS (#4983) 2024-08-16 22:41:26 +02:00
task.h
test_runner.h Gimmick Refactor (#4449) 2024-06-22 22:25:40 +02:00
text_window.h
tileset_anims.h Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
tilesets.h Fix specific tiles changing to pc tiles when using boxlink/debug pc (#5141) 2024-08-12 15:52:55 -04:00
time_events.h
title_screen.h
trade.h Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
trader.h
trainer_card.h Fix names and constant usage for union room classes 2022-08-23 12:44:07 -04:00
trainer_hill.h Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
trainer_pokemon_sprites.h Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-01-17 18:11:35 -03:00
trainer_see.h Port pokefirered's Vs. Seeker to pokeemerald (#3256) 2023-11-26 18:58:43 +01:00
trig.h
tv.h
type_icons.h Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131) 2024-08-11 17:55:51 +02:00
union_room.h Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
union_room_battle.h
union_room_chat.h Easy Chat always shows words in uppercase 2023-06-06 10:55:42 -04:00
union_room_player_avatar.h
util.h Removed all instances of gBitTable[x] (#5123) 2024-08-17 10:28:09 -05:00
vs_seeker.h Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled (#4866) 2024-06-29 22:12:26 +02:00
walda_phrase.h
wallclock.h
wild_encounter.h shiny roll calc as separate function 2024-07-06 02:10:30 +02:00
wonder_news.h Document wonder news 2022-11-22 02:17:03 -05:00