Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-14 08:11:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,765 Commits 2 Branches 0 Tags 366 MiB
3ff2bf88c1
Commit Graph

2520 Commits

Author SHA1 Message Date
GriffinR
c4cf82f439 Sync easy chat strings 2022-09-12 18:27:34 -04:00
GriffinR
f08115d9fe
Merge pull request #553 from GriffinRichards/sync-fld-weather-eff 
Sync field weather effects
 2022-09-12 17:56:14 -04:00
GriffinR
228869156c
Merge pull request #550 from GriffinRichards/sync-urmsg 
Document union room message texts
 2022-09-12 17:10:15 -04:00
GriffinR
ffaea1265b
Merge pull request #552 from GriffinRichards/sync-keyboardtext 
Sync keyboard text
 2022-09-12 15:03:52 -04:00
GriffinR
f59fb1710f
Merge pull request #551 from GriffinRichards/sync-rouletteutil 
Sync palette util
 2022-09-12 14:55:30 -04:00
GriffinR
c9281e5a57 Add more usage of GENDER_COUNT 2022-09-12 14:54:05 -04:00
GriffinR
398417593b
Merge pull request #549 from AsparagusEduardo/pret_unused 
Removed UNUSED attribute
 2022-09-12 14:47:25 -04:00
GriffinR
0a01d8f31b
Merge pull request #545 from GriffinRichards/sync-fieldmap 
Sync fieldmap
 2022-09-12 14:31:51 -04:00
GriffinR
212e455aae Sync field weather effects 2022-09-06 15:30:34 -04:00
GriffinR
d08aa80a70 Sync palette util 2022-09-06 14:54:40 -04:00
GriffinR
fc7da1aa5e Sync keyboard text 2022-09-06 14:10:43 -04:00
GriffinR
8fd8d21980 Document global ur text 2022-09-06 01:57:40 -04:00
GriffinR
8a7f1cf1ce Sync static text in ur message 2022-09-05 23:07:27 -04:00
Eduardo Quezada
7dcac240d4 Review changes 2022-09-04 21:23:24 -03:00
Eduardo Quezada
b6bc114ef1 Review suggestions 2022-09-04 20:56:14 -03:00
Eduardo Quezada
81ef26732d Removed UNUSED attribute 2022-09-04 18:06:58 -03:00
Eduardo Quezada
9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4 
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
 2022-09-04 17:44:13 -03:00
cbt6
dbaf8f5900 Document field moves 2022-09-04 17:55:15 +08:00
GriffinR
bfd1fb2419 MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants 2022-09-03 14:59:18 -04:00
GriffinR
0400ee2124
Merge branch 'master' into clone-union 2022-09-03 14:31:04 -04:00
GriffinR
76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub 2022-09-03 14:19:50 -04:00
cbt6
3a1994f7f7 Rearrange Pokemon storage source files 2022-09-03 23:35:07 +08:00
cbt6
c0bf576445 Organize Pokemon storage graphics 2022-09-03 23:30:02 +08:00
cbt6
859ca7994e Document Pokemon storage system 2022-09-03 23:27:56 +08:00
GriffinR
d5dfd66812 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:42:26 -04:00
GriffinR
dcdf31f020 Sync fieldmap 2022-09-02 19:24:59 -04:00
GriffinR
a30ea109c1
Merge pull request #544 from GriffinRichards/fix-b-msg 
Fix battle message charmap copied from emerald
 2022-09-01 23:08:21 -04:00
GriffinR
17a8498701 Fix battle message charmap copied from emerald 2022-08-30 14:07:57 -04:00
GriffinR
7c0b46f6da
Merge pull request #541 from GriffinRichards/sync-script 
Sync script.c
 2022-08-26 23:55:31 -04:00
GriffinR
321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR
da955aaf64 Document safari reactions, move b string ids to constants 2022-08-23 11:11:50 -04:00
GriffinR
a5853a71bd Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-23 10:47:07 -04:00
GriffinR
feb3d9cbab
Merge pull request #537 from GriffinRichards/doc-bmsg 
Sync/document battle_message.c
 2022-08-23 10:45:48 -04:00
