ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-11 22:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,626 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

11626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
c3939cd32b
Merge pull request #1978 from LOuroboros/pikaPal 
Fixed the palette of Pikachu Partner Cap's back
 2021-12-18 13:28:23 -03:00
Eduardo Quezada D'Ottone
9adbf3350e
Merge pull request #1965 from TheXaman/pokemon_expansion_debug 
Pokemon expansion debug
 2021-12-18 13:08:37 -03:00
Eduardo Quezada D'Ottone
bc43b5c650
Merge pull request #2000 from ultima-soul/master_sync 
Master Upstream Sync
 2021-12-18 11:00:50 -03:00
Eduardo Quezada D'Ottone
bd75ee9688 Using TAG_NONE in battle debug 2021-12-18 10:55:04 -03:00
ultima-soul
18afd06f6d Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 21:23:54 -08:00
Kurausukun
39f493287f one more lel 2021-12-17 23:03:09 -05:00
Kurausukun
f336acb3a9 fix indentation again 2021-12-17 23:00:03 -05:00
Kurausukun
efee1288a0 fix indentation 2021-12-17 22:56:20 -05:00
Kurausukun
0f6311b470 accept 16-bit aiff files and convert to 8-bit 2021-12-17 22:49:45 -05:00
GriffinR
32a9ac6eb1
Merge pull request #1575 from LOuroboros/benriBotan 
[LEAK INFORMED] Documented the unk19 item field
 2021-12-17 22:27:45 -05:00
LOuroboros
4a74d288d4 Review corrections 2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82 [LEAK INFORMED] Documented the unk19 item field 2021-12-17 19:41:39 -03:00
ultima-soul
84ce9745d5
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows 
Improved battle debug number value changing
 2021-12-17 09:21:04 -08:00
ghoulslash
31bbc4ddde prevent stat-raising damage effects if battle will end 2021-12-17 10:24:07 -05:00
Eduardo Quezada D'Ottone
837641f304
Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:46 -03:00
Eduardo Quezada D'Ottone
8005db5040
Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:35 -03:00
Eduardo Quezada D'Ottone
3a12cdb8cb
Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:02 -03:00
ExpoSeed
65186b8c3a Fix some style issues 2021-12-16 21:57:30 -06:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
ultima-soul
961710ddd9
Merge pull request #1986 from AsparagusEduardo/BE_steamEngine 
Added Steam Engine's overworld effect
 2021-12-16 16:15:58 -08:00
ultima-soul
5788caef39
Merge pull request #1996 from ghoulslash/pe/evo_weather 
fix EVO_LEVEL_RAIN
 2021-12-16 16:14:08 -08:00
Eduardo Quezada D'Ottone
8422ad6ccd
Merge pull request #1997 from ultima-soul/ie/enigma_berry_2 
Add Back Enigma Berry e-Reader Constant With Less Conflicts and Update Berry Data
 2021-12-16 21:07:21 -03:00
Eduardo Quezada D'Ottone
d23e7069bd
Merge pull request #1998 from ultima-soul/be/enigma_berry_3 
Eliminate Item Expansion Conflicts for ITEM_ENIGMA_BERRY_E_READER Constant
 2021-12-16 21:07:15 -03:00
ultima-soul
f0ffc749e9
Fix formatting for EVO_LEVEL_RAIN checks. 2021-12-16 16:05:51 -08:00
ultima-soul
356cf96654 Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries. 2021-12-15 19:33:35 -08:00
GriffinR
6e5520207f
Merge pull request #1573 from GriffinRichards/tilesetanim 
Clean up tileset_anims
 2021-12-15 09:47:54 -05:00
GriffinR
961dbee5e3 Clean up tileset_anims 2021-12-14 21:41:07 -05:00
ghoulslash
bb9fb72436 fix evo_level_rain 2021-12-14 13:56:25 -05:00
GriffinR
df371fdda5
Merge pull request #1572 from LOuroboros/patch-2 
Update trade.c
 2021-12-14 12:54:09 -05:00
LOuroboros
660a3df929
Update trade.c 2021-12-14 14:47:04 -03:00
TheXaman
cbd6553c43 changed L/R Button position to account for numbered animations 2021-12-14 10:15:13 +01:00
TheXaman
7a669565cc fixed the back button, didnt work as intended 2021-12-14 10:04:57 +01:00
TheXaman
9ce83b559e if elevation is changed to != 0 the shadow is shown 2021-12-14 10:01:04 +01:00
TheXaman
c4fea6a189 fixed Groudon terrain (dont forget your breaks...) 2021-12-14 09:46:26 +01:00
TheXaman
e23d49d802
Merge pull request #10 from AsparagusEduardo/PR_PEDebug 
Fixed form wrapping to the left in PE debug
 2021-12-14 09:44:26 +01:00
Eduardo Quezada D'Ottone
7738d67314 Slight documentation 2021-12-13 23:52:16 -03:00
Eduardo Quezada D'Ottone
037370fe19 Showing animation number 2021-12-13 23:33:25 -03:00
Eduardo Quezada D'Ottone
5d7ac2171f Animations reload when switching Forms 2021-12-13 22:57:39 -03:00
Eduardo Quezada D'Ottone
e95020c59a Fixed form wrapping to the left. 2021-12-13 22:01:31 -03:00
TheXaman
fe95e88938 added option to view changes for front/back sprite picCoords and elevation live 2021-12-13 22:31:37 +01:00
TheXaman
f1f4082f62 added footprints 2021-12-13 19:24:19 +01:00
TheXaman
a334f7f5e0 changed all missed ones to #if P_ENABLE_DEBUG == TRUE @LOuroboros 2021-12-13 18:58:13 +01:00
TheXaman
d113d5efd9
Update include/battle_bg.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-13 18:56:50 +01:00
LOuroboros
46977b52fa Added the footprints of all Gen. 7 and 8 species 2021-12-13 13:39:12 -03:00
TheXaman
d300b8f56c fixed front sprite shadow palette 2021-12-13 15:37:06 +01:00
TheXaman
e33abe6213 fixed castform elevation calculation 2021-12-13 15:13:51 +01:00
TheXaman
123969f093 fixed front sprite position including elevation and shadow for flying mon's (shadow palette too dark atm) 2021-12-13 15:05:17 +01:00
Eduardo Quezada D'Ottone
abe9910251 Fixed speed to be more like vanilla's 2021-12-12 12:42:14 -03:00