Squashed commit of the following:

commit 5d7713ac9b77a3467d0c84cfec8fe81907155639
Merge: 57b58544d 23790aed9
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 28 11:23:35 2024 +0100

    Merge branch 'pokeemerald-base-master' into develop

commit 23790aed978a4e41fcb3776dba5647a0ee892c37
Merge: 16ebda449 9051d9a51
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 28 11:18:26 2024 +0100

    Merge branch 'develop'

commit 9051d9a51752fe055998de900ee1d6915c5f8a09
Merge: c43136899 e9ab070e7
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 28 11:16:37 2024 +0100

    Merge remote-tracking branch 'upstream/master' into develop

commit 57b58544d327f293bc4199f4f20f6d033e9ab817
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 28 11:15:02 2024 +0100

    Swapped item locations

commit 337371d2f8b7ef6238eb55011221d301e8ebb851
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 28 10:31:45 2024 +0100

    Updated Grookey Family HM Moveset

commit ec1b3b3a1143c709f0ea681cfefd772d3d3f58ee
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 28 10:31:25 2024 +0100

    Swapped Mega Manetric and Ampharaos

commit 37635964141c2b79371ce92ccd926f84f84b1db5
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 28 10:30:47 2024 +0100

    Updated party heal

commit e9ab070e7d5bf43b06b631cecdd9b84c14d36019
Author: Alex <[email protected]>
Date:   Sun Oct 27 22:47:02 2024 +0100

    Fix damage calc modifiers (#5604)

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

commit 13d3245204dd99e9a96a796129c7715f0a675e11
Author: Eduardo Quezada <[email protected]>
Date:   Sun Oct 27 15:04:33 2024 -0300

    Added compressed OW mon VRAM notice in config file (#5599)

commit c6ccc29c936111e6d51d0481468ff45edb838ef7
Author: hedara90 <[email protected]>
Date:   Sun Oct 27 15:24:40 2024 +0100

    Fixed 64px uncompressed followers (#5601)

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

commit 1a1270ad277020f58a56c2540a276641c47c33a0
Merge: 2ccc91e09 a2c64b0ed
Author: hedara90 <[email protected]>
Date:   Sun Oct 27 11:33:55 2024 +0100

    Fix unnecessary dependency scanning for test build and test rom names (#5594)

commit 2ccc91e0915720f7c52216886a6be4cab6032708
Author: hedara90 <[email protected]>
Date:   Sun Oct 27 10:36:31 2024 +0100

    Fixed broken Starting Terrain test (#5582)

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

commit a2c64b0ed06d5180adca7418b83ace1bbc3377a2
Author: RavePossum <[email protected]>
Date:   Sat Oct 26 18:13:04 2024 -0400

    Fix unnecessary dependency scanning for test build and test rom names

commit ad16fa76f20ed2507ca9cc2a3bffcf282e2dbd21
Author: Alex <[email protected]>
Date:   Sat Oct 26 10:11:45 2024 +0200

    Fixes Magic Guard not preventing Salt Cure (#5583)

commit 77332eb8207208460bf12fc8c6a72d46f71e2b82
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 25 19:03:38 2024 +0200

    Fixed pokedex bug: Made first battle single battle

commit 5dcf3e766444a1260f1e5db9f2bce8acba548717
Author: hedara90 <[email protected]>
Date:   Fri Oct 25 14:42:06 2024 +0200

    Fixed Shiny Pokemon not being shiny after transforming with a gimmick (#5573)

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

commit a9abbdf1d44c9898752f3a176dd9fea98368d94f
Merge: be98de71d 111a95951
Author: hedara90 <[email protected]>
Date:   Fri Oct 25 13:38:41 2024 +0200

    Fallback memmem implementation (#5561)

commit be98de71d519f9db00c52290889d3a67116d4cf4
Author: GhoulMage <[email protected]>
Date:   Thu Oct 24 18:12:31 2024 +0200

    Fixed damage test (#5574)

commit 431a5dad5bab1a1376f929585296534baddaecc2
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 24 16:13:11 2024 +0200

    Increased Bag Item capacity
    Cleaned Egg Move Tutor

commit b68bbd473aa303f278e7f3cbf11e736ccf405962
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 24 14:47:54 2024 +0200

    Cleaned Egg Move Tutor

commit 74ddfe66e7dd982c09787d1edf014c22d5501e43
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 24 13:56:38 2024 +0200

    Removed songs.mk like in update

commit ac00334238d5ff96305938f4b73917f16d40ce48
Merge: 7c4e8c66c 16ebda449
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 24 13:39:31 2024 +0200

    Merge branch 'pokeemerald-base-master' into develop

commit 16ebda4490093339ae587fe14e38fc76f2fa68dc
Merge: f855543bb c43136899
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 24 13:31:56 2024 +0200

    Merge branch 'develop'

commit c43136899721c172f2b84f197850d48aed6c9780
Merge: a8a638e9b b892ad4da
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 24 13:17:24 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit 7c4e8c66cde43bcdad9c910c460aa88154e60b4e
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 24 13:14:15 2024 +0200

    Fixed Blue

commit b892ad4da62ad3e818e779e4c6804212854fcc67
Author: Pawkkie <[email protected]>
Date:   Thu Oct 24 05:59:49 2024 -0400

    Shed Skin chance fix (#5558)

commit 878721cfb5fab42e1e15e2ea01f7c400485dbeab
Merge: f1b639a50 2a610443a
Author: hedara90 <[email protected]>
Date:   Wed Oct 23 21:27:27 2024 +0200

    Missing string_util.h include in mini_printf.c (#5572)

commit 2a610443ab06bd94808522decfe96fc804af962a
Author: Martin Griffin <[email protected]>
Date:   Wed Oct 23 20:09:29 2024 +0100

    Missing string_util.h include in mini_printf.c

commit 4edc4c36fd5f7b60f0f142ed8362954e31edb467
Author: laserXdolphin <[email protected]>
Date:   Wed Oct 23 17:06:05 2024 +0200

    Added Blue OW Sprite

commit f1b639a504934807a7558566388b8945e62ec595
Author: ghoulslash <[email protected]>
Date:   Wed Oct 23 05:46:58 2024 -0400

    Add basic Steam Engine, Guard Dog Tests (#5569)

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

commit 582f67c5f6e3d108e4b86917c10480dc33774a6e
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 18:52:18 2024 +0200

    Added vs Cipher Admin music

commit 83cdab522a412b6517fff20419a8a61da3556f80
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 17:57:47 2024 +0200

    Added Superbosses

commit 0ad77db4b4e4563750924ff1d75ed1207e9c0443
Author: RavePossum <[email protected]>
Date:   Tue Oct 22 10:28:11 2024 -0400

    Fix HGSS dex search printing wrong mon after selecting evos (#5552)

commit afc89f53b065ac6f1d5fae79e9ee403f5d9f1ba3
Author: RavePossum <[email protected]>
Date:   Tue Oct 22 10:27:10 2024 -0400

    Fix weather genie move anims and springtide storm targets (#5553)

commit 6de4222c22e182976d6f3a11870990025fc0b161
Author: ghoulslash <[email protected]>
Date:   Tue Oct 22 10:24:48 2024 -0400

    Fix AnimTask_HorizontalShake uses for shaking screen in battle anims (#5562)

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

commit 111a95951cdb78a5d9f8464ede89368e83f834c6
Author: Martin Griffin <[email protected]>
Date:   Tue Oct 22 13:25:46 2024 +0100

    Fallback memmem implementation

commit c003b905e2f5f8b63abea0202eba514341ac4cd6
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 11:54:40 2024 +0200

    Added starters to breakouts

commit 3aa7e70dbb0e10eadba4df0bc8d05cf24f28e3f6
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 11:54:11 2024 +0200

    Added Frontier Brain OW Sprites

commit b4742b97756eac82649e3bbb77301be6ab06fea3
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 11:53:46 2024 +0200

    Added Cipher Admin Trainer Class

commit 55182de2ee60a7a8cfe278759d1291341f7f06cf
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 11:38:18 2024 +0200

    Updated Trades

commit cf31635ab28a57ea9f76524935d7b8d3d7c4dd34
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 11:38:11 2024 +0200

    Updated Wildmons

commit 0c599e5c96cd0270a896ee9314b51c61778da17e
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 22 11:38:00 2024 +0200

    Added Frontier Brain battles in Artisan Cave

commit 1421ed1b2462afc6d758d92a342f8e5ee4102681
Author: Martin Griffin <[email protected]>
Date:   Tue Oct 22 09:19:00 2024 +0100

    Tests: detect task leaks (#5528)

commit d11fd21cd6f886b9066140239a86264ca0e09032
Author: GhoulMage <[email protected]>
Date:   Mon Oct 21 12:33:21 2024 +0200

    Changing EVO_NONE from 0xFFFE to 0 (#5547)

commit c237bc24528b5ee027338eebe22d169d6d143064
Author: Bassoonian <[email protected]>
Date:   Sun Oct 20 16:13:20 2024 +0200

    Remove now outdated information from readme (#5548)

commit 5291117687ace90ac10ee2723526ac074ac634a6
Author: Alex <[email protected]>
Date:   Sun Oct 20 14:28:36 2024 +0200

    Global is used instead of passed var (#5546)

    In `AI_CalcDamage` a global was used for the Terastorm check instead of passed var

commit 601438e980ddf88311064c97fa66d09845755ed4
Author: Bassoonian <[email protected]>
Date:   Sat Oct 19 22:51:20 2024 +0200

    Centralise AI Tests trainer name (#5532)

commit 89e8bc5c4c441d740bc4b0c355a1b9db03f209e7
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 19 14:00:04 2024 -0300

    Add changelog header in PR template to aid automation (#5539)

    * Add changelog header in PR template to aid automation

    * Bullet points

    * Finished the statement

commit 495de8d1824da48a5c9af422ad9f49f31074bfed
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 19 13:59:49 2024 -0300

    Fix Follow Me failing in Single Battles for Gen 6/7 config (#5542)

commit d487bd05489794c85d189bbee111c1b89237a5eb
Author: ghoulslash <[email protected]>
Date:   Sat Oct 19 10:34:58 2024 -0400

    Revival Blessing fixes + Using Lunar Blessing's animation (#5490)

    * revival blessing fixes, add anim

    * fix lunar blessing anim

    * Added support for Revival Blessing in tests

    * Added test to confirm absent flag fix

    ---------

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

commit 8bb850045695bc8309f8a769e55acffe1e5ed73f
Author: ghoulslash <[email protected]>
Date:   Sat Oct 19 08:03:57 2024 -0400

    add curious medicine test (#5540)

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

commit 8d7996dc5b67940663115b98f7fe13322dc92c55
Author: psf <[email protected]>
Date:   Fri Oct 18 14:06:04 2024 -0700

    Added constant to expansion inclusive copyright magic number (#5413)

    * Added constant to expansion inclusive copyright magic number

    * Fixed open brackets

commit 3077592e68684278fe64c1daddbe4c2e076b8f19
Merge: e230f379b 20c5df74e
Author: Bassoonian <[email protected]>
Date:   Thu Oct 17 09:00:18 2024 +0200

    Pret merge 2024-10-15 (#5527)

commit e230f379b38460404e2e4c783f01c484f8f82616
Author: Eduardo Quezada <[email protected]>
Date:   Wed Oct 16 17:46:40 2024 -0300

    Fixed 10,000,000 Volt Thunderbolt name (#5533)

commit 29e37a002550c5384d3c8c25a23cbc91cc485af8
Merge: ed65c4a2f d044f53c7
Author: ghoulslash <[email protected]>
Date:   Wed Oct 16 12:51:32 2024 -0400

    Adds tests and Costar fix from PR #5526 (#5529)

commit 88f261e47321653950aa37b74834d84b028fc3fe
Author: laserXdolphin <[email protected]>
Date:   Wed Oct 16 16:17:04 2024 +0200

    Added Cipher Admins to Navel Rock

commit 20c5df74e4d0812a7eeaafbbee809b8e43a2453f
Author: Eduardo Quezada <[email protected]>
Date:   Wed Oct 16 09:45:58 2024 -0300

    Updated .gitignore for agbcc screenshot suffix

commit d58bbe2a6f3abe628594b3bb6700bb1c1240041d
Author: Eduardo Quezada <[email protected]>
Date:   Wed Oct 16 09:44:48 2024 -0300

    Removed all instances of gflib from ld_scripts

commit d044f53c722fdddcbef836a659edbc922eb85dd9
Author: AlexOn1ine <[email protected]>
Date:   Wed Oct 16 10:51:41 2024 +0200

    Adds tests and Costar fix from PR #5526

commit 9ed153ff93ed25e3c335ae841202d3edfdfc932e
Merge: 80447bee8 ed65c4a2f
Author: Eduardo Quezada <[email protected]>
Date:   Tue Oct 15 22:22:52 2024 -0300

    Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015

commit 80447bee8e84e308a24d5f8e2e65c2bb44e3304f
Merge: 0f8b2a1ba a55c75d35
Author: Eduardo Quezada <[email protected]>
Date:   Tue Oct 15 20:56:56 2024 -0300

    Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015

commit ed65c4a2f7639c12dd46df926e0e0a57f72ef862
Author: Alex <[email protected]>
Date:   Tue Oct 15 23:04:35 2024 +0200

    Fixes Partner targeting and Acupressure/Ally Switch interaction (#5446)

    * Fixes Partner targeting and Acupressure/Ally Switch interaction

    * More tests

    * Update test/battle/move.c

commit b9ac5d1d8a10567efaeb725f54dbb57b757c1e1b
Author: Bassoonian <[email protected]>
Date:   Tue Oct 15 21:58:58 2024 +0200

    Add newline to move relearner string (#5523)

commit a55c75d350969624745a357711ba01edf8ce9590
Author: luckytyphlosion <[email protected]>
Date:   Mon Oct 14 23:52:11 2024 -0400

    Get rid of common syms (#2040)

commit 253d3dd7ef1cd123d4ba2cce4117da13a503a8b9
Author: mid-kid <[email protected]>
Date:   Tue Oct 15 03:47:07 2024 +0000

    Remove unnecessary looping for rule generation and unroll macros (#2046)

commit 44e1ad2aa97508bc574239bddf747bdeccd91a4d
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 14 17:35:10 2024 +0200

    Added Kanto Trainer to Battle Frontier and updated legendary fights

commit 84f7a191eee962c770f1c74934937a5b6f913146
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 14 15:37:31 2024 +0200

    Updated Battle Frontier

commit 5379d9b0689c959196e34230c72a35c61143e708
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 14 15:36:57 2024 +0200

    Updated Item Prices

commit 4a975e02276e0abc0ed9cab4bcd760676a0951c1
Author: laserXdolphin <[email protected]>
Date:   Mon Oct 14 15:36:24 2024 +0200

    Added Green Battle to faraway island

commit b91656d1c32e4b55227695a4e2301eee0eb5a17d
Author: aronson <[email protected]>
Date:   Sun Oct 13 01:31:31 2024 -0500

    Update test LD script to respect 4 byte data section alignment (#5517)

commit a0be2cbf7b451f20cc5940fa04caf0dc3c5221a3
Author: GriffinR <[email protected]>
Date:   Sat Oct 12 23:50:12 2024 -0400

    Fix Fallorbor typo

commit a01f9b4708f35a0a97541450c1f703c73967d70c
Author: aronson <[email protected]>
Date:   Sat Oct 12 13:41:26 2024 -0500

    Align EWRAM and IWRAM data-filled sections to 4 bytes (#5512)

commit c82ff7b5b12f40910e31cca40f0e613c546117d8
Merge: 743dc4d76 8dba27249
Author: psf <[email protected]>
Date:   Sat Oct 12 10:50:31 2024 -0700

    Merrp merge (12th of October) (#5514)

    Co-authored-by: Ariel A <[email protected]>
    Fixes #5482

commit 743dc4d7654170468fcae277217a783438a9033f
Author: kittenchilly <[email protected]>
Date:   Sat Oct 12 12:37:11 2024 -0500

    Add text fitting tests for move, ability, item, and pokedex descriptions (#5505)

commit 8dba27249ce83a744caa1893b6674113fb27c7cc
Merge: b5c884504 e10005010
Author: Bassoonian <[email protected]>
Date:   Sat Oct 12 18:41:33 2024 +0200

    Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210

commit e10005010e0780b388baacb0bb0d4b69d529e3ca
Merge: 42d9f24c8 d80190fe1
Author: Ariel A <[email protected]>
Date:   Sat Oct 12 12:27:05 2024 -0400

    Merge branch 'followers' into followers-expanded-id

commit d80190fe105eee12bbf74ae29647ac909084d35c
Author: Ariel A <[email protected]>
Date:   Fri Oct 11 13:45:40 2024 -0400

    fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh

commit ef462d9d9b74121b7c75cbae5dd9001828e434f2
Author: Ariel A <[email protected]>
Date:   Thu Oct 3 00:41:04 2024 -0400

    meta: `remote_build` no longer untracks new files after build

commit b6892f5b67782afe05fcd31eaa2d1850bc4e3bc1
Author: GriffinR <[email protected]>
Date:   Fri Oct 11 15:03:38 2024 -0400

    Let scaninc ignore empty C files

commit 2c7964dbc273b0bed4456cdbd31ed4ee9b0bc783
Author: mid-kid <[email protected]>
Date:   Fri Oct 11 18:33:32 2024 +0000

    Fix deleting files with dependency files (#2045)

commit fcc067e5154bedc92a2e8ab009718d97d1fc94e5
Author: Martin Griffin <[email protected]>
Date:   Fri Oct 11 18:50:26 2024 +0100

    [preproc] support C23 enum underlying type syntax (#2043)

commit b5c884504c2ebee68804a614bc764a53ae565f6f
Author: Bassoonian <[email protected]>
Date:   Fri Oct 11 19:49:24 2024 +0200

    Fix negative mutation value (#5504)

commit 6d24d8a78f4e0fb9bc139343a970b84beabb6560
Author: GriffinR <[email protected]>
Date:   Fri Oct 11 13:05:56 2024 -0400

    Fix libpng installation for workflow on Ubuntu 24.04

commit a8dd4c4d53e1546819512b3b1847905618a458b0
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 11 15:35:21 2024 +0200

    Added Archie and Maxie fight before legendary

commit c8ece54f60fd6035d8a10105c5dc6f57973d4572
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 11 13:05:11 2024 +0200

    Add new starters for all seen pokemon

commit cac815164af74818671b6e8c6756d654ff867406
Author: hedara90 <[email protected]>
Date:   Fri Oct 11 12:14:14 2024 +0200

    Cleanup extraneous function in header (#5506)

commit d9b8cbc745a3c2c1fc3873331ba76e32d93b1d0c
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 11 11:59:20 2024 +0200

    Added new items

commit 281086b3acea8ccdeee07b96431343a0769bd138
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 11 11:28:45 2024 +0200

    Added Steven Bossfight

commit da845e7a66cf1d30ec822d54b48f49ae7728bef0
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 11 10:24:54 2024 +0200

    Updated Postgame flags

commit a7543218ee7fb1f6aeb5c95e67ce1de2b320fa7b
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 11 10:24:11 2024 +0200

    Finished E4 Rematches

commit 8890500b770d4712b2456d1addefbe0b44993793
Author: kittenchilly <[email protected]>
Date:   Thu Oct 10 14:26:46 2024 -0500

    Fix P_FRIENDSHIP_EVO_THRESHOLD not checking for Gen 8 (#5503)

commit 6395d55b43ff044fdcb441dbb95fd3b3bab62bca
Merge: 9a24c031b 9ad0018c1
Author: Martin Griffin <[email protected]>
Date:   Thu Oct 10 20:26:12 2024 +0100

    Merge pull request #2044 from AreaZR/Excessive

    Fix typo: | should be || in Task_TryFieldPoisonWhiteOut

commit 8d2d62273bd0d3565c4edb211ae4cf6a6b35b258
Author: PhallenTree <[email protected]>
Date:   Thu Oct 10 17:36:01 2024 +0100

    Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs (#5493)

    * Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues

    * More Doodle fixes

    * Add tests

    * Fix Doodle not activating if partner is fainted and its ability cannot be suppressed

    * Fix tests compile

    * Commander cantBeOverwritten

    * Add battle script for Overwrite then Regular ability

commit 9ad0018c176092ea3ff2a1884cf11ae1b5a194b7
Author: Rose <[email protected]>
Date:   Thu Oct 10 10:27:33 2024 -0400

    Fix typo: | should be || in Task_TryFieldPoisonWhiteOut

    Yes, this is honestly overkill, as it doesn't actually fix any behavioral bugs, but I was suggested to do this. This was a typo made in the source that GameFreak made, and the compiler warns against this. I opened a PR in pokeemerald expansion and was suggested to open one here.

commit 20d02ff28ec1b3e35f08f4597e19229dc417672d
Author: laserXdolphin <[email protected]>
Date:   Thu Oct 10 11:07:07 2024 +0200

    Added Berries

commit 70338590b0472745e602f1a1b27add36371b1de4
Author: laserXdolphin <[email protected]>
Date:   Wed Oct 9 19:33:00 2024 +0200

    Added Mega Stones

commit 3c3ce38378792223e95dd1e2a0e8f7e69336baef
Author: Alex <[email protected]>
Date:   Wed Oct 9 17:18:08 2024 +0200

    Remove one redundant call of SetAiLogicDataForTurn in DoBattleIntro (#5491)

    This is already run at the end of `TryDoEventsBeforeFirstTurn` which makes the first calc redundant.

    I've had this removed in my project for a while and didn't notice any problems

commit 7fc5502afd583c3ce404d281413b303dfef72e88
Author: Pawkkie <[email protected]>
Date:   Wed Oct 9 03:38:49 2024 -0400

    Don't clear move data on turn end (#5488)

commit 541ca2619b2f86e2367e322d9c781c3015ae1d62
Author: Eduardo Quezada <[email protected]>
Date:   Tue Oct 8 14:47:32 2024 -0300

    Start 1.9.4 cycle

commit a76f7fe92e960039071109731f5e9f2721f106d7
Author: Eduardo Quezada <[email protected]>
Date:   Tue Oct 8 14:45:09 2024 -0300

    Version 1.9.3 (#5485)

    * Version 1.9.3

    * Updated to latest master

commit efad9a32a972bf53f6a81b3d5ae8694c358a4625
Author: Pawkkie <[email protected]>
Date:   Tue Oct 8 13:04:35 2024 -0400

    Fix AI tests using PASSES_RANDOMLY (#5486)

commit 1da61340b9dd0d1dfc53fe165f4bbbac49c7f0bc
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 8 14:18:50 2024 +0200

    Updated Tutor texts

commit f8f4fc9afd92ce5df431714f4dfa4602dd84dd5b
Author: hedara90 <[email protected]>
Date:   Tue Oct 8 14:02:31 2024 +0200

    Removed old checksum matching workaround (#5480)

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

commit c4f7cbc880f69600bdaea801a4f7020a017079fa
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 8 12:33:49 2024 +0200

    Removed Aerodactyl from Regional Dex

commit 1af7882d3a39357146656cc78d8e14379f96b93a
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 8 12:33:22 2024 +0200

    Added final gym leader teams

commit 06fefe33186845d3bd851a3bcf18f8eeb7d33346
Author: ghoulslash <[email protected]>
Date:   Sun Oct 6 15:05:29 2024 -0400

    Various AI fixes (#5474)

    * fix AI mirror move check viability call

    * fix EFFECT_ABSORB missing break in AI_CalcMoveEffectScore

    ---------

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

commit 8918ff2c78b88ea99404ed2a04483d23a942497b
Author: laserXdolphin <[email protected]>
Date:   Sat Oct 5 20:49:11 2024 +0200

    Updated Safari Zone and started adding Mega Stones

commit bac961fcbc221020ebf951f20517a6a11bde1fcf
Author: laserXdolphin <[email protected]>
Date:   Sat Oct 5 12:46:20 2024 +0200

    Swapped Mew for Celebi in regional Dex

commit e96dd96cce4094f5cc438ff805a264b951d76a56
Author: laserXdolphin <[email protected]>
Date:   Sat Oct 5 12:28:58 2024 +0200

    Updated SS Tidal and Trick House trainers

commit 6f59d26753cc79a9526713d8935cc67b264704c8
Author: wiz1989 <[email protected]>
Date:   Fri Oct 4 18:42:15 2024 +0200

    updated Conversion 2 mechanics to 5+ (#5453)

    * updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2

    * fixes and added new test cases

    * bugfixing and added EWRAM u16 gLastUsedMoveType

    * update after Pawkkie review

    ---------

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

commit 0f8b2a1ba8464d18bb2c9a8bb47c5aaea5b37d89
Merge: f72091663 91325e83c
Author: Eduardo Quezada <[email protected]>
Date:   Fri Oct 4 10:23:58 2024 -0300

    Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909

commit 91325e83c185700d5cc65ef2f01dbba4b9c61bd4
Author: PhallenTree <[email protected]>
Date:   Fri Oct 4 10:00:12 2024 +0100

    Fixes to Protosynthesis, Quark Drive, Beast Boost, Orichalcum Pulse, Hadron Engine (#5447)

    * Protosynthesis & Quark Drive interactions; Fixes to Beast Boost/Protosynthesis/Quark Drive stat tie priority, Orichalcum Pulse and Hadron Engine stat boost

    * Protosynthesis + Quark Drive tests

    * Update src/battle_util.c

    * Update src/battle_util.c

    * Update src/battle_util.c

    * Update src/battle_util.c

    * Update src/battle_util.c

    * Update src/battle_util.c

    ---------

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

commit c462312fbd037c30d84c852b8e435807d38261ed
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 4 10:33:56 2024 +0200

    Added Scott Mega Ring Event on Ship

commit ead4a1e78acc5a7b8f12421d8f828aa11461fc30
Author: laserXdolphin <[email protected]>
Date:   Fri Oct 4 10:32:52 2024 +0200

    Added Ceelbi as roamer instead of Lati@s

commit be5f2e095e7fc0e45f33e87a3a83c4df53ff5a28
Author: ghoulslash <[email protected]>
Date:   Thu Oct 3 07:01:18 2024 -0400

    fix duplicating flute glitch (#5436)

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

commit 9a24c031bb21e5f9d198a93ef7b8acb66bbcdec7
Author: psf <[email protected]>
Date:   Wed Oct 2 17:48:54 2024 -0700

    Replaced copyright magic numbers in intro.c with constants (#2035)

commit 2b73d10a2ad544cbf407fd71accdfd40df0a0e88
Merge: 44e9228a6 c8cc0fa5a
Author: GriffinR <[email protected]>
Date:   Wed Oct 2 15:35:20 2024 -0400

    Merge pull request #2041 from Jaizu/patch-9

    Ignore mGBA screenshots

commit 44e9228a6e74b8f41ce0906a00d003f4c3605f8c
Merge: 37d104f7a 80a37c16b
Author: GriffinR <[email protected]>
Date:   Wed Oct 2 15:34:42 2024 -0400

    Merge pull request #2038 from GriffinRichards/gflib-syms

    Remove explicit symbol sizes in sym_common.txt

commit 37d104f7a509533c939d8982cfa0cd325f8e4c2e
Merge: 473e0623b 1dc85df1f
Author: GriffinR <[email protected]>
Date:   Wed Oct 2 15:34:22 2024 -0400

    Merge pull request #2039 from Scyrous/patch-1

    Bugfix for cable car hikerGraphicsIds array

commit d5560bbc87715e660d09dd8911f3b4671f5a49ec
Author: kittenchilly <[email protected]>
Date:   Wed Oct 2 14:20:02 2024 -0500

    Remove trailing whitespace pass 10-2-2024 (Master) (#5455)

commit 14fd5983590b4a4dba5ca1a42939596193a001b5
Author: laserXdolphin <[email protected]>
Date:   Wed Oct 2 15:22:47 2024 +0200

    Added Skeleton for E4 Rematch

commit fe26cce458660328ac4a3e1ab7bb0142c98c7972
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 1 17:43:19 2024 +0200

    Added Egg Move Tutor

commit ce794e7eee4087a935765f262012d28d73794c13
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 1 16:40:19 2024 +0200

    Updated Music

commit e59d972e841f6a0c4501b1cf092a515ac7a54f3f
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 1 16:38:28 2024 +0200

    Updated Move Tutor and Level Caps

commit d1fcd1899b9aecd2769a3f63adac3ef8ead7ae38
Author: laserXdolphin <[email protected]>
Date:   Tue Oct 1 16:37:31 2024 +0200

    Finalized Cipher Admins

commit b93e58266e03e9c9a9592ededa40629b67604bdd
Author: Alex <[email protected]>
Date:   Tue Oct 1 10:43:58 2024 +0200

    Fixes recoil moves not triggering berries if possible (#5449)

    * Fixes recoil moves not triggering berries if possible

    * Update battle_script_commands.h

commit c8cc0fa5a34f15b2ff1841dc380f215da677ff1f
Author: Jaizu <[email protected]>
Date:   Tue Oct 1 10:07:45 2024 +0200

    Ignore mGBA screenshots

    Everytime I make a new project I suffer, please merge.

commit 1c022f4d34ef4fdf6a894815fd4b4617b15932ed
Author: kittenchilly <[email protected]>
Date:   Sun Sep 29 16:05:54 2024 -0500

    Fix Jubilife Muffin full heal effect + better full heal tests (#5444)

commit 016eb18dc29c2dd754014f3dd4bd1c7b1c55d213
Author: laserXdolphin <[email protected]>
Date:   Sun Sep 29 21:29:43 2024 +0200

    Added Rival Fight to Evergrande and Special Mart

commit 4183fa9d5067199a4a601bc4947ed430b0f641de
Author: Eduardo Quezada <[email protected]>
Date:   Sun Sep 29 14:40:37 2024 -0300

    Fixed test assumption fail summary fields using more memory than needed (#5443)

commit 5908fbef9cbdf42f26128e69396d5ab8106a8832
Author: Pawkkie <[email protected]>
Date:   Sun Sep 29 12:34:34 2024 -0400

    Wake-Up Slap test typo (#5442)

    * Wake-Up Slap test typo

    * Update test/battle/move_effect/wake_up_slap.c

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

    ---------

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

commit 1dc85df1f0ab617dc402ee2da1f37097e3758461
Author: Scyrous <[email protected]>
Date:   Sun Sep 29 14:38:08 2024 +0200

    Update cable_car.c

commit 8e2c3ca3f2238765e993d005a00dbe4a6abf4a83
Author: Scyrous <[email protected]>
Date:   Sun Sep 29 14:13:50 2024 +0200

    Bugfix for cable car sprite array count

commit 0cadd7eeb7cc297cf0f8ce45badbb3b960c3a699
Author: laserXdolphin <[email protected]>
Date:   Sat Sep 28 18:04:06 2024 +0200

    Finished Pre Postgame Gym Leader Rematches

commit a114f0485fd76b965dedfa00713384b03cb6f572
Author: laserXdolphin <[email protected]>
Date:   Sat Sep 28 18:03:46 2024 +0200

    Finished Pre Postgame Gym Leader Rematches

commit a213304813e18a61a4de11d3432b79178f935adf
Author: laserXdolphin <[email protected]>
Date:   Thu Sep 26 17:15:39 2024 +0200

    Victory Road trainers and Gym Leader Rematches

commit 80a37c16beb71698903836e7bf583a03ea78c112
Author: GriffinR <[email protected]>
Date:   Wed Sep 25 13:35:52 2024 -0400

    Remove explicit symbol sizes in sym_common.txt

commit 8794dce4b40c5a0251bc652defd7a48132253601
Author: laserXdolphin <[email protected]>
Date:   Wed Sep 25 17:03:28 2024 +0200

    Victory Road Items and Wild Pokemon

commit 80fcd04b1621e3d8199cdb43e35f5cc9e8ca60a1
Author: laserXdolphin <[email protected]>
Date:   Wed Sep 25 17:02:55 2024 +0200

    Added Cipher Admin as Regi Bosses

commit e67d5a23ed54a0fc8a584199d99fe3019804bbbd
Author: PhallenTree <[email protected]>
Date:   Tue Sep 24 17:40:44 2024 +0100

    Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive (#5430)

    * Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)

    * Add Snatch interactions with Dancer, Swallow

    * Trace fix + cleanup

    * Simplify Quash

    * Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests

    * Fix Booster Energy Ability Popup

    * Accidentally removed healing from Swallow

    * More Trace cleanup

commit 5f3866203663bc17030667e80acb2ace18cf9fa9
Author: laserXdolphin <[email protected]>
Date:   Mon Sep 23 19:33:45 2024 +0200

    Added Miror B. encounter in Sealed Chamber

commit 55086586c57cc867fa45f618669f53cca2aa8987
Author: psf <[email protected]>
Date:   Sun Sep 22 16:59:43 2024 -0700

    Revert 5422 (#5424)

commit acd07ccfc10adb701f015d6d8f9e061c5ba1add0
Author: ghoulslash <[email protected]>
Date:   Sun Sep 22 13:44:18 2024 -0400

    add rocky helmet dmg to tangling hair + defiant test to ensure original battler IDs from chaining effects (#5423)

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

commit 918d45a6232ad2c29f93f655d001c68b12a7b9d8
Author: Bassoonian <[email protected]>
Date:   Sun Sep 22 16:33:17 2024 +0200

    Fix default tera type changing upon evolution/form change (#5422)

commit ed005fc345ad79065390a3a8ad8ab35cecf1c9b2
Merge: d695a6240 d122c0a22
Author: ghoulslash <[email protected]>
Date:   Sun Sep 22 08:47:37 2024 -0400

    Fix affection check for exp multiplier (#5421)

commit d122c0a22233c7a0097c58f9b1ff2fa1fbfc8633
Author: Bassoonian <[email protected]>
Date:   Sun Sep 22 14:14:15 2024 +0200

    Fix affection check for exp multiplier

commit d695a6240dbbd6bcdd7785fd172119efb3e49146
Author: ghoulslash <[email protected]>
Date:   Sun Sep 22 05:25:42 2024 -0400

    Convert settotemboost command to callnative (#5418)

    * settotemboost use callnative

    * Update src/battle_main.c

    ---------

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

commit 16e8be12335695e5fdb7100f1706a292f1f60ed0
Author: kleenxfeu <[email protected]>
Date:   Sat Sep 21 23:47:19 2024 +0200

    Mega evolution animation is a little smoother (#4816)

    * Smoother primal/mega animation

    * Just to make the CI run. It needs to run

    * Update src/battle_anim_effects_3.c

    ---------

    Co-authored-by: kleeenexfeu <[email protected]>
    Co-authored-by: Alex <[email protected]>

commit 832a7b286d3cedf202ae1af238b58abd66879511
Author: Bassoonian <[email protected]>
Date:   Sat Sep 21 21:22:30 2024 +0200

    Update item_use.c (#5415)

commit 39a8a77d3d74294b52ca5c81333132398126a952
Author: kittenchilly <[email protected]>
Date:   Sat Sep 21 13:28:20 2024 -0500

    Play point animation when sending a follower into battle (#5406)

    * Add point animation when sending a follower into battle

    * Update trainers.h

commit f7d2e62cccd9e5b27829a31f280aa9b096d34d66
Author: kittenchilly <[email protected]>
Date:   Sat Sep 21 11:51:08 2024 -0500

    Fix Switcheroo giving score even if the opponent has no held item (#5412)

commit 473e0623ba69541e6659ab88a5b9f35d94a3a76a
Merge: 635325304 8f41d9eb1
Author: GriffinR <[email protected]>
Date:   Thu Sep 19 12:23:58 2024 -0400

    Merge pull request #2031 from GriffinRichards/fix-toolchain

    Minor toolchain fixes

commit 8f41d9eb17cb2a22215095f337c17dee48773f6d
Merge: 302193a81 635325304
Author: GriffinR <[email protected]>
Date:   Thu Sep 19 12:20:51 2024 -0400

    Merge branch 'master' into fix-toolchain

commit 635325304bea07b891469fd33f4fabd46cade16f
Merge: 62c27faba 9cb353179
Author: GriffinR <[email protected]>
Date:   Thu Sep 19 12:19:48 2024 -0400

    Merge pull request #2033 from Kurausukun/goodbye_gflib

    Remove gflib

commit 68c51f84121f12dc87737ad3283a3e5a974f4093
Author: Alex <[email protected]>
Date:   Thu Sep 19 12:00:32 2024 +0200

    Fixes Spiky Shield Counter interaction (#5402)

    * Fixes Spiky Shield Counter interaction

    * Update test/battle/move_effect/protect.c

    ---------

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

commit 71dfd3e7c03bb02f80b8071b4f3d191ee69406f8
Author: Alex <[email protected]>
Date:   Thu Sep 19 00:25:53 2024 +0200

    Ogerpon masks were missing their hold effects (#5391)

    * Ogerpon masks were missing their hold effects

    * fix wrong num

    * test

    * correct tests and additional fix

    * added hold effect to battle debug

commit 76656e85c2f682f35d2504ee4a46c8c2f37dad0b
Author: PhallenTree <[email protected]>
Date:   Wed Sep 18 23:10:29 2024 +0100

    Fix Quash implementation, adds After You and Quash missing configs + tests (#5400)

    * Fix Quash + After You and Quash configs

    * Add tests

commit ac2b41ae71de8539217d046f15b873101b818741
Author: nescioquid <[email protected]>
Date:   Wed Sep 18 17:03:36 2024 -0400

    Typo fixes and Growth move description change (#5398)

    * changes Growth's move description to account for Gen 5+ behavior

    * completes B_DIVE_BALL_MODIFIER comment

    * fixes typos and incongruent spacing in various files

    * Update src/data/moves_info.h

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

    ---------

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

commit 6ef36837e94edcde20a5ddf78ab0c89e77df106a
Author: Alex <[email protected]>
Date:   Wed Sep 18 16:58:49 2024 +0200

    Fixed corruption of the next turn used move caused by Scale Shot (#5397)

commit 27db57f854856ccb75cf6b661e78d45f1e4e17c5
Author: RavePossum <[email protected]>
Date:   Wed Sep 18 10:57:13 2024 -0400

    fallback on default BW popup theme to reduce potential for error (#5392)

commit 9cb353179ba77e9d1247e003d018d5f005df8861
Author: Kurausukun <[email protected]>
Date:   Wed Sep 18 10:42:28 2024 -0400

    fix indentation

commit 52c2728ff6d07a5d8d420cbe39c08365aa1ca01e
Author: Kurausukun <[email protected]>
Date:   Wed Sep 18 10:37:34 2024 -0400

    remove gflib

commit 95dac7c4acb7fea7b3d4af866194236eee7d4926
Author: Alex <[email protected]>
Date:   Tue Sep 17 20:58:43 2024 +0200

    Remove potential uninitialized behavior (#5393)

    `MAX_BATTLERS_COUNT` makes more sense to use here because we iterate over max battlers in the first place.

commit 5551e22c0d5737fa19627b365648e18d0424c0df
Merge: 455665d47 f855543bb
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 17 11:08:00 2024 +0200

    Merge branch 'pokeemerald-base-master' into develop

commit 455665d475b2a50729b62340aa6dcb6382ea1e91
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 17 11:05:55 2024 +0200

    Updated Trickhouse to 2. to last room

commit f855543bb153980b4659c605b805effa29d553a2
Merge: 8ba813d55 a8a638e9b
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 17 11:04:13 2024 +0200

    Merge branch 'develop'

commit a8a638e9b956ef9ee2a35fb5651ffe0d441f1435
Merge: 463af80a6 6116b8b04
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 17 11:00:19 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit 463af80a6ba467cd2a0a0531013e38e6ea94fb33
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 17 10:58:03 2024 +0200

    Reverted BP Battle reward changes due to errors

commit 6116b8b04e4152f4e794fd54907c1a9979db375a
Author: Eduardo Quezada <[email protected]>
Date:   Mon Sep 16 11:57:41 2024 -0300

    Start 1.9.3 cycle

commit 889a02d263ddef7383666aa2d5df26ef159e64f0
Author: Eduardo Quezada <[email protected]>
Date:   Mon Sep 16 12:12:34 2024 -0300

    Version 1.9.2 (#5357)

    * Version 1.9.2

    * Apply suggestions from code review

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

    * Updated to latest master

    * Updated to latest master

    * Fix last PR

    * Corrected order + Pumpkaboo/Gourgeist credits

    ---------

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

commit 3433567188e539fdf99427894222ead271789f86
Author: hedara90 <[email protected]>
Date:   Sun Sep 15 20:28:04 2024 +0200

    Gourgeist and Pumpkaboo follower sizes (#5390)

    * Gourgeist sizes

    * Gourgeist all sizes

    * Pumpkaboo small

    * Added all sizes of Pumpkaboo

    * Resized Gourgeist (no more Titan)

    ---------

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

commit 0b429a8649501347b708e7934cbb4a459f9e4015
Merge: 0d7c193e4 8c0580828
Author: Bassoonian <[email protected]>
Date:   Sun Sep 15 13:21:39 2024 +0200

    Merrp merge (September 9th) (#5359)

commit f7209166338cf881490519e8334882d740875f51
Author: Eduardo Quezada <[email protected]>
Date:   Sun Sep 15 02:25:12 2024 -0300

    CI fix attempt

commit 0d7c193e4c6a99c5cb3424f709e73b4a91a18a29
Author: Alex <[email protected]>
Date:   Sun Sep 15 01:55:03 2024 +0200

    fixes Micle Berry not increasing accuracy on the next turn (#5358)

    * fixes Micle Berry not increasing accuracy on the next turn

    * adds bitfield instead of using protect struct

    * test from pawkkie

    * ndebug

    * renaming

    * delete redundant comment

    * typo

    * micle berry more detailed descriptions

commit 9d483cee5d46116043762197210edfb3b4af61b5
Author: Liamjd14 <[email protected]>
Date:   Sat Sep 14 19:21:34 2024 +0100

    Enable asym for  followers issue #5382 (#5385)

    * Applies asym code to followers
    galarian slowbro
    tinkaton line
    scovillain

commit 62c27faba4684ae707351f29940112a6d23614d6
Merge: db898f8ba c4b5818d9
Author: GriffinR <[email protected]>
Date:   Sat Sep 14 13:17:26 2024 -0400

    Merge pull request #2032 from DizzyEggg/patch-1

    remove ScriptContext_Enable from secret_base.h

commit c4b5818d986b6c4525ee78a360342ec2cb534e68
Author: DizzyEggg <[email protected]>
Date:   Sat Sep 14 19:13:02 2024 +0200

    remove ScriptContext_Enable from secret_base.h

commit db898f8baa43a87cf2458b71cf70b8f2d5a21c27
Merge: bc58a4ac0 a75be4124
Author: GriffinR <[email protected]>
Date:   Sat Sep 14 10:56:50 2024 -0400

    Merge pull request #2030 from skyeforeverblue/patch-2

    Update pull_request_template.md to include Discord username update

commit bc58a4ac045fcfe0154a28404c69be7b41a198c1
Merge: 7007439be 28786b42a
Author: GriffinR <[email protected]>
Date:   Sat Sep 14 10:56:41 2024 -0400

    Merge pull request #2029 from skyeforeverblue/patch-1

    Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft

commit 79776bf6bbd3421ef5fd0a6978041f330981d3a0
Author: Pawkkie <[email protected]>
Date:   Sat Sep 14 04:45:26 2024 -0400

    ShouldSwitchIfWonderGuard tests and cleanup (#5383)

commit 302193a814ffcf12fa2a5c394ce2ce85e6c49250
Author: GriffinR <[email protected]>
Date:   Fri Sep 13 23:40:00 2024 -0400

    Have scaninc ignore non-existing files

commit b8c71fa84d7d590006b94b0b5b46aa9a74cf2f41
Author: GriffinR <[email protected]>
Date:   Fri Sep 13 23:38:50 2024 -0400

    Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings

commit 5954d662a5762d73b073731aa1d46feab2481c5c
Author: Eduardo Quezada <[email protected]>
Date:   Fri Sep 13 15:26:42 2024 -0300

    Rebuild of makefile 7: Test Runner

commit bee1452c8e7d8b23667b4bc06a8200277ec6817d
Author: Eduardo Quezada <[email protected]>
Date:   Fri Sep 13 14:38:43 2024 -0300

    Rebuild of makefile 6: File-specific stuff

commit 5ea1f39a9dde753c5787d211c97963037daadfa5
Author: Eduardo Quezada <[email protected]>
Date:   Fri Sep 13 14:27:40 2024 -0300

    Rebuild of makefile 5: trainerproc

commit c7e1e857f376e4f30fde11f3e640c51ba68da0ef
Author: PhallenTree <[email protected]>
Date:   Fri Sep 13 17:17:59 2024 +0100

    Fix After You/Shell Trap not updating battlers' actions correctly (#5384)

commit 100c7dd8ad8f1419a6cd1e2d9248fdc26c7d79d4
Author: PhallenTree <[email protected]>
Date:   Fri Sep 13 17:08:23 2024 +0100

    Fixes Powder (status) interactions + tests (#5370)

    * Simplified fix from #4638

    * Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge

    * Powder Tests

    * Remove duplicate

    * Assume Powder is a powder move

    * Add config for Powder Rain interaction

    * Only primal rain

    * Z-Moves fix handled in Canceller_Z_Moves

    * Fix BattleScript name

    * Make sure Z-Move + Powder still damages user

commit 9633cefd11824249e58e10fa46c6f90c50723711
Author: hedara90 <[email protected]>
Date:   Fri Sep 13 15:30:01 2024 +0200

    Custom anim table follower macro & Farfetch'd example (#5309)

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

commit 8c0580828fd2f33afd887afc86f19922c59e3f92
Author: Eduardo Quezada <[email protected]>
Date:   Fri Sep 13 09:27:16 2024 -0300

    Apply suggestions from code review

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

commit 3d8b73300a1aaa6912327e718865c5cdba9d4197
Author: Alex <[email protected]>
Date:   Thu Sep 12 23:46:59 2024 +0200

    Fixes Multi Hit moves removing destiny bond flag in the middle of attack (#5377)

commit 7007439be899cd0901c2145f5eb219c9d7776a51
Author: GriffinR <[email protected]>
Date:   Thu Sep 12 13:50:47 2024 -0400

    Remove old ld_script processing

commit 5d8c61d8137a68762993d738ba94d889dcde01eb
Author: Liamjd14 <[email protected]>
Date:   Thu Sep 12 17:55:30 2024 +0100

    Pokemon follower changes for issue #5135 (#5336)

commit d9b824db3f6ede8007be70b58c03874451f9d046
Author: GriffinR <[email protected]>
Date:   Thu Sep 12 12:27:31 2024 -0400

    Sync missing alignment from pokefirered

commit 9e22bf1af410194cd2401a4c6910357386f94110
Merge: 51131e258 32f05269a
Author: GriffinR <[email protected]>
Date:   Thu Sep 12 10:46:30 2024 -0400

    Merge pull request #1957 from Icedude907/build-music-config

    [Build System Rewrite] Improved audio rules

commit 51131e2582ca004320dc674e599eea99e330e480
Merge: cfdb06a81 2d5231149
Author: GriffinR <[email protected]>
Date:   Thu Sep 12 10:45:41 2024 -0400

    Merge pull request #1954 from Icedude907/build-scaninc-speed

    [Build System Rewrite] Massive build speed improvement via scaninc changes

commit 5790200e2d602b1b9eb40b7ea7b25ec2b6ff0b20
Author: Eduardo Quezada <[email protected]>
Date:   Wed Sep 11 20:05:18 2024 -0300

    Rebuild of makefile 4: Teachable learnset helper

commit 5f8c9158267b83482e538e224abfd4d35fce7d0a
Author: Eduardo Quezada <[email protected]>
Date:   Wed Sep 11 19:40:52 2024 -0300

    Rebuild of makefile 3: ANALYZE

commit 83872ab89fb9e92f7fc9976fe0c8af6254d1082e
Author: Eduardo Quezada <[email protected]>
Date:   Wed Sep 11 19:31:40 2024 -0300

    Rebuild of makefile 2: -Wall and UNUSED_ERROR

commit 20e937a7241b86766657a6c5bf2cde05a164ee9e
Author: Eduardo Quezada <[email protected]>
Date:   Wed Sep 11 16:33:11 2024 -0300

    Rebuild of makefile 1: Modern as default

commit 831b394ca18568687834d32a2ebaad687ec46b1c
Merge: b8251e3a7 04197b491
Author: Eduardo Quezada <[email protected]>
Date:   Sun Sep 8 18:06:23 2024 -0300

    Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909

    # Conflicts:
    #	Makefile
    #	include/battle.h
    #	include/battle_main.h
    #	include/battle_util.h
    #	include/data.h
    #	make_tools.mk
    #	map_data_rules.mk
    #	src/battle_setup.c
    #	src/fieldmap.c

commit cdf781f7262cb5b4c456aaa159adfe4f72f3b205
Author: Eduardo Quezada <[email protected]>
Date:   Wed Sep 11 06:18:58 2024 -0300

    Fixed Toxic Thread stat increase (#5369)

commit a75be4124d9d06524ef42c9eb670f3bb93c5749b
Author: Skye Chappelle <[email protected]>
Date:   Tue Sep 10 23:39:41 2024 -0400

    Update pull_request_template.md to include Discord username update

commit 28786b42a6cf2f31333d9bc618ef63eae1553d0b
Author: Skye Chappelle <[email protected]>
Date:   Tue Sep 10 23:36:13 2024 -0400

    Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft

commit c57d149003929c71f7b44c27841c432ad39018ac
Author: hedara90 <[email protected]>
Date:   Tue Sep 10 23:53:55 2024 +0200

    Fixes with Pledge combos and absorption abilities (#5364)

    * Fixes with Pledge combos and absorption moves

    * Fixed incorrect merge

    * Removed superflous if statement

    ---------

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

commit 3aa46c3ca061c9031b1fbcb4bef0f5296dd89858
Author: Pawkkie <[email protected]>
Date:   Tue Sep 10 17:52:49 2024 -0400

    Fix stat id check (#5366)

commit 072b58d22f2b829847566cc106f0d91da85b4ce4
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 10 18:57:05 2024 +0200

    Trainers, Wild Mons and Items up to Evergrande City

commit b2a69ff1ce1d8169278f4db02b36ae12b08cb0ea
Merge: 3f9fb9a6f a51f563ae
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 10 09:16:06 2024 +0200

    Merge remote-tracking branch 'lxd/develop' into develop

commit 8ba813d5507ac70bdc2000dac178e5ea0d13c986
Merge: 531ecac1d a51f563ae
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 10 09:15:18 2024 +0200

    Merge branch 'develop'

commit a51f563aeffbfe6a8404f6cec2d9cbf39b1e0193
Merge: 3f8620e06 36ff435ab
Author: laserXdolphin <[email protected]>
Date:   Tue Sep 10 09:14:56 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit 3f9fb9a6f4e4ce508a223cec34adf4cab5ae8fe2
Author: laserXdolphin <[email protected]>
Date:   Mon Sep 9 21:45:28 2024 +0200

    Trainer, items and wildmon up to Paciflodge Town

commit 36ff435ab69e393df93c3e0c01715b9ab500fbff
Author: hedara90 <[email protected]>
Date:   Mon Sep 9 21:03:52 2024 +0200

    Liam follower fixes (#5334)

    * Fix Blinking on Meganium South Sprite

    * Fixes Lediba and Ledian Blinking

    * Fixes two blinking spots on spinerak

    * Crobat Eye and Igglibuff butt vlinking fix

    * More blinking follower fixes

    flaaffy
    xatu
    hoppip line

    * Blinking Gen 2 Fixes

    Mantine
    Miltank
    Raikou
    yanma
    wooper
    skarmory

    * Gen 4 Fixes + donphan and espeon

    prinplup
    starraptor
    shieldon
    roserade
    ambipom
    mamoswine
    Stunky

    Donphan - gen 2 fix
    Espion - noticed a flickering pixel on south walk

    * Synchronization with Cafeei

    * Messed up the merge, fixing now

    * Added mantine

    ---------

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

commit 60803cdba9fc1b6030e454bd3a88adc158da046a
Author: Eduardo Quezada <[email protected]>
Date:   Mon Sep 9 13:58:23 2024 -0300

    Fixed braces style

commit 002c770f07d8bd167455f4096dcfa1976a11ce3c
Merge: 389e5c20d 42d9f24c8
Author: Eduardo Quezada <[email protected]>
Date:   Mon Sep 9 13:52:34 2024 -0300

    Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge

commit 389e5c20dd9f4ba0d551a18ab0f50bab61f5fb88
Author: Alex <[email protected]>
Date:   Mon Sep 9 15:40:56 2024 +0200

    Fixes berries missing timing (#5300)

    * Fixes berries missing timing

    * salac berry test

commit dc2bbe0448c49f36af62e4b4c96e7c388ffb4c6b
Author: hedara90 <[email protected]>
Date:   Mon Sep 9 14:34:21 2024 +0200

    Fixed loading into the wrong version of a map after saving in areas with multiple layouts (#5347)

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

commit 5089b1d0b41c89985181df35be80ae36d2bf1329
Author: Alex <[email protected]>
Date:   Mon Sep 9 11:52:26 2024 +0200

    Adds callnative for soundproofcheck to addtionally check the flag (#5301)

    * Adds callnative for soundproofcheck to addtionally check the flag

    * rename callnative, include parish song and missing ability recording

commit d62b7270c8ee3d8e5f3d0d19e1eda948eafbdbf6
Author: hedara90 <[email protected]>
Date:   Mon Sep 9 10:49:05 2024 +0200

    Fixed trainerslide arguments (#5344)

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

commit fd4860d17ee93ba0cd5a8d971745b353d7a9d5dc
Author: ghoulslash <[email protected]>
Date:   Mon Sep 9 04:41:43 2024 -0400

    fix missing break in ENDTURNs (#5350)

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

commit 66a251b44425cdcdf6ca449523118fde7a739c42
Author: laserXdolphin <[email protected]>
Date:   Mon Sep 9 10:01:53 2024 +0200

    Trainers up to Archie

commit 432d56a94a3cf5ad4c1ee6b2c9d179a562cd111e
Author: laserXdolphin <[email protected]>
Date:   Mon Sep 9 09:58:40 2024 +0200

    Items up to Sootopolis

commit 76457da42202f685c9ed28bba51cf0abed82b448
Author: laserXdolphin <[email protected]>
Date:   Mon Sep 9 09:58:17 2024 +0200

    Wild Encounters up to Sootopolis

commit ab279d9f8c77064139580b466bfaa8ae446f8884
Author: kittenchilly <[email protected]>
Date:   Mon Sep 9 02:52:48 2024 -0500

    Update Move Category icons (#5080)

    Update Category Icons to be more accurate to Gen 5

commit 2f21073555eb6c5c4c1f60b8267f67dd44d6b8b5
Author: Eduardo Quezada <[email protected]>
Date:   Sun Sep 8 23:13:32 2024 -0300

    Fixed Tera Shift description (#5351)

commit cfdb06a813952756605ff732284c26219886c8aa
Merge: 04197b491 71fcb2e7b
Author: GriffinR <[email protected]>
Date:   Sun Sep 8 14:47:28 2024 -0400

    Merge pull request #2028 from NTx86/fix-contest-ai-point-macros

    Fix incorrect point macros in contest_ai_script.inc

commit b8251e3a756f838f744910597fd84e1501414e70
Author: hedara90 <[email protected]>
Date:   Sun Sep 8 16:17:18 2024 +0200

    Another Pledge fix, Powder this time (#5341)

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

commit d6d2f2033de91545e699e423688a7c79ccf173ef
Author: PhallenTree <[email protected]>
Date:   Sun Sep 8 12:41:23 2024 +0100

    Fixes Pledge move combo timeout if frozen (#5340)

    Missing `HITMARKER_UNABLE_TO_USE_MOVE` in the frozen canceller

commit 71fcb2e7b5b24d5bd64717d2ca7d9d760b55722c
Author: NT_x86 <[email protected]>
Date:   Sun Sep 8 12:50:35 2024 +0300

    Fix incorrect point macros in contest_ai_script.inc

commit 03e87a7d62162e94eb3b857315e9f83f42e7b951
Author: hedara90 <[email protected]>
Date:   Sun Sep 8 10:38:52 2024 +0200

    Pledge fail into opponent pledge loop fix (#5339)

    * Pledge fail into opponent pledge loop fix

    * Fixed excessively aggressive canceller

    * Move the Pledge bit clear to its proper place

    ---------

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

commit 68701a9e2d65a22693e71baeb61e1e27964040b8
Author: PhallenTree <[email protected]>
Date:   Sun Sep 8 07:28:16 2024 +0100

    Fix some Pledge move combo issues (#5330)

    Fix Pledge moves looping, adds tests for pledge+incapacitation situations

commit ac7abb6d599095791d9d3d8bc8939815dfeb66c4
Author: Cafei <[email protected]>
Date:   Sat Sep 7 17:59:09 2024 +0400

    Followers sprite fixes (#5333)

    Follower sprite fixes
    Mothim and Combusken shiny fixes

commit 28287fe80a0ff084472b0dfaccc236f90e04248e
Author: Alex <[email protected]>
Date:   Fri Sep 6 21:08:54 2024 +0200

    Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm (#5155)

    * Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm

    * update moveEffect

    * fix compile

commit 31717ed7303d4493ad699d2a9db48de3f7554cd5
Author: laserXdolphin <[email protected]>
Date:   Fri Sep 6 10:20:08 2024 +0200

    Trainers up to Mossdeep City

commit e9c0784dc09b4e37862cca81ef48ac2804ca61e1
Author: Liamjd14 <[email protected]>
Date:   Thu Sep 5 21:31:14 2024 +0100

    Gen 9 Follower pokemon sprites (#5304)

    * Gen 9 Follower Sprites

commit ff72723464be032b3f576dfce3c80cfdfe538772
Author: ghoulslash <[email protected]>
Date:   Thu Sep 5 14:51:13 2024 -0400

    Fix Cmd_trainerslidein/out (#5326)

    * fix Cmd_trainerslidein battler Id

    * GetBattlerForBattleScript in trainerslideout

    ---------

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

commit 9bd5601b5c085a70111f0fc4eaf7d98e43adbfa8
Author: Pawkkie <[email protected]>
Date:   Mon Sep 2 17:43:41 2024 -0400

    Wonder Guard AI Fix (#5317)

    * Fix Wonder Guard looping

    * Review + Sheer Cold

commit a422db09c69d8d07e336878081b63c716cf19b32
Author: SarnPoke <[email protected]>
Date:   Mon Sep 2 22:53:03 2024 +0200

    Fix Slateport Battle Tent/Battle Factory (#5281)

    * Fix Slateport Battle Tent/Battle Factory

    Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.

    * Fix player rental party being junk data after rest

    Fixes #5280

    * Consolidate checks into single method

    Consolidates every gSpecialVar_0x8005 check into a singular method.

commit cbf287fd0e1bfd1485515c8e7f6fb80f80c6b4ba
Author: laserXdolphin <[email protected]>
Date:   Mon Sep 2 21:48:43 2024 +0200

    Wildmons and Items up to Mossdeep City

commit fb1f12aa1b6fbe31875a3aa565160fa5b04ca49d
Author: hedara90 <[email protected]>
Date:   Mon Sep 2 13:58:10 2024 +0200

    Fixed Max Attacks into Max Guards message printing (#5312)

    * Fixed Max Attacks into Max Guards message printing

    * Updated the solution

    ---------

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

commit 42d9f24c8472a67d742d9d9da106480c84514336
Author: Ariel A <[email protected]>
Date:   Sun Sep 1 17:15:29 2024 -0400

    feat: added `OW_MON_WANDER_WALK` config option

commit 33d5cbd7a284dce2234de8bb6bff615accbf5049
Author: Eduardo Quezada <[email protected]>
Date:   Sun Sep 1 17:13:58 2024 -0400

    Moved ASSUMEs to inside GIVEN blocks (#5308)

commit 839cf2e79012e0fc9159af5ab9e6a497e86bbfa4
Author: Ariel A <[email protected]>
Date:   Sun Sep 1 15:31:12 2024 -0400

    feat: static OW pokemon now bob while walking in place (per `OW_MON_BOBBING`)

commit ffa02c584eb4d279963da751f879b9196cd8a657
Author: laserXdolphin <[email protected]>
Date:   Sun Sep 1 21:19:28 2024 +0200

    Trainer and Items up to AquaHideout

commit 6648498e2ec1a2e9b7d16d963bc682a289b7cd9b
Author: Alex <[email protected]>
Date:   Sun Sep 1 18:07:18 2024 +0200

    Fixes dmax move base power not seen by ai (#5299)

commit aa9713b36aa67cd0fb3ebaed38856b7393fb4f0e
Author: laserXdolphin <[email protected]>
Date:   Sun Sep 1 09:06:41 2024 +0200

    Trainers up to Magma Hideout

commit 27f1430cc292e2c62306deb8e4e7aa2a23630518
Author: laserXdolphin <[email protected]>
Date:   Sun Sep 1 08:59:32 2024 +0200

    Added AI_FLAG_OMNISCIENT to all trainers to equal the playing field

commit e09a59a7e4b2c8c7b3c340fdec557e80fb75d83a
Author: Alex <[email protected]>
Date:   Sat Aug 31 18:24:28 2024 +0200

    Fixes Tar Shot on Tera mons (#5302)

    * Fixes Tar Shot on Tera mon

    * new line

commit cfa56962e185237ddb0af037179748fcf0ad1b5b
Author: AgustinGDLV <[email protected]>
Date:   Sat Aug 31 04:15:56 2024 -0700

    fixed dupe gimmick use in doubles (#5235)

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

commit 073d599fc58e54f4dc1f910c843940c12ca6ad4b
Author: hedara90 <[email protected]>
Date:   Sat Aug 31 12:39:56 2024 +0200

    Fixed Cinderace GMax back sprite (#5295)

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

commit ac9b40a423fc9faf26e79336a06542cd3f01c917
Author: PhallenTree <[email protected]>
Date:   Sat Aug 31 11:39:37 2024 +0100

    Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names (#5296)

    * Fix Max and G-Max Moves bypassing absorbing abilities

    * Fix G-Max Corviknight and Centiskorch speciesName

    * Remove some outdated comments

    * Missing Dynamax check

    * Add Max Quake and Max Overgrowth to test

commit 04197b49126604a310fae1d314709334f6d2460d
Author: GriffinR <[email protected]>
Date:   Sat Aug 31 01:54:25 2024 -0400

    Fix swapped cycling road entrances

commit 32f05269a3c96b45464ca0e1f5c4090c2f37d75f
Author: GriffinR <[email protected]>
Date:   Sat Aug 31 00:53:23 2024 -0400

    Add missing terminal newlines

commit c265c3f8375eeaca01258b778f8f602e75af35df
Merge: 5e4e522d9 4d74dd5e3
Author: GriffinR <[email protected]>
Date:   Sat Aug 31 00:51:15 2024 -0400

    Merge branch 'master' of https://github.com/pret/pokeemerald into build-music-config

commit 2d5231149ea391a124d2bfc3a5216a5fc6e123b4
Merge: 4b2054c3e 4d74dd5e3
Author: GriffinR <[email protected]>
Date:   Sat Aug 31 00:39:48 2024 -0400

    Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed

commit 4d74dd5e330c5de3c5137015f5087b20eb71bcc7
Merge: 625a006ca a4dd82165
Author: GriffinR <[email protected]>
Date:   Sat Aug 31 00:36:50 2024 -0400

    Merge pull request #1950 from Icedude907/build-makefile-cleanup

    [Build System Rewrite] Refactored `Makefile`

commit a4dd8216587f73841ba9016678c1af88cb78b62c
Author: GriffinR <[email protected]>
Date:   Sat Aug 31 00:32:43 2024 -0400

    Restore review changes from dependent PR

commit 19ad2e16ac3d1cfd6048f120872f7875aa5ca0e5
Merge: 2198ca31c 625a006ca
Author: GriffinR <[email protected]>
Date:   Sat Aug 31 00:10:55 2024 -0400

    Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup

commit addaf40971e9891f5d5036c2d75dceb7d4f029b3
Author: Alex <[email protected]>
Date:   Sat Aug 31 01:36:14 2024 +0200

    Fixes Scale Shot not activating + Known Failing Round test (#5292)

    * Fixes Scale Shot not activating + Known Failing Round test

    * Update test/battle/move_effect/multi_hit.c

commit 2c9ab4244e4ad5614d4dc4e7e5aad5134c0505b2
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 30 12:50:01 2024 +0200

    Updated Ninjaboy Flags from Suicide to risky

commit 212e63e66bba91fd28c046f315238c3f808c01c5
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 30 11:27:48 2024 +0200

    Made Gym Leader Rematches earn BP

commit 625a006cabbf44734be2d0324264d86c3edba51b
Author: Icedude907 <[email protected]>
Date:   Fri Aug 30 06:01:01 2024 +1200

    [Build System Rewrite] `mapjson` now takes output directory parameters. (#1949)

commit 8053f4ab1e3d53e6b5fa40458925fdf59407fc13
Author: Cafei <[email protected]>
Date:   Thu Aug 29 20:14:46 2024 +0400

    Enable female Indeedee follower and improve shiny Indeedees (#5285)

    Enable Indeedee female follower sprite.
    Shiny improvements.
    Fix front Indeedee male shading.

commit 2e1dd565131e1fdcc13c6ebb3428823df4560314
Merge: 9a9fdfc6c 531ecac1d
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 29 16:44:28 2024 +0200

    Merge branch 'pokeemerald-base-master' into develop

commit 531ecac1d97940aaee8fb8e34e71ad3e22f9c321
Merge: 2f7d23f12 3f8620e06
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 29 16:43:32 2024 +0200

    Merge branch 'develop'

commit 3f8620e06da6a6f34601ec462b0fa1513eae33a0
Merge: fd69f0557 d0ba200ec
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 29 16:43:24 2024 +0200

    Merge remote-tracking branch 'origin/earn_bp_from_scripted_battles' into develop

commit d0ba200ec5809d0da30c16df693f76be2b483889
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 29 16:42:57 2024 +0200

    Fixed "money may be used uninitialized" warning

commit 9a9fdfc6c5ef4400d98ff61e25424673994e5818
Merge: d98e5e5bd 2f7d23f12
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 29 15:19:50 2024 +0200

    Merge branch 'pokeemerald-base-master' into develop

commit d98e5e5bdd2a75a2b79aebd7e27f50faf64b6997…

.gitattributes

@@ -0,0 +1,26 @@
+*.pal text eol=crlf
+*.sh text eol=lf
+*.s text eol=lf
+*.txt text eol=lf
+Makefile text eol=lf
+*.mk text eol=lf
+*.c text eol=lf
+*.h text eol=lf
+*.pl text eol=lf
+*.inc text eol=lf
+*.sha1 text eol=lf
+*.json text eol=lf
+*.sed text eol=lf
+*.cpp text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+*.hpp text eol=lf
+*.md text eol=lf
+*.ps1 text eol=crlf
+*.yml text eol=lf
+
+*.png binary
+*.bin binary
+
+*.h linguist-language=C
+*.inc linguist-language=Assembly

.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml

@@ -0,0 +1,56 @@
+name: ⚔️ Battle Engine mechanical bugs 🐛
+description: File a bug report related to battle mechanic, be it moves, abilities and/or items.
+labels: ["bug", "status: unconfirmed", "category: battle-mechanic"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing.
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.9.3 (Latest release)
+        - master (default, unreleased bugfixes)
+        - upcoming (Edge)
+        - 1.9.2
+        - 1.9.1
+        - 1.9.0
+        - 1.8.6
+        - 1.8.5
+        - 1.8.4
+        - 1.8.3
+        - 1.8.2
+        - 1.8.1
+        - 1.8.0
+        - pre-1.8.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming/master Version
+      description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml

@@ -0,0 +1,56 @@
+name: 🧠 Battle AI bugs 🐛
+description: File a bug report related to battle AI.
+labels: ["bug", "status: unconfirmed", "category: battle-ai"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing.
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.9.3 (Latest release)
+        - master (default, unreleased bugfixes)
+        - upcoming (Edge)
+        - 1.9.2
+        - 1.9.1
+        - 1.9.0
+        - 1.8.6
+        - 1.8.5
+        - 1.8.4
+        - 1.8.3
+        - 1.8.2
+        - 1.8.1
+        - 1.8.0
+        - pre-1.8.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming/master Version
+      description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/03_feature_requests.yaml

@@ -0,0 +1,27 @@
+name: 🙏 Feature Request 🙏
+description: Do you want a feature to be added to the Expansion? Let us know!
+labels: ["feature-request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing.
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/04_other_errors.yaml

@@ -0,0 +1,56 @@
+name: 💾 Other errors 🖥️
+description: Everything else that doesn't fit in the above categories.
+labels: ["bug", "status: unconfirmed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing.
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.9.3 (Latest release)
+        - master (default, unreleased bugfixes)
+        - upcoming (Edge)
+        - 1.9.2
+        - 1.9.1
+        - 1.9.0
+        - 1.8.6
+        - 1.8.5
+        - 1.8.4
+        - 1.8.3
+        - 1.8.2
+        - 1.8.1
+        - 1.8.0
+        - pre-1.8.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming/master Version
+      description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Rom-Hacking Hideout's Discord server!
+    url: https://discord.gg/6CzjAG6GZk
+    about: You can follow the development of pokeemerald-expansion and be notified of new releases :)