SarnPoke
a422db09c6
Fix Slateport Battle Tent/Battle Factory ( #5281 )
...
* Fix Slateport Battle Tent/Battle Factory
Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.
* Fix player rental party being junk data after rest
Fixes #5280
* Consolidate checks into single method
Consolidates every gSpecialVar_0x8005 check into a singular method.
2024-09-02 16:53:03 -04:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
ghoulslash
5a986c6d04
Customizable FrontierMon Sets ( #4313 )
...
* more customization to struct FacilityMon, remove facility item ids, convert vanilla data, add CreateFacilityMon universal function
* fix some unused vars
* use TrainerMon struct instead of FacilityMon
* add dynamaxLevel, gigantamaxFactor to CreateFacilityMon
* some struct TrainerMon documentation
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-03-29 08:47:17 +01:00
Bassoonian
9e051aa058
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears
2023-12-30 20:49:05 +01:00
Bassoonian
e5ac2fe0b1
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
Eduardo Quezada
8e0991475c
Incorporated upstream fixes
2023-10-27 11:04:10 -03:00
Eduardo Quezada
7ae37ab79c
Merge branch 'pret_master' into RHH/upcoming
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/event_scripts.s
2023-10-27 11:03:37 -03:00
kittenchilly
333523e5f7
Remove all leading whitespace
2023-10-23 13:24:38 -05:00
kaboissonneault
0a183c2027
Changed sFixedIVTable access from hardcoded index limits to ARRAY_COUNT
2023-10-05 08:26:34 -04:00
kaboissonneault
3a8a82d385
Fixed out-of-bounds access in GetFactoryMonFixedIV when generating player rentals in round 8 (if player has 15+ swaps) and in round 9
2023-10-04 09:18:02 -04:00
Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
GriffinR
b248791f47
Merge pull request #1904 from GriffinRichards/temp-alias
...
Add temp flag and var aliases
2023-08-11 15:45:00 -04:00
GriffinR
866c32a735
Add temp var aliases
2023-08-04 14:17:28 -04:00
GriffinR
16c0be7ed2
Fix some frontier gfx, adjacent cleanup
2023-08-03 11:15:15 -04:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack"
2023-01-07 11:39:56 -03:00
Eduardo Quezada
74d8c587fe
Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown
...
# Conflicts:
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/front_pic_anims.h
2023-01-04 17:58:54 -03:00
Eduardo Quezada
4bac880042
Removed Unown hack
2022-11-25 16:55:53 -03:00
Eduardo Quezada
e858b4e709
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2022-11-24 15:36:00 -03:00
Eduardo Quezada
7327be6f9e
Made Types and Egg Groups into arrays
2022-11-22 17:05:25 -03:00
Eduardo Quezada
3ed485632f
Renamed gBaseStats to gSpeciesInfo
2022-10-24 17:01:48 -03:00
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
GriffinR
7143865f6f
Add some battle frontier constant usage
2022-06-09 12:57:28 -04:00
LOuroboros
b6e2945072
Merge branch 'master' of https://github.com/pret/pokeemerald into bePret
2022-04-11 01:22:10 -03:00
GriffinR
66cbe29c14
Add bugfix for Battle Factory trainer IVs
2022-03-30 09:37:03 -04:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
gAlfonso-bit
c9c5586068
Fixed ChangeBgY_ScreenOff‘s signature. ( #1447 )
...
* Fix Functions
* Fix ChangeBgY_ScreenOff signature
* Remove unneeded changes
* Fix argument mismatch
Just to get this out of the way
* Not needed
* Update palette.c
2021-05-27 07:32:09 -05:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
Marcus Huderle
200e8214cf
Document GetOpponentMostCommonMonType and fix its fake matching
2021-02-28 10:43:56 -06:00
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07:00
Evan
f21b0140b9
revert to CheckViability and stat change effect viabilities
2021-01-04 19:39:59 -07:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen
2020-12-31 00:40:45 -05:00
Evan
916d0416e3
outline AI_CheckGoodMove
2020-12-15 21:57:33 -07:00
Evan
ac332d5e98
check bad move
2020-12-13 15:02:21 -07:00
kageru
52ebc4252e
Document gUnknown_03006298
2020-10-11 09:54:49 +02:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
GriffinR
bf61de01a7
Start documenting battle factory screen
2020-08-31 13:36:48 -04:00
GriffinR
1c75396276
Clean up some frontier mon use in battle factory
2020-07-13 00:47:30 -04:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
ff2d8a9c4e
Add frontier trainer constants
2019-12-20 21:14:05 -05:00
GriffinR
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
GriffinR
9fcfbdbef5
Set up Battle Factory macros
2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d
Set up remaining facility script doc, use Palace macros
2019-12-05 21:11:17 -06:00
GriffinR
63ee15fc28
Document Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2
Begin documenting Battle Pike and Frontier Util
2019-11-25 18:37:48 -06:00
