Commit Graph

6466 Commits

Author SHA1 Message Date
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
ExpoSeed a7e3da2301 pyramidWinStreas 2021-05-15 15:59:54 -05:00
ExpoSeed 361fa594b3 Various BUGFIXes and UBFIXes 2021-05-15 15:56:17 -05:00
gAlfonso-bit ab8318cc79 Fix UB: Destoyed task is modified.
After destruction, task is no longer used, so updating its values is worthless.
2021-05-15 14:35:32 -05:00
GriffinR f62b42eb59 Merge pull request #1386 from SatoMew/master
Remove Travis badge
2021-05-13 14:54:47 -04:00
SatoMew 7061e66212 Undo secondary changes 2021-05-13 19:49:15 +01:00
Kurausukun 3a403dc520 [LEAK-INFORMED] fix do {} while (0) in apprentice 2021-05-13 11:29:46 -05:00
Kurausukun e737f1f924 fix main_menu goto 2021-05-13 11:29:11 -05:00
Kurausukun 2cc38acb84 fix item.c gotos 2021-05-13 11:29:11 -05:00
Kurausukun 3b7f708eb0 fix player_pc goto 2021-05-13 11:29:11 -05:00
Kurausukun 0c7773ad75 fix mystery_gift gotos 2021-05-13 11:29:11 -05:00
Kurausukun f0453871a2 fix battle_dome goto 2021-05-13 11:29:11 -05:00
Kurausukun dbc1b9aacf fix goto in bike.c 2021-05-13 11:29:11 -05:00
Kurausukun 7740ca1303 replace raw values with char constants 2021-05-13 11:26:15 -05:00
Kurausukun fa23b196a9 [LEAK-INFORMED] fix battle_interface fakematch 2021-05-13 11:26:15 -05:00
Kurausukun dfd87e09f9 [LEAK-INFORMED] fix text.c "eff" fakematch 2021-05-13 11:26:15 -05:00
gAlfonso-bit 9a195c0fef Cherry-pick roamer bug fix from pokefirered
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
2021-05-13 11:23:42 -05:00
gAlfonso-bit 2be29cdb77 Update IsPokemonCryPlaying 2021-05-13 11:23:11 -05:00
gAlfonso-bit 3e15a3ef8f Update IsPokemonCryPlaying 2021-05-13 11:23:11 -05:00
gAlfonso-bit 7d3f25dfb0 Change IsPokemonCryPlaying to bool32
Better reflects its usage
2021-05-13 11:23:11 -05:00