GriffinR
72f76b19b3 Sync script.c 2022-08-22 20:27:23 -04:00
Eduardo Quezada
616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
GriffinR
8a793e73a5 Sync link_rfu_2 2022-08-19 15:27:54 -04:00
GriffinR
b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
GriffinR
219a38578a Sync battle anim - script funcs 2022-08-19 10:29:25 -04:00
GriffinR
c976547c02 Clean up FRLG-specific anim scripts 2022-08-19 10:11:39 -04:00
GriffinR
17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR
a3c2108af7 Sync battle anim - flying, header cleanup 2022-08-18 14:20:25 -04:00
Eduardo Quezada
2f03c4a62c src/battle_controller_link_opponent.c 2022-08-18 14:17:56 -04:00
Eduardo Quezada
9020751fc4 triedShinyMonAnim 2022-08-18 14:17:35 -04:00
Eduardo Quezada
9205e7ad67 Uses of DISPLAY_WIDTH 2022-08-18 14:02:08 -04:00
Eduardo Quezada
27e81b2fc7 UnusedControllerStruct 2022-08-18 12:59:38 -04:00
Eduardo Quezada
26e8d57ba1 Special Trainer IDs 2022-08-18 12:58:27 -04:00
Eduardo Quezada
e37c78c73f Usage of ST_OAM_AFFINE constants 2022-08-18 12:10:09 -04:00
Eduardo Quezada
5f81a9834f GetBattlerSpriteCoord and GetBattlerSpriteCoord2 using BATTLER_COORD_* constants 2022-08-18 12:00:13 -04:00
Eduardo Quezada
57374b796b Sync src/battle_controllers.c 2022-08-18 11:32:26 -04:00
GriffinR
5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -04:00
GriffinR
ab56ac41a1
Merge branch 'master' into clone-union 2022-08-17 15:41:50 -04:00
GriffinR
c0b0e87f68 Sync battle anim - status effects 2022-08-17 15:14:30 -04:00
GriffinR
4e106d86e3 Sync battle anim - sound tasks 2022-08-17 14:44:26 -04:00
GriffinR
8601b4fff3 Sync battle anim - smokescreen 2022-08-17 14:29:23 -04:00
GriffinR
f476806547 Sync battle anim - rock 2022-08-17 14:18:30 -04:00
GriffinR
96ecc82c98 Sync battle anim - poison, psychic 2022-08-17 13:52:24 -04:00
GriffinR
a1fcfa2f26 Sync battle anim - normal 2022-08-17 13:30:22 -04:00
GriffinR
efa422d6fa Sync battle anim - mons 2022-08-17 13:14:34 -04:00
GriffinR
1711490e16 Sync battle anim - mon movement 2022-08-17 12:31:28 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -04:00
GriffinR
56f8b1a47c
Merge pull request #536 from GriffinRichards/sync-data 
Sync data.c
 2022-08-17 11:36:07 -04:00
GriffinR
5dc80c492a
Merge pull request #532 from AsparagusEduardo/pokefirered_pokeemeraldSync3 
Sync src/battle_util.c with pokeemerald
 2022-08-17 11:29:51 -04:00
GriffinR
3a0cd4180d Sync battle anim - ground 2022-08-16 15:38:51 -04:00
GriffinR
ba890e57a4 Sync battle anim - ghost 2022-08-16 15:27:42 -04:00
GriffinR
796d307ffb Sync battle anim - fire 2022-08-16 15:15:07 -04:00
GriffinR
b598507a2e Sync battle anim - fight 2022-08-16 14:51:48 -04:00
GriffinR
ba6bb34226 Sync battle anim - electric 2022-08-16 14:35:37 -04:00
GriffinR
0c74385de7 Sync battle anim - effects 3 2022-08-16 14:23:32 -04:00
GriffinR
bcab96fb86 Sync battle anim - effects 2 2022-08-16 13:54:37 -04:00
cbt6
73f8a54aa9 Document remaining movement types and actions 2022-08-16 12:24:18 +08:00
Eduardo Quezada
5135d64501 Review changes 2022-08-15 20:42:34 -04:00
GriffinR
b15305378a Sync battle anim - effects 1 2022-08-15 15:17:18 -04:00
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR
102dc65fd1 Sync battle anim - dragon 2022-08-14 18:36:29 -04:00
GriffinR
92a193aa71 Sync battle anim - dark 2022-08-14 18:30:55 -04:00
GriffinR
e4aec1b6d1 Sync battle anim - bug 2022-08-14 18:21:03 -04:00
GriffinR
702d43e742 Rename battle anim files 2022-08-14 18:02:16 -04:00
GriffinR
b3c2c7291f
Merge pull request #534 from GriffinRichards/sync-scriptcmds 
Sync script commands
 2022-08-14 17:28:52 -04:00
