Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-11 22:45:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,194 Commits 2 Branches 0 Tags 366 MiB
1f7eb7ea01
Commit Graph

3194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
1f7eb7ea01
Merge pull request #466 from Deokishisu/master 
Fix Magic Numbers in battle_anim_scripts.s
 2021-10-01 00:26:48 -04:00
Deokishisu
18ca5ef678 Fix Magic Numbers in battle_anim_scripts.s 
This file should still be synced properly with pokeemerald in the future, but for now the magic numbers for the sound constants have been fixed.
 2021-10-01 00:01:16 -04:00
GriffinR
fb1bca5b3e
Merge pull request #464 from colonelsalt/documentation 
Document fields in oak_speech
 2021-09-26 22:46:10 -04:00
GriffinR
b0698e27f9
Merge pull request #465 from SatoMew/master 
Add fix to disallow negative current HP values
 2021-09-14 13:27:28 -04:00
SatoMew
e13a99717b Add fix to disallow negative current HP values 2021-09-13 21:51:56 +01:00
colonelsalt
d3e0bb6bba Removed #define access for data array in Oak speech subtasks take 3 2021-09-02 12:29:53 +01:00
colonelsalt
ba1a9e36f8 Removed #define access for data array in Oak speech subtasks take 2 2021-09-02 12:25:49 +01:00
colonelsalt
c8c5a06a43 Removed #define access for data array in Oak speech subtasks 2021-09-02 12:16:40 +01:00
colonelsalt
54377a43f5 Changed enum name for Oak speech trainer pics 2021-09-02 11:17:38 +01:00
colonelsalt
7ba40824f5 Documented some fields in oak_speech.c 2021-09-02 11:12:38 +01:00
PikalaxALT
6de0d61daf
Merge pull request #463 from PikalaxALT/fix_mid2agb_call 
Fix default mid2agb Makefile rule
 2021-09-01 17:19:20 -04:00
PikalaxALT
69aac07cc1 Fix default mid2agb Makefile rule 2021-09-01 17:11:58 -04:00
GriffinR
39c623c8cd
Merge pull request #461 from Kurausukun/oops 
oops
 2021-08-21 07:49:17 -04:00
Kurausukun
bb84e66e82 oops 2021-08-20 22:32:38 -04:00
GriffinR
9ad143bf24
Merge pull request #460 from Sewef/master 
Use SHINY_ODDS where necessary
 2021-08-19 13:37:01 -04:00
Sewef
c7473dac0b Use SHINY_ODDS where necessary 2021-08-19 19:24:11 +02:00
PikalaxALT
f77e1a9901
Merge pull request #457 from Kurausukun/cgbsound 
Port CgbSound Documentation and Fakematch Fixes
 2021-08-11 19:55:16 -04:00
PikalaxALT
65d5dab679
Merge pull request #459 from GriffinRichards/fix-symbols 
Fix symbols branch commit messages
 2021-08-11 19:43:23 -04:00
GriffinR
dbdd0d40f3 Fix symbols branch commit messages 2021-08-11 19:27:12 -04:00
GriffinR
073f315fc3
Merge pull request #458 from Squeetz/master 
Rename and document HITMARKER_x100000
 2021-08-11 12:21:26 -04:00
Squeetz
d4695fffe7 Rename and document HITMARKER_x100000 
This marker makes the target unable to Counter or Mirror Coat the damage back to an attacker, however the game does not have a scenario where this is applicable since all its uses are in end-turn events. It's used for all passive damage, where the damage dealt isn't coming from an attacker.
Alternate name: HITMARKER_NO_ATTACKER
 2021-08-11 15:45:30 +02:00
Kurausukun
2a244c57dc unsigned int -> u32 2021-08-08 22:23:54 -04:00
Kurausukun
dbc41d1d14 port cgbsound documentation and fakematch fixes 2021-08-08 20:44:52 -04:00
GriffinR
feb5428937
Merge pull request #456 from SethBarberee/one_func_name 
[New Game] Name single func
 2021-08-01 12:15:35 -04:00
Seth Barberee
c370eddd92 name single func 2021-08-01 09:02:55 -07:00
GriffinR
1150e16b68
Merge pull request #450 from PikalaxALT/flatten_sprite_pos 
Flatten pos fields in struct Sprite
 2021-07-25 12:51:51 -04:00
PikalaxALT
cd8ac0ed9b
Merge pull request #454 from PikalaxALT/misc_fixes 
Swap two fields in player PC struct
 2021-07-18 08:14:14 -04:00
PikalaxALT
864d371c25 Swap two fields in player PC struct 2021-07-17 20:33:31 -04:00
PikalaxALT
00c0cb05b0
Merge pull request #453 from PikalaxALT/fix_symbols_commit_msg 
Use merge commit message for symbols branch
 2021-07-16 12:58:58 -04:00
PikalaxALT
d3ef86dd2b Use merge commit message for symbols branch 2021-07-16 12:20:35 -04:00
GriffinR
ea889b65ae
Merge pull request #452 from Kurausukun/protectfix 
Port Protect Animation Fix from Emerald
 2021-07-13 00:42:44 -04:00
Kurausukun
d7f5e8d8f2 port UB fix from emerald 2021-07-12 23:57:38 -04:00
PikalaxALT
f1e345d279
Merge pull request #451 from GriffinRichards/fix-symsname 
Use PR title for symbols branch commits
 2021-07-08 11:35:05 -04:00
GriffinR
9648aad176 Use PR title for symbols branch commits 2021-07-08 11:25:58 -04:00
PikalaxALT
aec808ac0d Flatten pos fields in struct Sprite 2021-07-07 09:05:48 -04:00
GriffinR
1a43cdc81f
Merge pull request #449 from Kurausukun/align 
Remove Unnecessary .aligns
 2021-07-03 21:55:36 -04:00
Kurausukun
41ff1d7672 remove unnecessary .aligns 2021-07-03 20:19:26 -04:00
GriffinR
585d92f298
Merge pull request #445 from Kurausukun/ubfix 
Port UBFIX Macro and Some Usages from Emerald
 2021-07-03 17:25:05 -04:00
Kurausukun
ff94d49a45 add SAFE_DIV macro and usages 2021-07-03 17:18:41 -04:00
GriffinR
558097f423
Merge pull request #441 from Kurausukun/cast_test 
Change itemPrintFunc to Use u32 Instead of s32
 2021-07-03 17:14:06 -04:00
Kurausukun
ee0f35b866 Merge branch 'master' of https://github.com/pret/pokefirered into ubfix 2021-07-03 17:02:32 -04:00
Kurausukun
4a8bc916b1 remove redundant variable 2021-07-03 17:00:04 -04:00
Kurausukun
85beaf7f82 Merge branch 'master' of https://github.com/pret/pokefirered into cast_test 2021-07-03 16:57:44 -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