Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@laserXdolphin
laserXdolphin committed Jul 24, 2024
1 parent 11bb775 commit dfac399
Show file tree
Hide file tree
Showing 125 changed files with 3,365 additions and 939 deletions.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.8.4 (Latest release)
- 1.8.5 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.8.4
- 1.8.3
- 1.8.2
- 1.8.1
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.8.4 (Latest release)
- 1.8.5 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.8.4
- 1.8.3
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.4
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/04_other_errors.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.8.4 (Latest release)
- 1.8.5 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.8.4
- 1.8.3
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.4
Expand Down
55 changes: 28 additions & 27 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,49 @@
# Pokeemerald-Expansion Changelogs

## 1.8.x
- ### [Version 1.8.4](docs/changelogs/1.8.x/1.8.4.md) - Bugfix Release 🧹
- ### [Version 1.8.3](docs/changelogs/1.8.x/1.8.3.md) - Bugfix Release 🧹
- ### [Version 1.8.2](docs/changelogs/1.8.x/1.8.2.md) - Bugfix Release 🧹
- ### [Version 1.8.1](docs/changelogs/1.8.x/1.8.1.md) - HOTFIX Release 🔥
- ### [Version 1.8.0](docs/changelogs/1.8.x/1.8.0.md) - Feature Release ✨
- **[Version 1.8.5](docs/changelogs/1.8.x/1.8.5.md) - 🧹 Bugfix Release**
- **[Version 1.8.4](docs/changelogs/1.8.x/1.8.4.md) - 🧹 Bugfix Release**
- **[Version 1.8.3](docs/changelogs/1.8.x/1.8.3.md) - 🧹 Bugfix Release**
- **[Version 1.8.2](docs/changelogs/1.8.x/1.8.2.md) - 🧹 Bugfix Release**
- **[Version 1.8.1](docs/changelogs/1.8.x/1.8.1.md) - 🔥 HOTFIX Release**
- **[Version 1.8.0](docs/changelogs/1.8.x/1.8.0.md) - ✨ Feature Release**

## 1.7.x
- ### [Version 1.7.4](docs/changelogs/1.7.x/1.7.4.md) - Bugfix Release 🧹
- ### [Version 1.7.3](docs/changelogs/1.7.x/1.7.3.md) - Bugfix Release 🧹
- ### [Version 1.7.2](docs/changelogs/1.7.x/1.7.2.md) - Bugfix Release 🧹
- ### [Version 1.7.1](docs/changelogs/1.7.x/1.7.1.md) - Bugfix Release 🧹
- ### [Version 1.7.0](docs/changelogs/1.7.x/1.7.0.md) - Feature Release ✨
- **[Version 1.7.4](docs/changelogs/1.7.x/1.7.4.md) - 🧹 Bugfix Release**
- **[Version 1.7.3](docs/changelogs/1.7.x/1.7.3.md) - 🧹 Bugfix Release**
- **[Version 1.7.2](docs/changelogs/1.7.x/1.7.2.md) - 🧹 Bugfix Release**
- **[Version 1.7.1](docs/changelogs/1.7.x/1.7.1.md) - 🧹 Bugfix Release**
- **[Version 1.7.0](docs/changelogs/1.7.x/1.7.0.md) - ✨ Feature Release**

## 1.6.x
- ### [Version 1.6.2](docs/changelogs/1.6.x/1.6.2.md) - Bugfix Release 🧹
- ### [Version 1.6.1](docs/changelogs/1.6.x/1.6.1.md) - HOTFIX Release 🔥
- ### [Version 1.6.0](docs/changelogs/1.6.x/1.6.0.md) - Feature Release ✨
- **[Version 1.6.2](docs/changelogs/1.6.x/1.6.2.md) - 🧹 Bugfix Release**
- **[Version 1.6.1](docs/changelogs/1.6.x/1.6.1.md) - 🔥 HOTFIX Release**
- **[Version 1.6.0](docs/changelogs/1.6.x/1.6.0.md) - ✨ Feature Release**

## 1.5.x
- ### [Version 1.5.3](docs/changelogs/1.5.x/1.5.3.md) - HOTFIX Release 🔥
- ### [Version 1.5.2](docs/changelogs/1.5.x/1.5.2.md) - Bugfix Release 🧹
- ### [Version 1.5.1](docs/changelogs/1.5.x/1.5.1.md) - Bugfix Release 🧹
- ### [Version 1.5.0](docs/changelogs/1.5.x/1.5.0.md) - Feature Release ✨
- **[Version 1.5.3](docs/changelogs/1.5.x/1.5.3.md) - 🔥 HOTFIX Release**
- **[Version 1.5.2](docs/changelogs/1.5.x/1.5.2.md) - 🧹 Bugfix Release**
- **[Version 1.5.1](docs/changelogs/1.5.x/1.5.1.md) - 🧹 Bugfix Release**
- **[Version 1.5.0](docs/changelogs/1.5.x/1.5.0.md) - ✨ Feature Release**

