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

6654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ariel Antonitis
ba2d394109 Merge branch 'romhack' into lighting 2021-06-15 18:28:35 -04:00
Ariel Antonitis
9a6f6212b2 Fixed bug where selling items freed sprite palettes too early. 2021-06-15 18:27:58 -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
Ariel Antonitis
87608392fc Merge branch 'romhack' into lighting 2021-06-12 00:37:06 -04:00
Ariel Antonitis
3568c2a882 Fixed bug with followers and cross-map scripting events. 2021-06-12 00:35:15 -04: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
Ariel Antonitis
385c94d068 Merge branch 'romhack' into lighting 2021-06-08 17:58:29 -04:00
Ariel Antonitis
e4b9bb75e2 Merge branch 'master' into romhack 2021-06-04 23:36:21 -04:00
Ariel Antonitis
37f0684d98 Unown followers now appear as the right letter. 2021-06-04 23:35:10 -04:00
Ariel Antonitis
c267dd6ee6 Added function to check for newer emulators/hardware. 2021-06-04 23:35:04 -04:00
Ariel Antonitis
e9d01b4808 Added a non-RNG, PID-preserving way to modify pokemon nature. 
(wip) Preserve shiny value when changing nature.

(WIP) Preserve shiny value.

(WIP) Preserve nature.

(WIP) Removed some debugging statements.

(WIP) Removed more debugging statements.

(WIP) Nature changing now supports Unown.
 2021-06-04 22:49:20 -04: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
luckytyphlosion
c5b262159d Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-27 16:36:47 -04:00
luckytyphlosion
8b45c8e48a
Fix github links to pret's. 2021-05-27 16:20:13 -04:00
gAlfonso-bit
c9c5586068
Fixed ChangeBgY_ScreenOff‘s signature. (#1447) 
* Fix Functions

* Fix ChangeBgY_ScreenOff signature

* Remove unneeded changes

* Fix argument mismatch

Just to get this out of the way

* Not needed

* Update palette.c
 2021-05-27 07:32:09 -05:00
GriffinR
2b062e89c1
Merge pull request #1448 from Kurausukun/dumb 
[LEAK-INFORMED] Fix Fakematch in DrawWallpaper
 2021-05-25 04:41:15 -04:00
Kurausukun
5d5327c0b7 better match 2021-05-25 04:32:47 -04:00
Kurausukun
5ae5cf110d [LEAK-INFORMED] fix fakematch in DrawWallpaper 2021-05-25 04:03:11 -04:00
Kurausukun
94939e395b one last goto 2021-05-24 13:31:54 -05:00
gAlfonso-bit
aca96a1510 Mark 0xFFF8 as ~7 
Since 7 is used as a mask, I wondered if 0xFFF8 was used to undo the mask and it turns out it was.
 2021-05-24 07:36:08 -05:00
gAlfonso-bit
ff16812f99
UBFix: uninitialized variables in m4a engine and siirtc.c (#1432) 2021-05-23 09:56:37 -05:00
luckytyphlosion
c723d980e7 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
gAlfonso-bit
ffbbc88801
BUGFIX: battle scripts (#1436) 2021-05-23 09:35:03 -05:00
gAlfonso-bit
a454f9c187
UBFIX: sprite.c (#1442) 
Fix out-of-bounds array access in `SortSprites()`.

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
 2021-05-23 09:10:55 -05:00
GriffinR
ef6d91b0e3
Merge pull request #1443 from ExpoSeed/document-playbgm 
Document second parameter of playbgm
 2021-05-21 17:07:07 -04:00
ExpoSeed
6a977bdbfc Document second parameter of playbgm 2021-05-21 15:08:00 -05:00
GriffinR
58d83bf9a7
Merge pull request #1440 from GriffinRichards/remove-berry 
Remove leftover berry descriptions
 2021-05-17 03:12:23 -04:00
GriffinR
c8be6a1fbb Remove leftover berry descriptions 2021-05-17 03:06:02 -04:00
GriffinR
9358ab33a5
Merge pull request #1439 from AsparagusEduardo/MissingTreeckoAnim 
Added missing Treecko from animation list.
 2021-05-16 20:58:13 -04:00
Eduardo Quezada D'Ottone
76b99e66dc Added missing Treecko from animation list. 2021-05-16 20:46:58 -04:00
GriffinR
9e690c07ed
Merge pull request #1437 from ExpoSeed/bugfixes 
Various BUGFIXes and UBFIXes
 2021-05-16 12:24:04 -04:00