ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,313 Commits 1 Branch 0 Tags 235 MiB
3298312faf
Commit Graph

164 Commits

Author SHA1 Message Date
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05: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
TheXaman
2f8896f2f0 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2021-11-18 15:13:04 +01:00
GriffinR
929aade0fd Fix braille slash 2021-11-02 18:34:05 -04:00
GriffinR
13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04: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
luckytyphlosion
7189e4e26f Fix build on macos. 
Needs <cerrno> include in tools/preproc/c_file.cpp
 2021-06-03 21:05:56 -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
c723d980e7 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
GriffinR
65fd334256 Name map groups 2021-05-11 10:16:04 -05:00
luckytyphlosion
10c0566121 Don't keep temporary C build files by default. 2021-01-19 11:43:50 -05:00
luckytyphlosion
44bd156f26 Actually test out that it builds. 2021-01-05 20:10:43 -05:00
luckytyphlosion
a5f75b4949 Fix issue with diffs being incorrect with extreme values. 2021-01-05 19:53:41 -05:00
luckytyphlosion
8855623ad0 Fix choice of delta sign. 
Ensure that the delta goes in the correct direction (i.e. use positive delta for prev <= sample, and negative delta for prev > sample)
 2021-01-05 13:56:26 -05:00
luckytyphlosion
fb396395e9 Fix bug in pcm delta compression. 
error wasn't being correctly calculated for when new_sample was negative and sample was positive.
 2021-01-05 11:34:38 -05:00
GriffinR
ef60edd933 Remove deadnaming, sync BgEvent 2020-12-31 14:27:46 -05:00
luckytyphlosion
3d686116d8 [Round 3] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 21:24:44 -05:00
luckytyphlosion
5a5acfb0ad [Round 3] Revert multiple source change commits for re-commit. 2020-12-16 21:24:08 -05:00
luckytyphlosion
166183d5ed [Round 2] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 20:31:56 -05:00
luckytyphlosion
345aab63cf [Round 2] Revert multiple source change commits for re-commit. 2020-12-16 20:31:10 -05:00
luckytyphlosion
936ba7f1bf Apply all source related changes for the new INSTALL.md in one commit. 
For people who want to have dkPless builds in their repo.
 2020-12-16 15:10:01 -05:00
luckytyphlosion
cc5db41f30 Revert multiple source change commits for rebase. 2020-12-16 13:29:02 -05:00
luckytyphlosion
976b967732 Add msys2 and Cygwin instructions, also add .exe extension to built tools. 
Todo: actually extensively test out msys2 and Cygwin, and double check the readme.
 2020-11-26 20:21:16 -05:00