## 1.4.x
- ### [Version 1.4.3](docs/changelogs/1.4.x/1.4.3.md) - Bugfix Release 🧹
- ### [Version 1.4.2](docs/changelogs/1.4.x/1.4.2.md) - Bugfix Release 🧹
- ### [Version 1.4.1](docs/changelogs/1.4.x/1.4.1.md) - HOTFIX Release 🔥
- ### [Version 1.4.0](docs/changelogs/1.4.x/1.4.0.md) - Feature Release ✨
- **[Version 1.4.3](docs/changelogs/1.4.x/1.4.3.md) - 🧹 Bugfix Release**
- **[Version 1.4.2](docs/changelogs/1.4.x/1.4.2.md) - 🧹 Bugfix Release**
- **[Version 1.4.1](docs/changelogs/1.4.x/1.4.1.md) - 🔥 HOTFIX Release**
- **[Version 1.4.0](docs/changelogs/1.4.x/1.4.0.md) - ✨ Feature Release**

## 1.3.x
- ### [Version 1.3.0](docs/changelogs/1.3.x/1.3.0.md) - Feature Release ✨
- **[Version 1.3.0](docs/changelogs/1.3.x/1.3.0.md) - ✨ Feature Release**

## 1.2.x
- ### [Version 1.2.0](docs/changelogs/1.2.x/1.2.0.md) - Feature Release ✨
- **[Version 1.2.0](docs/changelogs/1.2.x/1.2.0.md) - ✨ Feature Release**

## 1.1.x
- ### [Version 1.1.1](docs/changelogs/1.1.x/1.1.1.md) - Bugfix Release 🧹
- ### [Version 1.1.0](docs/changelogs/1.1.x/1.1.0.md) - Feature Release ✨
- **[Version 1.1.1](docs/changelogs/1.1.x/1.1.1.md) - 🧹 Bugfix Release**
- **[Version 1.1.0](docs/changelogs/1.1.x/1.1.0.md) - ✨ Feature Release**

## 1.0.x
- ### [Version 1.0.0](docs/changelogs/1.0.x/1.0.0.md) - Feature Release ✨
- **[Version 1.0.0](docs/changelogs/1.0.x/1.0.0.md) - ✨ Feature Release**