GriffinR
a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
GriffinR
874f1c9832 Sync data.c 2022-08-12 12:07:43 -04:00
GriffinR
a530bb3a74
Merge pull request #533 from GriffinRichards/sync-naming-screen 
Sync naming screen
 2022-08-12 10:43:54 -04:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
cbt6
84848deb14 Rename movement action funcs 2022-08-11 12:20:07 +08:00
cbt6
79ae1e4f14 Use constants for movement speeds 2022-08-11 12:18:04 +08:00
cbt6
1d4503ab46 Sync jump movement functions 2022-08-11 12:17:00 +08:00
GriffinR
2b93687ade Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union 2022-08-10 13:48:30 -04:00
GriffinR
60fc8c5e22 Add remaining event.inc comments 2022-08-09 20:27:42 -04:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
GriffinR
bf544e84cf Clean up graphics 2022-08-09 11:13:40 -04:00
Eduardo Quezada
2cda0b61ce Reverted ++ operators not related to battle_util.c, battle_util2.c, or battle_main.c 2022-08-08 16:05:16 -04:00
GriffinR
1e02571269 Sync naming_screen 2022-08-08 12:05:30 -04:00
Eduardo Quezada
ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR
0e8b639fae Sync dbp - rename files 2022-08-07 13:55:50 -04:00
GriffinR
77e6f75509 Sync dbp - comm funcs 2022-08-07 13:47:22 -04:00
GriffinR
bc62f128ab Sync dbp - function bodies 2022-08-07 13:28:05 -04:00
GriffinR
76adc777bf Sync dbp - struct members 2022-08-07 01:40:12 -04:00
GriffinR
12fdf455ce Merge dodrio_berry_picking 1 and 2, sync function names 2022-08-06 20:40:11 -04:00
GriffinR
e46d7d4bca
Merge branch 'master' into format-obj 2022-08-06 18:36:52 -04:00
GriffinR
d6d5290099
Merge pull request #527 from GriffinRichards/sync-more-save 
Sync save sector checks
 2022-08-06 18:22:56 -04:00
