ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,816 Commits 1 Branch 0 Tags 235 MiB
c4db74460a
Commit Graph

8395 Commits

Author SHA1 Message Date
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
Jaizu
d58af1ba92
Fix 'y' actually being 'x' in CreatePCMultichoice 2022-09-08 10:38:52 +02:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
4a6d3d1deb
Whitespace 2022-09-08 00:19:13 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
LOuroboros
05c13614c6
Undefined temporary preproc macro HIBYTE 2022-09-07 13:41:48 -03:00
sbird
3a0759d458 [doc] fix misnamed dma <--> aslr 2022-09-07 14:37:03 +02:00
GriffinR
281bddcd3d
Merge pull request #1765 from AsparagusEduardo/pret/pokefirered_sync4 
Implemented review changes from https://github.com/pret/pokefirered/pull/548
 2022-09-06 21:40:37 -04:00
GriffinR
74b563f696
Merge pull request #1749 from GriffinRichards/ur-classes 
Fix names and constant usage for union room classes
 2022-09-06 21:35:10 -04:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -03:00
LOuroboros
a7a1ab9aeb Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 19:20:11 -03:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
LOuroboros
f1c153e469 Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 18:37:16 -03:00
TheXaman
94995c54fb fix? 2022-09-06 23:35:05 +02:00
Eduardo Quezada
12bb32666b Aligned FRONTIER_MONS trainer macros with the rest for consistency 2022-09-06 17:05:56 -04:00
Eduardo Quezada D'Ottone
f79e9f02de
Merge pull request #2289 from Blackforest92/RHH-PR-Branch 
Tidying Graphics/Battle_Anims
 2022-09-06 17:02:25 -04:00
TheXaman
b249399a53 changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()' 2022-09-06 23:00:26 +02:00
ghoulslash
d33e4b0fe8
Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor 
Config refactor
 2022-09-06 15:32:37 -04:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
ghoulslash
79bfbfb1b0
Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose 
Comatose prevents Battle Pike's status effects.
 2022-09-06 15:18:48 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
ghoulslash
51a569b66b
Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix 
Fixed ball multiplier fallthroughs
 2022-09-06 15:10:28 -04:00
Eduardo Quezada
7a0838a0f2 Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table 2022-09-06 10:53:18 -03:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0 Updates 
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)

Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
 2022-09-06 10:45:07 -03:00
sbird
584bfe0221 [debug] add support for mgba printf 
* adds support for mgba printf debugging as well as adding support for switching between debugging configuration
* adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler
* adds a pretty printing format to `mini_printf` to print preproc encoded strings
 2022-09-06 13:40:31 +02:00
GriffinR
c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04:00
Eduardo Quezada
cb97f93ef6 Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config 2022-09-05 14:49:40 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
Eduardo Quezada
dbd56efaef Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	src/battle_util.c
 2022-09-05 12:20:57 -04:00
U-DESKTOP-K1J86FD\Owner
7dabd903ce v -> STATUS4_WATER_SPORT (applicable to Gens 3-5) 2022-09-05 12:07:38 -04:00
tustin2121
33f10d2139 Adding missing externs 
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
 2022-09-05 09:49:20 -04:00
Eduardo Quezada D'Ottone
99a9b9f859
Merge pull request #2218 from LOuroboros/patch-1 
Updated Serene Grace checks in AI_CheckViability
 2022-09-05 10:30:18 -03:00
