LOuroboros
589c969e89
Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore
2022-10-07 18:20:00 -03:00
ghoulslash
06bddbac23
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007
...
One for the go! (pret merge 2022/10/07)
2022-10-07 17:14:00 -04:00
ghoulslash
9164f03f96
Merge pull request #2141 from Sneed69/Triple-Kick-Fix
...
Triple kick power calc rework
2022-10-07 16:31:50 -04:00
Eduardo Quezada
044898fe95
Documented missing gSoftResetDisabled uses
2022-10-07 15:56:00 -03:00
Eduardo Quezada
453da8aa8c
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
2022-10-07 15:49:00 -03:00
Eduardo Quezada
2a8048b677
Removed ItemId_GetId like in upstream
2022-10-07 14:53:58 -03:00
Eduardo Quezada
68b474c0f0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
...
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
2022-10-07 14:52:32 -03:00
Eduardo Quezada
9b977486fe
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
...
# Conflicts:
# src/data/pokemon/base_stats.h
2022-10-07 14:05:45 -03:00
LOuroboros
50ca188cb2
Replaced didMegaEvo with a shiny new species flag
2022-10-07 12:32:36 -03:00
LOuroboros
02c6bc64b2
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero
2022-10-07 12:20:52 -03:00
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
...
4 new species flags
2022-10-07 10:55:43 -04:00
ghoulslash
d7f7fa7d07
Merge pull request #2376 from AsparagusEduardo/RHH/pr/feature/ballsMulti
...
Changed ballMultiplier to account for future Hisuian ball multipliers
2022-10-07 10:48:02 -04:00
ghoulslash
1e04c80dfa
Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach
...
Special handling for Mew's Teachable moveset
2022-10-07 10:39:56 -04:00
ghoulslash
7c7eb8ac7f
Merge pull request #2365 from AsparagusEduardo/RHH/pr/BattleArenaBide
...
Added missing Bide exception to Battle Arena Mind Points
2022-10-07 10:32:47 -04:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
...
I don't have any Sunday memes (pret merge 2022-09-25)
2022-10-07 10:25:59 -04:00
GriffinR
bb2e64b3fc
Merge pull request #1786 from tustin2121/patch-spritestuff
...
Subsprite Tables Documentation
2022-10-06 22:17:32 -04:00
tustin2121
ea168d1a6b
Fix typo 2: revelations
2022-10-06 20:34:46 -04:00
tustin2121
f3bddd1ea6
Fix typo
2022-10-06 19:36:01 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop
...
Clean up shop.c
2022-10-06 17:24:53 -04:00
GriffinR
c6e4c29ea3
Merge pull request #1792 from GriffinRichards/display-tiles
...
Add DISPLAY_TILE_* constants
2022-10-05 20:44:28 -04:00
Eduardo Quezada
a20334f79a
Removed unused functions in item header
2022-10-04 22:06:07 -03:00
Eduardo Quezada
e8ed0bd9f2
Changed ballMultiplier to account for future Hisuian ball multipliers
2022-10-04 20:39:45 -03:00
Eduardo Quezada D'Ottone
d0895a7c32
Merge pull request #2370 from StephenLynx/master
...
Fixed berserk not activating if mon falls to exactly half HP.
2022-10-01 21:30:44 -03:00
Sérgio Augusto Vianna
764bed6580
Fixed berserk not activating if mon falls to exactly half HP.
2022-10-01 20:50:55 -03:00
Eduardo Quezada D'Ottone
af171eb4d4
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
...
# Conflicts:
# src/pokemon_summary_screen.c
2022-10-01 17:32:32 -03:00
GriffinR
79a34411ce
Add additional DISPLAY_TILE_WIDTH usage
2022-09-29 15:22:21 -04:00
sbird
8dad7cc649
[doc] clean up casts in decompress.c
2022-09-29 17:33:39 +02:00
Eduardo Quezada
90ad11278d
Sorry Mewtwo ^^;
2022-09-28 09:17:10 -03:00
Eduardo Quezada
d24899369f
Special handling for Mew's Teachable moveset
2022-09-28 09:04:31 -03:00
GriffinR
6db489e2d5
Use constants for overworld object palette slots
2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066
Convert tilesets.s to C
2022-09-27 17:23:26 -04:00
Eduardo Quezada
fb9105f8ac
Added Mega Evolution flag
2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
...
# Conflicts:
# src/pokemon.c
2022-09-27 10:13:32 -03:00
Eduardo Quezada
5ca1b927e6
Added missing Bide exception to Battle Arena Mind Points
2022-09-27 08:13:32 -03:00
ghoulslash
253234378c
trace records target ability
2022-09-26 23:46:41 -04:00
ghoulslash
6e276b5f4d
Merge pull request #2339 from AsparagusEduardo/RHH/pr/MindRatings
...
Extrapolated Battle Arena's move Mind ratings
2022-09-26 21:04:16 -04:00
Eduardo Quezada
ae21e1626e
Reworked Mind Points
2022-09-26 21:20:08 -03:00
GriffinR
e515e52abb
Add DISPLAY_TILE_* constants
2022-09-26 19:52:17 -04:00
ghoulslash
ff42806e04
Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix
...
Multi battle interface fix
2022-09-26 09:12:40 -04:00
ghoulslash
8ecdf68491
Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix
...
Fixes: Pokémon Debug isn't loading female icon palettes correctly
2022-09-26 09:09:14 -04:00
Eduardo Quezada
dfdfb72365
Separate config for updated move types
2022-09-26 07:50:43 -03:00
TheXaman
886a487bf1
Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes
2022-09-26 12:40:30 +02:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json
...
use json for region map sections
2022-09-25 21:56:09 -04:00
GriffinR
171367d66c
Merge pull request #1643 from cbt6/object-event-graphics-info
...
Format object event graphics info
2022-09-25 21:55:22 -04:00
GriffinR
45e6b48170
Merge pull request #1636 from GriffinRichards/rme-update
...
Updates to region map for Porymap
2022-09-25 21:54:26 -04:00
Eduardo Quezada
5054cf3586
Documented unk40EF in Summary Screen
2022-09-25 21:33:20 -03:00
GriffinR
56c28fb2dd
Move region map gitignore to existing data gitignore
2022-09-25 18:15:16 -04:00
GriffinR
e473aaf783
Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json
2022-09-25 18:10:04 -04:00
Eduardo Quezada
057f76bfe6
Cleaned up missing JOY macros
2022-09-25 13:05:18 -03:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update
2022-09-25 11:56:57 -04:00
Eduardo Quezada
f969effd36
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
3b983aae14
Apply suggestions from code review
2022-09-25 08:31:24 -03:00
LOuroboros
a9ab3286ef
Fixed IsPlayerInFrontOfPC
2022-09-25 05:51:08 -03:00
Eduardo Quezada
0f35f080ec
Gender icon in naming screen based on Pokémon name length
2022-09-24 23:48:24 -03:00
LOuroboros
8e9bfda120
Update field_specials.c
2022-09-24 22:22:18 -03:00
Eduardo Quezada D'Ottone
13573b6e53
Merge pull request #2356 from LOuroboros/PeeC
...
Modified the debug menu's PC access
2022-09-24 22:18:21 -03:00
LOuroboros
00eb67608a
Small tweak to the new check in PCTurnOffEffect
2022-09-24 22:10:46 -03:00
LOuroboros
5500e64a71
Reworked the debug menu's PC access
2022-09-24 17:26:41 -03:00
Eduardo Quezada D'Ottone
17c8842ad4
Merge branch 'dev' into teleport
2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone
38df216ebd
Merge pull request #2355 from ghoulslash/be/aiparty
...
Add overwrittenAbilities field
2022-09-24 14:33:02 -03:00
Eduardo Quezada D'Ottone
0fa8e20d08
Style changes from upstream
2022-09-24 14:20:07 -03:00
ghoulslash
c22671d2a2
add overwrittenAbilities field
2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis
2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI
2022-09-24 11:07:09 -03:00
Eduardo Quezada D'Ottone
bb564d805f
Merge pull request #2353 from LOuroboros/siTypes
...
Fixed Z-Moves showing the wrong type in battle
2022-09-24 10:36:38 -03:00
LOuroboros
696d90880e
Made Z-Moves always show the right type
2022-09-24 09:33:31 -03:00
LOuroboros
64405250ae
Updated IsViableZMove
2022-09-24 08:50:48 -03:00
GriffinR
9b6b164aad
Merge pull request #1768 from SBird1337/feature/mgba-print
...
[debug] add support for mgba printf
2022-09-23 13:49:48 -04:00
sbird
343d7f7d26
[debug] do not use heap allocation for MgbaPrintf
2022-09-23 04:12:57 +02:00
Eduardo Quezada
7e112b0f0d
Added missing uses of JOY_xx macros
2022-09-22 21:43:33 -03:00
GriffinR
1107ff954d
Clean up shop.c
2022-09-22 15:08:17 -04:00
GriffinR
b8341558c3
Merge pull request #1779 from GriffinRichards/sync-fld-weather
...
Add misc constant usage to field_weather_effect
2022-09-22 12:13:07 -04:00
GriffinR
9bcc36fe08
Merge pull request #1767 from GriffinRichards/trainer-pals
...
Generate trainer pic palettes from image
2022-09-22 11:34:03 -04:00
StubbornOne
cad8922d7b
Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI
2022-09-21 23:42:40 +08:00
LOuroboros
d04a852e91
Update debug.c
2022-09-20 02:31:20 -03:00
Eduardo Quezada D'Ottone
24aebf0624
Merge pull request #2337 from LOuroboros/patch-2
...
Renamed some misclassified labels in src/debug.c
2022-09-19 14:33:51 -03:00
Eduardo Quezada D'Ottone
6868d8aa2a
Merge pull request #2338 from LOuroboros/BoxMonMon
...
Fixed typo in BoxMonKnowsMove
2022-09-19 14:33:12 -03:00
Eduardo Quezada
192312d7ee
Extrapolated Battle Arena's move Mind ratings
2022-09-19 14:29:22 -03:00
LOuroboros
5f67335212
Fixed typo in BoxMonKnowsMove
2022-09-19 05:21:54 -03:00
LOuroboros
c137b01dd8
Update debug.c
2022-09-19 04:19:19 -03:00
ghoulslash
add3625589
fix natural cure, shed skin, early bird check in ShouldSwitchIfGameStatePrompt
2022-09-18 22:47:30 -04:00
Eduardo Quezada
adb4e54e95
Fixed multi battle battler coordinates and party menu when only one Pokémon is chosen
2022-09-18 22:34:06 -03:00
Eduardo Quezada D'Ottone
681ad8c7a9
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
2022-09-18 18:25:05 -03:00
Eduardo Quezada D'Ottone
41ae8ecdb7
Update src/battle_controller_opponent.c
2022-09-18 00:51:34 -03:00
Eduardo Quezada D'Ottone
293a880238
Apply suggestions from code review
2022-09-18 00:50:21 -03:00
Ct11217
5f74781a7d
Remove ACE_POKEMON_FUNCTIONALITY
2022-09-17 17:44:50 -06:00
tustin2121
5c55e44173
More diagrams
...
- Diagramed all subsprite tables in the code base. There's a LOT in the slot machine code.
2022-09-17 14:34:20 -04:00
tustin2121
c371a44a83
Formatting
2022-09-17 13:34:54 -04:00
tustin2121
13877f71dc
Minor documentation
...
Some things I figured out while working on my hack.
- The Subsprite tables do not use `DISPLAY_WIDTH`, but rather use -16, since they are signed bytes. The negative numbers better illustrate what the tables are doing.
- Figured out the as-of-yet undocumented data in SpriteCB_FlygonSilhouette
2022-09-17 13:33:10 -04:00
Eduardo Quezada
8a68596b64
Removed free macro
2022-09-16 20:36:44 -03:00
Eduardo Quezada
e412ec30a0
Removed calloc macro
2022-09-16 20:34:22 -03:00
Eduardo Quezada
63156b4398
Removed malloc macro
2022-09-16 20:24:26 -03:00
Eduardo Quezada
b2b308fe9e
Fixed Old Rod Lure swap
2022-09-16 15:16:51 -03:00
Eduardo Quezada
b0bd5f9879
Cleaned up trailing spaces and spaces instead of tabs
2022-09-16 14:42:11 -03:00
ghoulslash
8bbe1b9037
Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome
...
Config to limit the moves called by Metronome (by generation)
2022-09-16 11:03:33 -04:00
Eduardo Quezada
6b79c7772c
Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# src/battle_interface.c
2022-09-16 11:56:50 -03:00
Eduardo Quezada
672f572ff8
Config to limit the moves called by Metronome (by generation)
2022-09-16 11:04:30 -03:00
ghoulslash
ed81ec41bc
Merge pull request #2324 from ghoulslash/be/aiswitch
...
fix ai switch semi invulnerable
2022-09-15 23:15:02 -04:00
ghoulslash
95a3ead254
styling fix
2022-09-15 22:10:39 -04:00
Eduardo Quezada D'Ottone
7825153bb2
Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix
...
Exp Candy Fixes
2022-09-15 22:46:59 -03:00
ghoulslash
20190ac85a
fix ai switch semi invulnerable
2022-09-15 18:34:15 -04:00
ghoulslash
133aa9e28d
Merge pull request #2306 from AsparagusEduardo/RHH/pr/autogenNames
...
Generating music names for the debug menu based on their labels
2022-09-15 18:02:27 -04:00
ghoulslash
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
...
Tidying graphics - Trio Weather
2022-09-15 18:01:43 -04:00
ghoulslash
6cfacb396e
Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount
...
Automated creation of MAP_GROUP_COUNT for the debug menu
2022-09-15 18:01:05 -04:00
ghoulslash
5bdd292dc3
Merge pull request #2310 from AsparagusEduardo/RHH/pr/FairyUses
...
Added missing uses of Fairy type for Union Room and Battle Factory
2022-09-15 18:00:38 -04:00
ghoulslash
354a8256e4
Merge pull request #2226 from Porygon23/AI-Logic-Updates
...
Added corner case logic for AI Switching.
2022-09-15 17:56:35 -04:00
Eduardo Quezada
492380bd24
gReservedSpritePaletteCount using MAX_BATTLERS_COUNT for battles
2022-09-14 12:20:59 -03:00
TheXaman
ef4e64c2f7
-added a submenu to set the weather
...
-lowest flag is 1
2022-09-14 15:19:23 +02:00
TheXaman
1e03b4747f
debug menu: object events now frozen while open
2022-09-14 13:43:26 +02:00
TheXaman
2c20514035
improved debug menu function declaration consistency
2022-09-14 13:39:35 +02:00
Eduardo Quezada
dc423ef7ff
Handling repel/lure menu
2022-09-14 00:18:01 -03:00
Eduardo Quezada
c68ca72fb0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
2022-09-13 16:26:59 -03:00
Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
GriffinR
c1dfd3c9ec
Merge pull request #1763 from GriffinRichards/rm-global
...
Drop usage of global directive
2022-09-13 15:08:37 -04:00
LOuroboros
2d841a25f9
Removed unused extern declaration of old gUnknown func
2022-09-13 15:45:01 -03:00
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
...
Cleaned trailing whitespace
2022-09-13 14:00:11 -04:00
Ct11217
96d190f5ad
Updated Toxic Status Counter
2022-09-12 20:39:21 -06:00
GriffinR
041870672a
Add misc constant usage to field_weather_effect
2022-09-12 15:11:58 -04:00
GriffinR
d3d8b4a181
Merge pull request #1762 from GriffinRichards/sync-fieldmap
...
Sync fieldmap
2022-09-12 14:32:27 -04:00
Eduardo Quezada
ca048e1bc3
Lures now increase the level of encountered mon to max + 1
2022-09-12 10:22:01 -03:00
Eduardo Quezada
0944232059
Added shiny rerolls to Lures + reverted repel var name
2022-09-12 10:21:57 -03:00
Eduardo Quezada
e3005e5275
Item config for repel prompt
2022-09-12 10:21:52 -03:00
Eduardo Quezada
2d78ac0192
Implemented Lures using the same vars as repels
2022-09-12 10:21:49 -03:00
Deokishisu
e3c19f5df5
Implement B2W2 Repel System
...
The game now asks if the player would like to use another Repel when the one they used runs out.
# Conflicts:
# include/constants/vars.h
2022-09-12 10:21:38 -03:00
Eduardo Quezada
66177e7958
Reworked shiny charm rerolls allow adding additional rerolls when necessary
2022-09-12 10:21:21 -03:00
TheXaman
806106b537
removed flickering in debug menu @Jaizu
2022-09-12 12:12:26 +02:00
Eduardo Quezada D'Ottone
17fecd5996
Merge pull request #2313 from LOuroboros/intrepidDoges
...
Fixed the hero duo's abilities
2022-09-11 21:45:18 -04:00
LOuroboros
fc65a483aa
Fixed ability pop ups
2022-09-11 22:34:24 -03:00
LOuroboros
717d06bd17
Fixed the hero duo's abilities in doubles
2022-09-11 21:57:42 -03:00
LOuroboros
e624f205ba
Added CompareStat checks for the hero duo's abilities
2022-09-11 21:46:40 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
Eduardo Quezada
69f01d73cd
Added missing uses of Fairy type for Union Room and Battle Factory
2022-09-11 12:41:56 -04:00
Jaizu
0daeee83f3
Fix Lure prices
...
This change reflects the original prices used in Pokémon let's go pikachu/eevee
2022-09-11 18:06:05 +02:00
Eduardo Quezada
4b1aca19cb
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# src/battle_controller_link_opponent.c
# src/battle_controller_opponent.c
# src/battle_controller_recorded_opponent.c
# src/battle_controllers.c
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/pokemon.c
2022-09-10 00:17:03 -04:00
Eduardo Quezada
a462db5e69
Automated creation of MAP_GROUP_COUNT for the debug menu
2022-09-09 23:34:05 -04:00
Eduardo Quezada
5e399955d5
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations
2022-09-09 17:37:23 -04:00
Eduardo Quezada
503b85aa2d
Generating music names for the debug menu based on their labels
2022-09-09 16:44:34 -04:00
LOuroboros
ceb0c67bcf
Modified check in case FORM_ITEM_USE of GetFormChangeTargetSpeciesBoxMon
2022-09-09 16:17:13 -03:00
LOuroboros
12fee71008
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms
...
Introduced FORM_BATTLE form changes
2022-09-09 14:15:53 -04:00
LOuroboros
e8832a2655
Updated FORM_ITEM_HOLD check in GetFormChangeTargetSpeciesBoxMon
2022-09-09 14:56:12 -03:00
Blackforest92
431cb6fa7c
Tidying graphics - Trio Weather
2022-09-09 21:57:40 +07:00
ghoulslash
61cde312cc
Merge pull request #2301 from Blackforest92/RHH-PR-Branch
...
Tyding graphics - Acupressure
2022-09-09 10:26:23 -04:00
Eduardo Quezada
8449f237c2
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags
...
# Conflicts:
# src/pokemon.c
2022-09-09 09:02:35 -04:00
Eduardo Quezada
21df8c279b
Added SPECIES_FLAG_CANNOT_BE_TRADED
...
- Also corrected Cylarex's forms not having the legendary flag
2022-09-09 08:59:53 -04:00
Eduardo Quezada
1fa9bc1b5c
Adjusted style of coords tables
2022-09-08 18:32:01 -04:00
LOuroboros
db6d285f00
Small syntax fix for CanLearnTeachableMove
2022-09-08 17:53:15 -03:00
Blackforest92
3acb32acb8
Tyding graphics - Acupressure
2022-09-09 00:25:43 +07:00
Eduardo Quezada
7fe1e706b7
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig
...
# Conflicts:
# include/constants/pokemon_config.h
2022-09-08 08:52:13 -04:00
