Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,033 Commits 1 Branch 0 Tags
Commit Graph

2719 Commits

Author SHA1 Message Date
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
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees (#5285) 
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
 2024-08-29 18:14:46 +02:00
Eduardo Quezada
aebbe448b8 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-28 12:58:14 -04:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers (#5277) 2024-08-28 11:47:08 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. (#5273) 2024-08-27 14:33:58 +02:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces (#5261) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-26 16:55:54 -07:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix (#5256) 
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
 2024-08-25 10:03:33 +02:00
Eduardo Quezada
abf60e9c64 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-24 19:44:35 -04:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes (#5142) 
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
 2024-08-20 20:16:32 +02:00
Eduardo Quezada
6ac18a6fe5 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-20 08:00:05 -04:00
Pawkkie
a111ac496d
Fix typos (#5221) 
Fix typos in move description of Decorate, Collision Course and Electro Drift
 2024-08-20 12:44:27 +02:00
Frank DeBlasio
15348eae84
Consolidated the values of Rotom's moves and added Gen9 base form effect (#5186) 
* Consolidated Rotom move values

* Updated changing Rotom into its base form to its Gen9 effect

* Fixed order of if statement
 2024-08-16 23:31:19 +02:00
Bassoonian
c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07:00
Eduardo Quezada
661ec0a9fd Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework (#5159) 
* new move anims + fickle beam rework

* more fickle beam changes

* removed the true for consistency

* ficklebeamboosted gets cleared now

* mortal spin and thunderclap changes

* minor mortal spin pal change

* removed hex numbers and made hard press quicker
 2024-08-14 17:20:18 +02:00
Eduardo Quezada
abb1fd20f3 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-12 16:24:04 -04:00
psf
d1183f4b8a
Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131) 
* First attempt at a port

* Slightly broken but working

* Got images working and opponent palettes

* half finished compressed spritesheet approach instead

* fix the palettes (smh)

* fix hflip, and a lot of clean-up

* Add B_SHOW_TYPES

* Got Illusion working

* Add num type enum

* Updated function to get type

* Fixed type icon position and cleaned up functions

* Updated illusions and Tera handling

* Added BATTLE_TYPE_IS_SINGLE and DOUBLE

* Removed IS_BATTLE_TYPE_SINGLE

* Implemented BATTLE_TYPE_IS_DOUBLE across repo

* Removed SIDE macro

* Updated config

* Deprecated battler alive macro

* Reindented file

* Added exceptions for 2v1

* Replaced Fainted check with Null check

* Added functionality for only types of caught mons

* UseDoubleBattleCoords updated

* Added ShouldFlipTypeIcon

* Renamed TryLoadTypeIcon

* Refactored functions

* Refactored functions

* Refactored functions

* Refactored functions

* Renamed SEEN to CAUGHT

* Reset config

* Added useSecondPalette and isOrdinary to gTypesInfo

* Further simplified secondPalette and isOrdinary

* Changed isordinary to isSpecialCase

* Renamed to useSecondTypeIconPalette

* Fixed Stellar type interactions

* fixed spacing

* fixed include/config/battle.h

* fixed

* fixed include/config/general.h

* changed type1 and type2

* Moved IsDoubleBattle to include.battle.h
Removed BATTLE_TYPE_IS_DOUBLE
Removed IS_DOUBLE_BATTLE

* Changed IsBattlerFainted to IsBattlerAlive

* Removed IsBattlerNull

* Moved GetBattlerData to be inline

* Renamed GetMonDefensiveTeraType

* Removed IsIllusionActive

* Fixed identation

* found one last isDoubleBattle hold out

* fixed redundant brackets

* Fixed spacing for B_SHOW_TYPES

* Update src/battle_script_commands.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Fixed padding

* Reindent file and refactored GetTypeIconHideMovement

* Update include/data.h

---------

Co-authored-by: RavePossum <ravepossum@proton.me>
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-11 17:55:51 +02:00
kittenchilly
a4dc9a0480
Add Dowsing Machine expanded name (#5134) 2024-08-10 23:59:23 +02:00
Martin Griffin
a5e0738484
trainerproc: Parse line markers (#5122) 2024-08-08 20:12:18 +02:00
Eduardo Quezada
113f8de9b1 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_controller_player.c
 2024-08-08 13:22:49 -04:00
Eduardo Quezada
182809b515
Made perfect IV count into a granular setting (#5115) 
* Made perfect IV count into a granular setting

* Fixed optional parameter comment in SPECIES_NONE
 2024-08-08 13:46:22 -05:00
hedara90
6bbc0601a9
Fixed non-grass Ivy Cudgel breaking battle UI (#5117) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-08 10:39:38 +02:00
Bassoonian
207129e0c8 Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug 2024-08-07 12:42:45 +02:00
Ariel A
5293e67995 Merge branch 'followers' into followers-expanded-id 2024-08-07 00:02:16 -04:00
tertu
08f8ccd9eb
Follower palette fix (#5107) 2024-08-06 11:52:05 -05:00
Hedara
a9492f5b1c Fixed Xerneas 2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b Fixed some overworld palettes 2024-08-06 13:25:26 +02:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description (#5093) 
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive

* Fixes Fickle Beam's description

* Alternative fix

* Remove extra newLine
 2024-08-06 10:45:30 +02:00
ghoulslash
d2f3d319a7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/sideways_stairs 2024-08-04 12:26:20 -04:00
Bassoonian
4dce7db714 Another text fix 2024-08-04 16:53:46 +01:00
Bassoonian
369efc1208 Fix two small text errors in follower dialogue 2024-08-04 01:15:36 +01:00
cawtds
3af93bdfee
FRLG+ whiteout message (#4967) 
* FRLG whiteout message + post whiteout event
 2024-08-02 08:28:05 -07:00
Eduardo Quezada
8450268b74 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/data/battle_anim.h
 2024-07-31 18:13:19 -04:00
Alex
3b9ea5b54c
Adds battle frontier conversion script (#5040) 
Adds script to convert battle frontier mons to new format
Fixes existing battle frontier mons to match vanilla
 2024-07-31 15:04:21 -07:00
hedara90
74220518d4
Fixed the animation tables being different sizes (#5063) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-29 13:34:19 -04:00
Eduardo Quezada
18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	asm/macros/battle_anim_script.inc
#	data/battle_anim_scripts.s
#	include/constants/battle_anim.h
#	src/battle_anim.c
#	src/data/battle_anim.h
 2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM (#5046) 2024-07-27 21:41:05 +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
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
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
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
Eduardo Quezada
0b02527e5c Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	test/test_runner.c
 2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite (#5008) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-21 08:17:31 +02:00
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases (#4987) 2024-07-17 23:36:15 +02:00
Martin Griffin
23aa9f0433
trainers.h (#4990) 2024-07-17 21:41:52 +02:00
innocenthedgehog
d333f9f066
Fix typos in trainers.party documentation (#4988) 
Co-authored-by: psytp2 <psytp2@nottingham.ac.uk>
 2024-07-17 13:46:44 +02:00