ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,850 Commits 1 Branch 0 Tags 235 MiB
e6a8faec1e
Commit Graph

7850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
9e690c07ed
Merge pull request #1437 from ExpoSeed/bugfixes 
Various BUGFIXes and UBFIXes
 2021-05-16 12:24:04 -04:00
ExpoSeed
a7e3da2301 pyramidWinStreas 2021-05-15 15:59:54 -05:00
ExpoSeed
361fa594b3 Various BUGFIXes and UBFIXes 2021-05-15 15:56:17 -05:00
gAlfonso-bit
ab8318cc79 Fix UB: Destoyed task is modified. 
After destruction, task is no longer used, so updating its values is worthless.
 2021-05-15 14:35:32 -05:00
ghoulslash
cd84e8f05c
Merge pull request #1468 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-05-13 21:49:56 -06:00
GriffinR
f62b42eb59
Merge pull request #1386 from SatoMew/master 
Remove Travis badge
 2021-05-13 14:54:47 -04:00
SatoMew
7061e66212 Undo secondary changes 2021-05-13 19:49:15 +01:00
Kurausukun
3a403dc520 [LEAK-INFORMED] fix do {} while (0) in apprentice 2021-05-13 11:29:46 -05:00
Kurausukun
e737f1f924 fix main_menu goto 2021-05-13 11:29:11 -05:00
Kurausukun
2cc38acb84 fix item.c gotos 2021-05-13 11:29:11 -05:00
Kurausukun
3b7f708eb0 fix player_pc goto 2021-05-13 11:29:11 -05:00
Kurausukun
0c7773ad75 fix mystery_gift gotos 2021-05-13 11:29:11 -05:00
Kurausukun
f0453871a2 fix battle_dome goto 2021-05-13 11:29:11 -05:00
Kurausukun
dbc1b9aacf fix goto in bike.c 2021-05-13 11:29:11 -05:00
Kurausukun
7740ca1303 replace raw values with char constants 2021-05-13 11:26:15 -05:00
Kurausukun
fa23b196a9 [LEAK-INFORMED] fix battle_interface fakematch 2021-05-13 11:26:15 -05:00
Kurausukun
dfd87e09f9 [LEAK-INFORMED] fix text.c "eff" fakematch 2021-05-13 11:26:15 -05:00
gAlfonso-bit
9a195c0fef Cherry-pick roamer bug fix from pokefirered 
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
 2021-05-13 11:23:42 -05:00
gAlfonso-bit
2be29cdb77 Update IsPokemonCryPlaying 2021-05-13 11:23:11 -05:00
gAlfonso-bit
3e15a3ef8f Update IsPokemonCryPlaying 2021-05-13 11:23:11 -05:00
gAlfonso-bit
7d3f25dfb0 Change IsPokemonCryPlaying to bool32 
Better reflects its usage
 2021-05-13 11:23:11 -05:00
GriffinR
65fd334256 Name map groups 2021-05-11 10:16:04 -05:00
ExpoSeed
43854664b5 Fix UB in RotatingGate_RotateInDirection 2021-05-11 10:12:01 -05:00
LOuroboros
95d41524a2 Implemented Clanging Scales' effect 2021-05-09 18:20:03 -03:00
GriffinR
40c13e97e7
Merge pull request #1427 from Flametix/typo 
Fix Substitute typo
 2021-05-06 22:22:40 -04:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04:00
GriffinR
de3b32f76b
Merge pull request #1407 from ipatix/fix/modern 
Fix modern target when libc functions are used.
 2021-05-05 20:06:15 -04:00
luckytyphlosion
c50a21fba0 Tidy just cleans both normal and modern. 2021-05-05 16:07:21 -04:00
Michael Panzlaff
783a167b76 ld_script_modern: minor fixes for gcc 11 2021-05-05 00:49:42 +02:00
GriffinR
7b3a1498d6
Merge pull request #1425 from Kurausukun/f32 
Change Usages of float/double to f32/f64
 2021-05-04 15:52:04 -04:00
GriffinR
6ce27c0ff0 Restore EReaderTrainerHillSet dummy 2021-05-04 15:43:24 -04:00
LOuroboros
64a86d0285 Swapped launchtemplate calls with createsprite calls 2021-05-04 15:36:00 -03:00
ultima-soul
e864c39a5d Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-05-04 10:04:35 -07:00
ghoulslash
fd3605b023
Merge pull request #1443 from AmbientDinosaur/patch-1 
Keen Eye evasion ignoring effect from Gen 6
 2021-05-04 09:49:56 -06:00
ghoulslash
3d22799cda
Merge pull request #1465 from ExpoSeed/BE/num_ability_slots 
Introduce NUM_ABILITY_SLOTS
 2021-05-04 09:49:35 -06:00
ghoulslash
6b7a7ca260
Merge pull request #1406 from ghoulslash/be_bugfix 
Fix data corruption from HideMegaTriggerSprite
 2021-05-04 09:45:03 -06:00
ghoulslash
1ccf43b5f7
Merge pull request #1451 from LOuroboros/stench 
Implemented Stench's battle effect
 2021-05-04 09:41:13 -06:00
ghoulslash
a3e6fe1ef4
Merge pull request #1442 from LOuroboros/patch-1 
Fixed Punk Rock
 2021-05-04 09:37:54 -06:00
ghoulslash
984f49747f
Merge pull request #1454 from LOuroboros/HandleAction_UseMove 
Minor syntax tweaks to HandleAction_UseMove
 2021-05-04 09:37:10 -06:00
ghoulslash
97ae2fe1be
Merge pull request #1460 from AmbientDinosaur/patch-2 
Corrected the move data for Gen 4 Overheat
 2021-05-04 09:36:36 -06:00
ghoulslash
d73efc45e4
Merge pull request #1462 from AmbientDinosaur/patch-3 
Remove superfluous define of LEVEL_UP_END
 2021-05-04 09:33:23 -06:00
ghoulslash
e803b42827
Merge pull request #1467 from LOuroboros/gravity_acc 
Added Gravity's missing acc boost
 2021-05-04 09:32:58 -06:00
ghoulslash
afea2cf5fa
Merge pull request #1482 from BuffelSaft/room_moves_text 
Fix Wonder Room, Magic Room battle messages
 2021-05-04 09:32:37 -06:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix 
Make Big Root affect absorb moves
 2021-05-04 09:32:18 -06:00
ghoulslash
e343090a8b
Merge pull request #1479 from BuffelSaft/orb_fix 
Fix Toxic Orb and Flame Orb affecting Pokemon they shouldn't
 2021-05-04 09:31:58 -06:00
ghoulslash
34cd23619f
Merge pull request #1471 from LOuroboros/magic_gaurd 
Fixed a typo in the battle_engine
 2021-05-04 09:30:19 -06:00
BuffelSaft
ec4012e95d Fix "Room" move battle messages 
Move new line so these messages fit in the text box.
 2021-05-04 23:57:43 +12:00
BuffelSaft
5d177f0a15 Make Big Root affect absorb moves 
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
 2021-05-04 23:20:22 +12:00
BuffelSaft
542201dd4f Add missing ability checks to orbs 
Flame Orb shouldn't burn mons with Water Bubble and neither orb should affect mons with Comatose.
 2021-05-04 23:08:48 +12:00
BuffelSaft
e8598076a8 Fix Toxic and Flame Orb 
Shouldn't inflict status conditions on a fainted mon.
 2021-05-04 22:55:19 +12:00