ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-01 07:10:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,133 Commits 1 Branch 0 Tags 235 MiB
fc66a8c476
Commit Graph

13133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
1da65c4051 Fixed Grassy Terrain not healing 2023-03-23 22:33:47 -03:00
Bassoonian
cd6d71cd01 Add most of the new item icons (Clear Amulet & Shards missing) 2023-03-24 00:50:06 +01:00
Bassoonian
e601719c91 Add new PLA form change items 2023-03-24 00:04:08 +01:00
Bassoonian
f15fb1540f Allow Kubfu evolution with Scroll items 2023-03-23 23:16:08 +01:00
Bassoonian
80d0efae0c Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev 2023-03-23 23:04:23 +01:00
LOuroboros
6d1a436a87
Merge pull request #20 from DizzyEggg/moves_batch1 
tests for Moves batch1
 2023-03-23 16:06:29 -03:00
DizzyEggg
8cf357a37b tests for dire claw ceaseless edge barb barrage 2023-03-23 12:29:04 +01:00
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
Eduardo Quezada
168ed1cc55 Xerneas/Zacian/Zamazenta form change tests 2023-03-22 07:33:13 -03:00
ghoulslash
74ec59cace add sAnimHideHpBoxes to fix healthbox reappearing from e.g. B_ANIM_SWITCH_OUT_OPPONENT_MON 2023-03-21 18:11:49 -04:00
Eduardo Quezada
ef914a2fac Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-21 16:13:27 -03:00
May8th1995
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
Alex
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
bef5d98b88 Fixed Pokémon fainting in the Overworld that don't have that specific form change entry 2023-03-18 09:47:54 -03: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
0dfb60f2e4 Removed uneeded parameters 2023-03-14 11:07:26 -03:00
Eduardo Quezada
0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
GriffinR
0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04: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
Eduardo Quezada
a101476d51 Hunger Switch test 2023-03-12 17:01:53 -03:00
Eduardo Quezada
a0feaabef1 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-12 15:53:32 -03:00
Eduardo Quezada
c46e70ca82 Forgot about Primal Reversion 2023-03-12 02:38:27 -03:00