cawtds
ba1512f864
Fix specific tiles changing to pc tiles when using boxlink/debug pc ( #5141 )
2024-08-12 15:52:55 -04:00
Alex
805bb2888c
Fixes wrong padding in struct SpeciesInfo ( #5139 )
...
Fixes wrong padding in struct SpeciesInfo that is if I counted correctly.
After I opened #5138 I realized it might be an issue on master as well.
2024-08-11 18:27:22 +02:00
Bassoonian
c390999141
Pret Merge (7th of August) ( #5116 )
2024-08-08 10:23:14 +02:00
psf
b8dab587ab
Update include/battle.h
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-07 14:32:36 -07:00
pkmnsnfrn
5fbe5a331c
Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5114\#discussion_r1707607637
2024-08-07 13:33:35 -07:00
Bassoonian
0b1f06b594
Merrp merge (7th of August) ( #5110 )
2024-08-07 22:05:07 +02:00
pkmnsnfrn
5635f94036
More changes from typeX to types[X]
2024-08-07 11:35:45 -07:00
Bassoonian
cb4e687917
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf
2024-08-07 19:05:46 +02:00
Pawkkie
9f845a79e5
Fix Switch AI Bug: AI never switching out when it could be OHKO'd ( #5089 )
...
* Fix switch AI bug
* Forgot to save a file lol
* Fix infinite loop test compatibility
2024-08-07 15:58:39 +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
psf
312749dd31
Changed type1 and type2 to be consistent ( #2021 )
...
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
2024-08-07 06:44:03 +01:00
kittenchilly
e4f09c8103
Move Relearner now displays move category ( #5081 )
...
* Move relearner now displays move category
* Update move_relearner.c
* Update move_relearner.c
* Address reviews
2024-08-06 23:58:18 +02:00
pkmnsnfrn
0fb48e8a9a
Fixed expanded OW IDs
2024-08-03 17:04:33 -07:00
Martin Griffin
9d97537ee2
Fix speed ties ( #4780 )
...
* Fix speed ties
* fixup! Fix speed ties
* fixup! Fix speed ties
* fixup! fixup! Fix speed ties
* fixup! Fix speed ties
* Workaround for Comatose-Ditto interaction
2024-08-03 17:29:47 +02:00
Eduardo Quezada
512c44b698
Start 1.9.1 cycle
2024-08-01 17:04:48 -04:00
Eduardo Quezada
7ec24b89c8
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0
2024-08-01 16:58:19 -04:00
Eduardo Quezada
f95322628d
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0
2024-08-01 16:47:50 -04:00
Eduardo Quezada
483121dfc0
Version 1.8.6 ( #5005 )
2024-08-01 19:52:29 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro ( #5049 )
...
* Added OBJ_EVENT_GFX_SPECIES_SHINY
* Update src/event_object_movement.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-29 18:41:03 +02:00
Eduardo Quezada
b4eca0a6ec
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# src/battle_util.c
2024-07-29 09:36:16 -04:00
hedara90
a89820fa96
Fixed Hidden Power damage category for PSS < GEN_4 ( #5053 )
...
* Fixed Hidden Power damage category for PSS < GEN_4
* Fixed category display regression
* Wrapped GET_MOVE_TYPE
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:45:14 +02: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
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
Pawkkie
3c1fbbb06e
Fixes cantBeSurpressed ability check for breakable abilities ( #5043 )
2024-07-26 15:57:01 -04:00
AlexOn1ine
89563cb9b1
check for breakable ability
2024-07-26 21:11:16 +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
Martin Griffin
5b251b614c
trainerproc: Support Ogerpon
2024-07-25 14:50:32 +01:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
Eduardo Quezada
9d5e253867
Improved Test Runner Summary ( #4641 )
...
* Filename in list (no proper sorting yet)
* Line number and message in error list + removed sorting
* Style adjustment
* Added missing file/line number to "expected N passes/successes"
* Fixed Known Failing Passing test list
* Separated test list from totals
* Assumption fails list
* Better names
* Filename for KNOWN_FAILINGs passing
* Moved total back to the bottom
* Spaces correction
* Fixed test list count
* Source file for Alloc fails on tests
* Moved sourceLine from BattleTest to Test struct
* Fixed assumptions failed "and more" counter
* Fixed ASSUMPTION block not printing their line numbers
* Fixed when stopLine is printed
* Renamed stopLine to failedAssumptionsBlockLine
2024-07-20 18:22:40 +02:00
tertu
5ccf3e2688
Fix chain fishing shiny rolls ( #4906 )
2024-07-19 09:48:14 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases ( #4987 )
2024-07-17 23:36:15 +02:00
fakuzatsu
0625c90277
fix tests when B_USE_FROSTBITE is TRUE ( #4986 )
2024-07-17 23:23:52 +02:00
psf
7b3b635c67
Add AUTO_LOWERCASE_KEYBOARD ( #4976 )
...
* Added SwapKeyboardToLowerAfterFirstCapitalLetter and AUTO_LOWERCASE_KEYBOARD
* Fixed tabs and spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4976/files\#r1677868397
* Removed semicolon found by https://github.com/rh-hideout/pokeemerald-expansion/pull/4976\#discussion_r1678105502
2024-07-15 19:06:01 +02:00
Eduardo Quezada
2b40e79ac3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle_util.h
# src/battle_ai_main.c
2024-07-14 22:44:00 -04:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves ( #4923 )
2024-07-14 15:35:11 +02:00
psf
5c38532281
Add B_ENEMY_THROW_BALLS, B_PLAYER_THROW_BALLS_SOUND, and B_ENEMY_THROW_BALLS_SOUND ( #4953 )
...
* First proof of concept works
* Added B_THROW_BALLS_SOUND
* Made generic MonSendOut
* Changed magic number to constant
* added acute e and changed to GEN_LATEST
* Removed tabs
* Undef'd HIBYTE and removed extra bool32
* Made functions inline per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1675397114
Split into B_THROW_BALLS_SOUND B_PLAYER_THROW_BALLS_SOUND and B_ENEMY_THROW_BALLS_SOUND per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1676143761
* Reset debug script
* Removed static assert per Discord conversation with Alex
2024-07-14 14:46:04 +02:00
psf
d410f56a8c
Add P_CAN_FORGET_HIDDEN_MOVE ( #4968 )
...
* Added P_CAN_FORGET_HMS
* Renamed to can forget hidden move
* Bypass IsLastMonThatKnowsSurf
* Fixed typo
* Moved P_CAN_FORGET_HIDDEN_MOVE
* Update src/party_menu.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/4968#discussion_r1677033837
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-14 11:23:49 +02:00
Pawkkie
c721f1b04a
Smarter Focus Punch and Substitute ( #4952 )
...
* Smarter Focus Punch
* Smarter Substitute, review feedback
* Use HasAnyKnownMove instead of isFirstTurn
* When are we removing agbcc again
* Use HasMoveEffect
2024-07-14 08:29:27 +02:00
Bassoonian
385b7017f3
Fix fake RTC being on by default ( #4965 )
2024-07-13 21:20:55 +02:00
Alex
5e2e2e9fce
Minor shouldUseGimmick refactor ( #4962 )
2024-07-13 20:56:18 +02:00
psf
3e03419bdb
Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc ( #4954 )
...
* First concept
* Fixed config file and added static assert
* Reset debug scripts
* Cleaned up overworld config
* Renamed new Rtc pausing functions per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1675393121
* Added tabs instead of spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1676791279
* Update include/config/overworld.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 20:44:27 +02:00
Frank DeBlasio
d224db43c8
Consolidated Lilycove Contest Lady's values into one struct ( #4951 )
...
* Consolidated Lilycove Contest Lady's values into one struct
* Converted Lilycove Lady strings to COMPOUND_STRINGS
2024-07-13 14:44:22 +02:00
Alex
edc883d038
Refactors residual damage ( #4945 )
...
* Refactors damage non types
* correction
* Refactor weather damage script
* new line
* correction
* there was a hail test already
* ndebug
* add sandstorm test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +02:00
psf
522a8ba3f7
Allow users to increase MAX_MONEY ( #4943 )
...
* Added GetMaxNumMoneyDigits and GetMoneyBoxHorizontalPosition to header
Replaced use of PrintMoneyAmount
* Added define for MAX_MONEY_DIGITS
Removed GetMaxNumMoneyDigits
Converted uses of ConvertIntToDecimalStringN that called for 7 money digits to use MAX_MONEY_DIGITS
Replaced 6 money digits in PrintMoneyAmount with MAX_MONEY_DIGITS
* Use preproc and MAX_MONEY_DIGITS to increase the width of the sell item money box
* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS
* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS
* Removed width and tilemap changes
* Modified CountDigits to count digits greater than 1
Fixed PrintMoneyAmount to work with large digits
* Added an early return to PrependFontIdToFit
* First prototype working
* Updated GetMoneyBoxHorizontalPosition with amount
* Updated GetMoneyBoxHorizontalPosition with amount
* Got version working with one space before
* Got version working with one space before
* Got version working with all spacingOC
* cleaned up PrintMoneyAmount
* Created CalculateleadingSpacesForMoney
* Cleaned up for PR
* Changed tabs to spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4943\#issuecomment-2223023365
2024-07-13 11:16:34 +02:00
Bassoonian
ef76a6b21b
Merge branch 'upcoming' into disablefollowersbydefault
2024-07-11 14:08:55 +02:00
