Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rhh mastermerge #2082

Merged
merged 307 commits into from
Apr 3, 2022
Merged

Rhh mastermerge #2082

merged 307 commits into from
Apr 3, 2022

Conversation

LOuroboros
Copy link
Collaborator

Description

The next master merge is being worked on. The process used is that 2 separate users or more merge in the 3 branches into a copy of the latest Master branch and then compare each other's work to spot any differences or mistakes.
Here's my share of the work 👀

Discord contact info

Lunos#4026

TheXaman and others added 30 commits December 10, 2021 12:29
@TheXaman
proper Window usage
31330be
@TheXaman
added the option to change a sprites animation to check which animati…
963642d 
…on fits the best
@TheXaman
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pok…
f6d9b74 
…eemerald-expansion into pokemon_expansion_debug
@TheXaman
another fix for the shared front and back palette
ef01c40
@TheXaman
added battle bg's and platforms and a function LoadBattleBg to change…
44121b0 
… them
@TheXaman
fixed
8c23ad3
@TheXaman
added include/constants/pokemon_debug,h for defines, restructured cod…
bbe9189 
…e order
@TheXaman
Added new menu naviagtion, now all options can be changed
5137166
@TheXaman
removed dead code (arrows dont have a left animation)
a249737
@TheXaman
fixed front sprite position including elevation and shadow for flying…
123969f 
… mon's (shadow palette too dark atm)
@TheXaman
fixed castform elevation calculation
e33abe6
@TheXaman
fixed front sprite shadow palette
d300b8f
@LOuroboros
Added the footprints of all Gen. 7 and 8 species
46977b5
@TheXaman @LOuroboros
Update include/battle_bg.h
d113d5e 
Co-authored-by: LOuroboros <[email protected]>
@TheXaman
changed all missed ones to #if P_ENABLE_DEBUG == TRUE @LOuroboros
a334f7f
@TheXaman
added footprints
f1f4082
@TheXaman
added option to view changes for front/back sprite picCoords and elev…
fe95e88 
…ation live
@AsparagusEduardo
Fixed form wrapping to the left.
e95020c
@AsparagusEduardo
Animations reload when switching Forms
5d7ac21
@AsparagusEduardo
Showing animation number
037370f
@AsparagusEduardo
Slight documentation
7738d67
@TheXaman
Merge pull request #10 from AsparagusEduardo/PR_PEDebug
e23d49d 
Fixed form wrapping to the left in PE debug
@TheXaman
fixed Groudon terrain (dont forget your breaks...)
c4fea6a
@TheXaman
if elevation is changed to != 0 the shadow is shown
9ce83b5
@TheXaman
fixed the back button, didnt work as intended
7a66956
@TheXaman
changed L/R Button position to account for numbered animations
cbd6553
@LOuroboros
Update trade.c
660a3df
@GriffinRichards
Merge pull request pret#1572 from LOuroboros/patch-2
df371fd 
Update trade.c
@GriffinRichards
Clean up tileset_anims
961dbee
@GriffinRichards
Merge pull request pret#1573 from GriffinRichards/tilesetanim
6e55202 
Clean up tileset_anims
abaresk and others added 22 commits February 20, 2022 12:06
@abaresk
Minor fixes
a578fa5
@abaresk
Address comments
26e87ee
@abaresk
Switch to 'symbol' nomenclature
39fc1cd
@abaresk
Fix typos
08bf258
@GriffinRichards
Merge pull request pret#1633 from abaresk/slot-cleanup
eca5233 
Clean up and document Slot Machines more
@sphericalice
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
40efac0
@GriffinRichards
Merge pull request pret#1635 from sphericalice/battle-pyramind
3765c1e 
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
@cbt6
Use constants for PC locations
f826a5a
@GriffinRichards
Merge pull request pret#1637 from cbt6/pc-location
f7ba502 
Use constants for PC locations
@GriffinRichards
Merge pull request pret#1614 from laqieer/patch-1
6262080 
Install libpng using pacman instead of manual build for msys2
@GriffinRichards
Add missing menu array counts
36e5d5e
@GriffinRichards
Additional trader clean up
3d0663f
@GriffinRichards
Merge pull request pret#1638 from GriffinRichards/menu-arr-count
2142ad9 
Add missing menu array counts
@ultima-soul
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_exp…
84a7f96 
…ansion_sync
@ultima-soul
Merge branch 'master' of github.com:pret/pokeemerald into item_expans…
2d3ba50 
…ion_sync
@AsparagusEduardo
Update include/constants/pokedex.h
8f34249
@AsparagusEduardo
Update include/constants/pokedex.h
ff9556c
@AsparagusEduardo
Merge pull request pret#2074 from ultima-soul/pokemon_expansion_sync
ff4c391 
Pokemon Expansion Upstream Sync
@AsparagusEduardo
Merge pull request pret#2075 from ultima-soul/item_expansion_sync
48ce042 
Item Expansion Upstream Sync
@LOuroboros
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
fa39dc7 
…rald-expansion into HEAD
@LOuroboros
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeem…
af2f70e 
…erald-expansion into rhhmerge
@LOuroboros
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pok…
f82c946 
…eemerald-expansion into rhhmerge
AsparagusEduardo
AsparagusEduardo requested changes Apr 3, 2022
View reviewed changes
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only found 3 differences against my own merge.
image
I accidentally left IsPinchBerryItemEffect in src/item.c, so that difference shouldn't be considered.

