atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6456 commits 2 branches 40 tags 600 MiB
Commit graph

6456 commits

This branch
This branch
All branches
Author SHA1 Message Date
ghoulslash
b903d02c06 handle battle engine hidden ability change 2021-08-07 12:38:10 -04:00
ghoulslash
1898a1c2e5 add shiny charm check to handle FLAG_SHINY_CREATION 2021-08-07 12:29:40 -04:00
ghoulslash
53e6ba1c48 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-06-27 07:43:02 -06:00
ghoulslash
fbdbc33f37 fix dexnav headerId overflow issue 2021-06-27 07:42:55 -06:00
GriffinR
827c274979
Merge pull request #1470 from GriffinRichards/constants-ftrainerfemale 
Add missing use of F_TRAINER_FEMALE
 2021-06-25 12:40:22 -04:00
GriffinR
6d92b466e7 Add missing use of F_TRAINER_FEMALE 2021-06-25 11:50:09 -04:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts 
Clarify contest heart tiles
 2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
GriffinR
7582a6b12e
Merge pull request #1468 from ultima-soul/patch-1 
Replace Hardcoded Number in MakeCaptureStars
 2021-06-18 22:38:01 -04:00
ultima-soul
9407a1ac76
Replace hardcoded number in MakeCaptureStars. 2021-06-18 19:20:05 -07:00
ghoulslash
5da18d9263 add TryFindHiddenPokemon back in 2021-06-18 13:03:01 -06:00
PikalaxALT
182df7c101
Merge pull request #1465 from PikalaxALT/push_symbols 
Port symfile implementation from Ruby, FireRed
 2021-06-18 13:03:54 -04:00
PikalaxALT
6ca73737cf Fix regex error 2021-06-18 12:53:15 -04:00
ghoulslash
7862a7d1a2
Merge pull request #13 from Jaizu/patch-17 
Msgbox fixes
 2021-06-17 15:48:33 -06:00
ghoulslash
5d63d27124 add hidden encounters to wild_encounters json 2021-06-17 15:34:11 -06:00
Jaizu
705e79b35a
Msgbox fixes 
This makes so the msgbox doesn't move in the Y coordinate if the map popup was previously playing.
 2021-06-17 21:25:23 +02:00
GriffinR
780da6bfd0
Merge pull request #1466 from Sewef/patch-1 
Fix sATypeMove_Table definition
 2021-06-17 14:29:28 -04:00
ghoulslash
f007befe51 cleaner dexnav egg move generation 2021-06-17 11:28:25 -06:00
ghoulslash
608dd9ddc5 add shiny chaining 2021-06-17 11:15:53 -06:00
Sewef
fd55a0d015
Update src/battle_message.c 
Nothing happened.

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-06-17 14:12:06 +02:00
Sewef
d02be421bc
Fix sATypeMove_Table definition 2021-06-17 14:06:40 +02:00
PikalaxALT
ae8f6e29f8 Symplifi symfiles 2021-06-16 14:43:35 -04:00
ghoulslash
8010facac5 reset dexnav search when crossing maps 2021-06-16 10:23:24 -06:00
ghoulslash
7405c11934 add r to search 2021-06-16 09:47:53 -06:00
PikalaxALT
5ccac26f26 Port symfile implementation from Ruby, FireRed 2021-06-16 11:03:23 -04:00
GriffinR
69fb670955
Merge pull request #1464 from ExpoSeed/pret/map-header-flags 
Change map header flags to use a bitfield
 2021-06-13 18:12:40 -04:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
GriffinR
b0dfaa92be
Merge pull request #1460 from luckytyphlosion/remove-temps 
Buildsystem no longer builds temporary files for C compilation by default, and other makefile optimizations.
 2021-06-13 17:51:17 -04:00
GriffinR
f85fb3af89
Merge pull request #1463 from sphericalice/item-eventscript-labels 
Rename item script labels to fit the established name scheme
 2021-06-13 08:32:52 -04:00
SphericalIce
0a94dba4a7 Rename item script labels to fit the established name scheme 2021-06-13 13:21:23 +01:00
ghoulslash
c01ad82008 fix some text color labels, add creeping back 2021-06-11 12:44:12 -06:00
ghoulslash
5fd40d90ef add forgotten TryIncrementSpeciesSearchLevel call 2021-06-11 12:27:45 -06:00
ghoulslash
0c14ec4b78 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-06-11 12:22:15 -06:00
GriffinR
e308dc8236
Merge pull request #1462 from ExpoSeed/pret/more-gray-less-grey 
Remove remaining grey and replace with gray
 2021-06-10 13:01:55 -04:00
ExpoSeed
3ed06c2cc2 Remove remaining grey and replace with gray 2021-06-10 11:36:10 -05:00
luckytyphlosion
7a7ebe1827
Merge pull request #1461 from Fontbane/patch-1 
Rename sText_WildPkmnAppeared2 to reflect its use
 2021-06-04 22:42:24 -04:00
AJ Fontaine
2fe7184d10
Rename sText_WildPkmnAppeared2 to reflect its use 
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
 2021-06-04 22:32:33 -04:00
luckytyphlosion
7189e4e26f Fix build on macos. 
Needs <cerrno> include in tools/preproc/c_file.cpp
 2021-06-03 21:05:56 -04:00
luckytyphlosion
7e1ae9f95d Remove debug print statements in Makefile. 2021-06-03 18:22:49 -04:00
luckytyphlosion
4687847ace Fix building with KEEP_TEMPS=1, and NODEP=1. 
KEEP_TEMPS=1 not working was due to the pattern substitution in the old makefile rules for compiling C files ($*) not working with the explicit generation of dependencies. NODEP=1 not working was due to the NODEP rule for src/%.s not being updated to use preproc and cpp.
 2021-06-03 17:46:09 -04:00
GriffinR
a21ceb2e3c
Merge pull request #1457 from Kurausukun/const 
Re-add const to gEvolutionTable in daycare.c
 2021-06-02 16:28:39 -04:00
luckytyphlosion
92152e45e2 Fixes to makefile. 
Merge C_ASM_DEP and DATA_ASM_DEP, NODEP and SCAN_DEPS can be overridden, add --no-print-directory to MAKEFLAGS in make_tools.mk (also removed some unused variables), add newline to help message in preproc.
 2021-06-01 23:22:15 -04:00
luckytyphlosion
f0b41debc3 Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps 2021-06-01 20:40:27 -04:00
luckytyphlosion
a839463c84 Optimize Makefile. 
Don't do recursive makes for COMPARE and MODERN, use minimal makefile for making tools.
 2021-06-01 20:40:11 -04:00
Kurausukun
5c6b8ea8d6 re-add const to gEvolutionTable in daycare.c 2021-06-01 17:14:45 -04:00
Kurausukun
9f5bf65fb3 [PROBABLY LEAK-INFORMED] fix battle_transition fakematch, make 
consistent use of SOME_VRAM_STORE
 2021-05-31 18:12:35 -05:00
Kurausukun
2bbaf71998 [LEAK-INFORMED] fix CreateShedinja fakematch 
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
 2021-05-31 08:20:46 -05:00
Kurausukun
2705f2e5f4 [LEAK-INFORMED] also pretty dumb 2021-05-31 08:20:46 -05:00
Kurausukun
42021db743 [LEAK-INFORMED] literal dumbest fakematch ever 2021-05-31 08:20:46 -05:00
luckytyphlosion
823c862e4f
Merge pull request #1274 from luckytyphlosion/master 
Improve INSTALL.md
 2021-05-29 10:29:15 -04:00