Pret Merge (5th of July) #4915
Merged
Pret Merge (5th of July) #4915
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix build on NixOS and add instructions to INSTALL.md
Fix pokeemerald-expansion reference in INSTALL.md
Decode unused JP text in berry_blender.c
Berry blender's Task_HandleOpponent small fixes
AsparagusEduardo
approved these changes
Jul 5, 2024
laserXdolphin
added a commit
to laserXdolphin/pokeemerald-base
that referenced
this pull request
Jul 24, 2024
commit e395f1a Merge: 9d32b86 7a4df80 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 24 11:58:47 2024 +0200 Merge remote-tracking branch 'upstream/master' into develop commit 9d32b86 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 24 11:58:02 2024 +0200 Set Default Options Text Speed = Fast Sound = Stereo Battle Style = Set commit ed0ba14 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 24 11:16:57 2024 +0200 Implemented Move Pokémon as first PSS option https://www.pokecommunity.com/showpost.php?p=10065761 commit 7a4df80 Author: hedara90 <90hedara@gmail.com> Date: Tue Jul 23 17:55:07 2024 +0200 Added Ogerpon Tera Sprites (rh-hideout#4996) * Added Ogerpon Tera Sprites * Updated references to Ogerpon Tera forms * Fixed back sprite offsets and color indices for Hearthflame Tera * Removed Ogerpon data duplicates --------- Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> commit 305c1ba Merge: 67551db 30ff2fa Author: tertu <flameshadowxeroshin@gmail.com> Date: Mon Jul 22 15:05:23 2024 -0500 Fix random IVs for givemon (rh-hideout#5021) commit 30ff2fa Author: cawtds <38510667+cawtds@users.noreply.github.com> Date: Mon Jul 22 17:18:22 2024 +0200 fix givemon random ivs commit 67551db Merge: 0bcd6a5 19fff81 Author: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon Jul 22 08:20:16 2024 -0400 Fixes AI not being aware during calcs (rh-hideout#4992) commit 0bcd6a5 Author: kittenchilly <mario.pikmin.zelda@gmail.com> Date: Mon Jul 22 06:39:32 2024 -0500 Make Snow Warning description respect config (rh-hideout#5018) * Make Snow Warning description respect config * Update src/data/abilities.h --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> commit aac6ebd Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com> Date: Sun Jul 21 20:24:05 2024 +0100 Fixes Sleep Talk, Toxic Debris and Jaboca/Rowap Berry issues; Adds Sleep Talk tests (rh-hideout#5009) * Fix Sleep Talk failing with choice item; Added some Sleep Talk tests * Fix Jaboca, Rowap berries recording Rocky Helmet Effect; Fix Toxic Debris not checking side's toxic spikes count properly in Doubles commit 7e509c4 Author: hedara90 <90hedara@gmail.com> Date: Sun Jul 21 08:17:31 2024 +0200 Added Terapagos Stellar Sprite (rh-hideout#5008) Co-authored-by: Hedara <hedara90@gmail.com> commit 01831a3 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Sat Jul 20 12:23:47 2024 -0400 Temporarely revert regional form inheritance (rh-hideout#5004) commit 9d5e253 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Sat Jul 20 12:22:40 2024 -0400 Improved Test Runner Summary (rh-hideout#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 commit f2311b4 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Fri Jul 19 12:30:06 2024 +0200 Add trainer class ball test (rh-hideout#4999) commit 296bd05 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Fri Jul 19 11:58:42 2024 +0200 Fix tests not compiling outside of CI (rh-hideout#4998) commit 9ff30ee Author: Bassoonian <iasperbassoonian@gmail.com> Date: Fri Jul 19 11:46:25 2024 +0200 Fix frontier ineligibility fix (rh-hideout#4997) commit 552e276 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri Jul 19 11:01:46 2024 +0200 Fixes to Opportunist and Mirror Herb adjustments (rh-hideout#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 commit 93ee3a9 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Thu Jul 18 21:51:21 2024 +0200 Fix Psycho Shift Frostbite interaction (rh-hideout#4995) commit 0625c90 Author: fakuzatsu <118256341+fakuzatsu@users.noreply.github.com> Date: Wed Jul 17 22:23:52 2024 +0100 fix tests when B_USE_FROSTBITE is TRUE (rh-hideout#4986) commit 19fff81 Author: AlexOn1ine <alexthenotes@gmail.com> Date: Wed Jul 17 22:13:09 2024 +0200 Fixes AI not being aware during calcs commit fa27e80 Merge: 819741b cfcac0b Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 16:46:34 2024 +0200 Merge remote-tracking branch 'upstream/master' into develop commit 819741b Merge: 5609d11 950df26 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 16:38:59 2024 +0200 Merge branch 'master' into develop commit 5609d11 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 16:19:21 2024 +0200 Implemented Map Based Trainer Music https://github.com/pret/pokeemerald/wiki/Map-Based-Trainer-Battle-Music commit f999be5 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 15:57:39 2024 +0200 Implemented Speedy Nurse and fixed Badge Mart Items https://github.com/pret/pokeemerald/wiki/Speedy-Nurse-Joy commit b5c241d Merge: b902da2 56095f8 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 15:39:06 2024 +0200 Merge branch 'mart_badges' of https://github.com/ghoulslash/pokeemerald into develop commit b902da2 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 15:34:57 2024 +0200 Implemented Keyboard Auto Case Switch https://github.com/pret/pokeemerald/wiki/Automatically-make-the-keyboard-switch-to-lowercase-after-the-first-character/ commit 899ea4a Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 15:29:17 2024 +0200 Implemented Remove the extra save confirmation https://github.com/pret/pokeemerald/wiki/Remove-the-extra-save-confirmation commit d814564 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 15:19:21 2024 +0200 Implemented Disabling Union Room check when entering Pokémon Centers https://github.com/pret/pokeemerald/wiki/Disabling-Union-Room-check-when-entering-Pok%C3%A9mon-Centers commit 9537499 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 14:40:18 2024 +0200 Implemented Custom Battle Music Via Scripting - Anon822 https://www.pokecommunity.com/threads/simple-modifications-directory.416647/page-13#post-10341282 commit 0e82eab Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 11:29:16 2024 +0200 Implemented faster surfing https://www.pokecommunity.com/threads/simple-modifications-directory.416647/page-3#post-10137446 commit 6adc0a4 Merge: 7ef137f 754991e Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 11:20:17 2024 +0200 Merge branch 'gen4_bike_alt' of https://github.com/LOuroboros/pokeemerald into develop commit 7ef137f Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Wed Jul 17 11:10:44 2024 +0200 Implemented Move Item https://www.pokecommunity.com/threads/pokeemerald-move-items-in-party-menu.492745/ commit cfcac0b Author: Bassoonian <iasperbassoonian@gmail.com> Date: Mon Jul 15 16:25:25 2024 +0200 Clean up battle scripts (rh-hideout#4839) * Clean up battle and anim scripts * Revert anim cleanup commit b5a7185 Author: Pawkkie <61265402+Pawkkie@users.noreply.github.com> Date: Mon Jul 15 03:19:41 2024 -0400 Fix U-Turn With Ace Mon (rh-hideout#4748) (rh-hideout#4972) * Fix U-Turn With Ace Mon * ASSUME for test commit b084dcd Author: Pawkkie <61265402+Pawkkie@users.noreply.github.com> Date: Sun Jul 14 16:00:51 2024 -0400 Fix Upper Hand being used blindly (rh-hideout#4973) commit 0b9cdf4 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Sun Jul 14 11:59:58 2024 +0200 Update README.md (rh-hideout#4966) commit e480f73 Merge: deb2b69 50f368e Author: Martin Griffin <martinrgriffin@gmail.com> Date: Sat Jul 13 19:00:10 2024 +0100 Pret Merge (13th of July) (rh-hideout#4964) commit 50f368e Merge: deb2b69 550e668 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Sat Jul 13 19:42:29 2024 +0200 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge13july commit 550e668 Author: Philipp AUER <SBird1337@users.noreply.github.com> Date: Sat Jul 13 19:26:33 2024 +0200 Support C-Style `enum` in preproc (rh-hideout#1984) * [preproc] C-style enums - asm files parseable from stdin - 2nd preproc pass - add parser for C-style `enum` - positional arguments at end of command --------- Co-authored-by: sbird <sbird@no.tld> Co-authored-by: Martin Griffin <martinrgriffin@gmail.com> commit deb2b69 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Thu Jul 11 15:28:38 2024 +0200 Fix Diamond Storm's effect (rh-hideout#4947) commit f85bff6 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Thu Jul 11 15:07:39 2024 +0200 Fix Basculegion's gen9 level up learnset (rh-hideout#4948) commit 7b6ff1b Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed Jul 10 22:29:26 2024 +0200 Fixes Trace turn order (rh-hideout#4941) * Fixes Trace turn order * Update battle_script_commands.c * Update test/battle/ability/trace.c --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 0613af5 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Wed Jul 10 09:47:35 2024 -0400 Untag commit c0eb9af Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Wed Jul 10 09:44:55 2024 -0400 Version 1.8.5 (rh-hideout#4921) * Version 1.8.5 * Updated up to PR 4926 (squash) * Fixed descriptions (squash) * Updated up to PR4939 (squash) commit 76d7600 Author: hedara90 <90hedara@gmail.com> Date: Wed Jul 10 13:58:32 2024 +0200 Flame Burst + Substitute fix (rh-hideout#4939) Co-authored-by: Hedara <hedara90@gmail.com> commit e1a6876 Author: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com> Date: Mon Jul 8 23:37:40 2024 +0200 Bitter Malice description fix (rh-hideout#4933) It always lowers the foe's attack commit eea736c Merge: cc0a9ac 40950b6 Author: tertu <flameshadowxeroshin@gmail.com> Date: Mon Jul 8 11:39:46 2024 -0500 shop menu allows for 6 digits item prices (rh-hideout#4929) commit 40950b6 Author: DizzyEggg <jajkodizzy@wp.pl> Date: Mon Jul 8 18:12:48 2024 +0200 shop menu allows for 6 digits item prices commit cc0a9ac Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Mon Jul 8 11:47:30 2024 +0200 Fixes wrong nature on partner (rh-hideout#4926) commit 6404241 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Sun Jul 7 07:18:16 2024 -0400 Fixed P_UPDATED_ABILITIES not reverting newly given abilities in Gens 4/6/7 (rh-hideout#4922) commit de609a2 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Sun Jul 7 03:52:59 2024 -0400 Added missing redirect abilities Gen 3-4 config (rh-hideout#4920) * Added missing redirect abilities Gen 3-4 config * Combined 3 Battle Script Natives into 1 * Cleaner FindMonThatAbsorbsOpponentsMove commit 60c7588 Author: sneed <56992013+Sneed69@users.noreply.github.com> Date: Sat Jul 6 10:41:19 2024 +0300 IsFinalStrikeEffect uses effect instead of move (rh-hideout#4917) * IsFinalStrikeEffect uses effect instead of move * Update test/battle/ability/parental_bond.c --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> commit 93f5ca2 Merge: 8168dd7 31ee8fe Author: Bassoonian <iasperbassoonian@gmail.com> Date: Fri Jul 5 23:55:33 2024 +0200 Pret Merge (5th of July) (rh-hideout#4915) commit 31ee8fe Author: Bassoonian <iasperbassoonian@gmail.com> Date: Fri Jul 5 20:49:18 2024 +0200 Fix 2006 regression commit a7f7860 Merge: 8168dd7 a0a02f9 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Fri Jul 5 20:44:29 2024 +0200 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5july commit 8168dd7 Author: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com> Date: Fri Jul 5 19:21:30 2024 +0200 Shed tail rounds up, not down (rh-hideout#4913) * Shed tail rounds up, not down * Label commit a0a02f9 Merge: 502eeda 47533e3 Author: GriffinR <griffin.g.richards@gmail.com> Date: Thu Jul 4 15:02:58 2024 -0400 Merge pull request rh-hideout#2012 from DizzyEggg/patch-1 Berry blender's Task_HandleOpponent small fixes commit 47533e3 Author: DizzyEggg <jajkodizzy@wp.pl> Date: Thu Jul 4 20:56:22 2024 +0200 Berry blender's Task_HandleOpponent small fixes commit 13b8daf Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed Jul 3 22:53:41 2024 +0200 Supersweet Syrup wrong ability desc (rh-hideout#4902) commit dd7b735 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed Jul 3 22:53:15 2024 +0200 Fixes Grassy Terrain heal turn duration (rh-hideout#4903) commit 594633a Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed Jul 3 10:48:31 2024 +0200 Remove Duplicate ai code from battle_ai_util.c (rh-hideout#4883) * Remove Duplicate ai code from battle_ai_util.c * Add GetBattlerAbility in toxic self check commit d81662d Author: DizzyEggg <jajkodizzy@wp.pl> Date: Tue Jul 2 14:39:41 2024 +0200 Add parentheses to species egg macro (rh-hideout#4899) commit 80a6a21 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Mon Jul 1 18:02:31 2024 +0200 Wrapping Summary Screen https://www.pokecommunity.com/showpost.php?p=10060875 commit 1d428aa Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Mon Jul 1 15:56:19 2024 +0200 Update README.md commit 9487c3e Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Mon Jul 1 15:53:55 2024 +0200 Showing IVs/EVs in Summary Screen https://www.pokecommunity.com/showpost.php?p=10161688 commit 9dc2780 Merge: 072c578 6957fc7 Author: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com> Date: Mon Jul 1 14:44:52 2024 +0200 Merge branch 'rh-hideout:master' into develop commit 502eeda Merge: cb1a14c 779855e Author: GriffinR <griffin.g.richards@gmail.com> Date: Sat Jun 29 16:31:56 2024 -0400 Merge pull request rh-hideout#2009 from abcboy101/berry-blender Decode unused JP text in berry_blender.c commit 779855e Author: abcboy101 <16735361+abcboy101@users.noreply.github.com> Date: Sat Jun 29 13:59:30 2024 -0400 Decode unused JP text in berry_blender.c commit cb1a14c Merge: c0d630e 5dac97a Author: Martin Griffin <martinrgriffin@gmail.com> Date: Fri Jun 21 06:41:52 2024 +0100 Merge pull request rh-hideout#2006 from leo60228/oops-not-expansion Fix pokeemerald-expansion reference in INSTALL.md commit 5dac97a Author: leo60228 <leo@60228.dev> Date: Thu Jun 20 15:55:47 2024 -0400 Fix pokeemerald-expansion reference in INSTALL.md commit c0d630e Author: Alex Nash <contact@alexnash.dev> Date: Mon Jun 17 22:45:10 2024 -0400 Add support for LF line endings to gbagfx commit 366f8b3 Merge: 189d542 d8d4885 Author: Martin Griffin <martinrgriffin@gmail.com> Date: Thu Jun 20 19:10:57 2024 +0100 Merge pull request rh-hideout#1999 from leo60228/nixos-install Fix build on NixOS and add instructions to INSTALL.md commit d8d4885 Author: leo60228 <leo@60228.dev> Date: Wed May 29 18:53:16 2024 -0400 Add NixOS install instructions commit ef23305 Author: leo60228 <leo@60228.dev> Date: Wed May 29 19:32:17 2024 -0400 Don't assume bash is at /bin/bash commit 56095f8 Merge: 8078b7f 8c537cc Author: ghoulslash <pokevoyager0@gmail.com> Date: Thu May 11 10:40:27 2023 -0400 merge w pret commit 754991e Author: LOuroboros <lunosouroboros@gmail.com> Date: Thu Sep 16 21:25:24 2021 -0300 Fix Acro Bike wheelie freeze Thanks to RichterSnipes. commit 8078b7f Author: ghoulslash <pokevoyager0@gmail.com> Date: Sat Jun 20 14:26:40 2020 -0600 merge 3b2393a2d5b924e61050b370e4e4f4bd7a50fe7e commit cfac676 Author: ghoulslash <pokevoyager0@gmail.com> Date: Mon May 25 09:39:05 2020 -0600 start commit ab27f6f Author: LOuroboros <lunosouroboros@gmail.com> Date: Tue Oct 13 04:51:47 2020 -0300 Alternate take on the 2-in-1 Bike This implementation is based on Ketsuban's explanations on why the first take could feel "hacky" and his own proposal. Also thanks to Malin for the extra condition that makes it so you can't cast the bike by just pressing the R.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT SQUASH
Merges in pret. Contains the following PRs:
Shasum before merge: dd174d14c6e15609c924415428f9db937b5d9d1d
Shasum after merge: 3a8cbb8a74fc6ebd937008e9a85f8ec02df1f862
The updated berry blender code produces the same hash through agbcc, but produces different results on modern.
Discord contact info
bassoonian