Eduardo Quezada
d699ea3334 Fixed macro alignments 2022-09-05 08:38:35 -04:00
TheXaman
f6d111d0c7
Update src/debug.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:17:21 +02:00
TheXaman
40e3379921 removed music expansion songs, added newline, removed all weekday remains 2022-09-05 11:15:18 +02:00
TheXaman
7696a78760
Update src/trainer_see.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:04:21 +02:00
TheXaman
57296dde71
Update src/field_control_avatar.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:03:23 +02:00
TheXaman
0b3eddc9a4
Update src/field_control_avatar.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:03:01 +02:00
LOuroboros
2deabc2f36
Quick update for GetBattleMonMoveSlot 2022-09-05 04:27:21 -03:00
Eduardo Quezada
2ee843c70d Proper label for species flags 2022-09-04 22:13:28 -03:00
Eduardo Quezada D'Ottone
d0d4c52d84
Update src/pokemon.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-09-04 22:03:17 -03:00
Eduardo Quezada
a4c242f2f8 Implemented Shiny Lock functionality 2022-09-04 21:55:59 -03:00
Eduardo Quezada
7500435a80 Implemented review changes from https://github.com/pret/pokefirered/pull/548 2022-09-04 21:24:12 -03:00
Eduardo Quezada
74c3fdfba7 Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee) 2022-09-04 19:41:01 -03:00
Eduardo Quezada
89550ed05d Updated Sport Ball's modifier. 2022-09-04 18:54:23 -03:00
Eduardo Quezada
ce3dec43a7 Fixed ball multiplier fallthroughs 2022-09-04 17:21:23 -03:00
Blackforest92
2a8d2df6e7 Fix minor oopsies of src/graphics.c - gBattleAnimSpritePal_PrimalParticles 2022-09-04 23:40:00 +07:00
Blackforest92
7e9d243677 Tidying graphics/battle_anims 2022-09-04 23:24:37 +07:00
Eduardo Quezada D'Ottone
1287c3d263
Fixed call to ItemIdToBattleMoveId 2022-09-03 21:27:29 -04:00
Eduardo Quezada D'Ottone
4017fc3e20
Apply style suggestions from code review 2022-09-03 21:22:15 -04:00
Eduardo Quezada
41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
Eduardo Quezada
790bdd69f8 Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2 2022-09-03 00:28:32 -04:00
Eduardo Quezada
03498d7240 Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER 2022-09-02 23:57:43 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
GriffinR
97021baec6 Drop usage of global directive 2022-09-02 21:53:44 -04:00
GriffinR
8b7230c3c4 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:41:28 -04:00
GriffinR
7f1c4720a2 Update arguments for ApplyGlobalTintToPaletteSlot 2022-09-02 19:36:46 -04:00
GriffinR
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
Porygon23
ba6aad5bcc
Merge branch 'master' into AI-Logic-Updates 2022-09-02 14:44:47 -06:00
TheXaman
13cc640b78 whitspace changes, removed wrong comment 2022-09-02 18:53:51 +02:00
TheXaman
b4b3e84cbd removed default flags and added ingame warning if a function that requires them is used 2022-09-02 18:39:38 +02:00
Eduardo Quezada D'Ottone
c58dfa63a1 Merge remote-tracking branch 'RHH/master' into PE_monAnimations 
# Conflicts:
#	src/pokemon.c
 2022-09-02 12:06:43 -04:00
TheXaman
367b12801e changed debug_config.h to overworld_config.h, 
changed no bag use and no catching flags to battle_config.h,
removed TX reference (big sad)
 2022-09-02 12:33:42 +02:00
TheXaman
ad57551db1 removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation 2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone
59f1f10dec
Merge pull request #2260 from DizzyEggg/magic_bounce 
Fix Magic Bounce targets
 2022-09-01 19:56:15 -04:00
Sérgio Augusto Vianna
60132b29fb Fixed pickup running when it shouldn't in some cases. 2022-09-01 15:37:52 -03:00
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement 
Standardize judgement vs judgment spelling
 2022-09-01 11:51:04 -04:00