## Pre-1.0.x:
- ### [Version 0.9.0](docs/changelogs/0.9.x/0.9.0.md) - Retroactive Version 🦕
- **[Version 0.9.0](docs/changelogs/0.9.x/0.9.0.md) - 🦕 Retroactive Version**
7 changes: 7 additions & 0 deletions INSTALL.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,13 @@ nix-shell -p pkgsCross.arm-embedded.stdenv.cc git pkg-config libpng
```
Then proceed to [Choosing where to store pokeemerald Expansion (Linux)](#choosing-where-to-store-pokeemerald-expansion-linux).
### NixOS
Run the following command to start an interactive shell with the necessary packages:
```bash
nix-shell -p pkgsCross.arm-embedded.stdenv.cc git pkg-config libpng
```
Then proceed to [Choosing where to store pokeemerald Expansion (Linux)](#choosing-where-to-store-pokeemerald-expansion-linux).
### Other distributions
_(Specific instructions for other distributions would be greatly appreciated!)_
Expand Down
16 changes: 8 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ ifeq ($(NODEP),1)
$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c
ifeq (,$(KEEP_TEMPS))
@echo "$(CC1) <flags> -o $@ $<"
@$(CPP) $(CPPFLAGS) $< | $(PREPROC) $< charmap.txt -i | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
@$(CPP) $(CPPFLAGS) $< | $(PREPROC) -i $< charmap.txt | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
else
@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
Expand All @@ -389,7 +389,7 @@ define C_DEP
$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
ifeq (,$$(KEEP_TEMPS))
@echo "$$(CC1) <flags> -o $$@ $$<"
@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) -i $$< charmap.txt | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
else
@$$(CPP) $$(CPPFLAGS) $$< -o $$(C_BUILDDIR)/$3.i
@$$(PREPROC) $$(C_BUILDDIR)/$3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $$(C_BUILDDIR)/$3.s
Expand All @@ -404,7 +404,7 @@ ifeq ($(NODEP),1)
$(GFLIB_BUILDDIR)/%.o: $(GFLIB_SUBDIR)/%.c $$(c_dep)
ifeq (,$(KEEP_TEMPS))
@echo "$(CC1) <flags> -o $@ $<"
@$(CPP) $(CPPFLAGS) $< | $(PREPROC) $< charmap.txt -i | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
@$(CPP) $(CPPFLAGS) $< | $(PREPROC) -i $< charmap.txt | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
else
@$(CPP) $(CPPFLAGS) $< -o $(GFLIB_BUILDDIR)/$*.i
@$(PREPROC) $(GFLIB_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(GFLIB_BUILDDIR)/$*.s
Expand All @@ -416,7 +416,7 @@ define GFLIB_DEP
$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
ifeq (,$$(KEEP_TEMPS))
@echo "$$(CC1) <flags> -o $$@ $$<"
@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) -i $$< charmap.txt | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
else
@$$(CPP) $$(CPPFLAGS) $$< -o $$(GFLIB_BUILDDIR)/$3.i
@$$(PREPROC) $$(GFLIB_BUILDDIR)/$3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $$(GFLIB_BUILDDIR)/$3.s
Expand All @@ -429,11 +429,11 @@ endif

ifeq ($(NODEP),1)
$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s
$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@
$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(PREPROC) -i $$< charmap.txt | $(AS) $(ASFLAGS) -o $@
else
define SRC_ASM_DATA_DEP
$1: $2 $$(shell $(SCANINC) -I include -I "" $2)
$$(PREPROC) $$< charmap.txt | $$(CPP) -I include - | $$(AS) $$(ASFLAGS) -o $$@
$$(PREPROC) $$< charmap.txt | $$(CPP) -I include - | $$(PREPROC) -ie $$< charmap.txt | $$(AS) $$(ASFLAGS) -o $$@
endef
$(foreach src, $(C_ASM_SRCS), $(eval $(call SRC_ASM_DATA_DEP,$(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o, $(src)),$(src))))
endif
Expand All @@ -451,7 +451,7 @@ endif

ifeq ($(NODEP),1)
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s
$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@
$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(PREPROC) -ie $$< charmap.txt | $(AS) $(ASFLAGS) -o $@
else
$(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call SRC_ASM_DATA_DEP,$(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o, $(src)),$(src))))
endif
Expand All @@ -477,7 +477,7 @@ $(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(DATA_ASM_BUILDDIR)/event_scr
define TEST_DEP
$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
@echo "$$(CC1) <flags> -o $$@ $$<"
@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) -i $$< charmap.txt | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
endef
$(foreach src, $(TEST_SRCS), $(eval $(call TEST_DEP,$(patsubst $(TEST_SUBDIR)/%.c,$(TEST_BUILDDIR)/%.o,$(src)),$(src),$(patsubst $(TEST_SUBDIR)/%.c,%,$(src)))))

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ You are currently on the master branch which should always be a working (at leas

## What feature branches are included?

- **[RHH's pokeemerald-expansion](https://github.com/rh-hideout/pokeemerald-expansion?tab=readme-ov-file#pokeemerald-expansion)**
- **[RHH's pokeemerald-expansion v1.8.5](https://github.com/rh-hideout/pokeemerald-expansion?tab=readme-ov-file#pokeemerald-expansion)**
- **[Prof. Leon Dias' Fully Decapitalized Pokeemerald](https://www.pokecommunity.com/showthread.php?t=451448)**
- **[Content from Pokecommunity Simple Modifications Directory Content](https://www.pokecommunity.com/showthread.php?t=416647):** IV/EV Stat screens
- **[Fixes and content from the pret tutorials](https://github.com/pret/pokeemerald/wiki/Tutorials):** Map dependent Trainer Battle Music
Expand Down
22 changes: 10 additions & 12 deletions asm/macros/battle_script.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1507,18 +1507,10 @@
.4byte \jumpInstr
.endm

.macro jumpifrodaffected battler:req, jumpInstr:req
callnative BS_JumpIfRod
.4byte \jumpInstr
.endm

.macro jumpifabsorbaffected battler:req, jumpInstr:req
callnative BS_JumpIfAbsorb
.4byte \jumpInstr
.endm

.macro jumpifmotoraffected battler:req, jumpInstr:req
callnative BS_JumpIfMotor
.macro jumpifelectricabilityaffected battler:req, ability:req, jumpInstr:req
callnative BS_JumpIfElectricAbilityAffected
.byte \battler
.2byte \ability
.4byte \jumpInstr
.endm

Expand Down Expand Up @@ -1647,6 +1639,12 @@
.4byte \failInstr
.endm

.macro copyfoesstatincrease battler:req, failInstr:req
callnative BS_CopyFoesStatIncrease
.byte \battler
.4byte \failInstr
.endm

@ various command changed to more readable macros
.macro cancelmultiturnmoves battler:req
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
Expand Down
Loading

0 comments on commit dfac399

Please sign in to comment.