Eduardo Quezada
d7bbb2e628
Easy customizable Hidden Move types ( #5872 )
2025-01-04 21:42:14 +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
ghoulslash
401df8da4d
move overwrittenAbilities field to DisableStruct ( #5946 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-03 18:17:23 +01:00
Bassoonian
9199b6f3cc
Adds Dexnav ( #4818 )
2025-01-03 14:19:02 +01:00
Alex
ec1876b826
Remove EWRAM gHpDealt (not needed anymore) ( #5925 )
2025-01-02 23:37:58 +01:00
ghoulslash
9707d09f79
some more Dexnav -> DexNav
2025-01-02 10:13:06 -05:00
Philipp AUER
94fba81a90
Initialize m4a and IRQ handler in a loaded section ( #5912 )
...
Co-authored-by: sbird <sbird@no.tld>
2025-01-02 15:11:32 +01:00
ghoulslash
7a9e847fd4
some clean up
2025-01-02 09:00:56 -05: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
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix ( #5928 )
2025-01-01 21:41:42 +01: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
Eduardo Quezada
6b8665d08f
Speed up tests in headless mode ( #5889 )
2025-01-01 10:24:23 +01:00
Ariel A
a6ef9c7577
Merge branch 'followers' into followers-expanded-id
2025-01-01 00:39:14 -05:00
Eduardo Quezada
e1275594c5
Renamed OW type effectiveness function for clarity ( #5917 )
2024-12-31 22:55:42 +01:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Alex
51cfb96fd5
Fixes Sparkling Aria Shield Dust / Covert Cloak interaction ( #5911 )
2024-12-31 12:52:16 +01:00
Ariel A
3fffb9fac6
feat: added configuration to restrict following pokemon. Closes #42
2024-12-30 21:38:18 -05:00
Alex
9d30299148
Fixes Stance Change, Sleep Talk interaction ( #5909 )
2024-12-31 00:38:01 +01:00
Bassoonian
bf125c8f5e
Fix wrong value for NUM_MOVE_EFFECTS ( #5913 )
2024-12-30 23:51:48 +01:00
Alex
3db351359a
Clean up redundancy for mugshots ( #5906 )
2024-12-30 18:32:21 +01:00
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses ( #5899 )
2024-12-30 09:18:23 +01:00
Alex
f864bf8b70
Adds Generational config for Magic Guard (Fix for Gen4+) ( #5893 )
2024-12-30 09:01:20 +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
Hedara
2088f2a12d
Merge branch 'master' into master-upcoming
2024-12-29 21:43:07 +01:00
Eduardo Quezada
7ddb4cdc1b
Fixed TODO tests not showing up when filtering by name ( #5894 )
2024-12-29 14:18:33 +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
Alex
5900a01061
Atk Canceller refactor / reorder / clean up ( #5885 )
2024-12-27 21:14:05 +01:00
Eduardo Quezada
50d325f081
Slight contest documentation ( #2078 )
CI / build (push) Has been cancelled
2024-12-27 11:09:33 -05:00
Eduardo Quezada
91c7bd9e53
Fixed givemon not respecting perfect IVs for species ( #5873 )
2024-12-26 21:22:45 +01:00
AlexOn1ine
9c34634dd6
Draft Change
2024-12-25 11:03:32 +01:00
DizzyEggg
b1dbc6e9b2
Fix ASSUMPTIONS not working ( #5869 )
2024-12-24 06:46:40 -03:00
Alex
8edf14423a
Refactors argument into a union ( #5853 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-23 15:51:35 -03: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
25075239a2
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-21 08:46:33 -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
Eduardo Quezada
53aebc34dd
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-20 20:48:13 -03:00
AlexOn1ine
2c419ccb57
review comments
2024-12-20 22:43:05 +01:00
Eduardo Quezada
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
Bassoonian
5cc0b35d81
Replace power checks with IS_MOVE_STATUS ( #5820 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-20 08:20:46 -03:00
hedara90
e579333427
Egg cycle length fix ( #5828 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-20 11:23:51 +01: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
PhallenTree
f4a0cc0055
Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles ( #5829 )
2024-12-19 13:51:03 +01:00
Alex
a2aba3f86a
Changes target TURN_DAMAGED and MAX_HP to inlines ( #5822 )
2024-12-17 17:21:12 -05:00
Eduardo Quezada
bcc65e74a6
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-14 13:03:16 -03:00
Alex
4bff9f8ee9
Fixes simu hp reduction when no partner was on field ( #5799 )
2024-12-10 21:48:31 +01:00
PhallenTree
3ad5de5fef
Adds missing Friend Ball friendship bonus upon catching ( #5795 )
2024-12-10 08:26:23 -03:00
hedara90
75eaf890a2
Evolution level 1 learn ( #5791 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-09 13:21:30 +01:00
hedara90
09a8d051d4
Added the missing config to use new terrains ( #5792 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-09 12:28:31 +01:00
Eduardo Quezada
66a2a16bbc
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-08 12:00:29 -03:00
Alex
3f3f4cfe1c
New Volt Switch Animation ( #5729 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-07 15:52:13 +01: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
Pawkkie
da2a1e2aba
Destiny Bond fails on repeated use in Gen 7+ ( #5652 )
2024-12-05 22:29:20 +01:00
Philipp AUER
7744298788
Fix fixed point damage calculation off-by-1s ( #5775 )
...
Co-authored-by: sbird <sbird@no.tld>
2024-12-05 11:35:56 +00:00
Eduardo Quezada
a92350fb53
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-04 18:55:56 -03:00
Pawkkie
599f4d339b
Adds SleepClauseBlock enum to CanBeSlept ( #5773 )
2024-12-04 21:54:31 +01: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
Eduardo Quezada
5c180a0b09
Added FONT_SHORT_NARROWER ( #5101 )
2024-12-04 06:30:19 -08:00
Frank DeBlasio
1b880a1185
Converted item-related variables to COMPOUND_STRINGs ( #5714 )
2024-12-03 23:11:59 +01:00
Alex
70224f0ea3
Fixes items preventing other switch in effects ( #5732 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-12-03 11:15:29 -05:00
Martin Griffin
993663d9b0
Variadic IS_BATTLER_OF_TYPE and GetBattlerTypes ( #5708 )
2024-12-03 13:12:54 +01:00
Frank DeBlasio
a97cfaa068
Converts multi-choice options to COMPOUND_STRINGs ( #5686 )
2024-12-03 12:32:13 +01:00
Pawkkie
c8b0da2493
Add AI_FLAG_WEIGH_ABILITY_PREDICTION ( #5636 )
2024-12-03 12:28:22 +01:00
Pawkkie
b15f7ad4f1
Sleep Clause global config ( #5762 )
2024-12-02 16:35:28 -05:00
AlexOn1ine
8acb31339d
rename critChance and moveDamage
2024-12-02 19:57:45 +01:00
AlexOn1ine
d95dbadccc
merge rhh/upcoming
2024-12-02 19:00:55 +01:00
AlexOn1ine
aa61f24e81
clean up
2024-12-02 18:25:24 +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
720938f040
Fix conflicts
2024-12-01 14:28:26 -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
Alex
0ca588943b
Fixes choiced moves not locked in after ability block ( #5738 )
2024-12-01 13:45:35 +01:00
Eduardo Quezada
1a581c407c
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-01 08:11:32 -03:00
Alex
b3b0973fbb
Fixes Population Bomb / Triple Kick missing message ( #5747 )
2024-11-30 18:06:17 -05:00
hedara90
e4ef3a440f
Automatic Line Breaks, somewhat even lines ( #5689 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-29 18:46:45 +01: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
88cdd8bdfb
Fixes Kee Maranga and Enigma Berry ( #5727 )
2024-11-28 11:22:32 +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
612c8d3ff6
Fixes heal blocked leeach seed in tests ( #5700 )
2024-11-21 17:18:44 +00:00
Eduardo Quezada
b2ef363ac8
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-19 14:19:53 -03:00
AERDU
5388ed0cad
Mimicry updates typing with RemoveAllTerrains() ( #5666 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-11-17 10:21:01 +01:00
Alex
67c7106fee
Refactors Absorb to use Moveend ( #5670 )
2024-11-17 09:59:04 +01:00
ghoulslash
6f78288a9b
fix dexNavSearchLevels array size
2024-11-13 21:21:45 -05:00
hedara90
3481340da8
Critical Hit documentation and distorted match up struct switch ( #5665 )
2024-11-13 22:30:27 +01:00
PhallenTree
0919fbdc2d
Fix Order Up + Tera Stellar breaking each other with Commander ( #5667 )
2024-11-13 11:45:08 +01:00
AlexOn1ine
4dc784bd2d
fix conflict
2024-11-12 23:30:49 +01:00
AlexOn1ine
3204454853
Critical Hit documentation and distorted match up struct switch
2024-11-12 23:27:53 +01:00
hedara90
1d7e4cf8fc
Cleans up Primal Reversion code ( #5659 )
2024-11-12 13:48:06 +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
Alex
a8351e305c
Fixes Red Card / Eject Pack interaction with Emergency Exit ( #5657 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:56:51 -05:00
AlexOn1ine
a3fe53dd28
Cleans up Primal Reversion code
2024-11-11 20:31:21 +01: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
Martin Griffin
f770cb1ea3
Check that PASSES_RANDOMLY affected a Random call ( #5635 )
2024-11-11 10:59:58 +01:00
kittenchilly
7409b87d17
Add merged placeholder text for trainer name with class ( #5622 )
2024-11-10 21:21:27 -03:00
Eduardo Quezada
5f87d2e8a7
Convert gBattleStringsTable to COMPOUND_STRINGs ( #5649 )
2024-11-10 00:22:37 +01: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
Bassoonian
6d38e260d6
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov
2024-11-05 10:31:40 +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
hedara90
02d7767327
Set default battle shadow to Gen3 ( #5632 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-11-03 07:29:09 -03: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
Martin Griffin
39f5596d09
Improve unneeded SEND_OUT error
2024-11-01 17:06:22 +00:00
Eduardo Quezada
ac1dd857f7
Fixed text wrap obtaining the incorrect glyph width ( #5620 )
2024-11-01 15:07:58 +01:00
Alex
35a22d6e82
Follow up for #5570 ( #5625 )
2024-10-31 10:58:00 +01:00
Alex
d5f8e9cc0e
Combines CalculateMoveDamage arguments into a struct ( #5570 )
2024-10-31 07:59:28 +01:00
GhoulMage
5df6f0b753
AI_FLAG_ACE_POKEMON takes into account separate trainers (#5608 )
2024-10-29 15:18:29 -04:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences ( #5595 )
2024-10-29 15:38:26 +01:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids ( #5560 )
2024-10-28 18:03:15 +01:00
Alex
0b66f52ead
Minor BattleStruct clean up ( #5585 )
2024-10-28 16:35:31 +01:00
Eduardo Quezada
e8b8ca19a9
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-28 12:13:55 -03:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
Eduardo Quezada
13d3245204
Added compressed OW mon VRAM notice in config file ( #5599 )
2024-10-27 14:04:33 -04: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
Martin Griffin
09c424b70f
Mark all tests as used ( #5531 )
2024-10-25 13:05:19 +02:00
Pawkkie
7413d107ae
Should switch refactor to facilitate switch prediction ( #5466 )
...
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-25 13:04:42 +02:00
Eduardo Quezada
afa7ab9b2e
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-24 07:47:52 -03:00
Pawkkie
03eda5749d
Healer ability tests ( #5559 )
2024-10-22 19:02:28 +02:00
hedara90
bcfdf41078
Follower female fix ( #5475 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-22 12:38:06 -03:00
Martin Griffin
1421ed1b24
Tests: detect task leaks ( #5528 )
2024-10-22 10:19:00 +02: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
Frank
544b76fbbf
Added value for bard sound length
2024-10-21 09:04:42 -04: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
Bassoonian
601438e980
Centralise AI Tests trainer name ( #5532 )
2024-10-19 17:51:20 -03:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation ( #5490 )
...
* revival blessing fixes, add anim
* fix lunar blessing anim
* Added support for Revival Blessing in tests
* Added test to confirm absent flag fix
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03:00
RavePossum
85197eda5e
Move Relearner and Renaming From Summary Screen ( #5513 )
...
* implement move relearner in summary screen
* implement renaming in summary screen
* Enable summary screen rename and relearn by default
* Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC
* add a config to not restore full PP when relearning from summary screen
* hide summary relearner option if mon has no relearnable moves
* add note not to decap RELEARN string
* re-static function that now no longer needs to be accessible elsewhere
* Fix move relearner not showing up if you first select a mon with no moves
* The great curly brace massacre of 2024 (PR feedback)
* sprinkling in some parentheses
* PR feedback 2 (curly braces & whitespace)
2024-10-19 14:43:05 +02:00
ghoulslash
229525d122
some cleanup
2024-10-18 22:13:49 -04: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
kittenchilly
04aa5b7c24
Add more later gen fishing mechanics ( #5518 )
...
* Add new fishing bite odds and follower boost
* Sticky
* Update item.h
* Update field_player_avatar.c
* Update field_player_avatar.c
2024-10-18 16:45:31 +02:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config ( #5206 )
...
* Add back older sprites
* Graphics config
* Added GBA most graphical data to gSpeciesInfo
* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files
* GBA mon icons
* Split GBA footprints into separate config
* Separated GBA icons into their own config
* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS
* Moved GBA sprites to regular folder with prefix
* Renamed configs
* Temporarely disabled shadows when GBA sprites are enabled
* Removed remaining files from pokemon_old folder
2024-10-18 13:37:00 +02:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
Pawkkie
9882e0aea6
Refactor ShouldSwitchIfAllBadMoves ( #5452 )
...
* Refactor ShouldSwitchIfAllBadMoves
* Rest of bugfix
* Enable Shed Tail test
* Revert "Enable Shed Tail test"
This reverts commit e0b9a3affcf3c465c8743741e5ca61bde6c8cb18.
* Better names for i, j
* Fix MAX_MON_MOVES that should be MAX_BATTLERS_COUNT
* battlerIndex / moveIndex fix
* Update src/battle_controller_player_partner.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-16 11:22:48 -04:00
ghoulslash
43f184d0a5
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2024-10-16 10:26:55 -04:00
Bassoonian
d4387d880c
Replace hardcoded flute check with consumability check ( #5508 )
2024-10-16 12:07:34 +02:00
ghoulslash
bb78d45400
some fixes
2024-10-15 21:24:53 -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
luckytyphlosion
a55c75d350
Get rid of common syms ( #2040 )
CI / build (push) Has been cancelled
2024-10-14 23:52:11 -04:00
GriffinR
a0be2cbf7b
Fix Fallorbor typo
CI / build (push) Has been cancelled
2024-10-12 23:50:12 -04:00
Eduardo Quezada
0a4b3a8dd7
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-12 16:23:27 -03:00
Bassoonian
eedeaf1ead
Clean up scrcmd PR ( #5511 )
...
Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls
2024-10-12 10:34:05 -07:00
Bassoonian
8dba27249c
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210
2024-10-12 18:41:33 +02:00
Ariel A
e10005010e
Merge branch 'followers' into followers-expanded-id
2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10
fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh
2024-10-12 12:23:18 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands
2024-10-11 16:27:02 -07:00
ghoulslash
353915ef64
Add various tests, add RNG_RANDOM_TARGET ( #5438 )
...
* burn dmg test depends on config
* burn and frostbite tests use B_BURN_DAMAGE config for denom val
* update kings shield test with config
* add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck
* add sticky web+contrary test
* add EXPECT_EQ to contrary+sticky web test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update test/battle/move_effect/uproar.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* fix test
* syntax fix
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 23:47:46 +02:00
SarnPoke
2db1f071fa
Add battle flag that prevents running from wild Pokémon ( #5502 )
...
* Add No Running Battle Flag
Adds a flag that if set prevents the player from being able to run from wild battles.
* Formatting battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Adjust for pre-Gen 8 Teleport
Addresses the edge case with Teleport when used with under Gen 8 mechanics.
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 21:59:50 +02:00
Pawkkie
464c90a862
ShouldSwitchIfGameStatePrompt Tests ( #5462 )
...
* Weird tests plz help <3
* better RNG tag names?
* DATA.trial for data to reset between trials
* Fix Wonder Guard test
* Unused errors
* Finish new tests
* Split fix into its own PR
* Spacing
* Rename RNG_AI_SWITCH_TOXICD
* Forgot to save file lol
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-11 19:57:19 +02:00
hedara90
cac815164a
Cleanup extraneous function in header ( #5506 )
2024-10-11 12:14:14 +02:00
kittenchilly
5b4acea651
Add config to change Vivillon's breeding form ( #4813 )
...
* Add config to change Vivillon's default form
* Update daycare.c
* Remove the default form stuff
* Update daycare.c
* Clean up
* Assert and fancy
2024-10-10 21:27:50 +02:00
ghoulslash
9dbcd18251
Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function ( #5497 )
2024-10-10 10:42:09 -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
Pawkkie
2afc7f6138
ShouldPivot type cleanup ( #5441 )
...
* Cleanup ShouldPivot type
* PIVOT to SHOULD_PIVOT
2024-10-10 12:54:35 +02:00
AlexOn1ine
d0a97970ba
Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function
2024-10-10 09:55:25 +02:00
Alex
1454644376
Removes duplicate code in AI functions ( #5457 )
...
* Make functions CanAbilityAbsorbMove and CanAbilityBlockMove
* clean up
* Replace ai code with CanAbilityBlockMove / CanAbilityAbsorbMove
* Adds CanPartnerAbilityBlockMove
* Use switches instead of if-blocks
* solve potential bug in singles with spread attacks
* fix test
* revert other fix
* flash fire does not increase a stat
* left a comment for a future test and addition
* remove more checks
* comment was incorrect. it only applies to storm drain and lightning rod
* revert ndebug
* revert minor change
* Update src/battle_util.c
2024-10-09 15:50:59 +02:00
SonikkuA-DatH
708f64247f
Heart Swap Move Animation ( #5460 )
2024-10-09 10:43:04 +02: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
Pawkkie
efad9a32a9
Fix AI tests using PASSES_RANDOMLY ( #5486 )
2024-10-08 13:04:35 -04:00
psf
0dcb28ba0e
Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK ( #5448 )
...
* First addition of both checks
* Updated config file
* fixed spacing
* Updated spacing
* Fixed issues where feature was always on
* Update overworld.h
fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611
2024-10-07 17:07:23 +02:00
ghoulslash
a6a6737c42
some dexnav improvements, use CalculateDexnavShinyRolls for shiny rolls
2024-10-04 13:54:56 -04:00
Eduardo Quezada
a7fca616b0
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-04 14:28:13 -03:00
ghoulslash
2e52e3331f
merge w upcoming
2024-10-04 12:56:21 -04:00