LOuroboros
5d346fd939 Updated a couple more sizeofs 2022-08-31 23:49:43 -03:00
LOuroboros
b9a32a93f5 Update src/data/text/move_descriptions.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-08-31 23:39:59 -03:00
LOuroboros
ea345f90f5 Picked the correct pointers for correctness' sake 2022-08-31 23:06:20 -03:00
LOuroboros
e02b33ee11 Automatized the contents of some sideof in src/item.c 2022-08-31 23:00:24 -03:00
Eduardo Quezada
8d94c58cac Shows exp when leveling up with Exp Candies 2022-08-31 21:54:27 -04:00
LOuroboros
452b135c7f I forgot to replace the function calls where appropriate :P 2022-08-31 19:17:09 -03:00
Eduardo Quezada
3264c3c87a Shows amount of Exp gained. 2022-08-31 09:05:51 -04:00
Eduardo Quezada
fe5f30c200 Fixed moves learned at the same level being skipped while using exp candies 2022-08-30 22:50:46 -04:00
Eduardo Quezada
29448b6acc Fixed XL Candy going out of bounds. Also added failsafe in case an invalid param is used. 2022-08-30 22:06:25 -04:00
Eduardo Quezada
494e8791d7 Fixed tutors changing levels 2022-08-30 22:06:25 -04:00
LOuroboros
7b8226a8af Added descriptions for LA's moves 2022-08-30 23:05:22 -03:00
LOuroboros
cc86b2fd96 Added Z-Move stats for LA's moves 2022-08-30 20:29:36 -03:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
DizzyEggg
7cb010d71e fix magic bounce conflicts and fix magic coat 2022-08-30 19:36:06 +02:00
Eduardo Quezada
c2c18444b1 Updated HasAllMons to account for all Pokémon 2022-08-30 12:51:00 -04:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
e9a5442be5 Removed unused ITEM_EXPANSION constants from base stats 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation. 
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
 2022-08-30 12:50:59 -04:00
TheXaman
c13561e5ba simplified filed controls code for debug menu 2022-08-30 18:15:06 +02:00
TheXaman
04c40677bd Changed the way debug flags are handled, now in constants/battle_config.h 2022-08-30 17:41:35 +02:00
TheXaman
e09ba650f3 imrpoved code formatting in field_control_avatar as per suggestion 2022-08-30 17:12:23 +02:00
TheXaman
5fed45e40b
Update src/item_use.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:04:14 +02:00
TheXaman
2f61407c78
Update src/field_control_avatar.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:04:02 +02:00
TheXaman
725a9102ee
Update src/new_game.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:44 +02:00
TheXaman
155465a919
Update src/pokemon_storage_system.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:28 +02:00
TheXaman
79c4fa560f
Update src/start_menu.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:07 +02:00
TheXaman
cc921c62d7
Update src/field_control_avatar.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:01:59 +02:00
TheXaman
61c95421eb
Update src/event_object_movement.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:01:46 +02:00
LOuroboros
df88317a98 Introduced FORM_BATTLE form changes 
For species such as Xerneas and Zacian.
 2022-08-29 19:10:52 -03:00
TheXaman
8cf2933658 added preproc directive to main debug.c code 2022-08-29 19:46:03 +02:00
TheXaman
bed5639074 Changed preproc defines to TRUE/FALSE, small cleanup 2022-08-29 19:36:44 +02:00
TheXaman
8c9a59ec1c Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh 2022-08-29 19:13:11 +02:00
ghoulslash
2cd01bd95d
Merge pull request #2239 from DizzyEggg/quash 
Quash
 2022-08-29 10:43:54 -04:00
Blackforest92
b209645b20 Changes Origin to Origin Forme 2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone
32a1017c2d
Fixed tab 2022-08-29 10:13:01 -04:00
Blackforest92
61c33f56a0 Updated to latest master branch + add PLA's data to teachable_learnsets.h 2022-08-29 21:01:31 +07:00
TheXaman
006d28fd69 tiny fix for wrong "give pokemon" window 2022-08-29 14:51:40 +02:00
TheXaman
94183b45c7 Added options for ttoggling battle frontier pass and giving max BPs 2022-08-29 14:48:40 +02:00
DizzyEggg
2d4ac679a6 tabs 2022-08-29 10:26:55 +02:00
DizzyEggg
27010e9ee6 quash faintclearsetdata 2022-08-29 10:23:26 +02:00
Eduardo Quezada D'Ottone
8612300020
Merge branch 'master' into patch-1 2022-08-29 04:22:48 -04:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework 
Reworked TMHM into expandable list format
 2022-08-29 04:20:45 -04:00
