ghoulslash
be3ee1ba85
merge w upcoming
2024-09-29 13:33:20 -04:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
Bassoonian
7dad83070f
Added MB_X_Y_STAIR_WARP metatile behaviors ( #5278 )
2024-09-28 15:21:11 +02:00
kittenchilly
c1dffc694e
Merge level_caps and ev_caps into one caps file ( #5429 )
...
* Merge level_caps and ev_caps into one caps file
* Update caps.h
2024-09-27 23:40:49 +02:00
psf
009b42394e
Merge branch 'upcoming' into stairWarps
2024-09-22 09:40:34 -07:00
ghoulslash
b7246a018c
merge w upcoming
2024-09-22 09:13:25 -04:00
GriffinR
a551efea43
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2024-09-19 12:33:34 -04:00
GriffinR
e4e90eacd6
Merge pull request #2023 from Bassoonian/updatemapmacros
...
Fix defines in MAP_NUM and MAP_GROUP
2024-09-19 12:17:16 -04:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
Kurausukun
52c2728ff6
remove gflib
2024-09-18 10:37:34 -04:00
Eduardo Quezada
6116b8b04e
Start 1.9.3 cycle
2024-09-16 11:57:41 -03:00
Eduardo Quezada
889a02d263
Version 1.9.2 ( #5357 )
...
* Version 1.9.2
* Apply suggestions from code review
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
* Updated to latest master
* Updated to latest master
* Fix last PR
* Corrected order + Pumpkaboo/Gourgeist credits
---------
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-09-16 12:12:34 -03:00
psf
1ba8e7d300
Merge branch 'upcoming' into signpost
2024-09-12 14:45:37 -07:00
psf
51a69b6a9d
Merge branch 'upcoming' into stairWarps
2024-09-12 14:43:46 -07:00
pkmnsnfrn
a0e914b749
Merge branch 'upcoming' into scriptCommands
2024-09-12 05:39:24 -07:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
fc1212b060
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-11 08:09:09 -03:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers ( #5178 )
...
* Add data to SpeciesInfo entries for in-battle shadows
* Implement sized shadows in the sprite visualizer
* Implement sized shadows in game code
* Show shadows for the lead battler for opponents during their battle anim
* Feedback on shadows, round 1
* Revert removal of Goomy and Sliggoo shadows
* Fixed GEN_3 setting
* Code cleanup + remove pre-processor branches
* Fix bugs with gen-3 configuration branch
* Style corrections, final shadow coordinate adjustments
* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02:00
Eduardo Quezada
002c770f07
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge
2024-09-09 13:52:34 -03:00
Ariel A
d3a4839808
meta: included COLOR_MAP constants in field_effect_script. Credit: SDH
2024-09-08 16:02:51 -04:00
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak ( #5325 )
2024-09-07 18:04:47 +02:00
psf
0e1b62c732
Merge branch 'upcoming' into signpost
2024-09-05 17:11:32 -07:00
psf
1143da0c1c
Merge branch 'upcoming' into stairWarps
2024-09-05 17:09:45 -07:00
cawtds
6e3ce9db2f
Move battle anim arrays to C ( #5306 )
...
* move battle anim arrays to c
* use ARRAY_COUNT instead
* remove B_ANIM_STATUS_WRAPPED
* move anim rename
* rename battle anims status/general/special
2024-09-04 11:21:40 +02:00
Pawkkie
720bc6464d
AI_FLAG_SETUP_FIRST_TURN Rename and Clarifications ( #5310 )
...
* Rename AI_FLAG_SETUP_FIRST_TURN
* Update all AI flags with comments
2024-09-04 11:12:55 +02:00
Eduardo Quezada
8533b0c045
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-03 14:39:50 -04:00
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
Erickson Russell
de242c8a29
EV Caps and EV Items ( #5269 )
...
* EV Caps and EV Items
Introduces EV caps, inspired by level caps, with configurable options for various cap implementations. Additionally, modifies EV items to interact with these caps based on a configurable setting.
* EV Caps fixes
Changed the EV caps to be less redundant and work better overall.
* EV Caps Fix part 2
Set the items back to ItemUseOutOfBattle_Medicine, got rid of ItemUseOutOfBattle_EVItem and ItemUseCB_EVItem, and reverted CB2_ReturnToPartyMenuUsingItem to CB2_ReturnToPartyMenuUsingRareCandy
* EV Caps Fixes Part 3
Fixed being able to use EV items to go over 252 limit on single stats.
* Update src/ev_caps.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-01 23:15:39 +02:00
Ariel A
839cf2e790
feat: static OW pokemon now bob while walking in place (per OW_MON_BOBBING)
2024-09-01 15:31:12 -04:00
Eduardo Quezada
484acdc138
Convert 8 various to callnatives ( #5172 )
...
* Convert 8 various to callnatives
* Address review comments
2024-09-01 15:12:43 +02:00
Alex
bbcb1cd5a2
Adds basic trainer and smart trainer flags ( #5298 )
2024-08-31 17:50:37 -04:00
psf
83d3d95f58
Merge branch 'upcoming' into stairWarps
2024-08-31 07:02:37 -07:00
psf
95167936d4
Merge branch 'upcoming' into signpost
2024-08-31 07:02:18 -07:00
Eduardo Quezada
396a390114
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-08-29 19:58:17 -04:00
psf
4f39354185
Deprecate MMBN Names ( #5240 )
...
* Removed HANDLE_EXPANDED_MOVE_NAME
* Removed HANDLE_EXPANDED_TYPE_NAME
* Removed HANDLE_EXPANDED_ITEM_NAME
* Removed HANDLE_EXPANDED_SPECIES_NAME
* Removed I_EXPANDED_ITEM_NAMES
* Removed B_EXPANDED_MOVE_NAMES
* Removed B_EXPANDED_TYPE_NAMES
* Removed B_EXPANDED_ABILITY_NAMES
* Removed B_EXPANDED_ABILITY_NAMES
* Added documentation of names
* Github markdown spacing is silly
* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
2024-08-29 16:33:25 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. ( #1949 )
2024-08-29 14:01:01 -04:00
cawtds
8af35a7e0d
add Sirfetch'd alias for competitive format ( #5283 )
2024-08-29 08:11:21 -04:00
psf
6dd78cfdb9
Merge branch 'upcoming' into stairWarps
2024-08-28 21:30:04 -07:00
Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04:00
GriffinR
7532f8ddb8
Revert MB name changes
2024-08-28 11:19:27 -04:00
psf
113226b03a
Change metatile behaviors to enum ( #2027 )
2024-08-28 00:45:09 -04:00
psf
e7023088ed
Merge branch 'upcoming' into scriptCommands
2024-08-27 21:31:14 -07:00
psf
23134cec85
Merge branch 'upcoming' into signpost
2024-08-27 21:31:07 -07:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
pkmnsnfrn
fe428fc89b
original merge of branch
2024-08-25 16:46:22 -07:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces
...
Clean up defines lacking spaces
2024-08-21 19:04:12 +01:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -04:00
Eduardo Quezada
becb2fcac8
Start 1.9.2 cycle
2024-08-19 18:29:48 -04:00
Eduardo Quezada
a11f03ed9d
Version 1.9.1 ( #5199 )
...
* Version 1.9.1
* Added 5195
* Apply suggestions from code review
Co-authored-by: hedara90 <90hedara@gmail.com>
* Added 5196 and 5207
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-19 18:25:39 -04:00
