ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,445 Commits 1 Branch 0 Tags 235 MiB
7ce5c5fc66
Commit Graph

12445 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
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
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
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
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
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
ghoulslash
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
DizzyEggg
eead8e8e61 Tests work with new pokemon disabled 2023-03-09 09:49:50 +01:00
Alex
35645fe01c
electrify works on all move types (#2817) 2023-03-08 23:00:25 +01:00
LOuroboros
ff7686482f Updated PokeStorageSys related debug functions 2023-03-08 15:56:16 -03:00
LOuroboros
c1a52765eb Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into debUG 2023-03-08 15:29:54 -03:00
LOuroboros
f06c040bca Updated the debug menu 
-Updated the text string used by Debug_FlagsNotSetMessage.
-Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage.
-Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage,
-DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION
 -And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file.
-Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff.
-Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.
 2023-03-08 15:27:22 -03:00
Alex
27e342d7a6 Use function HasDamagingMove to avoid looping 2023-03-08 19:25:26 +01:00
Alex
59a0def706 delete leftover 2023-03-08 17:30:07 +01:00
Alex
c3674d6c17 Wrong score for Work Up and Growth 2023-03-08 17:23:44 +01:00
Eduardo Quezada D'Ottone
10410640b4
Update overworld_config.h reference in the debug system (#2811) 2023-03-08 11:52:50 -03:00
Bassoonian
1553be1e7d Update overworld_config.h reference in the debug system 2023-03-08 15:46:14 +01: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
Martin Griffin
cf432b088b
Updated Supreme Overlord's effect's code (#2809) 2023-03-07 22:30:25 +00:00
LOuroboros
fdebc994d2 Updated Supreme Overlord's effect's code 2023-03-07 19:14:38 -03:00
Eduardo Quezada D'Ottone
13ca2271e2
Add meltan and melmetal teachable moves (#2732) 2023-03-07 10:25:05 -03:00
DizzyEggg
318666e21d debug minor touches to give item max quantity and map number display 2023-03-07 12:20:36 +01:00
Eduardo Quezada D'Ottone
81a80e566c
Refactor Mega Evolution indicator sprite (#2805) 2023-03-07 08:06:28 -03:00
DizzyEggg
e055456b7e
Fix Protean / Libero when AI calculates Damage (#2714) 
* Fix Protean / Libero when AI calculates Damage

* fix ai changing types when calculating dmg
 2023-03-07 09:34:26 +01:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings (#2737) 
* start working on defog tests

* defog tests + improve terrain end battlescripts

* newline
 2023-03-06 20:35:08 +01:00