Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
pkmnsnfrn
1ad3ba1f32
Fixed compilations errors with abgcc
2024-07-27 10:58:51 -07:00
pkmnsnfrn
31fc49734a
Removed preproc from src/metatile_behavior.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1693914236
2024-07-27 07:34:33 -07:00
Eduardo Quezada
1cf2592a9b
Pret Merge (27th of July) ( #5045 )
2024-07-27 10:17:07 -04:00
Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
Martin Griffin
30f8ccfe6e
Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant
...
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-27 07:26:40 +01:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
pkmnsnfrn
587ffeeb97
Fixed tabs
2024-07-26 21:31:04 -07:00
pkmnsnfrn
59c2eeac21
Default signpost config is off
2024-07-26 21:22:29 -07:00
luckytyphlosion
7316e54161
Merge pull request #2016 from luckytyphlosion/master
...
Fix WSL1 install instructions
2024-07-26 19:22:58 -04:00
DizzyEggg
e82e3b4198
Allow flags in trigger scripts ( #4900 )
2024-07-26 23:46:33 +02:00
Pawkkie
3c1fbbb06e
Fixes cantBeSurpressed ability check for breakable abilities ( #5043 )
2024-07-26 15:57:01 -04:00
AlexOn1ine
5dd10a4af1
forgot abilityShield check
2024-07-26 21:34:20 +02:00
AlexOn1ine
dfd63fd34f
func CanBreakThroughAbility
2024-07-26 21:30:41 +02:00
AlexOn1ine
89563cb9b1
check for breakable ability
2024-07-26 21:11:16 +02:00
AlexOn1ine
8b2774e07d
Fixes cantBeSurpressed ability check for breakable abilities
2024-07-26 20:19:58 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Eduardo Quezada
cc00446eb8
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
pkmnsnfrn
f362f6e754
Cleaned up metatile behavior
2024-07-25 21:22:08 -07:00
pkmnsnfrn
02cdbb3c7d
Cleaned up field_control_avatar
2024-07-25 21:07:11 -07:00
pkmnsnfrn
7717812154
Clean up files
2024-07-25 20:34:14 -07:00
pkmnsnfrn
bf11e0c27b
Revert metatile behavior
2024-07-25 20:23:04 -07:00
pkmnsnfrn
2a5f384e66
Added metatile behaviors to mart and center signs
2024-07-25 19:44:26 -07:00
pkmnsnfrn
c6f89d1996
Removed swap file
2024-07-25 19:36:33 -07:00
pkmnsnfrn
b5c58e53de
Removed all comments
2024-07-25 19:35:28 -07:00
pkmnsnfrn
fd69ef339c
Got pokemart and pokecenter changes working
2024-07-25 19:33:07 -07:00
hedara90
3d65141db8
Fixed Sandile sprite ( #5038 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 00:07:43 +02:00
kittenchilly
a16448c081
Update and clean up Battle Debug ( #4643 )
...
* Update battle debug with new stuff
* Fix status not showing up
* Update hold effects as well
* Update battle_debug.c
* Update battle_debug.c
2024-07-26 00:07:11 +02:00
kittenchilly
b4792d3f7e
Add Axe Kick animation
2024-07-25 14:06:02 -05:00
hedara90
a372035fc8
Trainerproc: Support Ogerpon ( #5035 )
2024-07-25 19:46:14 +02:00
psf
c69107a14a
Fix fishing minigame ( #5031 )
...
Fixed issue from #4343 where `GEN_3` minigame was not correctly working.
2024-07-25 08:37:02 -07:00
Martin Griffin
5b251b614c
trainerproc: Support Ogerpon
2024-07-25 14:50:32 +01:00
Pawkkie
062856cc6c
Add Memento to Risky AI flag ( #5032 )
2024-07-25 13:57:42 +02:00
pkmnsnfrn
614b7f862e
Working version of interactable signpost msgbox
2024-07-24 22:21:00 -07:00
pkmnsnfrn
389f4e4180
Worked with ShinyDragonHunter to get signpost working
2024-07-24 20:58:18 -07:00
pkmnsnfrn
a0c5e5511c
Added gSignPostWindow_Gfx
...
Added LoadSignBoxGfx
Add LoadSignPostWindowFrameGfx
2024-07-24 19:41:36 -07:00
cawtds
7ae6b1d22a
fix fishing minigame
2024-07-25 00:58:21 +02:00
kittenchilly
7f6ddcf9d9
Update all level up learnsets to Indigo Disk ( #5023 )
...
* Update all movesets to Indigo Disk
* Also update past gens for gen 9 mons
* Update gen_1.h
2024-07-24 22:53:37 +02:00
sneed
298ee34097
fix givemon not giving Cherish Ball ( #5022 )
2024-07-24 20:37:46 +02:00
PhallenTree
7b2914c046
Fix Mold Breaker-like abilities, AI Move Accuracy function, Fury Cutter with Parental Bond ( #5030 )
...
* Fix GetBattlerAbility not checking correct battler's action
* Fix Fury Cutter counter being incorrectly incremented on 2nd hit of Parental Bond + test
* Fix AI_SetMoveAccuracy only using attacker's ability
* Review
2024-07-24 19:36:55 +02:00
luckytyphlosion
3d2b861436
Fix WSL1 install instructions
2024-07-23 17:53:19 -04:00
hedara90
3f4b4adae5
Updated reference to config location to new location ( #5026 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-23 14:09:32 -04:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites ( #4996 )
...
* Added Ogerpon Tera Sprites
* Updated references to Ogerpon Tera forms
* Fixed back sprite offsets and color indices for Hearthflame Tera
* Removed Ogerpon data duplicates
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-23 11:55:07 -04:00
Eduardo Quezada
ae48293806
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
2024-07-22 23:06:44 -04:00
tertu
305c1ba55e
Fix random IVs for givemon ( #5021 )
2024-07-22 15:05:23 -05:00
hedara90
84e249f98a
Some tera tests ( #5020 )
...
* Added tests for Terapagos/tera interactions
* Fixed missed things
* Fixed Terapagos Stellar boost (by Alex)
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-22 20:43:17 +02:00
cawtds
30ff2fa337
fix givemon random ivs
2024-07-22 17:18:22 +02:00
ghoulslash
67551dba04
Fixes AI not being aware during calcs ( #4992 )
2024-07-22 08:20:16 -04:00
kittenchilly
0bcd6a5435
Make Snow Warning description respect config ( #5018 )
...
* Make Snow Warning description respect config
* Update src/data/abilities.h
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-22 13:39:32 +02:00
