Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,788 Commits 1 Branch 0 Tags
Commit Graph

8382 Commits

Author SHA1 Message Date
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05:00
LOuroboros
216d8f0608 Solved game freezing issue 
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
 2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
ExpoSeed
a58641cd70
Merge pull request #1603 from LOuroboros/megaEvoString 
Tweaked sText_MegaEvoEvolved
 2021-08-26 19:33:39 -05:00
ExpoSeed
1f75f6e201
Merge pull request #1605 from LOuroboros/canEvolve 
Corrected `CanEvolve` function
 2021-08-26 19:32:22 -05:00
BuffelSaft
1d1546c7b2 Suggested changes 2021-08-26 19:00:43 +12:00
BuffelSaft
bc298d242f Move mega indicator for lv 100 mons 
Indicator sprite overlaps the "100" without this.
 2021-08-25 23:15:30 +12:00
BuffelSaft
bb89d03a1d Fix Venoshock 
Damage should double if target is poisoned, not attacker.
 2021-08-25 22:57:10 +12:00
LOuroboros
e42d329fc6 Small tweak 2021-08-25 02:16:38 -03:00
LOuroboros
d270892a6b Corrected CanEvolve function 2021-08-25 01:56:25 -03:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
LOuroboros
2c35006627 Tweaked sText_MegaEvoEvolved 2021-08-24 18:33:56 -03:00
LOuroboros
87461db04d Added missing 2nd frames for Gen. 5 species 
Also made certain Pokémon such as Zebstrika or Galvantula use their 2nd frame.
 2021-08-23 08:28:58 -03:00
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00
LOuroboros
a0a888698e Corrected Bronzor's evo level 2021-08-22 23:19:26 -03:00
GriffinR
8f5e2bbeba Label swap line margin flag 2021-08-21 11:04:28 -04:00
ultima-soul
4c3ed52c2f Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:39:11 -07:00
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
ultima-soul
840e2bc3f9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-16 16:33:34 -07:00
ultima-soul
76a7a2720d Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-16 16:10:59 -07:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
GriffinR
dfdcfc1568 Document remaining functions in cable_club 2021-08-15 16:22:15 -04:00
GriffinR
e01ae55c13 Start more link_rfu_2 documentation 2021-08-15 15:13:42 -04:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2 
Document item menu
 2021-08-15 12:01:57 -04:00
ghoulslash
d344612346 fix last used ball window in wild doubles 2021-08-12 14:49:17 -06:00
ghoulslash
a2d885c0d4 merge with be 2021-08-12 14:48:58 -06:00
ghoulslash
0bbbd1e7a9 fix electric/misty yawn/rest interactions 2021-08-12 14:08:41 -06:00
ghoulslash
5e250853c6 misty terrain blocks toxic spikes 2021-08-12 13:45:50 -06:00
ghoulslash
f050168c55 misty terrain blocks toxic spikes 2021-08-12 13:41:18 -06:00
ghoulslash
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
7b0e60c705 some tweaks 2021-08-12 12:44:53 -06:00
ghoulslash
e3d30602d9 record item effect with trick 2021-08-12 01:29:52 -04:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
ultima-soul
64a48800c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-11 17:10:57 -07:00
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound 
Fix CgbSound Fakematches (Thanks to Revo)
 2021-08-11 19:55:44 -04:00
ultima-soul
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
034b7f0513 Fix conflicting PC window names 2021-08-11 19:14:50 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc 
Document player pc
 2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2 
Document frontier pass
 2021-08-11 17:40:55 -04:00
GriffinR
d951d7c363 Use tag constants in region_map.c 2021-08-11 09:31:20 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
Kurausukun
2e892c6961 unsigned int -> u32 2021-08-08 22:22:50 -04:00
Kurausukun
ddb3911d0d oops 2021-08-08 20:49:29 -04:00
Kurausukun
0bceaab046 rename variable 2021-08-08 20:34:16 -04:00
Kurausukun
b51d025f1c port cgb fakematching fixes (thanks to revo) 2021-08-08 20:33:21 -04:00
BuffelSaft
e1ca2af8b3
Update src/battle_util.c 
Fix copy/paste typo

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-08-08 00:52:27 +12:00
BuffelSaft
6c6363f7cf Use form table in species check 2021-08-07 20:59:04 +12:00
BuffelSaft
f0cb6190e0 Implement Burmy form change 
Burmy changes form based on where it last battled.
 2021-08-07 20:56:10 +12:00