Commit Graph

3152 Commits

Author SHA1 Message Date
Kurausukun ff94d49a45 add SAFE_DIV macro and usages 2021-07-03 17:18:41 -04:00
Kurausukun ee0f35b866 Merge branch 'master' of https://github.com/pret/pokefirered into ubfix 2021-07-03 17:02:32 -04:00
GriffinR bbf39b8560 Merge pull request #442 from GriffinRichards/fix-offsets
Remove hardcoded offsets in battle scripts
2021-07-03 11:15:38 -04:00
GriffinR 552060c900 Merge pull request #448 from SnorlaxMonster/terrain
Using macro for plain terrain instead of hardcoded numbers
2021-07-03 09:38:56 -04:00
GriffinR 3927917784 Merge pull request #447 from Deokishisu/patch-2
Fix Magic Number in party_menu.c
2021-07-01 07:28:57 -04:00
Deokishisu dd3d464b6a Fix Magic Number in party_menu.c
`DisplayPartyPokemonDataForMoveTutorOrEvolutionItem` in `party_menu.c` had a magic number that was missed. This commit fixes it.
2021-07-01 03:11:05 -04:00
GriffinR b564c1e58c Merge pull request #446 from garakmon/hey
fix encounter slot logic to accomodate changes
2021-06-27 21:41:20 -04:00
garakmon 335e3bab09 fix encounter slot logic to accomodate changes 2021-06-27 21:32:18 -04:00
luckytyphlosion b9363bf366 Merge pull request #444 from Kurausukun/fix_alloc
Fix Dumb Alloc/AllocZeroed Issue
2021-06-26 22:53:52 -04:00
Kurausukun cf64f77349 make flash source volatile (ported from emerald) 2021-06-26 22:53:49 -04:00
Kurausukun 88bd618496 port UBFIXes from emerald 2021-06-26 22:51:41 -04:00
Kurausukun 23bc333bc7 fix alloc and alloczeroed 2021-06-26 22:42:11 -04:00
PikalaxALT 8116790c08 Merge pull request #443 from LOuroboros/patch-1
Informative note about PewterCity_Gym_Text_BrockDefeat
2021-06-26 08:49:26 -04:00
LOuroboros 92dccca2ee Informative note about gUnknown_2022AE8 2021-06-26 08:59:12 -03:00
LOuroboros cdfaa6a3ac Informative note about PewterCity_Gym_Text_BrockDefeat 2021-06-26 04:10:05 -03:00
GriffinR 5bf794f051 Remove hardcoded offsets in battle scripts 2021-06-21 16:02:13 -04:00
SnorlaxMonster 337caefaa9 Use plain terrain macro where appropriate 2021-06-21 21:56:01 +10:00
PikalaxALT 4c26116d1a Merge pull request #440 from PikalaxALT/push_symbols
Symplifi symfiles
2021-06-18 13:03:42 -04:00
PikalaxALT 3116ec6375 Fix regex error 2021-06-18 12:53:27 -04:00
PikalaxALT f6b0bd9368 Symplifi symfiles 2021-06-16 14:44:52 -04:00
PikalaxALT b15cc8eead Merge pull request #439 from PikalaxALT/push_symbols
Create symfiles on build
2021-06-16 10:49:41 -04:00
PikalaxALT 7993823ca5 Fix yml step names 2021-06-15 16:18:13 -04:00
PikalaxALT cc52b97294 Force tools to build in GH Actions 2021-06-15 16:14:06 -04:00
PikalaxALT 784e7a1502 Symfile no longer part of all target 2021-06-15 15:13:16 -04:00
PikalaxALT 250b53f85c Create symfiles on build 2021-06-15 10:27:16 -04:00
PikalaxALT 5acfde358a Merge pull request #421 from PikalaxALT/modern_ld
Full support for modern ARM toolchains
2021-06-06 21:17:01 -04:00
PikalaxALT 75ab879fd8 Merge remote-tracking branch 'origin/master' into modern_ld 2021-06-04 09:10:09 -04:00
GriffinR 2d3210dc11 Merge pull request #438 from PikalaxALT/doc_tileset_anims
Doc tileset anims
2021-06-03 16:35:03 -04:00
PikalaxALT f6c10b27e4 Merge remote-tracking branch 'origin/master' into doc_tileset_anims 2021-06-03 15:40:14 -04:00
PikalaxALT 14954c5463 Reorganize tileset graphics files 2021-06-03 15:00:52 -04:00
GriffinR 83cdfb52f7 Merge pull request #437 from Deokishisu/linkplayer-sync
Sync LinkPlayer Struct with pokeemerald
2021-06-03 14:40:55 -04:00
PikalaxALT 6e26b49589 Correct palettes on tileset anims 2021-06-03 13:53:16 -04:00
PikalaxALT 88e3ff0e39 Revert BG_CHAR_ADDR replacements in tileset_anims.c 2021-06-03 12:49:25 -04:00
Deokishisu 8e4320cc21 Sync LinkPlayer Struct with pokeemerald
In pokefirered, the `LinkPlayer` struct used an 11-byte name field and puts extra link-related info in the last three bytes. pokeemerald separates these last three bytes into their own fields. This commit replicates how pokeemerald handles those fields.

Also renamed `IntlConvertLinkPlayerName` to pokeemerald's `ConvertLinkPlayerName` because I was there and noticed it.
2021-06-03 12:45:59 -04:00
PikalaxALT ffb21d41b5 Tileset anims to PNG 2021-06-03 12:43:17 -04:00
PikalaxALT 0d3661f364 Rename funcs and data in tileset_anims.c 2021-06-03 12:32:14 -04:00
GriffinR 753b19d0ea Merge pull request #435 from Kurausukun/dumb
[LEAK-INFORMED] Fix CreateShedinja Fakematch
2021-06-02 16:38:03 -04:00
GriffinR 89ce873a73 Merge pull request #436 from PikalaxALT/sync_link_rfu
Sync link rfu from Emerald
2021-06-02 16:33:18 -04:00
PikalaxALT b3dfc556b1 Minor aesthetic tweaks RE review 2021-06-02 13:18:59 -04:00
Kurausukun c9ef0d1b7a re-add const to gEvolutionTable in daycare.c 2021-06-01 17:16:24 -04:00
PikalaxALT c7e8b0857a Sync link_rfu_3.c from Emerald 2021-06-01 16:27:38 -04:00
PikalaxALT 6580ac8739 Sync link_rfu_2 symbols from Emerald 2021-06-01 15:55:14 -04:00
Kurausukun e80a68327b [LEAK-INFORMED] fix CreateShedinja fakematch 2021-05-31 01:20:36 -04:00
PikalaxALT 5d9e161ae1 Port link_rfu_2 fakematch fix from Emerald 2021-05-28 16:04:10 -04:00
GriffinR c396aaa804 Merge pull request #431 from PikalaxALT/sync_bery_crush
Sync berry crush from Emerald
2021-05-27 06:46:29 -04:00
PikalaxALT 1a9ba7bb0a Revert typedefs in math_util 2021-05-26 09:59:32 -04:00
PikalaxALT 5c965f5357 Rename fixed point math routines again 2021-05-24 14:59:35 -04:00
PikalaxALT e82080d42b Merge remote-tracking branch 'origin/master' into modern_ld 2021-05-13 14:26:34 -04:00
PikalaxALT 23c07589f5 Merge remote-tracking branch 'origin/master' into sync_bery_crush 2021-05-13 14:25:52 -04:00
PikalaxALT 3dce3407d5 Merge pull request #427 from GriffinRichards/name-mapgroups
Name map groups
2021-05-13 14:24:11 -04:00