ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 05:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,807 Commits 1 Branch 0 Tags 235 MiB
643cc62f73
Commit Graph

6807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SnorlaxMonster
43c5107e4d Correct card lines in Battle Dome comments 
The comments regarding the lines that Trainer information is displayed
on the Battle Dome Trainer Card were off-by-one.
 2021-07-03 22:41:18 +10:00
GriffinR
d2701b51ab Combine battle script labels, add EFFECT comments 2021-07-02 15:37:59 -04:00
GriffinR
2946342a6b
Merge pull request #1476 from luckytyphlosion/master 
Fix modern builds when devkitARM is not in PATH.
 2021-07-02 15:07:27 -04:00
luckytyphlosion
b3d66f5528 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-07-02 12:53:12 -04:00
luckytyphlosion
9fd27fe855 Fix modern builds when devkitARM is not in PATH. 2021-07-02 12:52:31 -04:00
GriffinR
c42b5d783a Fix 'determining' typo 2021-07-02 03:26:50 -04:00
GriffinR
64d06f4c8f Condense battle AI scripts, minor clean up 2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
d73b3c05c6 Label remaining hall_of_fame symbols 2021-07-02 01:02:28 -04:00
GriffinR
fe89a4d147 Label remaining region_map symbols 2021-07-02 00:52:36 -04:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
GriffinR
3964820a84
Merge pull request #1473 from GriffinRichards/fix-div0 
Fix divide by 0 in Cmd_getexp
 2021-07-01 14:26:34 -04:00
GriffinR
93188ef0a8 Fix divide by 0 in Cmd_getexp 2021-07-01 00:18:52 -04:00
GriffinR
63b93c4611
Merge pull request #1472 from garakmon/hi 
fix encounter slot logic to accomodate changes
 2021-06-27 21:22:53 -04:00
garakmon
d391c136d8 fix encounter slot logic to accomodate changes 2021-06-27 21:14:21 -04: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
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
Kurausukun
10c80230c4 change printItemFunc to use u32 instead of s32 
also change a use of -2 to LIST_CANCEL
 2021-06-18 00:15:45 -04:00
Kurausukun
8b59909ac5 remove gflib 2021-06-17 22:09:48 -04:00
GriffinR
780da6bfd0
Merge pull request #1466 from Sewef/patch-1 
Fix sATypeMove_Table definition
 2021-06-17 14:29:28 -04: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
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
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