crater-git
1c735e1abe Restored bool32 type to shouldUseMove 2022-08-29 03:47:11 -04:00
DizzyEggg
b9babd9ff1
Merge pull request #2264 from AsparagusEduardo/RHH_pretMerge20220826 
Friday Night Mergin' (weekly merge)
 2022-08-29 09:17:40 +02:00
LOuroboros
5801047e50
Removed unused local var in SetMonFormPSS 2022-08-28 12:10:54 -03:00
Blackforest92
d6998d4579 Edited PLA' pokedex_text.h 2022-08-28 19:55:45 +07:00
crater-git
9f16d1dd12 Fixed battle frontier tutors (for real this time) 2022-08-27 22:45:10 -04:00
Eduardo Quezada
1c8d3a4922 Removed unnecessary parenthesis 2022-08-27 11:19:50 -04:00
Eduardo Quezada
99fbad92e2 IS_BATTLER_OF_TYPE 2022-08-27 02:50:55 -04:00
Eduardo Quezada
69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs 
# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2022-08-27 02:42:22 -04:00
Eduardo Quezada
866d916f2f SpriteTemplate formatting 2022-08-27 02:07:58 -04:00
Eduardo Quezada
1f0a952546 Usage of BATTLE_OPPOSITE 2022-08-27 01:44:39 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
Eduardo Quezada
6c457f42af Corrected uses of GetBattlerSide 2022-08-27 00:59:12 -04:00
Eduardo Quezada
0a34d47041 Merge remote-tracking branch 'pret/master' into pret_clean2 2022-08-27 00:56:00 -04:00
Eduardo Quezada
481210b7f3 Missing uses of MAX_SPRITES 2022-08-27 00:54:30 -04:00
Eduardo Quezada
7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
 2022-08-26 22:23:37 -04:00
SomeLoserThatCantPickOriginalUsernames
bd81841c30 Fix Escape Rope Message when on gen 8 mechanics 2022-08-26 17:47:45 -07:00
LOuroboros
922bbacd71 Updated GetMonFriendshipScore 
-Moved it to src/pokemon.c
-Made a battle specific variant called GetBattlerFriendshipScore.
-Made that variant return 0 for Mega Evolved 'mons and if called on link battles.
 2022-08-26 21:33:43 -03:00
GriffinR
578064d799 Add missing use of METATILE_ROW_WIDTH 2022-08-26 15:23:54 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection 
Implement affection-now-friendship mechanics
 2022-08-26 14:54:32 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore 
Added constants for GetLeadMonFriendshipScore
 2022-08-26 14:52:10 -04:00
crater-git
f8fb4e8cf2 Renamed funcs, lists, etc. - Teach->Teachable 2022-08-26 14:48:06 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan 
Add missing usage of SOUND_PAN_*
 2022-08-26 14:47:24 -04:00
crater-git
b8a3cc2846 Consolidated funcs, renamed CanMonLearnMove 2022-08-26 11:07:08 -04:00
crater-git
54ee960970 Fixed Battle Frontier tutor move IDs 2022-08-26 10:12:11 -04:00
DizzyEggg
6331931ba3 Fix Magic Coat targets 2022-08-26 15:01:51 +02:00
Eduardo Quezada
77e2a2da32 Fixed Net Ball Gen 7+ multiplier 2022-08-25 23:19:46 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy 
Gen 8 EXP Candies
 2022-08-25 23:03:24 -04:00