Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,646 Commits 1 Branch 0 Tags
main
Commit Graph
12646 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros 7ce5c5fc66 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-03-23 06:27:09 -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
AgustinGDLV 03f6fe635f changed CanBeConfused to actually check its argument (#2855) 2023-03-23 09:50:44 +01:00
tennis 299911139a Add test for intimidate on empty slot 2023-03-22 22:25:20 +00:00
CallmeEchoo 4541cc3319 add check for Gorilla Tactics 
knock off shouldnt reset choicedMove when the pokemon has the Gorilla Tactics ability
 2023-03-22 22:30:24 +01:00
GriffinR 8d67bebd51 Merge pull request #1869 from GriffinRichards/const-map 
Treat map data as const
 2023-03-22 13:00:06 -04:00
tennis 358180946d Fix Intimidate targetting dead sides and false postpones 2023-03-22 11:46:50 +00:00
May8th1995andtennis 9ec31c61bf Fixes weirdly set value for eject buttons etc (#2846) 
* Fixes weirdly set value for eject buttons etc

* Remove known fialing from fixed test

---------

Co-authored-by: tennis <May8th1995@users.noreply.github.com>
 2023-03-21 20:12:46 +01:00
ghoulslash c61797bc38 styling and syntax fix 2023-03-21 14:31:09 -04:00
ghoulslash 1adc6b761e remove random space 2023-03-21 13:38:24 -04:00
ghoulslash 3bd680cab9 fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker 2023-03-21 13:36:45 -04:00
AlexandPhilipp AUER 170ff2f422 Tests for Eject Button (#2843) 
* eject button tests + 1 intim test

Add KNOWN_FAILING

Eject Button Tests = 1 Intim Test

* Update test/ability_intimidate.c

* Update test/ability_intimidate.c

* Update test/hold_effect_eject_button.c

* Update test/hold_effect_eject_button.c

* Update test/hold_effect_eject_button.c

* Update test/hold_effect_eject_button.c

* Update test/hold_effect_eject_button.c

* Update test/hold_effect_eject_button.c

* Update test/ability_intimidate.c

Eject Button Tests

Eject Button Tests

* Update test/hold_effect_eject_button.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-03-21 10:41:37 +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
Bassoonian d480fc90f2 Fix Scrolls type 2023-03-19 21:21:43 +01:00
Bassoonian 372c6a1afa Add new item variables and defines 2023-03-19 20:55:39 +01:00
Eduardo Quezada D'Ottone 509da952ff Added Psyblade and Hydro Steam (#2834) 2023-03-17 09:36:14 -03:00
LOuroboros f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
Martin Griffin 89deda0416 Allow tests to override specific RNG calls 2023-03-15 13:39:17 +00:00
Martin Griffin 509ff4c7e0 Generic TEST that executes a function 2023-03-15 13:28:46 +00:00
GriffinR 00e211a417 Merge pull request #1873 from AsparagusEduardo/pret/pr2/stringConversionIDE 
Changed IDE macros to allow their use in compound literals without IDE errors
 2023-03-15 03:00:01 -04:00
GriffinR 02a37830cc Merge pull request #1872 from AsparagusEduardo/pret/pr2/friendship 
Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments
 2023-03-15 02:52:45 -04: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
Alex 66c63ee458 hisuian sprite fixes 2023-03-14 18:23:50 +01:00
LOuroboros aefd318945 Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect 2023-03-14 11:43:52 -03:00
Eduardo Quezada 0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
W1serV1ser 69c07fe3c8 Added fix for shadow issues when follower shrinks (thanks to Karl) 2023-03-13 15:31:06 -07:00
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
W1serV1ser 9e1c9cf720 Added more SetObjectEventDirection calls to follower_face commands 2023-03-13 11:06:10 -07:00
Eduardo Quezada D'Ottone 26015be305 Add missing Hisuian sprites and cries (#2725) 2023-03-13 14:50:42 -03:00
Alex f3810465e8 samurott shiny.pal v2 2023-03-13 17:46:52 +01:00
Alex 59d5f078d2 samurott shiny.pal 2023-03-13 17:44:25 +01:00
Alex aa29eced1f Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites 2023-03-13 17:46:53 +01:00
Eduardo Quezada D'Ottone a8c9309458 Fixed Wring Out's power (#2824) 
Fixes #2823
 2023-03-13 09:07:29 +01:00
W1serV1ser 2ac4feaa2c Added follower_face macros and fixed FaceEast (both thanks to Karl) 2023-03-12 16:23:15 -07:00
W1serV1ser 260fca5b46 Removed the Gen 4 Pokemon that snuck in 2023-03-12 13:10:31 -07:00
W1serV1ser bbe087d27d Updated gamma names to color names 2023-03-12 12:34:34 -07:00
W1serV1ser a6dc26acb7 Updated names and updated dynamic palette system 2023-03-11 16:32:42 -08:00
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08:00
W1serV1ser c07686871b Merge branch 'master' of https://github.com/W1serV1ser/pokeemerald 2023-03-10 15:41:32 -08:00
ghoulslashandghoulslash 6f13e4cfc5 word-align battle_interface u8 array gfx (#2812) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-03-10 20:52:22 +01:00
ghoulslash c669745b9c Fixed score for Work up and Growth (#2813) 2023-03-09 11:12:51 -05: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
Alex 9358265954 electrify ai speed check 2023-03-09 09:52:27 +01:00