GriffinR
507b284353 Celadon water -> cycling road water 2022-08-06 02:31:19 -04:00
GriffinR
1640f8b835 Document metatile behaviors 2022-08-05 15:27:08 -04:00
GriffinR
f16b6100c8 Sync save sector checks 2022-08-05 11:49:17 -04:00
cbt6
686c8383e5 Document src/save.c 2022-08-05 14:18:53 +08:00
Eduardo Quezada
b1bc05ec05 Review changes 2022-08-01 15:37:00 -04:00
Eduardo Quezada
95b16a2391 Review changes from https://github.com/pret/pokeemerald/pull/1721 2022-08-01 15:18:37 -04:00
Eduardo Quezada
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada
36a5761d36 PSS sync 2022-07-31 22:39:59 -04:00
Eduardo Quezada
9d9c2a9667 Combining pss 8 and 9 2022-07-31 22:02:44 -04:00
Eduardo Quezada
2d2d17dde3 Sync pokemon_storage_system_8.c 2022-07-31 21:41:39 -04:00
Eduardo Quezada
95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada
bcfebc7de4 Review changes 2022-07-30 13:11:02 -04:00
Eduardo Quezada
60ce72fa5a Synced src/mon_markings.c and partly synced PSS 2022-07-30 12:29:20 -04:00
Eduardo Quezada
4a60396428 Colors 2022-07-29 22:49:52 -04:00
Eduardo Quezada
dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada
c40791fd4e SPRITE_INVALID_TAG -> TAG_NONE 2022-07-29 18:37:43 -04:00
Eduardo Quezada
dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada
65baf962c5 Forgot to include this fix 2022-07-29 17:07:26 -04:00
Eduardo Quezada
e0010b9205 Reverted FONT_SMALL 2022-07-29 17:04:04 -04:00
Eduardo Quezada
c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada
4c9e831a05 Standarized use of star in void and struct pointers 2022-07-29 11:20:00 -04:00
Eduardo Quezada
4998b976e1 Standarized use of star in pointer types 2022-07-29 10:35:48 -04:00
Eduardo Quezada
94fc3ca044 Fixed check 2022-07-29 10:30:12 -04:00
Eduardo Quezada
53fc50229f Review changes from pokeemerald #1719 2022-07-29 10:21:59 -04:00
Eduardo Quezada
7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00
Eduardo Quezada
0709da5867 Multiple changes 2 2022-07-28 01:20:05 -04:00
Eduardo Quezada
f5e9cc595b Multiple changes 
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
 2022-07-27 18:14:48 -04:00
Eduardo Quezada
a81c1539e5 SpriteCallbackDummy2 -> SpriteCallbackDummy_2 2022-07-27 14:45:55 -04:00
Eduardo Quezada
36791b994b speciesToEvolve -> postEvoSpecies 2022-07-27 14:44:41 -04:00
Eduardo Quezada
611112269e StringCopy10 to StringCopy_Nickname 2022-07-27 14:35:19 -04:00
Eduardo Quezada
f998a7b661 tData7 and tData8 2022-07-27 14:23:03 -04:00
Eduardo Quezada
3b98289de2 BeginNormalPaletteFade PALETTES_ALL documentation 2022-07-27 13:16:28 -04:00
cbt6
4940c4da98 Document src/field_effect_helpers.c 2022-07-19 00:01:57 +08:00
cbt6
b3e53d255e Use FALSE instead of 0 2022-07-17 05:04:49 +08:00
cbt6
d6cb94895f Document src/overworld.c 2022-07-17 04:07:09 +08:00
cbt6
0feb0e47c9 Use constants and fix rock fragments' palettes 2022-07-13 06:09:56 +08:00
cbt6
56ca6d4bcc Document src/field_effect.c 2022-07-13 04:07:52 +08:00
GriffinR
d848452ffb
Merge pull request #512 from GriffinRichards/header 
Separate crt0, rom_header, and rom_header_gf
 2022-07-05 11:43:30 -04:00