include/constants/pokedex.h Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
@LOuroboros
Copy link
Collaborator Author

Pushed corrections 👀

@AsparagusEduardo AsparagusEduardo merged commit f3414e5 into rh-hideout:master Apr 3, 2022
@LOuroboros LOuroboros deleted the rhh_mastermerge branch April 3, 2022 17:38
hedara90 pushed a commit to hedara90/pokeemerald-expansion that referenced this pull request Jan 14, 2025
@mrgriffin
Merge pull request rh-hideout#2082 from shachar700/patch-2
5e75cd0 
Update vars.h (cleanup)
lwelyk added a commit to lwelyk/pokeemerald-expansion that referenced this pull request Feb 11, 2025
@lwelyk
Squashed commit of the following:
39d1a5e 
commit 6ceec38
Merge: 2271f3c 397e98b
Author: Kyle Wayne LaCroix <[email protected]>
Date:   Tue Feb 11 09:20:19 2025 -0600

    Merge tag 'expansion/1.10.2' of https://github.com/rh-hideout/pokeemerald-expansion

commit 397e98b
Author: Eduardo Quezada <[email protected]>
Date:   Thu Jan 30 18:38:28 2025 -0300

    Version 1.10.2 (rh-hideout#6144)

commit d0bd824
Author: hedara90 <[email protected]>
Date:   Thu Jan 30 01:13:53 2025 +0100

    Added some TO_DO tests (rh-hideout#6140)

    Co-authored-by: Hedara <[email protected]>

commit 392a166
Author: lordraindance2 <[email protected]>
Date:   Tue Jan 28 18:04:16 2025 -0500

    Implemented clear animation for also overworld pokemon (rh-hideout#5825)

commit 72edeef
Author: bassforte123 <[email protected]>
Date:   Tue Jan 28 15:37:02 2025 -0500

    Update pokemon.h with nature comments (rh-hideout#6133)

commit 49cbebd
Author: Alex <[email protected]>
Date:   Tue Jan 28 21:11:11 2025 +0100

    Remove formToChangeInto (Unused) (rh-hideout#6137)

commit 4041af0
Author: hedara90 <[email protected]>
Date:   Tue Jan 28 19:14:12 2025 +0100

    Removed stray semi-colon in AI code (rh-hideout#6134)

    Co-authored-by: Hedara <[email protected]>

commit c77cf82
Author: DizzyEggg <[email protected]>
Date:   Tue Jan 28 13:11:39 2025 +0100

    Fix safari zone crash on No Cash (rh-hideout#6132)

commit f3f03ec
Author: Frank DeBlasio <[email protected]>
Date:   Mon Jan 27 09:52:03 2025 -0500

    Fixed Hoenn dex off by 1 issues (rh-hideout#6104)

commit 37b6f03
Author: Cafe <[email protected]>
Date:   Sun Jan 26 20:27:05 2025 +0400

    Duraludon battle animation (rh-hideout#6086)

commit 99c24c5
Author: DizzyEggg <[email protected]>
Date:   Sun Jan 26 16:23:33 2025 +0100

    Fix Double Iron Bash move animation crash on MyBoy/No$ (rh-hideout#6114)

commit b3543cb
Author: DizzyEggg <[email protected]>
Date:   Sun Jan 26 16:06:13 2025 +0100

    Fix MindBlown crash on MyBoy/No Cash (rh-hideout#6112)

commit 0339f68
Author: PhallenTree <[email protected]>
Date:   Sun Jan 26 11:21:19 2025 +0000

    Fix seeds softlocking the game when a battler with a Surge ability enters the field (rh-hideout#6110)

commit 9e10f68
Author: Frank DeBlasio <[email protected]>
Date:   Sun Jan 26 03:48:38 2025 -0500

    Move flag fixes (rh-hideout#6107)

commit df50320
Author: DizzyEggg <[email protected]>
Date:   Sat Jan 25 17:38:19 2025 +0100

    Fix Crash if something costs 0 in shop (rh-hideout#6106)

commit 856553d
Author: DizzyEggg <[email protected]>
Date:   Sat Jan 25 16:53:51 2025 +0100

    Put Identifier and smol in gitignore (rh-hideout#6105)

commit c4b8385
Author: Alex <[email protected]>
Date:   Sat Jan 25 14:38:18 2025 +0100

    Fixes Charge effect not boosting and tests (rh-hideout#6102)

commit 4dc2bc6
Author: Frank DeBlasio <[email protected]>
Date:   Fri Jan 24 12:38:51 2025 -0500

    Fixed Liquid Voice's dynamic type for normal moves  (rh-hideout#6092)

commit c372a3b
Author: Bassoonian <[email protected]>
Date:   Fri Jan 24 11:59:24 2025 +0100

    Fix Enamorus not changing forms (rh-hideout#6093)

commit 2aa0ee3
Author: RavePossum <[email protected]>
Date:   Wed Jan 22 18:20:07 2025 -0500

    Add dependency on json files to learnset helper (rh-hideout#6083)

commit e8d3b41
Author: hedara90 <[email protected]>
Date:   Wed Jan 22 14:50:23 2025 +0100

    Trainerslide animation fix (rh-hideout#6040)

    Co-authored-by: Hedara <[email protected]>

commit f2840cb
Author: Alex <[email protected]>
Date:   Tue Jan 21 23:58:52 2025 +0100

    Fixes Eject Pack triggering twice on Intimidate (rh-hideout#6072)

commit b2f2a8c
Author: Alex <[email protected]>
Date:   Tue Jan 21 21:43:54 2025 +0100

    Fixes Rapid Spin / Toxic Debris interaction (rh-hideout#6023)

    Co-authored-by: Bassoonian <[email protected]>

commit b1831da
Author: Alex <[email protected]>
Date:   Tue Jan 21 21:15:25 2025 +0100

    Adds static assert for DamageCalculationData (rh-hideout#6063)

commit 6ec8470
Author: Pawkkie <[email protected]>
Date:   Mon Jan 20 10:45:14 2025 -0500

    Fix Entrainment AI scoring bug (rh-hideout#6056)

commit 4bcb07a
Author: kittenchilly <[email protected]>
Date:   Mon Jan 20 02:49:20 2025 -0600

    Add Clodsire second frame and fixed Grookey backsprite + overworld (rh-hideout#6047)

commit 3977b66
Author: Alex <[email protected]>
Date:   Sun Jan 19 22:45:26 2025 +0100

    Remove redundant line in Cmd_setcharge (rh-hideout#6053)

commit b9acfdb
Author: PhallenTree <[email protected]>
Date:   Sun Jan 19 11:04:15 2025 +0000

    Fixes large battle messages being cut off instead of being prompted to advance (rh-hideout#6052)

commit ab9c48b
Author: hedara90 <[email protected]>
Date:   Sun Jan 19 11:32:58 2025 +0100

    Fixes HGSS dex not compiling currently (rh-hideout#6051)

    Co-authored-by: Hedara <[email protected]>

commit e4e4460
Author: AERDU <[email protected]>
Date:   Sat Jan 18 18:54:20 2025 +0000

    fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 (rh-hideout#6032)

commit 9ed3b17
Merge: 37cbae5 db5dc85
Author: Alex <[email protected]>
Date:   Sat Jan 18 19:53:29 2025 +0100

    Pret merge (17 of January) (rh-hideout#6045)

commit 37cbae5
Author: ghoulslash <[email protected]>
Date:   Sat Jan 18 08:44:07 2025 -0500

    Fix Symbiosis Needing battler Argument + Tests (rh-hideout#6039)

    Co-authored-by: ghoulslash <[email protected]>

commit db5dc85
Merge: cc9a4d3 e83f7c7
Author: Bassoonian <[email protected]>
Date:   Sat Jan 18 13:07:05 2025 +0100

    Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

commit cc9a4d3
Author: Bassoonian <[email protected]>
Date:   Sat Jan 18 13:07:01 2025 +0100

    Fix tests not building

commit 199760a
Author: Bassoonian <[email protected]>
Date:   Sat Jan 18 03:04:46 2025 +0100

    Add known failing learnset cap test (rh-hideout#6046)

commit e83f7c7
Author: DizzyEggg <[email protected]>
Date:   Sat Jan 18 00:19:21 2025 +0100

    Fix conflicting types for rotating gate functions (rh-hideout#2087)

commit 0a436d5
Author: DizzyEggg <[email protected]>
Date:   Sat Jan 18 00:18:17 2025 +0100

    Extern gSprites and gOamMatrices with known array size (rh-hideout#2090)

commit 17e2243
Author: Eduardo Quezada <[email protected]>
Date:   Fri Jan 17 18:04:16 2025 -0300

    Fixed whitespace issue with trainerproc (rh-hideout#6042)

commit bcf9a1e
Merge: 21d2e40 2f67b17
Author: Bassoonian <[email protected]>
Date:   Fri Jan 17 21:57:25 2025 +0100

    Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

commit 2f67b17
Author: GriffinR <[email protected]>
Date:   Fri Jan 17 12:54:38 2025 -0500

    Document bard music (rh-hideout#2053)

    * Missing bard song limit constants
    * Index bard sound arrays with word constants
    * Document bard music

commit b5b0ffd
Author: Raymond Dodge <[email protected]>
Date:   Fri Jan 17 12:04:00 2025 -0500

    Define field script opcode constants (rh-hideout#2005)

    Replace the magic number opcodes in field script command macros with
    these new constants

commit 21d2e40
Author: Mercy <[email protected]>
Date:   Fri Jan 17 00:23:12 2025 -0500

    Fix Match Call Behavior (rh-hideout#5931) (rh-hideout#6033)

commit fd26d3a
Author: ghoulslash <[email protected]>
Date:   Wed Jan 15 09:20:31 2025 -0500

    Fix Redirection Abilities Not Drawing in Ally Moves (rh-hideout#6026)

    Co-authored-by: ghoulslash <[email protected]>

commit 9952b67
Merge: 1c765d1 9385dfe
Author: Martin Griffin <[email protected]>
Date:   Wed Jan 15 09:21:22 2025 +0000

    Merge pull request rh-hideout#2095 from DizzyEggg/transition

    Fix CaveTransition pals

commit 9385dfe
Author: DizzyEggg <[email protected]>
Date:   Wed Jan 15 10:08:02 2025 +0100

    Fix CaveTransition pals

commit 1c3ce75
Author: Alex <[email protected]>
Date:   Tue Jan 14 20:01:10 2025 +0100

    Wrong undefs (rh-hideout#6024)

commit 7af6c4c
Author: Pawkkie <[email protected]>
Date:   Mon Jan 13 20:03:18 2025 -0500

    Workflow for Scope Discussion (rh-hideout#6022)

commit c02b7ba
Author: psf <[email protected]>
Date:   Mon Jan 13 11:52:49 2025 -0800

    Codify new expansion release schedule (rh-hideout#5916)

    Co-authored-by: Bassoonian <[email protected]>
    Co-authored-by: Eduardo Quezada <[email protected]>

commit 52201b1
Author: Eduardo Quezada <[email protected]>
Date:   Mon Jan 13 06:16:43 2025 -0300

    Improved Hidden Power test (rh-hideout#6014)

commit f1eebc9
Author: Alex <[email protected]>
Date:   Mon Jan 13 10:09:55 2025 +0100

    Fixes defrosting if frozon mon is not damaged by opponent (rh-hideout#6016)

    Co-authored-by: Bassoonian <[email protected]>

commit 536f386
Author: RavePossum <[email protected]>
Date:   Sun Jan 12 18:01:47 2025 -0500

    Explicitly specify dependencies for teachable learnset helper (rh-hideout#6015)

commit 96122d9
Author: Alex <[email protected]>
Date:   Sun Jan 12 13:08:04 2025 +0100

    Adds Liquid Ooze and Aromatic Mist test (rh-hideout#6012)

commit 9c7c94d
Author: hedara90 <[email protected]>
Date:   Sun Jan 12 10:01:44 2025 +0100

    Fixed a bunch of move anims (rh-hideout#5936)

    Co-authored-by: Hedara <[email protected]>

commit 15a034a
Author: Eduardo Quezada <[email protected]>
Date:   Sun Jan 12 05:49:19 2025 -0300

    Fixed multiple transform/form change graphical issues (rh-hideout#6005)

commit 28561bc
Author: Alex <[email protected]>
Date:   Sun Jan 12 00:59:57 2025 +0100

    Fixes zmove trigger sprite on b button exit (rh-hideout#6009)

commit 9e8ab3d
Author: Alex <[email protected]>
Date:   Sun Jan 12 00:59:12 2025 +0100

    Fixes Tera giving boost to dynamic bp moves (rh-hideout#6008)

commit 2da5479
Author: Alex <[email protected]>
Date:   Sun Jan 12 00:27:31 2025 +0100

    Fixes Shell Bell inlcuding heal amount from Future Sight when triggered (rh-hideout#5962)

commit 10a3ed2
Author: Alex <[email protected]>
Date:   Sun Jan 12 00:25:17 2025 +0100

    Use gCurrentMove instead of checking FF move (rh-hideout#5999)

commit 846734e
Author: hedara90 <[email protected]>
Date:   Sat Jan 11 21:53:15 2025 +0100

    Ported Makefile fix from upcoming (rh-hideout#6007)

    Co-authored-by: Hedara <[email protected]>

commit 8427d47
Author: Eduardo Quezada <[email protected]>
Date:   Sat Jan 11 09:36:00 2025 -0300

    Fixed Gimmick tests failing when running first (rh-hideout#6001)

commit 71cf1bf
Author: psf <[email protected]>
Date:   Fri Jan 10 23:25:04 2025 -0800

    Updated Makefile to allow for the creation of specific tests (rh-hideout#5993)

commit 3c7708f
Author: DizzyEggg <[email protected]>
Date:   Fri Jan 10 17:00:30 2025 +0100

    Remove out of bounds gSprites access in move relearner (rh-hideout#5991)

commit 75a2d41
Author: Alex <[email protected]>
Date:   Fri Jan 10 16:59:37 2025 +0100

    Follo up for Innards Out / Future Sight interaction (rh-hideout#5967)

commit 25d678f
Author: DizzyEggg <[email protected]>
Date:   Fri Jan 10 10:53:27 2025 +0100

    PlayerHandleStatusXor - change u8 to u32 (rh-hideout#5988)

commit 1c765d1
Merge: 0779c9c 8485681
Author: Martin Griffin <[email protected]>
Date:   Thu Jan 9 19:29:09 2025 +0000

    Merge pull request rh-hideout#2085 from DizzyEggg/patch-4

    remove undef TASK_NONE from list_menu

commit 8485681
Author: DizzyEggg <[email protected]>
Date:   Thu Jan 9 19:33:45 2025 +0100

    remove undef TASK_NONE from list_menu

commit 0779c9c
Merge: 697d2b7 9ab4f5d
Author: Martin Griffin <[email protected]>
Date:   Thu Jan 9 15:51:10 2025 +0000

    Merge pull request rh-hideout#2084 from DizzyEggg/patch-3

    extern gAncientPowerRockSpriteTemplate fix

commit 9ab4f5d
Author: DizzyEggg <[email protected]>
Date:   Thu Jan 9 15:50:39 2025 +0100

    extern gAncientPowerRockSpriteTemplate fix

commit e244d94
Author: DizzyEggg <[email protected]>
Date:   Thu Jan 9 14:01:00 2025 +0100

    CreateFacilityMon error: 'personality' may be used uninitialized (rh-hideout#5981)

commit e264fa6
Author: Alex <[email protected]>
Date:   Thu Jan 9 01:14:38 2025 +0100

    Removed OW_AUTO_SIGNPOST (rh-hideout#5978)

commit b5f539e
Author: Pawkkie <[email protected]>
Date:   Wed Jan 8 08:00:20 2025 -0500

    Rename AI_FLAG_PREFER_STRONGEST_MOVE (rh-hideout#5972)

commit 697d2b7
Merge: 5e75cd0 0ec1189
Author: Martin Griffin <[email protected]>
Date:   Wed Jan 8 06:05:37 2025 +0000

    Merge pull request rh-hideout#2083 from DizzyEggg/patch-2

    missing const in extern gBasicHitSplatSpriteTemplate

commit 0ec1189
Author: DizzyEggg <[email protected]>
Date:   Tue Jan 7 22:14:54 2025 +0100

    extern const gBasicHitSplatSpriteTemplate

commit c3833fa
Author: Alex <[email protected]>
Date:   Tue Jan 7 21:24:12 2025 +0100

    Fixes Parting Shot / Eject Pack interaction (rh-hideout#5963)

commit 46fc560
Author: Pawkkie <[email protected]>
Date:   Tue Jan 7 15:17:14 2025 -0500

    Update scope.md (again) (rh-hideout#5971)

commit c10287b
Author: PhallenTree <[email protected]>
Date:   Tue Jan 7 19:08:31 2025 +0000

    Fixes various Dynamax HP conversions/calculations (rh-hideout#5933)

commit 5a0c548
Merge: 0294bed 5bfc25a
Author: Martin Griffin <[email protected]>
Date:   Tue Jan 7 14:57:46 2025 +0000

    Fixed interaction between Innards Out and Future Sight (rh-hideout#5966)

commit 5bfc25a
Author: wiz1989 <[email protected]>
Date:   Tue Jan 7 15:33:22 2025 +0100

    changed data according to suggestions from the PR

commit 04da838
Author: wiz1989 <[email protected]>
Date:   Tue Jan 7 14:00:09 2025 +0100

    Innards Out and Future Sight interaction

commit 19d8f51
Merge: 5b07750 0294bed
Author: wiz1989 <[email protected]>
Date:   Tue Jan 7 13:18:02 2025 +0100

    Merge pull request rh-hideout#3 from rh-hideout/master

    update to newest expansion

commit 5e75cd0
Merge: 50d325f a0e8753
Author: Martin Griffin <[email protected]>
Date:   Mon Jan 6 20:38:52 2025 +0000

    Merge pull request rh-hideout#2082 from shachar700/patch-2

    Update vars.h (cleanup)

commit a0e8753
Author: shachar700 <[email protected]>
Date:   Mon Jan 6 22:17:24 2025 +0200

    Update vars.h (cleanup)

    Removed an extra are

commit 0294bed
Author: kittenchilly <[email protected]>
Date:   Mon Jan 6 11:23:09 2025 -0600

    Add manual breaking back to "What will (mon) do?" message (rh-hideout#5908)

commit adb4a1f
Author: LOuroboros <[email protected]>
Date:   Mon Jan 6 08:03:44 2025 -0300

    Added the Gen. 4+ berries to gBerryCrush_BerryData (rh-hideout#5937)

commit cbd0b3e
Author: shachar700 <[email protected]>
Date:   Sun Jan 5 17:45:21 2025 +0200

    Field effect for cutting grass is missing setfieldeffectargument. Issue rh-hideout#5766 (rh-hideout#5952)

commit c6d92ea
Author: Eduardo Quezada <[email protected]>
Date:   Sun Jan 5 11:32:48 2025 -0300

    Removed references to HANDLE_EXPANDED_MOVE_NAME in docs (rh-hideout#5955)

commit b8ccc29
Author: Pawkkie <[email protected]>
Date:   Sat Jan 4 14:40:10 2025 -0500

    Update scope.md (rh-hideout#5948)

commit c3b0f4d
Author: hedara90 <[email protected]>
Date:   Fri Jan 3 15:47:45 2025 +0100

    Fixes broken link battles (rh-hideout#5940)

    Co-authored-by: Hedara <[email protected]>

commit 8ccb385
Author: Alex <[email protected]>
Date:   Fri Jan 3 14:15:05 2025 +0100

    Insomnia test used the wrong move in Turn section (rh-hideout#5939)

commit dd985db
Author: Cafe <[email protected]>
Date:   Fri Jan 3 16:49:42 2025 +0400

    Fix formatting in WSL.md (rh-hideout#5942)

commit 875f0f7
Author: Alex <[email protected]>
Date:   Wed Jan 1 21:46:42 2025 +0100

    Fixes Trainer Slide messages causing corruption for recoil damage (rh-hideout#5926)

commit b7e945f
Author: Alex <[email protected]>
Date:   Wed Jan 1 21:41:42 2025 +0100

    Reverts wrongly done partial Eject Pack fix (rh-hideout#5928)

commit 92c0039
Author: Pawkkie <[email protected]>
Date:   Wed Jan 1 15:40:29 2025 -0500

    Cleanup fix from 5922 (rh-hideout#5927)

commit e040dcb
Author: Eduardo Quezada <[email protected]>
Date:   Wed Jan 1 16:20:40 2025 -0300

    Begin 1.10.2 cycle

commit 50d325f
Author: Eduardo Quezada <[email protected]>
Date:   Fri Dec 27 13:09:33 2024 -0300

    Slight contest documentation (rh-hideout#2078)

commit 5b07750
Merge: 069f1ae 889a02d
Author: wiz1989 <[email protected]>
Date:   Tue Oct 1 18:58:24 2024 +0200

    Merge tag 'expansion/1.9.2' of https://github.com/rh-hideout/pokeemerald-expansion

commit 069f1ae
Merge: 71fd95e 13b8daf
Author: wiz1989 <[email protected]>
Date:   Thu Jul 4 16:23:13 2024 +0200

    Merge pull request rh-hideout#2 from rh-hideout/master

    Merge 1.8.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AsparagusEduardo AsparagusEduardo AsparagusEduardo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.