Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,615 Commits 1 Branch 0 Tags
aa31fc840f8ab84296285c29893e27e01f182020
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone 5fe79d83c1 Fix CalcMoveBasePower using battler addresses (#2858) 2023-04-03 23:27:36 -04:00
Eduardo Quezada D'Ottone 0e6adece89 Properly align Pokémon icons up to gen V (#2879) 2023-04-03 23:26:42 -04:00
Eduardo Quezada D'Ottone fa245c6edf fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker (#2848) 2023-03-27 18:11:22 -03:00
Eduardo Quezada f6a924a791 Fixed instances of gSideTimers not using side constants 2023-03-27 11:49:50 -03:00
Eduardo Quezada 028aba3fdb Merge branch 'RHH/upcoming' into RHH/pr/fix/AiComatose 2023-03-27 11:44:01 -03:00
Eduardo Quezada D'Ottone 226ce49e77 Added KNOWN_FAILING to Dire Claw and Tri Attack's force-bruted RNG failing tests (#2865) 
Emergency powers, activate!
 2023-03-27 11:42:13 -03:00
Eduardo Quezada 2fba07c501 Added KNOWN_FAILING to Dire Claw and Tri Attack's force-bruted RNG failing tests 2023-03-27 11:30:38 -03:00
Eduardo Quezada 0b8285737a Fixed Comatose AI checks 2023-03-27 09:19:48 -03:00
Eduardo Quezada 32b2c01619 Merge branch 'RHH/upcoming' into RHH/pr/fix/GassyTerrain 
# Conflicts:
#	test/test.h
 2023-03-26 16:06:04 -03:00
Eduardo Quezada c383c995f1 Applied review changes 2023-03-24 10:12:09 -03:00
Eduardo Quezada D'Ottone c922ff69b9 Added To-Do test results 2023-03-23 22:34:08 -03:00
Eduardo Quezada D'Ottone 1da65c4051 Fixed Grassy Terrain not healing 2023-03-23 22:33:47 -03:00
Eduardo Quezada D'Ottone 2658fe32c2 Removed ITEM_HAS_EFFECT (#2840) 2023-03-23 10:02:32 +01:00
Eduardo Quezada D'Ottone 023cc4d38d Fixed erroneous uses of non e-reader Enigma Berries (#2839) 2023-03-23 09:58:26 +01:00
Eduardo Quezada D'Ottone 763cf488a0 pret merge 2023/03/19 (#2841) 2023-03-19 22:01:34 -03:00
Eduardo Quezada 47b4e6095d Undo Timburr and Stunfisk friendships, as they don't change 2023-03-19 22:00:18 -03:00
Eduardo Quezada 51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
 2023-03-19 20:28:56 -03:00
Eduardo Quezada D'Ottone 509da952ff Added Psyblade and Hydro Steam (#2834) 2023-03-17 09:36:14 -03:00
Eduardo Quezada 2cb54c49da Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors 2023-03-14 15:38:18 -03:00
Eduardo Quezada D'Ottone d91d550341 Fixes some hisuian sprites (#2829) 2023-03-14 14:46:30 -03:00
Eduardo Quezada 0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
Eduardo Quezada D'Ottone 26015be305 Add missing Hisuian sprites and cries (#2725) 2023-03-13 14:50:42 -03:00
Eduardo Quezada D'Ottone a8c9309458 Fixed Wring Out's power (#2824) 
Fixes #2823
 2023-03-13 09:07:29 +01:00
Eduardo Quezada D'Ottone aedf18fea9 Debug Menu improvements (#2814) 2023-03-09 08:23:58 -03:00
Eduardo Quezada D'Ottone bb90dc7dd1 Debug menu to give items based on max quantity and map number 3digits display (#2807) 2023-03-09 08:17:29 -03:00
Eduardo Quezada D'Ottone 73236344ba Fixes the check for speed on electrify (#2819) 2023-03-09 08:02:00 -03:00
Eduardo Quezada D'Ottone dc6ff13c6a Existing tests work with new species disabled (#2818) 2023-03-09 07:59:14 -03:00
Eduardo Quezada D'Ottone 10410640b4 Update overworld_config.h reference in the debug system (#2811) 2023-03-08 11:52:50 -03:00
Eduardo Quezada D'Ottone dd686ee606 More detailed hydra test results (#2722) 2023-03-08 10:11:11 -03:00
Eduardo Quezada 24d8d3fbee Updated switch format 2023-03-08 09:09:48 -03:00
Eduardo Quezada eb49e28e6c Renamed TEST_RESULT_SKIP to TEST_RESULT_ASSUMPTION_FAIL 2023-03-08 08:26:33 -03:00
Eduardo Quezada D'Ottone 13ca2271e2 Add meltan and melmetal teachable moves (#2732) 2023-03-07 10:25:05 -03:00
Eduardo Quezada D'Ottone 81a80e566c Refactor Mega Evolution indicator sprite (#2805) 2023-03-07 08:06:28 -03:00
Eduardo Quezada D'Ottone b3ffc9d1c4 Set link tutorial as complete when using Cheat Start (#2802) 2023-03-06 09:29:34 +01:00
Eduardo Quezada a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
Eduardo Quezada D'Ottone 33dc7cb13a pret sync 2023/03/03 (#2801) 2023-03-03 16:29:30 -03:00
Eduardo Quezada 9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
Eduardo Quezada 3b27b602fd End of file 2023-02-28 00:09:43 -03:00
Eduardo Quezada 90021f3be6 Removed zMovePower field in gBattleMoves in favor of a function. 2023-02-27 23:49:43 -03:00
Eduardo Quezada 501cff84b9 Removed unused single-frame front pics 2023-02-27 18:09:54 -03:00
Eduardo Quezada D'Ottone c6149ea7fb fit long z-moves names on battle textbox (#2789) 2023-02-27 13:02:29 -03:00
Eduardo Quezada D'Ottone 137c13aa69 Fix sprite palettes up to Ampharos included (#2783) 2023-02-26 23:38:33 -03:00
Eduardo Quezada 41bf9ea63c Removed trailing whitespaces 2023-02-26 18:43:15 -03:00
Eduardo Quezada d00c8902f9 Whitelist instead of Blacklist for TOOLDIRS in Makefiles 2023-02-25 16:49:41 -03:00
Eduardo Quezada D'Ottone abc0e20aaf Consider Nature Power in AI_CalcDamage (#2776) 2023-02-25 12:30:53 -03:00
Eduardo Quezada D'Ottone 05b52cf3f1 Status moves should not be considered for type effectiveness (#2743) 2023-02-25 10:45:38 -03:00
Eduardo Quezada 31ab56bceb Fixed footprint symbol names. 2023-02-25 09:23:34 -03:00
Eduardo Quezada ca81d7a0f9 Forgot about Jangmo-o 2023-02-24 21:58:09 -03:00
Eduardo Quezada D'Ottone cf1231d69a Merge pull request #2740 from AlexOn1ine/AI_TryToFaint 
Fix AI mon getting lower score when it is faster
 2023-02-24 20:26:47 -03:00
Eduardo Quezada D'Ottone 0669ac851f Merge pull request #2735 from LOuroboros/libertePNG 
Purged the bKGD warning once and for all
 2023-02-24 16:13:48 -03:00
Eduardo Quezada bbefee6bd4 Use proper symbol styles for Hakamo-O and Kommo-O 2023-02-24 15:22:58 -03:00
Eduardo Quezada 079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
Eduardo Quezada d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Eduardo Quezada f5aa3b8272 Document the 2 different sText_GotchaPkmnCaught 2023-02-23 11:43:40 -03:00
Eduardo Quezada e3ed114754 Updated commands comment 2023-02-22 15:09:47 -03:00
Eduardo Quezada 5808e82434 Added assumption fail total, made fails into their own counter and changed "SKIP" to "ASSUMPTION_FAIIL" in log 2023-02-22 15:05:39 -03:00
Eduardo Quezada 54e388a375 More detailed hydra test results 2023-02-22 00:30:12 -03:00
Eduardo Quezada D'Ottone 2581f91353 Merge pull request #2710 from LOuroboros/patch-1 
Updated Psyshield Bash's accuracy
 2023-02-19 19:23:05 -03:00
Eduardo Quezada D'Ottone ec343cef02 Config to have Shuckle make Berry Juice from Oran Berries (#2331) 
* Removed unused ifdefs and made actually check for Z Power Ring

* Config to have Shuckle make Berry Juice from Oran Berries

* Ordered species-specific configs
 2023-02-19 10:45:59 +01:00
Eduardo Quezada D'Ottone fcf13aab2b Fixed evolutions that use held items to evolve not working when using Rare Candies. (#2565) 2023-02-19 10:40:55 +01:00
Eduardo Quezada D'Ottone 625a7622e2 Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 
It's ya boi, pret merge! (pret merge 2023/02/16)
 2023-02-16 21:57:41 -03:00
Eduardo Quezada a60b179bcb Incorporated fixes from upstream 2023-02-16 18:20:54 -03:00
Eduardo Quezada 7ddebb6671 Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	data/battle_ai_scripts.s
#	src/menu_specialized.c
#	src/mystery_gift_menu.c
 2023-02-15 14:18:00 -03:00
Eduardo Quezada b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c
 2023-02-15 14:11:03 -03:00
Eduardo Quezada dbd02d3a56 Clarified Champion Ribbon's description to avoid being interpreted as needing to beat the champion in both RSE and FRLG. 2023-02-15 14:06:42 -03:00
Eduardo Quezada bd54990333 Review changes 2023-02-15 13:56:11 -03:00
Eduardo Quezada d699d55ba3 Reformatted gNatureStatTable 2023-02-12 01:19:03 -03:00
Eduardo Quezada a937b3221a Documented Ribbons 2023-02-11 23:16:24 -03:00
Eduardo Quezada 96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada 6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03:00
Eduardo Quezada D'Ottone 59f367b165 Merge pull request #2665 from SBird1337/refactor/rhh-credits 
[intro] refactor expansion intro
 2023-02-11 09:23:48 -03:00
Eduardo Quezada D'Ottone cd8bf15f3c Merge pull request #2666 from DizzyEggg/base_stats_info 
Fix SpeciesInfo(base stats) struct offset labels
 2023-02-08 19:57:11 -03:00
Eduardo Quezada D'OttoneXhyziJaizu
 		8381b14c51 Implemented Xhyzi's RHH copyright intro (with config) (#2415) 
* Rhh & Pret Copyright Screen

* Porygon recovered his voice

* Expansion text

---------

Co-authored-by: Xhyzi <xhyzdot@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
 2023-02-08 15:54:12 +01:00
Eduardo Quezada D'Ottone b048afb56d Merge pull request #2653 from AsparagusEduardo/RHH/pr/prtest 
Test PR
 2023-02-08 00:54:38 -03:00
Eduardo Quezada 6c30c5490c Test PR 2023-02-08 00:51:59 -03:00
Eduardo Quezada c2f284a1d3 Apply official palettes for Gen 1 Pokémon. #2593 
commit 136016ee4f13c0b5b145018cea3f569da20cf63e
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:58:50 2023 +0100

    Fix Kangaskhan

commit 77c618a2ab446accba74ce3b8310f07fd09025b9
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:58:40 2023 +0100

    Fix Rhyhorn

commit 4c55bf6534469c079374ebad5869acba46273685
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:58:26 2023 +0100

    Fix Mewtwo

commit 281161396ef9d7386ea2f27925f20ff79175ad78
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:58:18 2023 +0100

    Fix Omanyte

commit a3616fc74e7f52a5c82fcac49071964c87bc1e19
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:58:06 2023 +0100

    Fix Starmie

commit a383a4e2ff0eac66d82059d06dde74257381e1a4
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:57:57 2023 +0100

    Fix Vaporeon

commit a7950a1f345f7fd9e0102ec168ff71b119b2a411
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:55:04 2023 +0100

    Fix Voltorb sprite

commit f0d8f5091f88f015f021409d7ab000f372becb86
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:54:53 2023 +0100

    Fix Rhydon sprite

commit b0d260e68942b7bb44e50f9dcc31efd60df61fb3
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:54:44 2023 +0100

    Fix Tauros sprite

commit 092132b3e469b187b373c1fb2831cc7b94f5536a
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:54:31 2023 +0100

    Fix Tangela sprite

commit 348006fc98b7258ff84628770b07ee345537a1d5
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:52:53 2023 +0100

    Fix Seaking

commit 08e1b2a70e784403f6226132dda0b9af7dccdfaf
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:52:42 2023 +0100

    Fix Snorlax

commit 0eb0c22154f320ea7fc40102041b44ee827ad550
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:52:30 2023 +0100

    Fix Weezing

commit 734e26d09e95526b76641cbd9e81d8d08ae7e698
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:52:22 2023 +0100

    Fix Zapdos

commit f64a73f055d2f04081450c280bad2a53eddec89b
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:52:13 2023 +0100

    Fix Jynx

commit 6df3de03c15b236ab1d35817fc88a791f67fccaf
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:52:04 2023 +0100

    Fix Hitmonchan

commit 011727960a6ff3488f3afc71e246e01ecc3c14ec
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:51:54 2023 +0100

    Fix Moltres

commit bac77a1bd86f5a15d8adb7498baaa5a687a33614
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:51:43 2023 +0100

    Fix Seadra

commit 9c3ac9253d514faad2d458aeac7b21d1f091bf2e
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:51:31 2023 +0100

    Fix Scyther, including its shiny

commit 4004956d55855f872a9acd8f822f819a48fb43de
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:50:31 2023 +0100

    Fix Pinsir

commit aaad68ad622d5e9bf65cb75b40804cbb3af73203
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:50:20 2023 +0100

    Fix Mr. Mime

commit 42df7c97b662b231cfa665aeca558a60d77d0714
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:50:11 2023 +0100

    Fix Flareon

commit 9d4b7685710892fedb1a0064a48e7928f44ffd5d
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:49:58 2023 +0100

    Fix Marowak

commit 5c357f209c38d24246067453b4e65f4aa07c98e3
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:49:44 2023 +0100

    Fix Charizard

commit 67a098eea1f7a48405881e85fbbf3104c0d0ba5e
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:49:33 2023 +0100

    Fix Magikarp

commit c4750f39ed4a504561683ef0d54029efad63e8e6
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:49:26 2023 +0100

    Fix Magikarp

commit 3792029c61685b762fbf34f016623a9bac6cbe34
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:49:13 2023 +0100

    Fix Mew

commit d66d0a727c1d66bd9abe1c10f19656b7a333a33c
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:49:01 2023 +0100

    Fix Magmar

commit d43a68ee3069e66fc5e5a842e29cd20fb76a9463
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:48:53 2023 +0100

    Fix Kingler

commit be1a79d4ff977b0abb9545571cdcc7af0e402e3a
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:48:46 2023 +0100

    Fix Koffing

commit 1c0e2dd055ea8040ff3677ab0af4b277191091a5
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:48:37 2023 +0100

    Fix Krabby

commit 40245f88805be12c792a3e82892fd12f5a65009a
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:48:30 2023 +0100

    Fix Lapras

commit 9b55067bb73127e3a03d0c5ddbe36d6c5b7a366d
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:48:23 2023 +0100

    Fix Horsea

commit 818b337dfd00c4bf811610e0d1d3d00729411d68
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:48:14 2023 +0100

    Fix Dragonite

commit 49ac05e98e03ab6dd72d24477cee820c3618d87f
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:48:06 2023 +0100

    Fix Articuno

commit 1ffb74e87858f5f027646430016411e0ee58ebd2
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:47:54 2023 +0100

    Fix Chansey

commit 0fd6e6df1f4b5fa629a5b6287909141fca7a05af
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:47:45 2023 +0100

    Fix Electrode

commit c25f6dc173692b92413bbede7a49426a3d5c168c
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:47:38 2023 +0100

    Fix Staryu

commit be89da73168154beab28112f9423f3514c1d8fc1
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:47:22 2023 +0100

    Fix Jolteon

commit 02c6ee40c6354ae9b1bbc7a1714f80a157bd417c
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:47:11 2023 +0100

    Fix hitmonlee

commit 739c6a2b45cb9f26a5d6dc4718a682023584cc92
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:46:57 2023 +0100

    Fix Gyarados

commit effa1a8d1ffd40cf232aee71fbf3a49559431145
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:46:49 2023 +0100

    Fix exeggcute

commit 381e0362593ff06a5d7fcc841f2ab6a6805302c5
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:46:38 2023 +0100

    Exeggutor

commit 38f97d7856eb3658ef4e6202670e14fec4bc2edc
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:46:26 2023 +0100

    Fix Cubone

commit 0cb9cdcd4f2a102d963e85e34cbe4921c27b5812
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:46:18 2023 +0100

    Fix Eevee

commit e677911485017bb20628cd6b4667897493131429
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 14:46:07 2023 +0100

    Fix Aerodactyl

commit 7d8e96a32d2b5e4a9f9a71a72a3e925d6b152da3
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:37:36 2023 +0100

    Fix Onix

commit 8839619e714d2806e28c09c34d8b5e950b305880
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:36:32 2023 +0100

    Fix Gengar

commit 7c8f940b41c5aaf4567695070e8374d50ad38cbd
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:36:27 2023 +0100

    Fix Gastly

commit 604f7deec5f18a416d2d2e00e7b33b9ca8acc2d6
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:32:17 2023 +0100

    Fix Cloyster

commit 8f2765fa0dc3331cda91dfbf1c1ced1a812e2e57
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:30:35 2023 +0100

    Fix Muk

commit de855a235ad692bfb4f2fbce7ce75547c2d02c1a
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:29:13 2023 +0100

    Fix Grimer

commit 04188aa7f33b61c0301e0a5494043a7eb8daa4c8
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:28:20 2023 +0100

    Fix Dewgong

commit 8b107880534f85dcd7af37db387c1f0b89809aeb
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:27:08 2023 +0100

    Fix Seel

commit 2a73093423d85b1aa81599d0375b020a93f4a69a
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:27:02 2023 +0100

    Fix Dodrio

commit 859bfa4c9bd0527ecf8bc46b9d338b7af8363b37
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:23:15 2023 +0100

    Fix Farfetch'd

commit 17943ebb05c76ce6a6dbcc5092d511ef7bec2e99
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:21:57 2023 +0100

    Fix Magneton

commit f548e0d22c5a1e9247b5c08ebb892e95467e55fe
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:20:22 2023 +0100

    Fix Magnemite

commit dff56dad0de0abab600b1466648a1a9e6be99a64
Author: Jaizu <jaizu85@gmail.com>
Date:   Sun Feb 5 13:18:16 2023 +0100

    Fix Slowbro

commit 8ea99acbc9466722ea1d7752f97e2ef9b42c7e8d
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:15:13 2023 +0100

    Fix Golem

commit 8c70cfbb92dce4d754b7e70d03f563ff1302c781
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:12:12 2023 +0100

    Fix Graveler

commit 50ce5a477d34f5ee522f0c789091b4cf38aec61e
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:11:51 2023 +0100

    Fix Geodude

commit 6480770d40fa25900b78348d4438a47497ac1b92
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:10:16 2023 +0100

    Fix Tentacruel

commit 14705cee715a4abf9916e86e1c73b085f641578c
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:09:20 2023 +0100

    Fix Tentacool

commit f0862700287832a9d7c123996b43345dfe6c130f
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:08:16 2023 +0100

    Fix Victreebel

commit 466f0243ba0d4bc32efd1689a2cd834cb80702ec
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:06:40 2023 +0100

    Fix Weepinbell

commit 7dfa5a42b34736c40874b7ef81da136975bd4c52
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:05:04 2023 +0100

    Fix Bellsprout

commit e28baaf465fb80fc9f3a66f8cc7e5a332dd8d3de
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 18:03:44 2023 +0100

    Fix Machamp

commit 8283537accc6c3a64347eea4bff0084369740957
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:59:00 2023 +0100

    Fix Machoke

commit b9aca57833f55ef41f9922b59446fb58ed8d1c95
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:55:02 2023 +0100

    Fix Machop

commit bfb122483cca28f30b87a950ddefaf2b7ec6a58b
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:54:08 2023 +0100

    Fix Alakazam

commit c8a070556299c60a5da7c52cd9e4ec194ffbd7bc
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:52:56 2023 +0100

    Fix Kadabra

commit 565a8f8ca603192c3d1abacf67bb1a016f5fcf53
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:51:23 2023 +0100

    Fix Abra

commit 5cf78bc0251ff39062f0e07c077f88dd6537be31
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:49:49 2023 +0100

    Fix Poliwrath

commit 887f7c8c5f291d31183aba47efe7a6e5a8520798
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:48:46 2023 +0100

    Fix Poliwhirl

commit 2fa3606401013592be494fbd76bec8e871c026b2
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:47:17 2023 +0100

    Fix Poliwag

commit fa6561101e68e5d802f5106e84ae929ea4e7f62c
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:45:11 2023 +0100

    Fix Arcanine

commit ceb0a9423b5e888d500bc82a00ac341b862a6f19
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:42:46 2023 +0100

    Fix Growlithe

commit 4052e2b36db3f96b7583d2f320cd519cedd9537c
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:40:09 2023 +0100

    Fix Primeape

commit b7c752fd6fecbbbbe3300a7813e6efd4fb8cebc9
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:38:33 2023 +0100

    Fix Mankey

commit 76f5bb40c53ea7a8eeff3c86bf17123009b28258
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:35:59 2023 +0100

    Fix Golduck

commit eb658c62ddcc1c24716c8cf5f5a0a357ac6dd304
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:34:45 2023 +0100

    Fix Psyduck

commit a7d8055bbc954d521033a413bcde39ce973a5128
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:33:13 2023 +0100

    Fix Meowth

commit 773678e9339e53e3997400a9edf7706afa0181d6
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:26:23 2023 +0100

    Fix Dugtrio palette

commit e8a17bd3d0b485ba7a9e3466539a53c2e0fa92a5
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:25:33 2023 +0100

    Fix Diglett

commit 6b1c09e3622d3e7b35a77c80fef2862cd1f33d67
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:24:30 2023 +0100

    Fix Venomoth

commit 474e83c2a2ed55d136221c896002c926c2bd7551
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:22:09 2023 +0100

    Fix Venonat

commit 0f7e1a23884765b4afc37aa70927823639ccc34d
Author: Jaizu <jaizu85@gmail.com>
Date:   Mon Jan 30 17:17:56 2023 +0100

    Fix Paras

commit 0134efd983a9f7be44d25c744141301507e3376d
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:34:12 2023 +0100

    Fix Ninetales

commit de5d8407ad68fcdab66590b232c34e53619f4edb
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:34:03 2023 +0100

    Fix Vulpix

commit 24d81ccf960f9c52d9e3798f87699e550a12d887
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:33:56 2023 +0100

    Fix Jigglypuff

commit dd9c63d6f2532705027146e6f92196e9958ccafb
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:33:47 2023 +0100

    Fix Golbat

commit 94c9e3a94360fe4962b7a459cce25598da1ff71c
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:33:38 2023 +0100

    Fix Gloom

commit 43a45d18d83385bee306ee485d9a273dfb4015d6
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:33:29 2023 +0100

    Fix Vileplume

commit 4573f1b48dd46dd3ee252e8b271d0e7f133d90b1
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:33:19 2023 +0100

    Fix Oddish

commit 6d9e26270dd8c7aef2fd71b45dfbd79222e2e307
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:33:07 2023 +0100

    Fix Wigglytuff

commit 1817d85a2b6707f421179c5fa69468d0240a8ced
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:32:51 2023 +0100

    Fix Zubat

commit fca339f5e0a44028be6fbec39f53564f603c8ad8
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:13:30 2023 +0100

    Fix Clefable

commit c8e0d3fce1c455e453a2fc50ef6ee0e98adf9867
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:13:19 2023 +0100

    Fix Clefairy

commit a6e462b20cf6bc6e820100f4bba71222f32a9a7a
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:13:11 2023 +0100

    Fix Nidoking

commit d71f5fd81d10ffff2006f9f8ae0c4a0eb48ae3dd
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:12:58 2023 +0100

    Fix Nidoqueen

commit a1a3e1d68a3787c0b45a960c686943dc85d751f6
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:12:51 2023 +0100

    Fix Nidoran f

commit bbaa397c78ab85853f0047be1cd694907e29c470
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:12:42 2023 +0100

    Fix Nidoran m

commit d1432e4517f0a12bbe337ac1ef59ab19e4c65eb6
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:12:31 2023 +0100

    Fix Nidorina

commit 9dd0560bfa343a10029524ac141529609607a5f6
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 15:12:21 2023 +0100

    Fix Nidorino

commit 9c6ba83269d1e0963fc7ba0f23d95e90afc1c011
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:53:52 2023 +0100

    Fix Sandslash

commit 7cecb0e0eeeb01a4acc129d0b715184444a4f33a
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:53:46 2023 +0100

    Fix Snadshrew

commit 4718cf91a52687ac984c296ec2e962510cb8742b
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:49:40 2023 +0100

    Fix Raichu

commit 4c84431a76bb2f0b7647a4fcd22ee9b1396286b9
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:49:35 2023 +0100

    Fix Pikachu

commit 2fb719541a3fb2a4636793d4d8e938a2840aba5f
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:49:28 2023 +0100

    Fix Arbok

commit a926d6741abae61d81caa8e56e1d529cf1b41cbf
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:49:19 2023 +0100

    Fix Ekans

commit bf4c126663cb7b887519e62c471c68db0ed59fff
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:43:34 2023 +0100

    Fix Fearow palettes

commit bc45dccdc7aa44597504312a879fcd496cd74ba7
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:34:09 2023 +0100

    Fix Spearow

commit fa13bf6b7f2dbb991b46bf8a7ec495f2e6991fd7
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:34:02 2023 +0100

    Fix Raticate

commit d3c43ab392319c220905922b70032d170436000c
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:33:54 2023 +0100

    Fix Rattata

commit 518d4c7fba53065d944ff9164cb59cb483c06aab
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:27:36 2023 +0100

    Fix Pidgeot

commit cc19533975a948ad6f78d2d4c6f8f5a5bd7e0be1
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:25:30 2023 +0100

    Fix Pidgeotto

commit 90a10d88572e7317c8e29d5419b87513f22c966f
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:20:34 2023 +0100

    Fix Beedrill

commit 7510b413bdf5e205d7ae5302599b548e236ac631
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:20:22 2023 +0100

    Fix Kakuna

commit 2ea6620202ba80e7baacf917cff537d41bfd9d68
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:20:10 2023 +0100

    Fix Pidgey

commit 492add120005a5bbe2af89bca86acccccbbd010c
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:20:01 2023 +0100

    Fix Weedle

commit 2f32c7b41e0e59109dca0a52c92cd92173be5dd2
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:10:39 2023 +0100

    Fix Butterfree

commit 5c7431c443f831c1b3571a9cd6be03c8cc7e9440
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:10:28 2023 +0100

    Fix Caterpie

commit d7af028d57a2ee56dcae3cea400200047d761d98
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:04:55 2023 +0100

    Fix Blastoise sprite

commit b304d60da0c8ad56ee11bde33aa20ca8f6d0d036
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:04:47 2023 +0100

    Fix Wartortle sprite

commit a581b63cdcd7342e94b9baabe826612f205a6f44
Author: Jaizu <jaizu85@gmail.com>
Date:   Tue Jan 24 14:04:37 2023 +0100

    Fix Squirtle sprite
 2023-02-06 10:25:36 -03:00
Eduardo Quezada D'Ottone e3bb8ab433 Merge pull request #2618 from Jaizu/fix_transform 
Fix Transform's interaction with Gender Differences
 2023-01-31 09:15:01 -03:00
Eduardo Quezada D'Ottone fcccffce45 Apply suggestions from code review 
* Jaizu ran away *
 2023-01-31 09:07:45 -03:00
Eduardo Quezada D'Ottone a56cc4b6c6 Merge pull request #2616 from Jaizu/patch-3 
Implement Destiny Knot
 2023-01-31 07:43:03 -03:00
Eduardo Quezada D'Ottone d7b761f99a Merge pull request #2613 from Jaizu/patch-2 
Fix ball resetting when hatching an Egg
 2023-01-28 17:53:20 -03:00
Eduardo Quezada D'Ottone 6ea0af2fb6 Merge pull request #2612 from ghoulslash/be/toxicdebrisfix 
Fix toxic debris side status check
 2023-01-28 16:04:20 -03:00
Eduardo Quezada D'Ottone f1d97bfad7 Merge pull request #2607 from mrgriffin/rhh-battlescript-fixes 
Fix uses of gBattlescriptCurrInstr
 2023-01-27 19:25:06 -03:00
Eduardo Quezada D'Ottone 53e41a2b3d Merge pull request #2605 from mrgriffin/rhh-battle-tests-fixes 
Rhh battle tests fixes
 2023-01-27 19:24:13 -03:00
Eduardo Quezada D'Ottone 4c4fa6a2b6 Merge pull request #2603 from TeamAquasHideout/upcoming 
Fix Wood Hammer To Have 1/3rd Recoil
 2023-01-27 10:47:32 -03:00
Eduardo Quezada D'Ottone ca5a45d34d Merge pull request #2601 from ghoulslash/be/flameburst 
Fix flame burst hitting semi-invulnerable partner
 2023-01-26 15:14:07 -03:00
Eduardo Quezada D'Ottone 0dc6b10909 Merge pull request #2597 from AsparagusEduardo/RHH/pr/sync/pret_20230125 
I like shorts, they're comfy and easy to wear! (pret merge 2023/01/25)
 2023-01-25 20:37:42 -03:00
Eduardo Quezada 7774c9727d Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 
# Conflicts:
#	tools/mapjson/mapjson.cpp
 2023-01-25 20:28:55 -03:00
Eduardo Quezada a044774896 Added Gen9 item data and fixed Punching Glove's effect 2023-01-24 16:47:54 -03:00
Eduardo Quezada D'Ottone 1202f0366c Merge pull request #2586 from Jaizu/ability_popup_fixes 
Ability popup updates
 2023-01-23 17:34:18 -03:00
Eduardo Quezada D'Ottone fbcad9d3ec Merge pull request #2572 from rh-hideout/AsparagusEduardo-patch-1 
Fixed Exp Candy S using the XS description
 2023-01-23 15:00:25 -03:00
Eduardo Quezada D'Ottone 1bfc922c72 Merge pull request #2471 from ghoulslash/be/gen9items 
Start Gen9 Hold Effects
 2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone 2b22bdf1e7 Merge pull request #2579 from LOuroboros/allahu 
Fixed Explosion & Intimidate's 'interaction'
 2023-01-23 11:37:06 -03:00
Eduardo Quezada D'Ottone 27fa8167c6 Merge pull request #2588 from TeamAquasHideout/upcoming 
Fix Psycho Shift not buffering the string index for its printfromtable call
 2023-01-23 10:35:09 -03:00
Eduardo Quezada D'Ottone 1c7757032b Merge pull request #2585 from ghoulslash/be/endturn_fix 
add hp check to ITEMEFFECT_ORBS
 2023-01-21 19:06:22 -03:00
Eduardo Quezada D'Ottone 4855b370a9 Merge pull request #2583 from AsparagusEduardo/RHH/pr/sync/pret_20230120 
| || || |_ (pret merge 2023/01/20)
 2023-01-20 13:18:14 -03:00
Eduardo Quezada 4a9515e8db Restored improvements from upstream 2023-01-20 12:34:15 -03:00
Eduardo Quezada 749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
Eduardo Quezada 70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
Eduardo Quezada D'Ottone 6e1981369b Fixed Exp Candy S using the XS description 2023-01-13 13:22:27 -03:00
Eduardo Quezada 77cc407386 Review change 2023-01-12 23:44:34 -03:00