Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo #4068
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AsparagusEduardo
previously approved these changes
Jan 26, 2024
AsparagusEduardo
approved these changes
Jan 26, 2024
johannakullmann
added a commit
to johannakullmann/pokeemerald-expansion-base
that referenced
this pull request
Mar 19, 2024
commit bd8594835f2e67e34e6dfd9d35889769fca95b7c Author: johannakullmann <[email protected]> Date: Tue Mar 19 15:08:58 2024 +0100 re-converted all the new .inc files to poryscript commit ffbf8050eb6681270b9b7485397a04fe43d3e6f4 Merge: 35f7e166a 107bcdf62 Author: Johanna K <[email protected]> Date: Tue Mar 19 14:45:35 2024 +0100 Merge tag 'expansion/1.8.0' of https://github.com/rh-hideout/pokeemerald-expansion commit 107bcdf6231beb59f29e2d964c0602d844e4c259 Merge: dbd7e2a7c 331efedf7 Author: Eduardo Quezada <[email protected]> Date: Sun Mar 17 12:45:58 2024 -0300 Version 1.8.0 (#4259) commit 331efedf7ea1ae9622a06f10e1a847fc05539ec7 Author: Eduardo Quezada <[email protected]> Date: Sat Mar 16 19:46:20 2024 -0300 Version 1.8.0 commit f692244ce725a1f8b0c7c2c88c6f6a76e64d6ea9 Author: DizzyEggg <[email protected]> Date: Sat Mar 16 22:31:58 2024 +0100 Improve error message with unsupported cpp (#4272) * Improve error message with unsupported cpp * Update include/metaprogram.h Co-authored-by: Martin Griffin <[email protected]> --------- Co-authored-by: Martin Griffin <[email protected]> commit 7ac8aac913398b3e0301543c741f1360f6e3c17a Author: tertu <[email protected]> Date: Sat Mar 16 14:55:01 2024 -0500 Add LocalRandomSeed (#4278) commit 7c25db5200916477f147598ff39d644da1b894d6 Author: Eduardo Quezada <[email protected]> Date: Sat Mar 16 14:38:43 2024 -0300 Fill data for placeholder species (#4281) * Absolute IDs * Mothim internal forms * Scatterbug/Spewpa internal forms * Fixed Mothim not having form tables * Totem Alolan Raticate * Moved shared dex text to its own folder * Totem Mimikyu * Added missing empty third-ability fields * Totem Gumshoos + missing totem flags * Renamed files to better match their contents * Fixed Disguise on Totem Mimikyu * Totem Vikavolt/Alolan Marowak + missing Gumshoos form table * Totem Ribombee/Araquanid/Lurantis/Salazzle * Totem Togedemaru/Kommo-O * Partner Pikachu/Eevee * Reintroduced shinyLocked species flag for convenience * Revert "Reintroduced shinyLocked species flag for convenience" This reverts commit 3e07bd378ba6a249effe0aed83a424d0c775f236. commit 15aa9099446ab1e4086e08b95da8a0c44c6ecfec Author: LOuroboros <[email protected]> Date: Thu Mar 14 18:02:19 2024 -0300 Updated OW_SYNCHRONIZE_NATURE statement in ScriptGiveMonParameterized (#4271) Fixes an issue where the nature of a Deoxys would be randomized even if one was set at the time of calling givemon or the functions related to it. commit 6804e82c0a33924de8f455c91acb72d227914f29 Author: Eduardo Quezada <[email protected]> Date: Thu Mar 14 17:47:38 2024 -0300 Revert gSpeciesInfo "INFO" macros (#4230) * Venusaur, Charizard, Blastoise * Butterfree, Beedrill, Pidgeot * Rattata, Raticate * Expanded the rest of Gen 1 macros * Expanded Gen 2 macros * Expanded Gen 3 macros * Expanded Gen 4 macros * Expanded Gen 5 macros * Expanded Gen 6 macros * Expanded Gen 7 macros * Expanded Gen 8&9 macros * Removed trailing macro slashes * Expanded macros for sprites, pals, icons and learnsets (using shasum) * AMEND ME * Gen 1 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 2 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 3 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 4 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 5 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 6 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 7 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 8 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> * Gen 9 fully reordered (thanks Alex!) Co-authored-by: Alex <[email protected]> --------- Co-authored-by: Alex <[email protected]> commit b5af343dc4539da467c95acf92aeb92a4f59bdaf Author: Alex <[email protected]> Date: Thu Mar 14 21:20:13 2024 +0100 Reverts additional move effect macros (#4277) commit 68e5c9f8cb45f2c27d377879e650d0df033f4688 Merge: 306621638 dbd7e2a7c Author: Eduardo Quezada <[email protected]> Date: Thu Mar 14 11:41:27 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # include/battle.h # src/pokedex.c commit dbd7e2a7c817b17166ab9c797ebcc0b51952620f Author: Eduardo Quezada <[email protected]> Date: Thu Mar 14 05:42:09 2024 -0300 Fixed DisplayCaughtMonDexPage graphical issue + cry (#4279) commit 306621638915c4a503a3e44ad6b40acc10e4b282 Author: Eduardo Quezada <[email protected]> Date: Tue Mar 12 08:32:06 2024 -0300 Type array tweaks (#4276) * Using Z-Moves in type array * Added Arceus form data commit 1568b0a424452c672e43925d4ca387cf0db5218f Author: Eduardo Quezada <[email protected]> Date: Tue Mar 12 08:21:03 2024 -0300 Pre-1.8 tweaks (#4275) * Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE * Move level_caps.h to config folder * Multiple EV/IV refered as EVs/IVs * Disabled decap by default * Level up learnsetst comments commit 2f4203bc4c3f5b4113ff80663bd8c9ef395c8815 Author: Frank DeBlasio <[email protected]> Date: Tue Mar 12 06:57:38 2024 -0400 Consolidate type properties (#4185) * Moved gTypeNames into gTypes * Added invalid move text to struct * Added max move to struct * Added icon palette to struct * Added macros for invalid and max moves * Swapped palette and max move order * Renamed invalid to generic * Renamed invalid to generic in struct definition * Added zMoves and items to type struct * Addressed comments * Incorporated newer comments * Updated comment format commit a741e2e3966da1a579bc5adaf29032cd77fd2969 Author: Alex <[email protected]> Date: Tue Mar 12 11:51:37 2024 +0100 Couple things for 1.8 release (#4274) * Couple things for 1.8 release * revert EFFECT_VARY_POWER_BASED_ON_HP change * Fix comment --------- Co-authored-by: Eduardo Quezada <[email protected]> commit cd650ae9987687456ce7f949694db98eac68fbcc Author: LOuroboros <[email protected]> Date: Mon Mar 11 15:47:04 2024 -0300 Corrected initial value of targetSpecies in GetEvolutionTargetSpecies (#4269) commit ec73e2850726ac49f94cecda60ff89e49c2e439a Author: MartyKen <[email protected]> Date: Mon Mar 11 11:46:16 2024 +0100 Gen 6 level up learnset update (#4267) * Lvl up learnsets by generation I think the title sums it up pretty nicely * Update level_up_learnsets.h forgot some newer pokemon * divided the learnset file into generations * Separated learnsets by generation Separated the learnsets by generation, added a bit more documentation in the config file * Update src/pokemon.c Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> * Update include/config/pokemon.h Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> * PLA aux item sprites * Gen 6 lvl up Learnset update Updates gen 6's level up learnsets to ORAS (previously XY) * Revert "Merge branch 'upcoming' of https://github.com/MartyKen/pokeemerald-expansion into upcoming" This reverts commit 53462c4088926a813f216a7917b1dfeb5ef2ca25, reversing changes made to 051a93058c83c691f8476fbb97035e64fcee38aa. --------- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 0dabcfc966ed466aa7d251606cfc4046786f2c89 Author: ghoulslash <[email protected]> Date: Sun Mar 10 17:49:00 2024 -0400 fix repeated quick claw/quick draw checks (#4266) * fix repeated quick claw/quick draw checks * fix field names --------- Co-authored-by: ghoulslash <[email protected]> commit ff482957bd93415cd373a3638a6fcdcd52663ea8 Author: LOuroboros <[email protected]> Date: Fri Mar 8 19:26:25 2024 -0300 Made ScriptGiveMonParameterized recognize the state of P_FLAG_FORCE_SHINY and P_FLAG_FORCE_NO_SHINY (#4256) * Made ScriptGiveMonParameterized recognize the state of the P_FLAG_FORCE_SHINY * And made it respect P_FLAG_FORCE_NO_SHINY too commit b7f5ef3cd7192f1f489ef2dde5608a5287823274 Author: kittenchilly <[email protected]> Date: Fri Mar 8 16:25:59 2024 -0600 Add Paldean Wooper mini icon (#4260) commit 3697363198a6554743d4be0e397ae2c6f8e97cb3 Merge: 95270e540 48d49b40c Author: Eduardo Quezada <[email protected]> Date: Fri Mar 8 08:57:27 2024 -0300 Pret merge 07.03.2024 (#4255) commit 48d49b40c58f102963417997952dc99a9f9c8529 Merge: 95270e540 82c3e4af1 Author: DizzyEggg <[email protected]> Date: Thu Mar 7 20:57:07 2024 +0100 Merge branch 'master' of https://github.com/pret/pokeemerald into upcoming commit 82c3e4af14d636e6c64524dff1a171abf3506b99 Merge: 954ba0a15 7da5cb421 Author: GriffinR <[email protected]> Date: Thu Mar 7 10:33:52 2024 -0500 Merge pull request #1981 from DizzyEggg/patch-3 Make sure gHeap is always aligned commit 95270e5400aa61876a836f190304f74c244c7577 Author: DizzyEggg <[email protected]> Date: Wed Mar 6 22:27:21 2024 +0100 gHeap can go in the middle of ram (#4253) commit a36cfb10936502857803df42d811d977d4b5690b Author: DizzyEggg <[email protected]> Date: Wed Mar 6 22:26:33 2024 +0100 unify monSpritesGfx sprites/ptr and fix various compiler errors on o3/os/og (#4252) commit 3b45fda8e9732f53c28fed145c954da5e6eb041f Author: DizzyEggg <[email protected]> Date: Wed Mar 6 22:22:05 2024 +0100 Use u32 in gflib functions and remove unused (#4250) commit c91af31a268867730d193b84ff9d3333f062868f Author: Eduardo Quezada <[email protected]> Date: Wed Mar 6 12:54:44 2024 -0300 Fixed P_FOOTPRINTS not compiling (#4251) commit 7da5cb421ecd65d5b607158feebde53728e1171c Author: DizzyEggg <[email protected]> Date: Wed Mar 6 16:13:06 2024 +0100 Make sure gHeap is always aligned commit 49ddefe84ad8a4f06eb7a5fdba3ccd904eecd543 Merge: b9f715f11 156517123 Author: Eduardo Quezada <[email protected]> Date: Wed Mar 6 10:40:20 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming commit 1565171235f74a9335b42b14a0008d2765367771 Author: Eduardo Quezada <[email protected]> Date: Tue Mar 5 14:08:02 2024 -0300 Fixed considering Mold Breaker but not Turboblaze/Teravolt for flinch-related decisions (#4244) commit b9f715f1144744245d2ab729639ebdc1f3f11f50 Author: DizzyEggg <[email protected]> Date: Mon Mar 4 22:31:05 2024 +0100 Fix possible multi battle bug (#4240) commit 650f80d57efb0b878f140283bd51beee41a8688c Author: DizzyEggg <[email protected]> Date: Mon Mar 4 17:36:23 2024 +0100 remove some unused data (#4239) commit 8d58af4d333ff8f18283ded2d7cf8631e4485885 Author: Alex <[email protected]> Date: Mon Mar 4 09:54:04 2024 +0100 Move most damage AI_BadMove checks to AI_CalcDamage (#4238) * Move a couple damage AI_BadMove checks to AI_CalcDamage * re-add effectivness score decrease * reduce score for bad move in ai_checkviability * review changes commit 5acc770f0076bfd5376379d17c9faaa0146ee418 Author: Eduardo Quezada <[email protected]> Date: Sun Mar 3 05:07:47 2024 -0300 Fixed config comment (#4237) commit d811614f6019a3640550b1fefce22b9a0fc18e5e Merge: 64b7cfeb2 9e0ae222c Author: Eduardo Quezada <[email protected]> Date: Sat Mar 2 11:04:48 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming commit 64b7cfeb29cc5bd61127e3b1a5d3fc288dcc01a8 Author: LOuroboros <[email protected]> Date: Fri Mar 1 15:55:54 2024 -0300 Upgrading the debug menu's 'Poison Party' (#4235) * Upgrading the debug menu's 'Poison Party' * Optimized the 'No Pokémon' check in Debug_EventScript_InflictStatus1 * Killed a pointless function call in Script_SetStatus1 * Added Frostbite support to ¡inflict status1' commit e3d9a19f455c5e753980f2149c9e9c478aaa2510 Author: tertu <[email protected]> Date: Wed Feb 28 00:04:47 2024 -0600 Use a 32 bit seed for new game seeding in HQ mode. (#4218) Also adjust some comments commit 918a0be312e97eb75785890bf5247d6734b8d870 Merge: 38e7de211 e9b2f3308 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Tue Feb 27 09:32:54 2024 -0300 MoveInfo rearrangement and flag optimisation (#4096) commit e9b2f33084af514b4dabf09983bc9a85c8b51ab0 Author: Nephrite <[email protected]> Date: Tue Feb 27 13:38:38 2024 +0900 Fixed Tangling Hair + Mirror Armor interaction commit b1f0fbdf894c9bff62e138fe0468da2fed661ac6 Merge: 4781ca41a 38e7de211 Author: Nephrite <[email protected]> Date: Tue Feb 27 13:03:26 2024 +0900 Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored commit 9e0ae222c3f5e09ca6b41d55d827482d240c604f Author: Eduardo Quezada D'Ottone <[email protected]> Date: Mon Feb 26 14:33:06 2024 -0300 Fixed Tri Attack status ability immunity test (#4229) * Fixed Tri Attack test incorrectly having abilities that don't prevent Paralysis * Fixed Dauntless Shield test names commit 4781ca41a9929d353912792d607573c83be1e0cb Author: Nephrite <[email protected]> Date: Tue Feb 27 00:03:25 2024 +0900 Renamed GET_ADDITIONAL_EFFECT_COUNT macro commit 170070baef64f97b843d4c778dbe861df884375a Author: Nephrite <[email protected]> Date: Mon Feb 26 23:59:15 2024 +0900 Apply suggestions from code review Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 38e7de211fde7b015aab63af7f2313846e74c963 Merge: d2e84afd0 750eb40a7 Author: Eduardo Quezada <[email protected]> Date: Mon Feb 26 11:52:55 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming commit b0d36b22ba6c508bdaad1cd578d450f4a8dd2516 Author: Nephrite <[email protected]> Date: Mon Feb 26 15:12:34 2024 +0900 Fixed test commit 0aac57bf6027a079a60f53cfa3955258c319e3d8 Author: Nephrite <[email protected]> Date: Mon Feb 26 15:11:21 2024 +0900 Renamed TestSheerForceFlag commit 46b67355a5333b7418c4427b7be78524f70d2c19 Merge: 174c6fc99 d2e84afd0 Author: Nephrite <[email protected]> Date: Mon Feb 26 14:23:53 2024 +0900 Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored commit 174c6fc9999c82c5db57ea1f52ab8edffb154301 Author: Nephrite <[email protected]> Date: Mon Feb 26 14:21:38 2024 +0900 Renamed "MoveHasMoveEffect" functions commit d2e84afd03ca658e6500088c467357d75512dafa Author: DizzyEggg <[email protected]> Date: Sun Feb 25 11:20:23 2024 +0100 AI sets up double flags correctly (#4228) * Fix AI double flag not being set up * ai vs ai doubles commit 9db03fb2630ce4d107a99a907ed2a33e95147ec3 Author: Nephrite <[email protected]> Date: Sun Feb 25 18:22:21 2024 +0900 Removed GET_MOVE_EFFECT commit 8671da436ba705d31d75c0c85e2d630ebe00053f Author: Eduardo Quezada D'Ottone <[email protected]> Date: Sun Feb 25 06:13:26 2024 -0300 Add LGPE+ Premier Ball Bonus config (#4191) * Add LGPE+ Premier Ball Bonus config * Capitalization * Premier Ball count in message + only give the amount of Premier Balls possible * Review changes * Updated B_TELEPORT_BEHAVIOR to match Premier Ball config * Update src/shop.c Co-authored-by: Bassoonian <[email protected]> --------- Co-authored-by: Bassoonian <[email protected]> commit b55b1eaa5d06ad93c273ee07963a4ce74db5a0db Author: Nephrite <[email protected]> Date: Sun Feb 25 17:54:04 2024 +0900 Added word comment commit 7592ec59732f255c742cfdd6d3e9cf209600c03e Author: Nephrite <[email protected]> Date: Sun Feb 25 17:42:43 2024 +0900 Revert moves_info.h reorder commit 0522ec0247d6bd881909a1c8844e139acd7bba69 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Thu Feb 22 10:22:57 2024 -0300 Trainer data encapsulation (#4216) * Moved existing sanitized trainer data functions to include/data.h * Sanitized encounterMusic_gender * Sanitized trainer class ID * Sanitized trainer pic ID * Sanitized trainer starting status * Sanitized obtaining Trainer struct * Sanitized trainer double battle flag * Sanitized trainer party size * Sanitized trainer mugshot data * Sanitized trainer name * Consolidated Dome Brain trainer data to the rest of the frontier data * Sanitized trainer items * Removed accidental test data * Sanitized trainer party * Sanitized trainer AI flags * Final encapsulation bit commit 750eb40a75871c510bf423ae64cbaf4f745ecaa3 Author: Alex <[email protected]> Date: Wed Feb 21 23:55:38 2024 +0100 Fixes Tangling Hair, Rocky Helmet interaction (#4219) commit 5e79fcd5b42499d320108faab8cdaa69841f214b Author: Eduardo Quezada D'Ottone <[email protected]> Date: Mon Feb 19 14:42:56 2024 -0300 Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct (#4213) * Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct * Fixed SaveBlock1 comment (please squash) * Separated FREE_EXTRA_SEEN_FLAGS for each SaveBlock commit 75ad61e5bff078df683f0ef27b5cf96af829255a Merge: cd596fdd8 57e0d7b20 Author: Eduardo Quezada <[email protected]> Date: Mon Feb 19 10:13:13 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_ai_main.c # src/battle_ai_util.c # src/battle_tv.c # src/data/battle_moves.h # src/data/graphics/pokemon.h commit 57e0d7b20bee5f5a8ae2e1d610e4ec664260efb9 Author: Alex <[email protected]> Date: Mon Feb 19 13:36:21 2024 +0100 Partial fix for Teeter Dance and Ability Dancer interaction (#4129) * Parial fix for Teeter Dance and Ability Dancer interaction * Removes rest of teeter dance checks and make it work with effect_confuse * Update test/battle/ability/dancer.c Co-authored-by: Bassoonian <[email protected]> * Update test/battle/ability/dancer.c Co-authored-by: ultima-soul <[email protected]> --------- Co-authored-by: Bassoonian <[email protected]> Co-authored-by: ultima-soul <[email protected]> commit 5be97faf9da0cf512e347a9e55c57c5f52605ced Author: Eduardo Quezada <[email protected]> Date: Sun Feb 18 22:09:08 2024 -0300 Non-tagged commit cd596fdd802fc5c26cf5ead808ed274d2e73f538 Author: Alex <[email protected]> Date: Sun Feb 18 20:00:36 2024 +0100 Adds Tidy Up + minor Dragon Cheer follow up (#4136) * Adds Tidy Up + minor Dragon Cheer follow up * improve tidy up script * Add IncreaseTidyUpScore function * remove useless calls * 2 small tests and a correction for IncreasyTidyUpScore commit 76946282964b1ce70f4ac6ecb3b46b131509f766 Author: Alex <[email protected]> Date: Sun Feb 18 15:05:08 2024 +0100 Adds Powerful status move flag (#4125) * Adds Powerful status move flag * fix flag * fixed final issues * review changes commit 7ab23cf426afeb5b1d8250b7212e66edd332ff42 Author: Alex <[email protected]> Date: Sun Feb 18 15:02:58 2024 +0100 Sets neutral nature and ability 0 as default in trainer control (#4172) * Sets neutral nature and ability 0 as default in trainer control * add config to generate a random ability * minor correction * move config to battle.h * fixed compiling commit d608af5662e4af51facbf06e98244eddba23f4bc Author: Ultimate_Bob <[email protected]> Date: Sun Feb 18 20:24:21 2024 +1100 Copy null terminator when decapping player name. (#4206) commit d102467d8d34c4c4b8f61d8a04f93e195eeb758e Author: Alex <[email protected]> Date: Fri Feb 16 19:18:43 2024 +0100 AI PR 4036 follow up (#4199) commit fcc28393463429d600b6bf91e93e26a9c270cdc1 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Fri Feb 16 15:18:26 2024 -0300 Fixed missing Z-Move power override (#4201) commit ebe13ffc3c58674e70b5c50e17b9ca24f9a67d8d Merge: 1f349e0fb 20a3d91de Author: Eduardo Quezada <[email protected]> Date: Fri Feb 16 11:30:01 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming commit 1f349e0fb9753f070bc6f0504b5ae1ea47fc1bc3 Author: LOuroboros <[email protected]> Date: Thu Feb 15 11:22:25 2024 -0300 Renamed NUM_ABILITY_VANILLA to NUM_ABILITY_PERSONALITY (#4196) commit cc22fef6c83e8defc737b59dd0bdd27a6fde7919 Author: psf <[email protected]> Date: Thu Feb 15 01:23:11 2024 -0800 - Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. (#4193) - Created `ConvertMonHeightToString` and `ConvertMonWeightToString` for developers to use commit c21ab741f7dd43bf7546deccf258b3f5a053b634 Author: Martin Griffin <[email protected]> Date: Thu Feb 15 07:07:28 2024 +0000 randompercentage, randomelement (#4189) 'randompercentage X' sets VAR_RESULT to TRUE X% of the time, or FALSE 100-X% of the time. 'randomelement X, Y, ...' sets VAR_RESULT to one of X, Y, ... with equal probability. commit eb7ddeb66cf433502d7b92e70f8d60aa71b7b0df Author: LOuroboros <[email protected]> Date: Thu Feb 15 04:01:34 2024 -0300 Updated the way in which ScriptGiveMonParameterized and ScrCmd_givemon chooe a default ability (#4192) * Updated the way in which ScrCmd_givemon and ScriptGiveMon assign a default ability When an abilityNum is not assigned in a call to givemon performed inside of an overworld script, ScriptGiveMonParameterized will make sure to generate an abilityNum of 0 or 1 in the same way vanilla does it; by defaulting to 0, and then tweaking it based on the least relevant bit of the Pokémon's personality. ScriptGiveMon will set the default ability of a Pokémon in the same way now too, because even though it was rewritten in #3924, it should ideally produce a Pokémon in a similar way than vanilla does it. * Removed pointless abilityNum setup in ScriptGiveMonParameterized commit 7f6e1e2aea15a8c0f864b5ba8d76422cfd029634 Author: psf <[email protected]> Date: Wed Feb 14 01:17:23 2024 -0800 Add configs for measurement systems and decimal separators (#4183) * Allow developers to choose metric or imperial, and their decimal seperator of choice for Pokédex entries - Creates which cleans up the existing implementing of printing height and weight to the pokedex - Developers can choose to use metric or imperial units of measurement in the Pokédex - - Developers can choose to use any character as a decimal seperator in the Pokédex - Allows users to define units and decimal seperators independently - Fixes a bug in Lotad / Seedot house * Fixed compilation issue with agbcc * Updated to include HGSS Dex and address PR Feedback commit ce99db0086a60b85d789971c936d8b47d669f7a6 Author: ghoulslash <[email protected]> Date: Wed Feb 14 04:05:37 2024 -0500 Generic Starting Battle Status Variable (#4176) * setup generic starting battle status variable, ABILITYEFFECT_SWITCH_IN_STATUSES * fix B_ANIM_TAILWIND, assign to starting statuses, and change B_VAR_STARTING_STATUS check for only the variable and not trainers * Update src/battle_main.c Co-authored-by: Bassoonian <[email protected]> * Update src/battle_util.c Co-authored-by: Bassoonian <[email protected]> * Update src/battle_util.c Co-authored-by: Bassoonian <[email protected]> * style fixes * General_Room naims play SE * fix sText_BizarreArenaCreated --------- Co-authored-by: ghoulslash <[email protected]> Co-authored-by: Bassoonian <[email protected]> commit 1ac99347420028281abf3e9349f4ab1677520385 Author: Nephrite <[email protected]> Date: Tue Feb 13 12:19:27 2024 +0900 Reverted `forcePressure` flag move commit e73c58ed2e24a2ea67595617924f92f3be0fe794 Author: LOuroboros <[email protected]> Date: Mon Feb 12 18:39:15 2024 -0300 Made EFFECT_WRING_OUT read the max power from the move's argument field (#4180) * Made EFFECT_WRING_OUT read the max power from the move's argument field * Renamed EFFECT_WRING_OUT to EFFECT_VARY_POWER_BASED_ON_HP commit 3537a37e1227c741be37c267c9a2724851cb1630 Author: Nephrite <[email protected]> Date: Mon Feb 12 22:31:26 2024 +0900 Re-added missing linebreaks commit b447add4c3220a96fff0022eb9de37a0674610c9 Author: Nephrite <[email protected]> Date: Mon Feb 12 22:27:58 2024 +0900 Minor fixes to RNG and additional effect count commit 16ab876241b070868521e4c36b711a7bb863e832 Author: Nephrite <[email protected]> Date: Mon Feb 12 21:47:07 2024 +0900 Swapped power/accuracy and type/split Also moved one bit from power to accuracy; raises BP limit to 511, decreases accuracy limit to 127 (which is already more than necessary). commit b665e7245b4a7caba26fc52ec24970f4c008328a Merge: 3695f0317 de0f94406 Author: Nephrite <[email protected]> Date: Mon Feb 12 16:15:53 2024 +0900 Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored commit 3695f0317b0595f903f4bccdda0abeb6bc992a02 Author: Nephrite <[email protected]> Date: Mon Feb 12 16:13:15 2024 +0900 Reordered everything in moves_info.h to be in struct order commit de0f94406a2cf235e833c0b3aeb7ebf038a5c80a Author: Nopinou <[email protected]> Date: Sun Feb 11 21:36:35 2024 +0100 Add shouldDynamax & shouldTerastal bits to TrainerMon (#4169) commit d1b3d1c2c3b3c568c24a524a82f6cc646f3eaca7 Merge: 1720e1b12 ec83b1135 Author: Bassoonian <[email protected]> Date: Sun Feb 11 00:05:31 2024 +0100 Pret merge 2024/02/10 (#4173) commit ec83b11354ce5b291ecf0139270eff1af21efb15 Merge: 1720e1b12 d7a361cef Author: Eduardo Quezada <[email protected]> Date: Sat Feb 10 18:05:20 2024 -0300 Merge branch '_pret/master' into _RHH/pr/upcoming/pret_20240210 # Conflicts: # gflib/malloc.c commit 1720e1b129ee9b81ae79694f1d20ab680b327e6a Merge: 97e4aa514 b4fa0b1bf Author: Eduardo Quezada <[email protected]> Date: Sat Feb 10 17:53:32 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # data/battle_scripts_2.s # src/data/pokemon/species_info/gen_9.h commit 97e4aa514af7807562a5ceeb7025718158bd67cd Author: Alex <[email protected]> Date: Sat Feb 10 20:15:21 2024 +0100 Reverted Intrepid Sword and Dauntless Shield field unification (#4171) * Reverts back Intrepid Sword and Dauntless Shield field unification * fixes commit fed5c6fa7a47ab340f3ccb0a705f69de83813e66 Author: Bassoonian <[email protected]> Date: Sat Feb 10 18:43:46 2024 +0100 Analogously fix Supersweet Syrup interaction (#4170) commit 311d732359e6ad2cad73c6248a5c7e04fa224f89 Author: Martin Griffin <[email protected]> Date: Sat Feb 10 17:14:36 2024 +0000 Save-compatible SaveBlock3 (#4112) * SaveBlock3 in sector footers * Update load_save.c Since mgriffin is currently not available I took the liberty to edit the file. Hope it's fine. * SaveBlock3 in debug menu (#3) --------- Co-authored-by: DizzyEggg <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: psf <[email protected]> commit 81fdfdd90ba209536acf6edcc4207d92af243290 Author: MartyKen <[email protected]> Date: Sat Feb 10 18:08:09 2024 +0100 PLA aux item sprites (#4160) * PLA aux item sprites * Sprite sharing commit 954ba0a15590d1eaf4929238cec4e0ea3d2e8dd4 Merge: d7a361cef 3342fdafc Author: GriffinR <[email protected]> Date: Sat Feb 10 09:38:51 2024 -0500 Merge pull request #1980 from Kurausukun/dexcry Missing Constant in Dex Cry Screen commit 3342fdafc2f51825e7b05ae48aed3663eefc5f48 Author: Kurausukun <[email protected]> Date: Sat Feb 10 05:32:03 2024 -0500 add missing constant commit af95a0996115f648cccee80ea0873480b8903560 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Sat Feb 10 06:58:41 2024 -0300 Last Respects effect + Fixed Supreme Overlord (#4151) * Last Respects effect + Fixed Supreme Overlord * Fixed ability pop-up happening when there's no fainted party members * Fixed Supreme Overlord counting faints during the battle instead of fainted party * Removed invalid test. * Converted GetSupremeOverlordModifier to an inline function * Created inline functions to obtain faint counters * Fixed erroneous implemenation and tests commit 5496115f92a2ddf352a86b1b5be844460c5733f0 Author: ghoulslash <[email protected]> Date: Sat Feb 10 03:09:11 2024 -0500 replace AI_GetMoveEffectiveness with AI_DATA->effectiveness checks in AI_CanStatus funcs (#4166) Co-authored-by: ghoulslash <[email protected]> commit 67f1772f1e51fe442241f07d72099b5c3467c72e Merge: 6da1be01a 47abc33c8 Author: Eduardo Quezada <[email protected]> Date: Fri Feb 9 17:02:56 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_util.c # test/battle/item_effect/heal_and_cure_status.c commit 6da1be01a91154a028bff01ace5856a0933948c8 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Fri Feb 9 15:46:09 2024 -0300 Added Indigo Disk cries (#4164) commit f873c6f93b2977422c21d794ab7935d07a54a482 Merge: 15f30d646 06f1f6790 Author: ghoulslash <[email protected]> Date: Fri Feb 9 09:52:59 2024 -0500 A batch of gen 9 move anims (#4145) commit 436ef7e59a729d0b3b7d964035c09495a217a3d4 Author: Nephrite <[email protected]> Date: Fri Feb 9 23:01:27 2024 +0900 Tweaks + RETURN_MOVE_HAS_MOVE_EFFECT_WITH macro Macro makes it easier to build functions that check a move's move effects commit ce4dd729f4e92ccf14d0ab4003fd392a64ab8412 Merge: 8a8d18165 15f30d646 Author: Nephrite <[email protected]> Date: Fri Feb 9 23:00:36 2024 +0900 Merged from upcoming commit 15f30d646ee8293caac97dd419ae3be883d24298 Author: Bassoonian <[email protected]> Date: Thu Feb 8 21:20:15 2024 +0100 Add MON_TYPES and MON_EGG_GROUPS (#4154) * Add MON_TYPE macro * Add MON_EGG_GROUP macro * Rename as requested by Edu * Fix alignment after rename commit ce97984d809e3285debfc404ec222e93f7ff3adc Author: Eduardo Quezada D'Ottone <[email protected]> Date: Thu Feb 8 13:27:26 2024 -0300 Updated teacheable learnests to Indigo Disk data (#4155) * Updated teacheable learnests to Indigo Disk data * Adjusted titles to indicate where to modify the moves commit d2690278b08f1795bf043d97b3e1f7b43d167610 Merge: ec803054e 4bfe6d3c6 Author: ghoulslash <[email protected]> Date: Thu Feb 8 10:54:15 2024 -0500 Implement ghoul's save block branch (#4113) Implement ghoul's save block branch commit ec803054e635d0f41ee6c26af74d806615e018e0 Merge: 5d5cc76a2 452432533 Author: Eduardo Quezada <[email protected]> Date: Thu Feb 8 12:19:51 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_main.c # src/battle_util.c # test/battle/hold_effect/kee_berry.c commit 5d5cc76a2ce186155bbadf16e9b4796031835bcc Author: Bassoonian <[email protected]> Date: Thu Feb 8 15:32:48 2024 +0100 Teachable learnset helper mechanics (#3856) * Teachable learnset helper mechanics * Rename folder and python script * Some teachable learnset work * Update PoryMoves file labels * Add header and make custom json * Include found moves in output file * Update SV file to latest version * Don't run if there are no jsons to be found * Add Basculin duplication in json * Add universal move support to * Ignore and skip Mew * Integrate tool in Makefile * Condense Basculin learnsets * Split Oinkologne for easier generation * Add Deoxys' XD move tutor data * Add missing Darumaka/Yamask Galarian SwSh TMs * Add TID species to sv.json * Update sv.json to The Indigo Disk data * Add Python install instructions * Fix Makefile * Expand header with more information * Add config to allow disabling the learnset helper * Update include/config/pokemon.h Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> * Don't crash if the config is missing --------- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 4bfe6d3c6db2b7617f521b885e8aa726bd72be92 Merge: f1ff524d4 51cbf92ed Author: ghoulslash <[email protected]> Date: Thu Feb 8 08:37:57 2024 -0500 Merge branch 'upcoming' into ghoulsaveblock commit 51cbf92ed0bc204a2e83366bda15e8c4421d3ea3 Author: MartyKen <[email protected]> Date: Thu Feb 8 13:02:02 2024 +0100 Lvl up learnsets by generation (#4049) * Lvl up learnsets by generation I think the title sums it up pretty nicely * Update level_up_learnsets.h forgot some newer pokemon * divided the learnset file into generations * Separated learnsets by generation Separated the learnsets by generation, added a bit more documentation in the config file * Update src/pokemon.c Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> * Update include/config/pokemon.h Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> --------- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 916e4814bd9ea5fd1341caae13801fdfbe26bdc8 Author: LOuroboros <[email protected]> Date: Thu Feb 8 05:11:13 2024 -0300 Implemented Custom/Complex/Expanded GiveMon scripting command (#3924) * Introducing an expanded givemon * Added debug features to check a Pokémon's EV and IV * Added a parameter to set a custom mon's gender * Added a debug feature to clear the party * Defined the EV/IV getters in gSpecials * Added Gigantamax Factor toggle to givecustommon * Updated Gigantamax Factor label in givecustommon macro * Added tera type parameter to givecustommon Misc. changes: -Added a few harmless comments to CreateCustomMon for consistency reasons. * Cleaned up the code inside CreateCustomMon a bit Also updated the values assigned to the parameters of ScriptGiveCustomMon This is temporary though. I'll probably end up turning them into 2byte parameters so they can be filled when the scripting command is called by using variables once I solve the bigger problem that the scripting command is currently facing. * Foolproofed the Poké Ball check in CreateCustomMon * Assigned a default gender to givecustommon This solved the nasty issue by which the command wasn't working properly if you didn't fill in each parameter when calling givecustommon in a script. * Reinforced the gender checks at CreateCustomMon * Re-reinforced the gender checks at CreateCustomMon * Compressed givecustommon and added tests -Made givecustommon skip unspecified parameters. -Added scripting variables support for every parameter. -Added tests. * Updated the default values of some ScriptGiveCustomMon parameters * Replaced vanilla's givemon with givecustommon Misc. Changes: -Renamed CreateCustomMon to ScriptGiveMonParameterized. -The truth is that the function was never limited to creating the skeleton of a Pokémon like the actual CreateMon functions do, so that label was never correct. The function was always an expanded ScriptGiveMon. -Moved the core functions to src/script_pokemon_util.c which is where they actually belong. -Updated ScriptGiveMonParameterized a little to incorporateb changes that were applied to the original ScriptGiveMon, namely, Synchronize ability and form change handling. -Introduced a new ScriptGiveMon to replace the original one. * Corrected givecustommon tests * Fixed the default IV values for the new givemon * Updated DebugAction_Party_ClearParty for consistency with the other debug functions * Updated the text strings used by the Check EV/IV debug features --------- Co-authored-by: Martin Griffin <[email protected]> Co-authored-by: Alex <[email protected]> commit f1ff524d4e2ce6588dc1aaae45046e511aed6330 Merge: 84686d15d 8d4c3a8ac Author: Bassoonian <[email protected]> Date: Thu Feb 8 00:06:35 2024 +0100 Merge branch 'upcoming' into ghoulsaveblock commit 06f1f6790357c2db5b17d74ef6ccad32cf742a02 Author: ZnogyroP <[email protected]> Date: Wed Feb 7 16:15:03 2024 -0500 Use shaketargetbasedonmovepowerordmg commit e295d7346ab2e007e25811d3249634a12d4afccd Merge: 34067ac37 8d4c3a8ac Author: ZnogyroP <[email protected]> Date: Wed Feb 7 16:10:00 2024 -0500 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into battle-anims commit 8d4c3a8acb5abc8c79c4e4a6e180eee59c961856 Author: Nephrite <[email protected]> Date: Wed Feb 7 23:42:05 2024 +0900 Two turn moves tweaks (#4150) * Two turn move tweaks Fixed comment bug and added CheckIfCanFireTwoTurnMoveNow function * Renamed `tryfiretwoturnmovenowcheckeffect` macro commit 02e4154f0c81214ef1b702b1f3e8cacf21d528ab Author: Alex <[email protected]> Date: Wed Feb 7 11:26:23 2024 +0100 Electro Shot Animation (#4148) Co-authored-by: Bassoonian <[email protected]> commit b18857321a477619ca0aa8709a98d3a80ab1efa2 Author: Bassoonian <[email protected]> Date: Wed Feb 7 10:13:03 2024 +0100 Update README.md (#4144) * Update README.md Removes Mulches, Dynamax Candy and Mints from the "Existing item data but missing effects" category in upcoming's README, as said features do in fact have functionality in upcoming. * Add Guillotine to feature branch list * Update README.md Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> --------- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 5d2dfe218ea01f28588da574cf0251ab440e59f7 Author: ZnogyroP <[email protected]> Date: Tue Feb 6 19:18:35 2024 -0500 Fixes to strings + Hospitality (#4147) * Fixes to strings + Hospitality * Requested changes --------- Co-authored-by: Alex <[email protected]> commit 84686d15d8b5a2eeae5df728c58d0f64023e14ce Merge: 28e3a2ba9 7f50c0b9c Author: Bassoonian <[email protected]> Date: Tue Feb 6 23:36:46 2024 +0100 Merge branch 'upcoming' into ghoulsaveblock commit 28e3a2ba98f94bb4ca338552a0f3261895b128e7 Merge: 37b442f3b dddbce4f7 Author: Bassoonian <[email protected]> Date: Tue Feb 6 23:36:35 2024 +0100 Merge branch 'ghoulsaveblock' of https://github.com/Bassoonian/pokeemerald-expansion into ghoulsaveblock commit 37b442f3bbba722f31ab97b84a2573bbb8647c28 Author: Bassoonian <[email protected]> Date: Tue Feb 6 23:36:30 2024 +0100 Apply ghoul's review commit 7f50c0b9c35ea8f36da1d9afa73215b6ec10ae72 Author: Frank DeBlasio <[email protected]> Date: Tue Feb 6 16:24:36 2024 -0500 Simplify gTrainerSprites (#4140) * Simplified y_offset equations * Removed trainer pic animation from gTrainerSprites * Used metaprogram to simplify trainer sprites without mugshots * Incorporated comments --------- Co-authored-by: Alex <[email protected]> commit 34067ac37ffb685f788336d2ad97f78a014cb793 Author: ZnogyroP <[email protected]> Date: Tue Feb 6 13:58:25 2024 -0500 A batch of gen 9 move anims Animations for: - Last Respects - Lumina Crash - Kowtow Cleave - Torch Song - Aqua Step - Hydro Steam - Tidy Up - Pounce - Trailblaze - Chilling Water - Rage Fist - Temper Flare - Psychic Noise commit dd3228aa14981b817c0628f5d3d89ae1ecd0e6b6 Author: Frank DeBlasio <[email protected]> Date: Tue Feb 6 06:55:49 2024 -0500 Updated Mew teachable moves to SV (#4142) commit 273110ebae92b4e5a69ce2aec0bc33e39027520b Author: PCG <[email protected]> Date: Tue Feb 6 16:25:08 2024 +0530 Jet Punch animation (#4067) * Jet Punch animation * Tabs * Jet Punch anim makeover * Fix anim glitch in doubles and whitespace --------- Co-authored-by: ghoulslash <[email protected]> commit f7ec44c2ea44433811e469a1f53587c9adcc3d7b Author: Nephrite <[email protected]> Date: Tue Feb 6 17:19:37 2024 +0900 Fixed Shield Dust, added tests (#4137) * Fixed Shield Dust, added tests Also fixed a duplicate macro caused by near-simultaneous PR merges (oops) * Added KNOWN_FAILING Sparkling Aria test --------- Co-authored-by: Alex <[email protected]> commit c2c97d3c1c224b39cddcf3033301fd5c898301c7 Author: ghoulslash <[email protected]> Date: Tue Feb 6 03:05:26 2024 -0500 GetBattleAnimMoveTargets fill absolute battler ids instead of relative anim ids (#4139) Co-authored-by: ghoulslash <[email protected]> Co-authored-by: DizzyEggg <[email protected]> commit f89efad08276013be1dc3a7fce9365b4658159ab Merge: 521ef8bf8 8b70cea72 Author: Eduardo Quezada <[email protected]> Date: Mon Feb 5 17:52:34 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming commit d7a361cef148a26463f6ff57f9372962e5ba41bc Merge: 246f47d9d e87a69a5e Author: GriffinR <[email protected]> Date: Sun Feb 4 20:34:17 2024 -0500 Merge pull request #1978 from DizzyEggg/windows_overflow Fix HideMapNamePopUpWindow possible overflow commit 246f47d9d07faade4af8884d5588e89c9d5c5e32 Merge: 5be69b271 132ca1be1 Author: GriffinR <[email protected]> Date: Sun Feb 4 20:22:37 2024 -0500 Merge pull request #1979 from DizzyEggg/patch-2 Change Safe Div to explicitly check b != 0 commit 521ef8bf866ca23f89be5c47b2be43cc5db395dd Author: ghoulslash <[email protected]> Date: Sun Feb 4 17:30:30 2024 -0500 battle debug menu can cycle through battlers in ai score/dmg window (#4134) Co-authored-by: ghoulslash <[email protected]> Co-authored-by: Alex <[email protected]> commit 65c508d1937514e6faf1ada022b0b317af141cf1 Author: Nephrite <[email protected]> Date: Mon Feb 5 07:02:59 2024 +0900 Secondary effects overhaul minor follow-up (#4062) * settwoturnstring command * Unified two-turn attacks and Meteor Beam To do: Solar Beam * Solar Beam Also fixed various function, removed EFFECT_GUST (who knows why that exists?) * Updated Solar Beam + tests * Redid two turn move + animations logic Removed pointless various function; to do: remove Skull Bash, fix AI test * Removed now-pointless flag * Removed Skull Bash And temporarily commented out failing AI tests * Removed Sky Uppercut effect Not sure when or why this was ever necessary * Removed BattleScript_EffectSemiInvulnerable Now uses BattleScript_EffectTwoTurnsAttack. Kept the effect; used the argument field to determine which STATUS3 such moves should apply but added a function to jump over weather checks in BattleScript_EffectTwoTurnsAttack if the current move is semi-invulnerable (since the instant-fire weather check and STATUS3 use the same field) * Applied review changes * Replaced VARIOUS with callnative Tried to fix test but couldn't :/ wtf is going on * Fixed one AI test Cant fix the other... * Added KNOWN_FAILING to failing AI tests Separated them out into their own test * Optimised script, overhauled charge turn string setting Condensed multiple confusing macros into one, jumpifweathercheckchargeeffects. Script now tweaked and trimmed, string ids for charge turns now added to argument along with status3 (thanks to compression macro) and instant-fire-weather for semi-invulnerable and two-turn moves respectively. Also introduced a savedStringId in gBattleScripting to make string selection work. * Unified two turn move tests + minor corrections * Added semi-invulnerable move tests Set the Razor Wind test to known failing - something to do with its animation? --------- Co-authored-by: Alex <[email protected]> commit 7ae50ea507a10ff99b269313064540019ad59004 Author: Nephrite <[email protected]> Date: Mon Feb 5 04:28:27 2024 +0900 Metaprogram (#3968) * metaprogram.h Created by Mr. Griffin. Removed non-relevant parts * Added DEFAULT/DEFAULT_2 macros Also added a demonstration in battle_main * Removed GET_ARGS * Expanded DEFAULT Because why not? * Added EXCEPT Expands to everything but the first x arguments. * Added BIT_INDEX (thanks to MGriffin) and COMPRESS_BIT macros These let you compress a bit up to a word in size inside a single byte and uncompress at the same time. BIT_INDEX just tells you where the bit is. * Updated HANDLE_EXPANDED_MOVE_NAME --------- Co-authored-by: Martin Griffin <[email protected]> commit 691b1879f89de6561dd486b29b5b55cae0933eef Author: LOuroboros <[email protected]> Date: Sun Feb 4 09:04:55 2024 -0300 Renamed VAR_TERRAIN to B_VAR_TERRAIN and added a var-based field terrain timer (#4132) * Renamed VAR_TERRAIN and introduced a var-based field terrains timer * Fixed sky battle configs alignment and syntax * Added B_VAR_TERRAIN_TIMER handling to Overworld_ResetBattleFlagsAndVars * Removed pointless edits to EndTurnTerrain * Updated B_VAR_TERRAIN_TIMER's comment * Updated the syntax of ABILITYEFFECT_SWITCH_IN_TERRAIN to comply with Agbcc * Nuked pointless VarGet calls in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects * Reverted changes made to BS_SetRemoveTerrain I shouldn't have touched it at all since it's not involved with B_VAR_TERRAIN functionality. * Removed trailing spaces in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects commit ab2774f8c7976bdc915319508e65e392fdcbc447 Author: Alex <[email protected]> Date: Sat Feb 3 16:00:41 2024 +0100 Adds Dragon Cheer (#4122) * Adds Dragon Cheer * fix assumptions --------- Co-authored-by: ghoulslash <[email protected]> commit 132ca1be145176893efe4ff31e7794cfa890ddc2 Author: DizzyEggg <[email protected]> Date: Fri Feb 2 22:57:02 2024 +0100 Change Safe Div to explicitly check b != 0 commit e87a69a5e7fd9cf2e51bcdff021de6d51d3426e6 Author: DizzyEggg <[email protected]> Date: Fri Feb 2 22:31:20 2024 +0100 Fix HideMapNamePopUpWindow possible overflow commit ac94af3be6b8ca481593f011390af5ab05b6ba60 Merge: a193b795c 3a45f0de0 Author: DizzyEggg <[email protected]> Date: Fri Feb 2 20:28:23 2024 +0100 Indigo Disk sprites (#4117) commit 3a45f0de0aa07811d4cc3f5bcae0aabd57de6131 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Fri Feb 2 16:12:39 2024 -0300 Apply suggestions from code review commit 4f40c678b5e3c15f398a3631b192cd8c69f573df Author: Alex <[email protected]> Date: Fri Feb 2 19:06:28 2024 +0100 Archaludon commit f1b6fbb80011b983d086b36fa88378be7f5b0377 Author: Alex <[email protected]> Date: Fri Feb 2 18:09:04 2024 +0100 Indigo Disk sprites commit dddbce4f7e6dd85a0c10c39da0ac0bba5d10e880 Merge: adc3308d1 a193b795c Author: Bassoonian <[email protected]> Date: Fri Feb 2 16:53:03 2024 +0100 Merge branch 'upcoming' into ghoulsaveblock commit adc3308d13eebc05ef444adaa4f5b4a7e285c46b Author: Bassoonian <[email protected]> Date: Fri Feb 2 16:52:39 2024 +0100 Actually multi battles seem to work fine too commit a193b795c71952c75e56f3702e8852aa7628d9ed Author: Alex <[email protected]> Date: Fri Feb 2 16:49:36 2024 +0100 fix omniscient flag (#4114) * rebase to upcoming * merge rhh/upcoming and remove known failing * remove known failing --------- Co-authored-by: ghoulslash <[email protected]> commit 6c1a111c147383110b19919321f98b85be09b07a Author: Bassoonian <[email protected]> Date: Fri Feb 2 16:45:58 2024 +0100 No questionnaires are actually broken commit 06d04c1194e0bd42aa0fb46af42ba5ed64e2ee7f Merge: b8b7dd304 83b9b9566 Author: Bassoonian <[email protected]> Date: Fri Feb 2 16:39:15 2024 +0100 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into ghoulsaveblock commit b8b7dd304bea82ad22f2c4f09db26870b01e0a1a Author: Bassoonian <[email protected]> Date: Fri Feb 2 16:38:33 2024 +0100 Add final config documentation commit 016a05ba9620d908ade1e4a1c1625b0271c3bc27 Author: Bassoonian <[email protected]> Date: Fri Feb 2 16:34:03 2024 +0100 Fix small error with making new FREE_MYSTERY_GIFT commit 6f668fb31dc601bc54b64b400da2d441c611e316 Author: Bassoonian <[email protected]> Date: Fri Feb 2 16:31:19 2024 +0100 Add FREE_MYSTERY_GIFT commit 4092d0283a63bc7ec4eb0ea06913627e8e412f1b Author: Bassoonian <[email protected]> Date: Fri Feb 2 15:58:27 2024 +0100 Fix FREE_BATTLE_TOWER_E_READER commit 83b9b956626096e8a8ab10ce4688e538be0839a0 Author: ghoulslash <[email protected]> Date: Fri Feb 2 09:44:14 2024 -0500 add supersweet syrup, unify single-use entry abilities to single field (#4115) Co-authored-by: ghoulslash <[email protected]> commit db95a06ae06d8bb32a3608216876c6253b9a953d Author: Bassoonian <[email protected]> Date: Fri Feb 2 15:24:46 2024 +0100 Fix FREE_TRAINER_HILL commit dedba114be0d7044e57e0e09dc057c231f24e4c9 Author: Bassoonian <[email protected]> Date: Fri Feb 2 15:16:18 2024 +0100 Fix FREE_LINK_BATTLE_RECORDS commit a1c17a1de76d3d8c99f93fbae93915c6120892e9 Author: Bassoonian <[email protected]> Date: Fri Feb 2 15:01:50 2024 +0100 Fix FREE_ENIGMA_BERRY commit cc5745269591cbb67ce2992a5fc74d733008dda5 Author: Bassoonian <[email protected]> Date: Fri Feb 2 14:57:40 2024 +0100 Fix FREE_UNION_ROOM_CHAT commit 24ed9e77ffd9dacf0a38584168b58b1bdd140910 Author: Bassoonian <[email protected]> Date: Fri Feb 2 14:13:16 2024 +0100 Fix FREE_MATCH_CALL commit deb3e6a11d908deb38db81c778da63677aa0ec18 Author: Bassoonian <[email protected]> Date: Fri Feb 2 13:47:53 2024 +0100 Add dependency #error commit 27a65a59619fe22a611a07342e2f80654dd0edef Author: Bassoonian <[email protected]> Date: Fri Feb 2 13:46:19 2024 +0100 Fix FREE_RECORD_MIXING_HALL_RECORDS commit 90be8436d9191d9d22ac1f56d9d2c17f57ceaa63 Author: Bassoonian <[email protected]> Date: Fri Feb 2 13:39:21 2024 +0100 Fix FREE_POKEMON_JUMP commit 26a4c5684373de38bdd3a92ddfe089f1eba29b88 Author: Bassoonian <[email protected]> Date: Fri Feb 2 13:32:13 2024 +0100 Ensure FREE_EXTRA_SEEN_FLAGS works commit 9eacffe5bbd489fa0a61541ed0958d3270f5f788 Author: Bassoonian <[email protected]> Date: Fri Feb 2 13:18:47 2024 +0100 Fix Enigma Berry checks commit 495ee6698cf341efcade2b85499613846c0ea00b Author: Bassoonian <[email protected]> Date: Fri Feb 2 13:13:27 2024 +0100 Clean up code commit acf5d8133aeac80ccfdda66bc1a7a0851ed797e4 Author: Bassoonian <[email protected]> Date: Fri Feb 2 12:43:31 2024 +0100 Convert ifndef configs to standard configs commit d1bb0789195878875b50fdb920426c9ab3c27459 Merge: 2f2d7c281 ee0652416 Author: Bassoonian <[email protected]> Date: Fri Feb 2 11:27:48 2024 +0100 Merge branch 'saveblock' of https://github.com/ghoulslash/pokeemerald into ghoulsaveblock commit 2f2d7c281f19def1f38576be337ba5dfbd62b846 Author: Bassoonian <[email protected]> Date: Fri Feb 2 10:55:39 2024 +0100 Clean up contest strings (#3876) * Move contest move descriptions out of inc file * Clean up unused contest strings * More contest cleanup * sRoundResultTexts cleanup --------- Co-authored-by: DizzyEggg <[email protected]> commit b898a65891354c4dcf0ab56dcd6a6023d0244005 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Thu Feb 1 19:26:30 2024 -0300 Fixed Gigantamax Factor not changing form (#4108) Co-authored-by: Alex <[email protected]> commit ccfebe5e0565f8cca61af766a835decd0087cd46 Author: Bassoonian <[email protected]> Date: Thu Feb 1 22:35:38 2024 +0100 Adds missing evolution methods (#4087) * Add evolution tracker to BoxMon struct * Add "use move 20 times, then lv up" evolution method * Add recoil tracker * Reduce to 9 bits * Fix agbcc complaint * Put MOVEEND_CLEAR_BITS at the end * Remove battle argument from tryupdaterecoiltrackker * Add null checks * Fix upcoming merge * Add requested formatting changes * Condense evolution check into a single function for easier customisation later * Incorporate review requests * Update src/pokedex_plus_hgss.c Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> --------- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 09d12fb154c29e1545c6b94aec5b2bd40114e43f Merge: 71b49a114 1a6589496 Author: Eduardo Quezada <[email protected]> Date: Thu Feb 1 12:52:31 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # ld_script_modern.ld # src/battle_ai_switch_items.c commit 71b49a114f2c070df77176764f1ba42c4e11722e Author: ZnogyroP <[email protected]> Date: Thu Feb 1 06:23:58 2024 -0500 Adds move Upper Hand (#4085) * Remove non-existent tilesets from label comments and alphabetize * Fixed braces style * gbagfx bit depth upconversion fix * jsonproc: filter out every non-alphanumeric character * fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld * Adds move Upper Hand * Requested changes - Tabs / spaces where proper - HitFromAtkString -> HitFromAccCheck - Actually compiles now lol - Moved assumes into relevant tests - Cleaned up the check for TryUpperHand * Fixed || positioning * Update upper_hand.c * Revert "Merge remote-tracking branch 'upstream/master' into upper-hand" This reverts commit b21275dfe9a8c106069a5d34ecba9c84064f599f, reversing changes made to 89b1ad1ea1655bf30c51a7f0f7a0b176cc64635a. * AI logic and conflicts solved * Test fix * Fix Sheer Force test * Requested changes * Requested changes * Update battle_script_commands.c --------- Co-authored-by: GriffinR <[email protected]> Co-authored-by: Eduardo Quezada <[email protected]> Co-authored-by: Sierraffinity <[email protected]> Co-authored-by: sbird <[email protected]> commit 8a8d181654c3fa705ea334cde22e332c26f4e6a3 Author: Nephrite <[email protected]> Date: Thu Feb 1 15:19:10 2024 +0900 AdditionalEffects storage tweak Uses some macro and bitwise trickery to store additional effects and the count thereof in a single word commit 6d3fa525d5f2616a8e11ecccad5b0dedf8843f50 Author: Alex <[email protected]> Date: Wed Jan 31 13:32:58 2024 +0100 Rename EFFECT_FAKE_OUT to EFFECT_FIRST_TURN_ONLY (#4081) * Splits First Impression effect from Fake Out * Fix test failing * rename EFFECT_FAKE_OUT * use moveeffect chance for fake out and priority field for first impression * rename rest of fake out * messed up merge * remove useful comment --------- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 7afa20029ce4ebfbfdd3820c444294271e448aef Author: Eduardo Quezada D'Ottone <[email protected]> Date: Wed Jan 31 06:26:44 2024 -0300 Fix braces style (#4023) * Fix braces style * Unified 2 conditions --------- Co-authored-by: DizzyEggg <[email protected]> Co-authored-by: Bassoonian <[email protected]> commit 5be69b2713df03e9ca991c419f193bf972809a90 Author: GriffinR <[email protected]> Date: Tue Jan 30 11:46:19 2024 -0500 Merge slot machine smoke SubspriteTable arrays commit 086375ab132fdf8a14d46d4515da472e05e94db8 Author: Nephrite <[email protected]> Date: Tue Jan 30 17:54:43 2024 +0900 Moved a couple more flags commit 02ffd05aeaa0d89eadcb069ab4b851cf664c9ce6 Author: Nephrite <[email protected]> Date: Tue Jan 30 13:27:46 2024 +0900 Removed Sheer Force flag commit e602a310c9614355cc2fb44272c28cc63460971b Author: Nephrite <[email protected]> Date: Mon Jan 29 13:05:05 2024 +0900 BattleMove adjustment Moved one or two flags to the effects array as well commit a64e1c63c1fe880dec6a29874947443240347bf9 Author: LOuroboros <[email protected]> Date: Mon Jan 29 08:51:32 2024 -0300 Move data unification (#3999) * Made gBattleMoves handle the InGame name and description of battle moves No more multiple arrays in separate, individual files. Note: -Keep an eye on Task_LearnedMove. * Reintroduced move names Misc: -Fixed Trick-or-Treat and Light of Ruin's expanded names. -Introduced a new field for Z-Move names, and a constant for their name length. -Added a few TODOs to GetBattleMoveName. -Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own. * Updated GetBattleMoveName to handle Z-Move Names Misc: -Removed pointless TODO about MOVE_NAME_LENGTH. -The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it. * Fixed a couple of expanded move names * Removed zMoveName variable of struct BattleMove and extended the name variable's size * Ditched no longer used MOVE_NAME_LENGTH constant * Corrected the names of the max moves I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea. * Fixed U-turn's name * Brought back MOVE_NAME_LENGTH I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves. * Introduced a union for Move/Z-Move names in the struct BattleMove * Fixed the union for gBattleMoves move names Also updated GetBattleMoveName to properly handle Max Move names. Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names. * Removed deprecated GetZMoveName and GetMaxMoveName * Reintroduced mention to gMoveNames in sGFRomHeader * Fixed move names and ported move descriptions * Fused the struct ContestMove into the struct BattleMove * Removed no longer used Z_MOVE_NAME_LENGTH constant * Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names * Reintroduced the contest parameters for Pokémon moves * Renamed gBattleMoves to gMovesInfo This is consistent with gSpeciesInfo, the array that contains most of the species data. * Renamed the BattleMove struct to MovesInfo This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array. * Removed empty lines separating battle params from contest params in gMovesInfo * Renamed MovesInfo to MoveInfo * Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro Used to handle moves with expanded names in a more comfortable manner. Also fixed Trick-or-Treat's expanded name. * Renamed GetBattleMoveName to GetMoveName * Added a comment pointing out that the shared move descriptions are shared move descriptions * Re-aligned one of the escape characters of CHECK_MOVE_FLAG * Renamed the battle_moves.h file to moves_info.h instead for consistency's sake * Applied Eduardo's adjustments * Using compound string for regular move names as well, saving 1180 bytes and making their use consistent * Move description formatting * Updated Pursuit test after merge * Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY --------- Co-authored-by: Nephrite <[email protected]> Co-authored-by: Bassoonian <[email protected]> Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> commit 199e863909d7263f550b44350efdabbe800588d7 Author: Alex <[email protected]> Date: Mon Jan 29 12:28:16 2024 +0100 Adds move score defines + minor score clean up (#4075) * Adds move score defines + minor score clean up * fixes compiling, added comments + more replacements * fix agbcc * Update include/battle_ai_main.h Co-authored-by: Bassoonian <[email protected]> --------- Co-authored-by: Bassoonian <[email protected]> commit 6bc0bf0afac8b9d27f1709d423c4c9210d51d1a6 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Mon Jan 29 08:02:54 2024 -0300 Adjusted item description alignment (#4088) commit afb1efe0d3c093c97d37e8faa1eff7348be0e723 Merge: 308bf50dc 9bcd46bce Author: Eduardo Quezada <[email protected]> Date: Sun Jan 28 18:11:44 2024 -0300 Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_controller_player_partner.c commit 232eab4bee971017aeff8519ac9000965d71fbcd Merge: f2276e14a b98e044ce Author: GriffinR <[email protected]> Date: Sun Jan 28 13:54:11 2024 -0500 Merge pull request #1975 from Sierraffinity/jsonproc-fix jsonproc: filter out every non-alphanumeric character commit f2276e14a291425d28efe0e2e4834769c6e3706e Merge: 5e47049b3 e2eca97b0 Author: GriffinR <[email protected]> Date: Sun Jan 28 13:39:49 2024 -0500 Merge pull request #1976 from SBird1337/ld/malloc fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld commit e2eca97b02c322f16e023e9e0915739640d1a74e Author: sbird <[email protected]> Date: Sun Jan 28 12:36:36 2024 +0100 fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld commit b98e044ce914a9068ee5e763831179b83398b585 Author: Sierraffinity <[email protected]> Date: Sat Jan 27 19:29:29 2024 -0800 jsonproc: filter out every non-alphanumeric character commit 5e47049b3c24df0a069d5df6ccf7842ade4641ac Merge: bcd5fc148 e85750bb5 Author: GriffinR <[email protected]> Date: Sat Jan 27 17:44:44 2024 -0500 Merge pull request #1974 from Sierraffinity/gbagfx-fix gbagfx bit depth upconversion fix commit e85750bb55d040e829a141f9fe23732a952a4361 Author: Sierraffinity <[email protected]> Date: Sat Jan 27 14:29:31 2024 -0800 gbagfx bit depth upconversion fix commit 308bf50dccf923f911fa2d7931d247e807dca3b8 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Sat Jan 27 15:33:29 2024 -0300 Set EFFECT_PLACEHOLDER as the default move effect (#4079) commit b9a02b205df0d46edad1219ff3220ca19dbcacd2 Author: Bassoonian <[email protected]> Date: Fri Jan 26 19:25:52 2024 +0100 Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068) * Re…
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This sister PR to #3999 renames gItems and gAbilities by appending Info. This way, we have a nice and cosy consistency of gMovesInfo, gSpeciesInfo, gItemsInfo and gAbilitiesInfo.
Discord contact info
bassoonian