tustin2121
327c648e87
Document seldom-used trigger functionality
...
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone
1607291982
Implemented Honey's Sweet Scent functionality
2022-10-16 20:20:13 -03:00
Abaresk
e67d55bfc4
Fix names
2022-10-15 13:37:24 +00:00
Abaresk
b538239f18
Add more documentation to thunder weather
2022-10-15 04:25:35 +00:00
Eduardo Quezada D'Ottone
4cbc6d4de1
Config for running indoors
2022-10-14 22:31:45 -03:00
LOuroboros
90f79999bb
Added class-based Poké Balls for trainers
...
Thanks to Ghoulslash for helping me optimizing things.
2022-10-14 11:14:30 -03:00
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c
...
Convert tilesets.s to C
2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93
Give tileset palettes proper type, name compressed secret base tiles
2022-10-08 02:02:12 -04:00
Eduardo Quezada D'Ottone
2ce340e8e1
Merge pull request #2262 from LOuroboros/becomingAHero
...
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
2022-10-07 18:27:29 -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
Eduardo Quezada
8ea060044a
Battle text pauses config
2022-10-07 17:22:29 -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
77f24d42e4
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald
...
# Conflicts:
# include/constants/battle_config.h
2022-10-07 15:39:02 -03:00
Eduardo Quezada
44754f8ca7
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
...
# Conflicts:
# include/constants/pokemon_config.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
2022-10-07 15:27:16 -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
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
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 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
Eduardo Quezada
0370cb3fd2
Removed comment MAP_GROUP_COUNT
2022-09-30 22:05:10 -03:00
GriffinR
fb87616e9d
Use window constants in mystery_gift_menu
2022-09-29 15:48:19 -04:00
GriffinR
4af1044439
Use window constants in region_map
2022-09-29 13:11:38 -04:00
GriffinR
16be1e8447
Use window constants for move relearner
2022-09-29 12:10:10 -04: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
ecad6ff0db
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2
2022-09-27 10:46:49 -03: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
GriffinR
e515e52abb
Add DISPLAY_TILE_* constants
2022-09-26 19:52:17 -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
Eduardo Quezada
5054cf3586
Documented unk40EF in Summary Screen
2022-09-25 21:33:20 -03: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
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
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
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
sbird
12670e8e3e
[debug] simplify macros, add EX versions
2022-09-23 03:48:58 +02:00
sbird
22329d3318
[debug] use boolean constants for nStopProgram
2022-09-23 03:23:44 +02:00
sbird
44a5a8d31e
[debug] fix AGBAssert for AGBPrintf debug block
2022-09-23 03:22:57 +02:00
GriffinR
1107ff954d
Clean up shop.c
2022-09-22 15:08:17 -04:00
LOuroboros
5f67335212
Fixed typo in BoxMonKnowsMove
2022-09-19 05:21:54 -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
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
Eduardo Quezada
720cb249d6
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald
...
# Conflicts:
# include/constants/battle_config.h
2022-09-16 12:06:06 -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
Eduardo Quezada
77696ca686
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
2022-09-16 10:31:02 -03: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
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
...
Tidying graphics - Trio Weather
2022-09-15 18:01:43 -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
bca1267ca8
Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes
2022-09-15 14:52:18 -03:00
Eduardo Quezada
dc423ef7ff
Handling repel/lure menu
2022-09-14 00:18:01 -03:00
Eduardo Quezada
ee628de82f
Config to turn off Hippopotas' and Hippowdon's female icons
2022-09-13 21:42:53 -03:00
Eduardo Quezada
0caf79f702
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
...
# Conflicts:
# graphics/pokemon/cherrim/anim_front.png
# graphics/pokemon/scyther/anim_front.png
# graphics/pokemon/scyther/front.png
# graphics/pokemon/shinx/anim_front.png
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
2022-09-13 20:44:49 -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
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
...
Cleaned trailing whitespace
2022-09-13 14:00:11 -04:00
GriffinR
4c34babb4d
Merge pull request #1780 from LOuroboros/raquaza
...
Fixed a typo and scripting vars alignment
2022-09-12 22:02:46 -04:00
LOuroboros
14c6d8b91a
Fixed alignment for the value of vars 0x4020 to 0x40FF
2022-09-12 21:33:03 -03:00
LOuroboros
cb83a09203
Fixed vars alignment
2022-09-12 21:27:53 -03:00
LOuroboros
222362e804
Fixed Raquaza typo
2022-09-12 21:26:22 -03:00
Eduardo Quezada
5eb9312250
Added missing labels in headers
2022-09-12 21:14:15 -03:00
GriffinR
d3d8b4a181
Merge pull request #1762 from GriffinRichards/sync-fieldmap
...
Sync fieldmap
2022-09-12 14:32:27 -04: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
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
Eduardo Quezada
61752a4977
Added parenthesis to GET_SHINY_VALUE
2022-09-11 13:35:58 -04: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
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
Blackforest92
29529a0c47
Remove primal_particle leftovers
2022-09-09 22:28:11 +07:00
Blackforest92
d870d71dbe
Remove windstorm_brew leftovers
2022-09-09 22:26:29 +07:00
Blackforest92
431cb6fa7c
Tidying graphics - Trio Weather
2022-09-09 21:57:40 +07: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
9144779634
Removed repeated extern consts in strings.h
2022-09-09 08:49:16 -04:00
Blackforest92
caf323a653
Erase ghost data in include/constants/map_groups.h
2022-09-09 00:40:30 +07: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
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
47a50b3dac
Merge branch 'master' into weather_forms_fixes
2022-09-07 23:07:25 -04:00
sbird
3a0759d458
[doc] fix misnamed dma <--> aslr
2022-09-07 14:37:03 +02: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
c8f4a44380
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux
2022-09-06 20:40:34 -03:00
LOuroboros
8705d1656b
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-09-06 20:38:28 -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
b249399a53
changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()'
2022-09-06 23:00:26 +02: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
59de7e48e5
Merge pull request #2265 from AsparagusEduardo/RHH_substructFix
...
Fixed PokemonSubstruct3 alignment
2022-09-06 15:14:45 -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
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
Eduardo Quezada
e253a87bc5
Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.
2022-09-05 14:49:14 -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
TheXaman
6cab795c5c
Update include/constants/overworld_config.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-09-05 11:02:44 +02:00
Eduardo Quezada
2ee843c70d
Proper label for species flags
2022-09-04 22:13:28 -03:00
Eduardo Quezada
a4c242f2f8
Implemented Shiny Lock functionality
2022-09-04 21:55:59 -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 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
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
03a98c72bc
Sync fieldmap
2022-09-02 19:29:35 -04:00
Eduardo Quezada
c7fc2e13f7
Renamed TM flags to keep consistency with the rest of the repo
2022-09-02 16:54:58 -04:00
Porygon23
ba6aad5bcc
Merge branch 'master' into AI-Logic-Updates
2022-09-02 14:44:47 -06: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
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
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement
...
Standardize judgement vs judgment spelling
2022-09-01 11:51:04 -04:00
Eduardo Quezada
8d94c58cac
Shows exp when leveling up with Exp Candies
2022-08-31 21:54:27 -04:00
Eduardo Quezada
3264c3c87a
Shows amount of Exp gained.
2022-08-31 09:05:51 -04: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
925384eedc
Generations of Pokémon can now be disabled individually
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
3debf0442d
changed the locations of tx_debug_system related #defines to its own file 'constants/debug_config.h'
2022-08-30 18:02:23 +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
d9bd272452
removed the entries ld_script as per pret#1738, added newline to debug.h
2022-08-30 17:08:35 +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
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
61c33f56a0
Updated to latest master branch + add PLA's data to teachable_learnsets.h
2022-08-29 21:01:31 +07: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
Eduardo Quezada
12b32606f5
Fixed PokemonSubstruct3 alignment
2022-08-27 03:05:06 -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
15d611ba65
Usage of BATTLE_PARTNER
2022-08-27 01:26:13 -04:00
Eduardo Quezada
0a34d47041
Merge remote-tracking branch 'pret/master' into pret_clean2
2022-08-27 00:56:00 -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
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
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
ghoulslash
ae2ff4c1d8
Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix
...
Enable BUGFIX by default
2022-08-26 09:56:19 -04:00
DizzyEggg
6331931ba3
Fix Magic Coat targets
2022-08-26 15:01:51 +02: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
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-08-25 22:40:19 -04:00
Eduardo Quezada
4c999b40b1
Enable BUGFIX by default
2022-08-25 22:35:33 -04:00
GriffinR
ce4a6e9067
MAP_NONE -> MAP_DYNAMIC
2022-08-25 21:34:05 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
AgustinGDLV
e204527f43
changed candy item parameters
2022-08-25 15:52:47 -07:00
LOuroboros
8bd7103b9d
Even more review corrections
2022-08-25 17:32:12 -03:00
DizzyEggg
622a7f8141
merge with master
2022-08-25 22:10:59 +02:00
LOuroboros
2cf2c00b29
Updated friendship labels
2022-08-25 17:10:11 -03:00
ghoulslash
552d1f3d7b
Merge pull request #2237 from gruxor/compat_define
...
Reworked branch defines into single compatibility define
2022-08-25 15:36:01 -04:00
ghoulslash
15a368163d
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic
...
LoadSpecialPokePic adjustments
2022-08-25 15:35:21 -04:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves
...
Moves with EFFECT_PLACEHOLDER can't be used.
2022-08-25 15:34:23 -04:00
LOuroboros
5dd143f19d
Applied Blackforest's changes to General_AffectionHangedOn
2022-08-25 13:07:52 -03:00
LOuroboros
1fc63c3431
More review corrections
2022-08-25 11:52:21 -03:00
DizzyEggg
a0ec8a5a80
4 digit hp in battle
2022-08-25 16:40:56 +02:00
LOuroboros
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
LOuroboros
e792fae415
Review corrections
...
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03:00
ghoulslash
f736766c94
Merge pull request #2238 from DizzyEggg/multi
...
Wild multi battles and doubles 2 vs 1 interface
2022-08-25 08:47:02 -04:00
Eduardo Quezada
af137c9b9d
Multiple changes
...
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
2022-08-25 03:42:41 -04:00
LOuroboros
7b7ba93d45
Fixed P_UPDATED_ABILITIES's comment
2022-08-24 20:35:13 -03:00
crater-git
6012731f27
Removed redundant ifdef
2022-08-24 19:31:55 -04:00
DizzyEggg
91b76e2e4f
quash pr clean up
2022-08-24 23:39:34 +02:00
DizzyEggg
06b4548603
Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash
2022-08-24 23:35:42 +02:00
DizzyEggg
7aa55f2753
better interface 1 player mon in double
2022-08-24 23:00:21 +02:00
crater-git
940f9f1726
Moved branch defs to config.h, now only for compat
2022-08-24 16:10:32 -04:00
DizzyEggg
e3ab439ec0
Fix multi wild battles
2022-08-24 21:56:24 +02:00
LOuroboros
b7ca63d151
Implemented Ice Face
...
Thanks to Benício Gonçalves#3454 who provided a base to work with.
2022-08-24 13:45:34 -03:00
Blackforest92
07a07ddc8d
Update to latest master branch + allow Reveal Glass to work with Enamorus
2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI
2022-08-24 01:07:35 -04:00
Eduardo Quezada
eea718cfc6
Placeholder moves can't be used in battle.
2022-08-24 00:30:49 -04:00
Eduardo Quezada
56a2e91518
Updated move limitations
2022-08-23 22:40:04 -04:00
Ct11217
67f473f38b
Fixed recommended issues.
...
Added additional comments.
Reordered switching ladder in ShouldSwitch() function.
Functions that can specify a specific party mon to switch into need to come first.
2022-08-23 19:49:54 -06:00
crater-git
45511fcc44
Reworked TMHM into expandable list format
2022-08-23 21:44:42 -04:00
Eduardo Quezada
1f5adf93c7
Cleaned up use of configs be almost exclusively preproc functions
2022-08-23 21:00:08 -04:00
GriffinR
3771abbe08
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -04:00
Eduardo Quezada
7c7887aa65
Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret
2022-08-23 08:25:27 -04:00
DizzyEggg
05ec8fb182
AI knows Party mons
2022-08-23 11:58:17 +02:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
DizzyEggg
327782646b
Save party mons ai
2022-08-23 01:07:25 +02:00
Eduardo Quezada
75ac960365
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock
...
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
...
Fixed inconsistent use of white space for scripts, .c files and .h files.
2022-08-20 23:03:59 -04:00
GriffinR
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
...
Add some missing battle arena constants
2022-08-20 22:54:32 -04:00
Eduardo Quezada
76d2d92abb
Merge branch 'pretmaster' into pret_clean2
2022-08-20 12:43:09 -04:00
GriffinR
1685365cd4
Merge pull request #1727 from AsparagusEduardo/pret_clean
...
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-19 21:27:55 -04:00
Martin Griffin
d57442a511
Decimal paletteNums
2022-08-19 17:05:22 +01:00
GriffinR
c2d5dd2a1f
Additional battle anim sync
2022-08-19 11:51:13 -04:00
Martin Griffin
5719a7f7bc
Use static inline instead of extern inline for modern
2022-08-19 15:47:50 +01:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
Blackforest92
a9d09bcd17
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
2022-08-19 17:53:01 +07:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
Eduardo Quezada
3bc2cf921c
Sync src/battle_controllers.c with pokefirered
2022-08-18 14:30:22 -04:00
Eduardo Quezada
59f89bde9e
Misc cleanup
2022-08-18 14:23:45 -04:00
Ct11217
a4b53126f6
Added AI_FLAG_ACE_POKEMON
...
When this flag is set, the trainer will have an "Ace" pokemon that will
always be sent out last.
If this flag is set, the last Pokemon in the party will be considered the
"Ace" Pokemon.
This is similar to the gym leader functionality found in Sword & Shield.
2022-08-17 18:23:12 -06:00
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
GriffinR
26734d80f3
Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum
...
Convert MON_DATA constants into enum to ease editing and addition of fields.
2022-08-15 18:51:32 -04:00
Eduardo Quezada
0149f420f9
Corrected comment
2022-08-15 17:36:55 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
tustin2121
ec73158f16
Moving documentation comments per request
...
from the discord chat.
2022-08-15 16:37:38 -04:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
GriffinR
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature
...
Sector security -> signature
2022-08-12 10:47:10 -04:00
Ct11217
b95e450cb6
Added corner case logic for AI Switching.
...
1. Refactor Perish Song
2. Yawn
3. Secondary Damage (Leech Seed, Cursed etc).
4. Added Preliminary logic to help AI be smarter against semi-invulnerable
Added AI logic regarding abilities that benefit from switching
1. Natural Cure
2. Regenerator
2022-08-11 22:48:36 -06:00
GriffinR
cf4d05e9e7
Fix typo
2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
GriffinR
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable
...
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-10 21:28:14 -04:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
Eduardo Quezada
1fd1870a13
Moved enum to include/pokemon.h
2022-08-08 18:40:47 -04:00
Eduardo Quezada
75d52dc762
Convert MON_DATA constants into enum to ease editing and addition of fields.
2022-08-08 18:18:17 -04:00
Eduardo Quezada
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
GriffinR
2487ddb128
Sector security -> signature
2022-08-05 10:42:31 -04:00
DizzyEggg
c991131b75
Change language stuff based on the french decomp
2022-08-04 11:53:16 +02:00
GriffinR
e5c36cd745
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-03 14:21:13 -04:00
GriffinR
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn
...
Clean up field_poison.c
2022-08-02 13:20:49 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro
...
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-08-02 13:11:43 -04:00
ExpoSeed
807c3fd17f
Delete item and ability defines in configs
2022-08-02 00:28:42 -05:00
ExpoSeed
49da2ee53f
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
2022-08-02 00:15:55 -05:00
GriffinR
79c5a5983e
Merge pull request #1721 from AsparagusEduardo/pret_clean2
...
Companion PR to pokefirered #525
2022-08-01 16:57:40 -04:00
Eduardo Quezada
c6cdb2a281
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-31 22:57:46 -04:00
GriffinR
5101811407
Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands
...
Further cleaning after comparing with pokefirered
2022-07-30 09:09:23 -04:00
Eduardo Quezada
40805fffc0
Space cleanup
2022-07-29 21:28:39 -04:00
Eduardo Quezada
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd
Review changes
2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -04:00
Jaizu
7a8c28ccca
Remove duplicated CB2_InitCopyrightScreenAfterBootup
2022-07-29 10:52:36 +02:00