cbt6
a4327cd093 Remove use of enum when defining sMessageBoxType 2022-07-04 00:28:09 +08:00
cbt6
951b72145f Document src/field_message_box.c 2022-07-03 23:48:40 +08:00
GriffinR
1ff0849127 Reformat object event graphics info 2022-07-02 16:42:36 -04:00
GriffinR
d1935aebb4 Merge branch 'master' of https://github.com/pret/pokefirered into header 2022-06-27 18:26:40 -04:00
GriffinR
9cde4e0f74 Remove address comments 2022-06-24 21:10:48 -04:00
LOuroboros
04a57bb791
Update pokemon.c 2022-06-24 21:35:22 -03:00
GriffinR
2eb1c9664e Separate crt0, rom_header, and rom_header_gf 2022-06-21 20:16:20 -04:00
cbt6
b2146283e6 Rename as DoPortholeWarp 2022-06-22 00:04:39 +08:00
cbt6
c400604981 Document src/field_fadetransition.c 2022-06-21 21:31:35 +08:00
Kurausukun
4cd9615e99 fix constant usage 2022-06-19 21:39:24 -04:00
colonelsalt
ed9dcb2fbe Some documentation of transform types 2022-05-13 08:24:02 +01:00
lioniac
6cf06255c0
Added missing SHINY_ODDS replacements (#502) 2022-05-09 23:04:35 -04:00
garakmon
c518cba3ec use json for region map sections 
- also update wild encounters inja template to consider whitespace trimming
 2022-04-21 20:21:58 -04:00
PikalaxALT
ccd694f665 Sync INSTALL.md with Emerald 2022-03-13 16:04:56 -04:00
GriffinR
16aacb0648 Sync pokemon jump documentation 2022-03-02 02:05:07 -05:00
GriffinR
82f0cced2d Merge pokemon jump files 2022-03-01 17:53:05 -05:00
GriffinR
cd9d40b3cd Add usage of ANIM_GET_ON_OFF_POKEMON_WEST, unused comments 2022-02-28 15:10:53 -05:00
GriffinR
a5e6e91605 Document/sync object event anims 2022-02-28 13:17:57 -05:00
cbt6
7ae187a2dd Add clarifying comment 2022-02-28 23:27:26 +08:00
cbt6
0aaae88d6e Rename movement action 0x9F 2022-02-28 23:12:57 +08:00
GriffinR
23d7c00c62
Merge branch 'master' into clone-union 2022-02-22 18:42:20 -05:00
GriffinR
759f373d31
Merge pull request #488 from GriffinRichards/map-constants 
Sync roamer.c, add missing map constant usage
 2022-02-14 21:17:44 -05:00
GriffinR
59695b8221 Sync roamer 2022-02-11 15:05:15 -05:00
GriffinR
24f18af338 Add missing map constant usage 2022-02-11 14:43:38 -05:00
GriffinR
2598b285bb Add missing trainer type constant usage 2022-02-11 13:26:55 -05:00
Deokishisu
27c3f7204a
Fix Magic Number in sub_8064544 in event_object_movement.c 
`sub_8064544()` has something to do with handling boulder puzzles and used a magic number instead of `OBJ_EVENT_GFX_PUSHABLE_BOULDER` while checking the object's `graphicsId`. This has been fixed.
 2022-02-11 06:19:16 -05:00
cbt6
0f3e26f9a4 Fix formatting and style 2022-02-10 01:53:48 +08:00
cbt6
ac3de6d02c Rename some movement actions and functions 2022-02-10 00:20:22 +08:00
GriffinR
38601cf09b Reformat clone objects in JSON 2022-02-05 14:34:53 -05:00
GriffinR
dd5f6ccd3b Add union for clone objects 2022-02-05 13:42:46 -05:00
GriffinR
bef2668d8b
Merge pull request #481 from GriffinRichards/sync-classes 
Sync/update trainer classes
 2022-01-21 19:26:14 -05:00
GriffinR
cf41c78370 Remove berry fix 2022-01-15 13:03:36 -05:00
GriffinR
08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
GriffinR
26c496e099 Decompress map preview tilemaps 2022-01-06 15:34:55 -05:00
GriffinR
f1121b1593 Move map preview gfx to own folders 2022-01-06 15:26:00 -05:00
Luke Hubmayer-Werner
92d6d97c65 Fix party size calculations for larger-than-six PARTY_SIZE 2022-01-01 22:23:41 +10:30
GriffinR
7e38583a5d Rotating Gate -> dir stair warp 2021-11-20 10:50:22 -05:00
GriffinR
b2c74cae84 Sync global 2021-11-19 20:36:59 -05:00
lioniac
0cc1d8a1b5 Multiple renamings; Removed some orphaned functions 2021-10-27 11:56:03 -03:00
lioniac
d9800a63e0 Few renamings based on Emerald 2021-10-18 15:33:46 -03:00
GriffinR
7f123f4d0f
Merge pull request #470 from GriffinRichards/fix-saveblockchunk 
Disallow negative sizes in SAVEBLOCK_CHUNK
 2021-10-13 13:43:58 -04:00
GriffinR
490300daab Disallow negative sizes in SAVEBLOCK_CHUNK 2021-10-13 13:29:17 -04:00
GriffinR
1460774d1d Sync fieldmap.c 2021-10-01 17:56:14 -04:00
GriffinR
fb1bca5b3e
Merge pull request #464 from colonelsalt/documentation 
Document fields in oak_speech
 2021-09-26 22:46:10 -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
Kurausukun
bb84e66e82 oops 2021-08-20 22:32:38 -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
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
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
864d371c25 Swap two fields in player PC struct 2021-07-17 20:33:31 -04:00
Kurausukun
d7f5e8d8f2 port UB fix from emerald 2021-07-12 23:57:38 -04:00
PikalaxALT
aec808ac0d Flatten pos fields in struct Sprite 2021-07-07 09:05:48 -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
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
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
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
garakmon
335e3bab09 fix encounter slot logic to accomodate changes 2021-06-27 21:32:18 -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
LOuroboros
92dccca2ee Informative note about gUnknown_2022AE8 2021-06-26 08:59:12 -03:00
SnorlaxMonster
337caefaa9 Use plain terrain macro where appropriate 2021-06-21 21:56:01 +10:00
Kurausukun
72fc4b6f84 change itemPrintFunc to use u32 instead of s32 2021-06-17 23:26:02 -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
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
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
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
23c07589f5 Merge remote-tracking branch 'origin/master' into sync_bery_crush 2021-05-13 14:25:52 -04:00
PikalaxALT
aa202b0624 Merge remote-tracking branch 'origin/master' into sync_bery_crush 2021-05-11 12:13:18 -04:00
PikalaxALT
c05af7f394 Rename NUM_FIELD_MAP_OBJECT_TEMPLATES --> MOVEMENT_TYPES_COUNT 2021-05-08 14:36:03 -04:00
PikalaxALT
f12ce45033 Fix visual alignment of pal tag defines 2021-05-08 14:28:57 -04:00
PikalaxALT
d30ba3b1fe Port pal tag names from Emerald 2021-05-08 14:28:08 -04:00
PikalaxALT
c94617db96 Match pal tag names with their values 2021-05-08 11:41:38 -04:00
PikalaxALT
8cb3819cc2 Merge remote-tracking branch 'origin/master' into doc_field_effect_templates 2021-05-08 11:35:23 -04:00
PikalaxALT
a64b074e7d Rename palette tags and files 2021-05-08 11:34:38 -04:00
GriffinR
4767019e4f
Merge pull request #432 from PikalaxALT/fix_list_menu 
Replace unknown list struct
 2021-05-08 11:21:09 -04:00
PikalaxALT
e07dd9507b Name used object event palette tags 2021-05-08 10:27:52 -04:00
PikalaxALT
11acb9adc7 Finish porting data_8479668.s to C 2021-05-08 09:42:12 -04:00
PikalaxALT
b79634e2f3 TrainerTowerTrainer.{unkC --> textColor} 2021-05-06 12:52:05 -04:00
PikalaxALT
2fb82d4eca Merge remote-tracking branch 'origin/master' into trainer_tower_to_c 2021-05-06 12:47:21 -04:00
PikalaxALT
7b1ae6e629 Fix another typo 2021-05-06 12:35:49 -04:00
PikalaxALT
2f58a0c5f7 Fill in some missing macro/enum uses 2021-05-06 12:22:28 -04:00
PikalaxALT
f2847354f4 Improve documentation of math_util 2021-05-06 09:27:56 -04:00
PikalaxALT
da67ad94b6 Fix typo and sync bool-typed fields 2021-05-06 09:20:03 -04:00
PikalaxALT
693e1c0fc9 Replace unknown list struct 2021-05-06 09:14:13 -04:00
PikalaxALT
c8e0d60897 Name args for berry crush commands 2021-05-05 13:37:37 -04:00
PikalaxALT
27d4411de0 Fix accidental label swap in link_rfu.h 2021-05-05 13:07:22 -04:00
PikalaxALT
ee6b3c1acf Sync berry crush from Emerald 2021-05-05 13:03:39 -04:00
PikalaxALT
fecbee43d3 Name gObjectEventPal_xxx objects 2021-05-04 09:51:48 -04:00