luckytyphlosion
5029c90979 Missing inc files in asm/*.s and data/*.s will raise an actual error message. 2020-11-12 11:04:38 -05:00
TheXaman
6456009a44 Implementation if Pyredrid and AsparagusEduardo debug menu plus huge rewrite and tons of additions 
V2: Fly, Warp, Flags, Vars, give items, give pkm 2 versions

Improved cheats, reworked the vars system

vars function now starts at VARS_START and end VARS_END

Figured out how to display FieldMessages, reimplemented CheckSafeBlock, cleanup

DebugAction_DestroyExtraWindow instead of multiple, renamed text variables

cleanup + pokemon simple

give pokemon complex nearly done

Complex pkm works, items now with icons

if statement cleanup

alter build tools to include maps per map group

Warp functionallity

added hex value to flags and vars

cleanup

Credits
 2020-10-20 20:37:02 +02:00
GriffinR
c6b27013cc
Merge pull request #1112 from GriffinRichards/add-genwarn 
Add warnings to generated map/layout files
 2020-07-28 17:47:55 -04:00
PokeCodec
fb6f859edd semicolon 2020-07-27 19:17:34 -04:00
GriffinR
2439f42de4 Add warnings to generated files 2020-07-24 03:43:37 -04:00
GriffinR
a35ab0d023 Fix segfault in gbagfx 2020-06-29 15:28:59 -04:00
PikalaxALT
e0ae696479
Merge pull request #1027 from PikalaxALT/gbagfx_tilemap 
Add tilemap rendering capability to gbagfx
 2020-05-29 16:49:46 -04:00
Kurausukun
65fb2e9957
Fix compilation on gcc 10 (for real this time) 2020-05-18 23:42:42 -04:00
Kurausukun
72c8574780
Fix compilation on gcc 10 2020-05-18 01:41:54 -04:00
GriffinR
b057411eea Fix -Wmissing-braces clang warning 2020-04-29 16:39:14 -04:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
PikalaxALT
a4509d06ef Fix an issue with uninitialized tilemap ptr 2020-04-25 16:54:27 -04:00
PikalaxALT
14f76fbe03 Add tilemap rendering capability to gbagfx 2020-04-24 08:47:22 -04:00
Sierraffinity
b2d8c6793d gbagfx: Check for nullptr for new output path 2020-04-22 16:53:11 -07:00
Sierraffinity
21e9ed6615 gbagfx: Various fixes and improvements 
Fix num_colors exceeding amount of colors in palette leading to use of uninitialized colors

Handle png -> pal conversion (aka extracting JASC palettes from png

Allow using only file extension as output to reuse entire path from input before extension
 2020-04-22 14:39:20 -07:00
Diegoisawesome
f84ac6d633 Make aif2pcm looping not dependent on order of MARK and INST chunks 2020-02-19 08:51:01 -08:00
Diegoisawesome
4dd4c4d077 Allow INST chunk loops without MARK chunk 2020-02-18 22:32:27 -08:00
Diegoisawesome
059e5467f7 Add safety check 2020-02-18 22:11:04 -08:00
Diegoisawesome
57af90158d Follow defined AIFF loop standard 2020-02-18 22:08:38 -08:00
Diegoisawesome
437cb7c452 Fix aif2pcm Pascal string bug, allow flexibility in marker names for loop 2020-02-18 20:59:08 -08:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
garak
4a79081197 replace inja license text 2019-10-14 18:12:03 -05:00
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
garak
74477471a6 update inja 2019-10-14 18:12:03 -05:00
GriffinR
2884f4ee4a Fix extraneous parentheses warning 2019-09-16 19:22:07 -05:00
PikalaxALT
36723a235a
Merge pull request #735 from garakmon/encounter_json 
Add Different Field Info to Wild Encounters JSON
 2019-09-04 16:50:39 -04:00
PikalaxALT
1f4c88c952
Copy Berry Fix MB dism from FR (#777) 
* Copy Berry Fix MB dism from FR
 2019-09-03 15:33:11 -04:00
Marcus Huderle
1a2b430646 Update scaninc to include missing .include files in assembler files 2019-08-29 16:37:42 -05:00
garak
b420b98d63 allow CRLF line endings in asm files for preproc 2019-08-29 16:37:32 -05:00
aaaaaa123456789
e28cf5406b Fix Makefiles to account for the $CC and $CXX environment variables 2019-08-06 20:30:57 -03:00
PikalaxALT
6ff1426abe Quieter "make tools" 2019-07-23 16:17:00 -04:00
garak
4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
garak
adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -04:00
PikalaxALT
8b73ba61ee Misc. changes 
use the TOOLCHAIN variable instead of overriding DEVKITARM
remove redunant DEBUG variable, substitute DINFO
 2019-06-29 18:32:49 -04:00
PikalaxALT
f9d8678db4 Additional fixes 
Rearrange gbafix to not modify file in the event of failure
Fix bug where Dma3Manager may get stuck when compiled with gcc-9.1.0
 2019-06-29 11:41:26 -04:00
PikalaxALT
fb06e4a3c9 Modernize code 
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
 2019-06-26 12:12:10 -04:00
Marcus Huderle
483648e372 Create jsonproc tool 
Add custom function hooks to jsonproc

Add jsonproc to build_tools.sh

Newer g++
 2019-05-08 17:06:39 -05:00
Phlosioneer
fe1c14db76 Fix warning for extra parens (#646) 
* Fix warning for extra parens

* Committed too many files
 2019-04-01 19:27:55 -05:00
Marcus Huderle
bd157b301d Scaninc: Don't insert missing headers into dependencies 2019-03-07 09:46:14 -06:00
Phlosioneer
6638ebe7fd Fix copyright mixup 2019-03-07 08:46:55 -06:00
Phlosioneer
b0c634d531 Support absolute paths 2019-03-07 08:46:55 -06:00
Phlosioneer
105e1721d6 Overhaul scaninc to work recursively 
This also fixes the bug where scaninc would ignore #include lines
in assembly files.
 2019-03-07 08:46:55 -06:00
Marcus Huderle
19b76bffda Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:41 -06:00
garak
0b1bb9e4e9 use strings for map json coord_event var_value 2019-02-16 16:14:43 -06:00
Diegoisawesome
05d02e804e Fix C comment consumption logic 2019-02-13 21:55:39 -06:00
Marcus Huderle
d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
garak
82abc164dc convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
garak
da1b5365a7 label a flag in the asm 2018-10-17 08:55:09 -04:00
Diegoisawesome
c13d2b567c mid2agb fix: compare whole note details before compression 2018-10-02 12:07:37 -05:00
Kermalis
dc53e35a60 Fix mid2agb argument parsing 2018-09-29 21:18:30 -04:00
Diegoisawesome
6a82bbe973 Fix the fix that was buggy 2018-09-29 14:46:59 -05:00
Diegoisawesome
f143e184a8 Fix compression score code bug reintroduction 2018-09-25 23:09:42 -05:00
Diegoisawesome
7522d2e16a Partial implementation of MEMACC command 2018-09-25 15:07:14 -05:00
Diegoisawesome
d86b290419 Change initial state of lastNote 2018-09-25 11:43:46 -05:00
Diegoisawesome
7f38a03093 mid2agb compression algorithm less buggy than originally thought 2018-09-25 11:41:18 -05:00
Diegoisawesome
af4ff89e55 Comment out unused variable so GCC doesn't complain 2018-09-25 01:32:24 -05:00
Diegoisawesome
48b65eecee Match compression behavior, for real 2018-09-25 01:26:09 -05:00
Diegoisawesome
98e1c1994b Completely blind guess to fix compression score 2018-09-24 02:00:09 -05:00
Diegoisawesome
ef95a13288 Fix compression score lower limit 2018-09-23 23:37:47 -05:00
Diegoisawesome
e0acb92a3f mid2agb: allow -L param to take string 2018-09-23 00:40:37 -05:00
Diegoisawesome
f613176308 Fix order of initial vol command 2018-09-22 13:54:00 -05:00
Diegoisawesome
3028fdc353 Update mid2agb source 
Credit to @camthesaxman
 2018-09-15 15:49:31 -05:00
Diegoisawesome
e8be47abb8 Add running status to mid2agb 2018-09-14 22:35:04 -05:00
Diegoisawesome
8026188e36 Make long param use two dashes 2018-09-10 13:15:53 -05:00
Diegoisawesome
aa0782c40b Make gbafix silent 2018-09-10 12:13:07 -05:00
Diegoisawesome
12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome
f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
Diegoisawesome
ef62393289
Merge pull request #316 from huderlem/gbagfx-metatiles 
Add ability to specify metatile dimensions to gbagfx
 2018-09-06 12:56:04 -05:00
Marcus Huderle
78cdd97c8b Add ability to specify metatile dimensions to gbagfx 2018-09-06 11:44:50 -05:00
Diegoisawesome
e0a83e3d72 Update scaninc and preproc with multi-file incbins 2018-09-06 03:45:50 -05:00
Diegoisawesome
064216d3be Add gbafix from devkitPro/gba-tools 2018-08-29 23:39:03 -05:00