GriffinR
cdadd7d2ed
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly ( #4985 )
2025-02-03 17:03:29 +01:00
Eduardo Quezada
64c5113b23
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-02 14:18:13 -03:00
Alex
f8c2e860d7
Remove unused PainSplit scripting global ( #6164 )
2025-02-02 14:50:39 +01:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs ( #6154 )
2025-01-31 22:02:26 +01:00
Eduardo Quezada
ee1b75614d
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-30 22:46:06 -03:00
Eduardo Quezada
1c3cabb52a
Fix typo
2025-01-30 18:46:06 -03:00
Eduardo Quezada
370cfd5bb4
Begin 1.10.3 cycle
2025-01-30 18:40:03 -03:00
Eduardo Quezada
397e98b954
Version 1.10.2 ( #6144 )
2025-01-30 18:38:28 -03:00
bassforte123
72edeeffad
Update pokemon.h with nature comments ( #6133 )
2025-01-28 21:37:02 +01:00
Eduardo Quezada
927bb8f833
Fixed AI not handling type effectiveness beyond x8 ( #6127 )
2025-01-28 19:16:10 +01:00
Eduardo Quezada
00241cf569
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
...
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
2025-01-26 12:08:10 -03:00
hedara90
e1e3bcfa91
Tera starstorm ( #6073 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Ariel A
c1d105c31c
Merge branch 'lighting' into lighting-expanded-id
2025-01-25 21:45:23 -05:00
Ariel A
bc034aaf73
Merge branch 'followers-expanded-id' into lighting-expanded-id
2025-01-25 21:42:02 -05:00
Pawkkie
43e41bbed8
Add Code Entry functionality ( #5951 )
2025-01-25 22:03:08 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
Eduardo Quezada
26daf15ce0
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-24 18:29:28 -03:00
psf
b109aa0c92
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide ( #6018 )
2025-01-23 16:28:33 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" ( #6082 )
2025-01-22 21:50:39 +01:00
hedara90
2a8f4b03dc
Revert "Revert map related enum conversion" ( #6079 )
2025-01-22 21:25:24 +01:00
hedara90
2b9c5fe4e7
Revert map related enum conversion ( #6078 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 19:37:56 +01:00
Pawkkie
3c5bd4d16c
Return the universe to a state of balanced quilibrium ( #6074 )
2025-01-21 18:25:15 -05:00
Eduardo Quezada
ed505cfb5f
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-21 19:32:51 -03:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction ( #6023 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-21 21:43:54 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums ( #6071 )
2025-01-21 21:19:41 +01:00
Pawkkie
7d39dd4aae
Add AI_FLAG_PREDICT_INCOMING_MON: AI will score against predicted switchin if predicting switch ( #6037 )
2025-01-20 20:54:38 +01:00
khbsd
52666fb545
IV/EV Info on Summary Screen ( #6027 )
2025-01-20 09:41:31 +01:00
Eduardo Quezada
a756bb501c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-19 22:31:33 -03:00
Eduardo Quezada
f6a86a65ef
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-19 10:32:57 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality ( #5048 )
2025-01-18 23:19:06 +01:00
Alex
9ed3b176f0
Pret merge (17 of January) ( #6045 )
2025-01-18 19:53:29 +01:00
Bassoonian
199760a6d3
Add known failing learnset cap test ( #6046 )
2025-01-17 21:04:46 -05:00
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
Eduardo Quezada
6162628104
A bit more of addressing
2025-01-17 19:25:29 -03:00
Eduardo Quezada
ffc8903f93
More review addressing
2025-01-17 18:47:38 -03:00
Bassoonian
bcf9a1eff8
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music ( #2053 )
...
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports ( #6041 )
2025-01-17 14:39:52 -03:00
Pawkkie
465d30fbd0
Add AI_FLAG_PREDICT_SWITCH ( #6028 )
2025-01-16 21:43:16 +01:00
Pawkkie
e8dd8da5f7
Add AI_FLAG_PREFER_HIGHEST_DAMAGE_MOVE ( #6025 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-14 14:13:48 -05:00
DizzyEggg
f15d89893e
Allow Party Menu with 0 Pokemon ( #5997 )
2025-01-11 12:14:31 +01:00
Eduardo Quezada
8821779815
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-11 08:07:15 -03:00
Eduardo Quezada
21bc5cfd30
Debug menu and createmon additions/cleanup ( #5994 )
2025-01-11 10:07:47 +01:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs ( #5964 )
2025-01-10 17:07:32 -05:00
Pawkkie
b5f539ed21
Rename AI_FLAG_PREFER_STRONGEST_MOVE ( #5972 )
2025-01-08 14:00:20 +01:00
shachar700
a0e8753083
Update vars.h (cleanup)
...
Removed an extra are
2025-01-06 22:17:24 +02:00
Eduardo Quezada
40ba25dd3e
Converted 2 various to callnative ( #5950 )
2025-01-05 17:47:49 +01:00
psf
a7f77ed08d
Adds B_VAR_DIFFICULTY and related functions READ DESC ( #5337 )
...
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-01-04 14:25:03 +01:00
ghoulslash
03684c6539
Battle Weather Refactor ( #5833 )
2025-01-04 07:33:25 -05:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03:00
ghoulslash
d8ea4fa1ec
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2025-01-02 08:28:21 -05:00
Eduardo Quezada
a50c78bb1e
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-01 18:34:42 -03:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
e040dcb0b4
Begin 1.10.2 cycle
2025-01-01 16:20:40 -03:00
Eduardo Quezada
89699939de
Version 1.10.1
2025-01-01 16:17:49 -03:00
Ariel A
a6ef9c7577
Merge branch 'followers' into followers-expanded-id
2025-01-01 00:39:14 -05:00
Ariel A
a515cb3c6b
Merge branch 'followers' into lighting
2025-01-01 00:37:09 -05:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Ariel A
3fffb9fac6
feat: added configuration to restrict following pokemon. Closes #42
2024-12-30 21:38:18 -05:00
Bassoonian
bf125c8f5e
Fix wrong value for NUM_MOVE_EFFECTS ( #5913 )
2024-12-30 23:51:48 +01:00
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses ( #5899 )
2024-12-30 09:18:23 +01:00
Eduardo Quezada
009de5c98c
Setting Battle configs during tests ( #5803 )
...
Co-authored-by: sbird <sbird@no.tld>
2024-12-29 23:28:39 +01:00
AlexOn1ine
74f1d7cb80
merge rhh/upcomig
2024-12-28 21:03:34 +01:00
AlexOn1ine
6a906a3fc1
refactor done
2024-12-28 20:55:59 +01:00
Eduardo Quezada
3bc4126558
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-28 15:28:07 -03:00
AlexOn1ine
0bb86e4437
struct
2024-12-28 10:23:28 +01:00
Eduardo Quezada
50d325f081
Slight contest documentation ( #2078 )
CI / build (push) Has been cancelled
2024-12-27 11:09:33 -05:00
AlexOn1ine
9c34634dd6
Draft Change
2024-12-25 11:03:32 +01:00
Eduardo Quezada
f9fed98665
Fixed MOVE_EFFECT_FREEZE_OR_FROSTBITE not being usable in battle scripts ( #5859 )
2024-12-22 23:39:48 +01:00
Bassoonian
5560f339d0
Remove unused various ( #5851 )
2024-12-21 20:26:46 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup ( #5812 )
2024-12-21 19:45:50 +01:00
Eduardo Quezada
1e6628b78d
Address Review comments Pt2
2024-12-21 10:49:59 -03:00
Eduardo Quezada
e175c5aca8
Changes Various defines to an Enum ( #5840 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-12-21 11:48:31 +01:00
AlexOn1ine
573200d56a
nobody saw anything but again
2024-12-21 11:23:30 +01:00
AlexOn1ine
ff4c2aaf78
nobody saw anything
2024-12-21 10:24:34 +01:00
AlexOn1ine
71318eca5f
Revert weather order
2024-12-21 10:04:16 +01:00
AlexOn1ine
2c419ccb57
review comments
2024-12-20 22:43:05 +01:00
Eduardo Quezada
05f300f6cc
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-20 15:22:14 -03:00
Alex
f27bf843cb
Changes Various defines to an Enum ( #5839 )
2024-12-20 10:49:40 +01:00
AlexOn1ine
eb4427db94
primal weather fix
2024-12-19 21:41:32 +01:00
AlexOn1ine
99fef0260f
Battle Weather Refactor
2024-12-19 20:50:08 +01:00
Alex
4bff9f8ee9
Fixes simu hp reduction when no partner was on field ( #5799 )
2024-12-10 21:48:31 +01:00
GriffinR
dbff8c4360
Merge branch 'porymap-6' into generate-map-constants
2024-12-09 20:25:41 -05:00
Eduardo Quezada
66a2a16bbc
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-08 12:00:29 -03:00
hedara90
54d372162f
Added NBSP and up+down arrows to all fonts ( #5767 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-07 07:26:23 -03:00
PhallenTree
775ea3b564
Pursuit refactor ( #5707 )
2024-12-06 19:14:46 +01:00
Eduardo Quezada
720b2daecc
Improve Pyramid location documentaion
2024-12-05 18:25:27 -03:00
Eduardo Quezada
458bd5ad4d
Review changes pt 1
2024-12-05 07:56:49 -03:00
Eduardo Quezada
d151e00c70
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-04 19:15:48 -03:00
Eduardo Quezada
68b5b63ecb
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/hp_reduction
2024-12-04 12:04:47 -03:00
Eduardo Quezada
e4f8b4ccf0
Addressed review changes (minus encapsulation)
2024-12-04 11:31:28 -03:00
Pawkkie
c8b0da2493
Add AI_FLAG_WEIGH_ABILITY_PREDICTION ( #5636 )
2024-12-03 12:28:22 +01:00
AlexOn1ine
d95dbadccc
merge rhh/upcoming
2024-12-02 19:00:55 +01:00
Eduardo Quezada
7ac7ab8f6f
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-02 13:49:43 -03:00
AlexOn1ine
09c9d8a800
merge rhh/upcoming
2024-12-02 17:45:00 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE ( #5566 )
...
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
0322d51887
Split "Do nothing" move effects ( #5613 )
2024-12-02 09:05:04 +01:00
Eduardo Quezada
4635f0e0f8
Converted Stance Change to proper Form Change + Tests ( #5749 )
2024-12-01 22:36:25 +01:00
Eduardo Quezada
00cb7b36e1
Actually start 1.11.0 cycle
2024-12-01 15:36:39 -03:00
Eduardo Quezada
2e30e66e15
Begin 1.11.0 cycle
2024-12-01 15:33:42 -03:00
Eduardo Quezada
7e5327864e
Start of 1.10.1 cycle
2024-12-01 15:27:01 -03:00
Eduardo Quezada
bd7a46f9c7
Version 1.10.0
2024-12-01 15:10:46 -03:00
Eduardo Quezada
7010080465
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.10.0
2024-12-01 14:28:12 -03:00
Eduardo Quezada
6fe935f1b8
Version 1.9.4
2024-12-01 14:04:13 -03:00
Hedara
f6fdca615f
Merge branch 'master' into master-to-upcoming
2024-11-29 11:32:12 +01:00
Alex
0f4b598984
Fixes Aegislash not reverting back ( #5734 )
2024-11-28 23:21:42 +01:00
Alex
6b170d70f1
Fixes Red Card / Eject Pack interaction ( #5724 )
2024-11-27 14:05:11 -05:00
Alex
194f7644b8
Changes taget bit of Flower Shield ( #5698 )
2024-11-23 12:02:40 -05:00
AlexOn1ine
97b30cb712
simultaneous hp reduction
2024-11-23 08:35:01 +01:00
Alex
67c7106fee
Refactors Absorb to use Moveend ( #5670 )
2024-11-17 09:59:04 +01:00
Alex
b55c87f73f
Fixes Take heart ( #5658 )
...
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05:00
Eduardo Quezada
b48e5770be
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-11 15:58:42 -03:00
ghoulslash
931a05f12b
Mrcrge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2024-11-11 12:38:52 -05:00
GriffinR
b89fda79ea
Generate MAPSEC constants from JSON
2024-11-06 21:43:13 -05:00
Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives ( #5646 )
2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01:00
Eduardo Quezada
ee2535be96
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-03 12:21:22 -03:00
ghoulslash
57225e878a
some more fixes
2024-11-03 10:11:05 -05:00
ghoulslash
b488ff9b53
merge w upcoming
2024-11-03 07:11:40 -05:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack ( #5630 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-02 09:38:29 -03:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids ( #5560 )
2024-10-28 18:03:15 +01:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
GhoulMage
6819dd3c37
New AI flag for marking the two last Pokémon as Ace Pokémon. ( #5587 )
2024-10-27 11:32:45 -04:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards ( #3240 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-21 14:52:45 -03:00
Eduardo Quezada
3205f377d5
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-21 08:18:44 -03:00
GhoulMage
d11fd21cd6
Changing EVO_NONE from 0xFFFE to 0 ( #5547 )
2024-10-21 07:33:21 -03:00
Ariel A
0f706ac9e0
Merge branch 'followers' into followers-expanded-id
2024-10-21 00:05:26 -04:00
Ariel A
4056804575
feat: improved follower handling during scripted movements
2024-10-20 23:55:05 -04:00
ghoulslash
4fc07c4369
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2024-10-20 18:46:54 -04:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects ( #5549 )
2024-10-20 21:44:28 +02:00
ghoulslash
cb9f1f27a7
move dexnav flags, vars to config, add DEXNAV_ENABLED config to add static asserts that flags, vars are setup and dexnav cannot be used/accessed otherwise
2024-10-18 22:00:19 -04:00
ghoulslash
54484593b3
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2024-10-18 21:46:54 -04:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
GriffinR
0eb6d1d74c
Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants
2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2024-10-15 22:02:40 -04:00
ghoulslash
cf78462fab
merge w upcoming
2024-10-15 21:24:47 -04:00
Eduardo Quezada
9ed153ff93
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
GriffinR
a0be2cbf7b
Fix Fallorbor typo
CI / build (push) Has been cancelled
2024-10-12 23:50:12 -04:00
GriffinR
f61c0099b9
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
GriffinR
a2a3255bdd
Fix typo, remove old size check
2024-10-12 03:30:35 -04:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands
2024-10-11 16:27:02 -07:00
GriffinR
091b7269df
Move heal locations data to their associated map.json ( #2034 )
2024-10-11 15:15:55 -04:00
Bassoonian
d0379b9b55
Turn item hold effects into an enum ( #5498 )
...
* Turn item hold effects into an enum
* Rename to ItemHoldEffect
2024-10-10 14:23:59 +02:00
SonikkuA-DatH
708f64247f
Heart Swap Move Animation ( #5460 )
2024-10-09 10:43:04 +02:00
Eduardo Quezada
1d9557811b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-10-08 15:58:17 -03:00
Eduardo Quezada
ee00c251ae
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-08 14:52:12 -03:00
Eduardo Quezada
541ca2619b
Start 1.9.4 cycle
2024-10-08 14:47:32 -03:00
Eduardo Quezada
a76f7fe92e
Version 1.9.3 ( #5485 )
...
* Version 1.9.3
* Updated to latest master
2024-10-08 14:45:09 -03:00
Eduardo Quezada
f913f2884b
Add config for shadow intensity
2024-10-08 12:21:06 -03:00
ghoulslash
a6a6737c42
some dexnav improvements, use CalculateDexnavShinyRolls for shiny rolls
2024-10-04 13:54:56 -04:00
ghoulslash
2e52e3331f
merge w upcoming
2024-10-04 12:56:21 -04:00
Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
Eduardo Quezada
80af2af9ad
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-03 14:33:01 -03:00
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map ( #5405 )
...
* Add functionality to Poké Flute and Town Map
* Poke flute in-battle
* Address reviews
* Update item_use.c
* Update battle_message.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
2024-10-03 10:52:59 +02:00
psf
2597d8a35a
Updated species defines ( #5075 )
...
* First version of new defines
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Removed old defines
* Removed old defines
* Removed old defines and cleaned up some macros
* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs
* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599
* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
2024-10-02 18:24:57 -03:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible ( #5449 )
...
* Fixes recoil moves not triggering berries if possible
* Update battle_script_commands.h
2024-10-01 10:43:58 +02:00
Eduardo Quezada
d1056f887b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-30 15:52:49 -03:00
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands
2024-09-30 06:57:54 -07:00
Bassoonian
5a8a393dcd
Add Sideways Stairs ( #4836 )
2024-09-30 00:06:25 +02:00
Alex
42c43a3f8f
Adds Commander and Order Up ( #5246 )
...
* Adds Commander
* review points
* new line
* correction
* regression / double targeting still broken
* fix wrong target order
* transform fixes
* haze test
* fixes, tests
* bring back wrongly removed else if case
* Eject Pack / Button test + fix
* red card fix
* test fixes
* Fixes Tatsu being hit by multi hit move
* change transform check
* fix test + revert change
* Fix Tatsugiri attacking after freed up from Dozo in the same turn
* Dragon Darts tests
* fix test
* review comments
* assumtion in wrong file
* Order Up test fixes
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +02:00
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
