Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-14 16:20:24 -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
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
Kurausukun
ca7134316d [LEAK-INFORMED] fix battle_interface fakematch 2021-05-04 00:49:51 -04:00
PikalaxALT
e4c733d95d Move field effect graphics resources, 2 2021-05-03 16:54:07 -04:00
PikalaxALT
9ce96141c8 Move event gfx resources, 1 2021-05-03 16:23:01 -04:00
PikalaxALT
014dd7f0be Sync field_effect_objects.h from Emerald 2021-05-03 15:22:13 -04:00
PikalaxALT
7f50753360 Sync field_effect_object_template_pointers.h with Emerald 2021-05-03 14:09:21 -04:00
PikalaxALT
cb90fda18d Refactor some field effect graphics 2021-05-03 13:27:37 -04:00
PikalaxALT
d0f3c277a7 Corrections and augmentations to ttower docs 2021-04-29 09:56:44 -04:00
PikalaxALT
9a91476b81 Improve documentation of trainer tower sets 2021-04-28 20:44:15 -04:00
PikalaxALT
46a98a8f8d Modern gcc is just as dumb as agbcc 2021-04-28 18:57:01 -04:00
PikalaxALT
a60d6675d7 Trainer tower sets to C 2021-04-28 18:44:38 -04:00
GriffinR
9ed87063f1
Merge pull request #424 from PikalaxALT/doc_fame_checker 
Improve fame_checker.c documentation
 2021-04-27 16:28:08 -04:00
PikalaxALT
5a2da388cc Sync task.c from Emerald 2021-04-27 15:47:09 -04:00
PikalaxALT
2b20893df5 Document Fame Checker, 2 2021-04-24 20:48:48 -04:00
PikalaxALT
81b338157e Document Fame Checker, 1 2021-04-24 20:27:54 -04:00
GriffinR
d21090cf04
Merge pull request #406 from hjk321/index-graphics 
Document, Index, and Prettify Graphics, Part 1 (A-H)
 2021-04-23 14:01:11 -04:00
hjk321
b80442645d Reorganize battle terrain gfx 2021-04-23 11:25:53 -06:00
PikalaxALT
4b0dd3e406 Move dex gfx back to pokedex subfolder 2021-04-21 15:03:04 -04:00
PikalaxALT
704dc2f913 Document Pokedex Screen 2021-04-21 10:34:15 -04:00
Kurausukun
576e63fd0a fix librfu_intr fakematching (port from emerald) 2021-04-20 22:21:20 -04:00
Kurausukun
3f2fc649f2 fix librfu_sio32id nonmatching (port from emerald) 2021-04-20 22:14:09 -04:00
Kurausukun
60cbcaaa9b THE BEAST IS SLAIN 2021-04-19 23:49:58 -04:00
Kurausukun
1f194a4169 fix GetStringWidth fakematching 2021-04-19 02:26:12 -04:00
Kurausukun
d4a5f580c5 fix HelpSystemRenderText fakematching 2021-04-19 02:14:36 -04:00
GriffinR
918ed2d31e
Merge pull request #417 from SatoMew/master 
Replace rival labels
 2021-04-18 18:23:00 -04:00
GriffinR
9392ba8ab1
Merge pull request #416 from GriffinRichards/fix-party 
Fix empty trainer party initializer
 2021-04-18 18:21:34 -04:00
SatoMew
c128e68062 Replace rival labels 2021-04-17 16:32:55 +01:00
GriffinR
851807f7ac Fix empty trainer party initializer 2021-04-14 16:10:37 -04:00
PikalaxALT
627402560c Name remaining symbols in pokemon_summary_screen.c 2021-04-13 09:17:12 -04:00
hjk321
f6e5d2a233 [Gfx] - Prefix s for static symbols 2021-04-12 16:26:46 -05:00
PikalaxALT
03b4ea32a9 Merge remote-tracking branch 'origin' into doc_pokesum 2021-04-12 16:18:38 -04:00
hjk321
47cc3aa0f1 Document hall of fame and help system gfx 2021-04-10 21:35:14 -05:00
hjk321
dc59d5ac4f Document and index fame_checker and field_effects gfx 2021-04-10 20:54:41 -05:00
hjk321
e3e7a7423a Document and index evolution_scene 2021-04-10 15:47:58 -05:00
SatoMew
9b6469a7a3 Fix Record Corner labels 2021-04-10 18:43:10 +01:00
hjk321
117c8db279 Document and index contest and diploma gfx 2021-04-10 09:43:46 -05:00
hjk321
77b781b93a Document and index berry_pouch 2021-04-10 09:02:36 -05:00
Kurausukun
4b182affb6 standardize "grey" to "gray" 2021-04-09 22:34:08 -04:00
PikalaxALT
52c25bac8e
Merge pull request #411 from Kurausukun/temp2 
Fix Trade Nonmatchings (Thanks to Shoomer/RadicalDweamer)
 2021-04-09 12:33:31 -04:00
PikalaxALT
ee96375931
Merge pull request #412 from Kurausukun/iheartpikalax 
Fix Color Text Codes, Correct Arguments in CopyRectToBgTilemapBufferRect
 2021-04-09 08:29:58 -04:00
Kurausukun
48fb5e9b45 correct text color variable names 2021-04-09 01:30:49 -04:00
Kurausukun
31e117a1d3 fix CopyRectToBgTilemapBufferRect arguments 2021-04-09 01:25:01 -04:00
Kurausukun
4446da96fe fix text color names 2021-04-09 01:11:31 -04:00
Kurausukun
ba26e43f94 fix trade nonmatchings (thanks to shoomer) 2021-04-07 23:09:44 -04:00
PikalaxALT
c9632154ba Document pokemon summary screen, 2 2021-04-04 11:27:51 -04:00
PikalaxALT
c99894bc60 Document Pokemon Summary Screen, 1 2021-04-04 09:59:40 -04:00
Kurausukun
5112364e63 fix some fakematchings 2021-04-02 15:32:42 -04:00
PikalaxALT
80d282e73b Okay I guess this matches now 2021-03-31 19:52:06 -04:00
PikalaxALT
32b19a2722 Remove unneeded temp var in MovementActionFunc_x99_1 2021-03-31 13:32:47 -04:00
hjk321
273e7fc059 Index battle_records and berry_fix graphics 2021-03-31 10:08:08 -05:00
PikalaxALT
a704592eb7 Merge branch 'master' of github.com:pret/pokefirered into fix_mvmt_types 2021-03-31 09:42:57 -04:00
hjk321
ea68ec3fd7 Merge battle graphics into battle_terrain and remove un-included files 
The previous battle folder contained the used (and until recently undocumented) battle terrain graphics, while everything in the previous battle_terrain folder contained unused data (which is now at battle_terrain/unused, minus the files that never get included in the rom).
 2021-03-30 23:34:31 -05:00
PikalaxALT
f00b44699c Fix movement types; fix some math ops 2021-03-30 20:33:31 -04:00
hjk321
7d9bcc9f77 Document and index graphics/battle_anims and graphics/battle_interface 2021-03-30 17:13:37 -05:00
PikalaxALT
d9234adb00 Fix typos 2021-03-30 16:07:18 -04:00
PikalaxALT
8e82c291fd Document bike.c and fix weird goto 2021-03-30 15:45:42 -04:00
hjk321
05521b0668 Document and index graphics/battle 2021-03-29 01:25:27 -05:00
PikalaxALT
7f70b570dd Improve some names in field_player_avatar 2021-03-24 13:19:07 -04:00
PikalaxALT
6b64fbc522 Merge branch 'master' of github.com:pret/pokefirered into misc_doc 2021-03-24 08:15:08 -04:00
PikalaxALT
a925d2b7b0 Document vars in CopyGlyphToWindow 2021-03-23 16:12:50 -04:00
PikalaxALT
877e09438b Fix alignment and typos 2021-03-23 15:58:16 -04:00
PikalaxALT
56b37fef8d Update some more names in help system 2021-03-23 13:52:14 -04:00
PikalaxALT
10a96540ff Rename help system C files 2021-03-23 11:43:46 -04:00
PikalaxALT
d1f62285b5 Document help system 2021-03-23 11:28:06 -04:00
PikalaxALT
ff7f7744b7 gGlyphInfo to struct 2021-03-23 09:17:23 -04:00
Kurausukun
b280105f52 [LEAK-INFORMED] fix sub_8113AE8 fakematching 2021-03-23 02:53:00 -04:00
Kurausukun
0f1acd595e [LEAK-INFORMED] fix sub_812E768 fakematching 2021-03-23 02:05:15 -04:00
Kurausukun
3e9ccb4b77 [LEAK-INFORMED] fix clear_save_data_screen fakematch 2021-03-23 00:51:34 -04:00
Kurausukun
64e3ba9964 [LEAK-INFORMED] fix vs_seeker fakematchings 2021-03-23 00:19:34 -04:00
Kurausukun
646c443221 [LEAK-INFORMED] fix Task_UseItem_OutwardSpiralDots fakematching 2021-03-22 23:56:38 -04:00
Kurausukun
3f236d09c6 [LEAK-INFORMED] fix InitItemIconSpriteState fakematch 2021-03-22 23:44:08 -04:00
PikalaxALT
bccdee5299 Fakematch HelpSystem_RenderText 2021-03-22 21:15:57 -04:00
PikalaxALT
f6565a15d4 Style fixes; attempt to match help_system NONMATCHING 2021-03-21 20:28:42 -04:00
PikalaxALT
30c265118c Fix fakematch in clear_save_data_screen 2021-03-21 08:23:38 -04:00
PikalaxALT
2edc21281e Document symbols reffed in field_control_avatar 2021-03-20 17:27:21 -04:00
PikalaxALT
95c7e3d067 Update player avatar state enums 2021-03-20 16:44:16 -04:00
PikalaxALT
301ef72cf8 Use CpuCopy macros instead of CpuSet directly 2021-03-20 14:11:43 -04:00
PikalaxALT
64d781111c Document drought weather effect 2021-03-20 13:49:35 -04:00
PikalaxALT
cdfeb638f4 Document remaining routines in field_specials 2021-03-20 11:13:58 -04:00
Kurausukun
fcd39ec726 won't be needing this anymore 2021-03-19 16:25:12 -04:00
Kurausukun
37e5dd9c33 match RollCredits, with thanks to shoomer 2021-03-19 16:24:22 -04:00
PikalaxALT
f8932775cd Sync berry.c sym labels from Emerald 2021-03-19 15:51:50 -04:00
PikalaxALT
b5d9fb3c7e Match SetEnigmaBerry 2021-03-19 15:45:29 -04:00
Kurausukun
c94e5e9ab0 Merge remote-tracking branch 'upstream/master' into port_matchings 2021-03-19 14:34:58 -04:00
PikalaxALT
45f75213c0 Some more quest log and field player avater documentation 2021-03-19 09:26:01 -04:00
PikalaxALT
8ccf95e502 Label unnamed symbols in trade_scene, 1 2021-03-19 08:51:05 -04:00
PikalaxALT
89faf387db Document remaining symbols in daycare.c 2021-03-19 08:29:25 -04:00
Kurausukun
0643255c85 port task00_mystery_gift matching from emerald 2021-03-19 05:12:21 -04:00
Kurausukun
31a32c955e fakematch sub_805EE3C 
I have no idea why this won't actually match, but thanks to pidgey for figuring out this fakematch
 2021-03-19 04:53:28 -04:00
Kurausukun
c11710288a port moar fixes and documentation 2021-03-19 02:25:43 -04:00
Kurausukun
f18aeb187d [LEAK-INFORMED] fix cut nonmatchings 2021-03-18 23:47:39 -04:00
Kurausukun
f41d7b222c [LEAK-INFORMED] match InitObjectEventStateFromTemplate 
additionally, port range fixes from emerald as well as a couple other
things
 2021-03-18 22:30:59 -04:00
PikalaxALT
bf69c79b12 Name all syms in battle_anim_mons 2021-03-18 20:32:20 -04:00
PikalaxALT
d95cdf42f5 Document ShouldIgnoreDeoxysForm, 2 2021-03-18 18:24:10 -04:00
PikalaxALT
815636f271 Document ShouldIgnoreDeoxysForm 2021-03-18 18:23:41 -04:00
PikalaxALT
27897b0581 <minor> Fix visual alignment in sFriendshipEventDeltas 2021-03-18 17:53:32 -04:00
PikalaxALT
014596dea5 Document and refactor AdjustFriendship 2021-03-18 17:50:55 -04:00
PikalaxALT
c5aa5d3722 Fix faulty search&replace 2021-03-18 15:00:06 -04:00
PikalaxALT
18f1080882 Finish syncing pokemon.c with emerald 2021-03-18 14:33:43 -04:00
PikalaxALT
d864eb510e Sync DRAW_SPINDA_SPOTS from pokeemerald 2021-03-18 13:23:05 -04:00
PikalaxALT
c779411957 Sync EVO_MODE consts from emerald 2021-03-18 13:14:08 -04:00
PikalaxALT
d86c9b0976 Document battle_anim_mons, 1 2021-03-18 08:49:31 -04:00
PikalaxALT
5add6bc54f Name undocced syms in battle_transition 2021-03-17 12:50:25 -04:00
PikalaxALT
a172f0064c Fix accidental ++ deletion 2021-03-17 08:34:03 -04:00
PikalaxALT
4d86834d12 Document item use functions in pokemon.c 2021-03-16 21:16:31 -04:00
PikalaxALT
c4b61cc0ed Document FRLG-unique vars in main.c 2021-03-16 16:57:52 -04:00
PikalaxALT
783488aae5 Name nullsubs in battle ctlrs 2021-03-16 16:41:28 -04:00
PikalaxALT
fa6b2c4615 nvalidmons -> nValidMons 2021-03-16 14:56:43 -04:00
PikalaxALT
aedd30e104 Remove unneeded pokedude macros 2021-03-16 14:30:30 -04:00
PikalaxALT
7794570c71 Document pokedude battle controller, 1 2021-03-16 13:51:03 -04:00
PikalaxALT
6fc2bdf840 battle_controller_link_partner sync labels from emerald 2021-03-16 09:46:17 -04:00
PikalaxALT
10f0222d28 Battle controller opponent sync labels from emerald 2021-03-16 08:24:53 -04:00
Kurausukun
a2367448b8 sync berry crush with emerald 2021-03-16 03:49:48 -04:00
PikalaxALT
14aa5bf52f Remove unused, unneeded fields from BattleHealthboxInfo 2021-03-15 20:17:47 -04:00
PikalaxALT
81da6acff5 battle_gfx_sfx_util sync emerald names to unnamed syms 2021-03-15 19:32:49 -04:00
PikalaxALT
c6563b78c0 Sync new field name in BattleStruct 2021-03-15 16:19:15 -04:00
PikalaxALT
2f4f63afdb Document old man batttle controller 2021-03-15 14:27:50 -04:00
PikalaxALT
67cdab24f8 Use macro in BufferPartyVsScreenHealth_AtEnd 2021-03-15 08:37:11 -04:00
PikalaxALT
df9bed0548 Revert HERE and USED macros 2021-03-15 08:33:37 -04:00
PikalaxALT
37537e38f9 Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer 2021-03-14 21:04:11 -04:00
PikalaxALT
5075067ecd
Merge pull request #402 from GriffinRichards/nonmatch-fix 
Use global symbols for assembly on modern
 2021-03-14 20:52:30 -04:00
PikalaxALT
31f4edbe50 Document more symbols in battle 2021-03-14 20:10:19 -04:00
GriffinR
077faeb1bd Use global symbols for assembly on modern 2021-03-14 19:13:23 -04:00
PikalaxALT
99ec579deb Name symbols in battle_anim_special.c 2021-03-14 16:29:33 -04:00
PikalaxALT
d87e2e2fc2 Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer 2021-03-13 17:50:30 -05:00
Seth Barberee
6bcf9e64b1 backport 2 nonmatching fixes from emerald 2021-03-12 16:16:57 -06:00
PikalaxALT
f7f7e9a70d More documentation in battle_main 2021-03-12 16:56:09 -05:00
PikalaxALT
b38a5a85d4 Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:28 -05:00
GriffinR
4d1e074514 Fix Son/Daughter name swap 2021-03-12 12:47:51 -05:00
Deokishisu
a7233dcd0c Use GENDER_COUNT Constants & Rename an Unknown in field_player_avatar.c 
`gUnknown_835B882` has been cleaned up and renamed to `sPlayerAvatarGfxToStateFlag` to match pokeemerald.
 2021-03-10 16:45:11 -05:00
Deokishisu
0589bd5827 Fix Typos / Use Box Constants 
The Celadon City scripts that give Eevee misspelled it as Eeevee. Fixed.

The comment explaining `boxRSEggsUnlocked` in the `ExternalEventFlags` struct had an incorrect deposit requirement listed and was fixed.

Also, replaced the literals with the `TOTAL_BOXES_COUNT` and `IN_BOX_COUNT` constants in `pokemon.c`'s `IsPokemonStorageFull` function. Thanks hjk321 for pointing that out.
 2021-03-10 16:22:08 -05:00
GriffinR
12c7dab219
Merge pull request #396 from hjk321/storage-magic 
Change embarassing magic numbers that should have been fixed a long time ago
 2021-02-22 11:26:52 -05:00
hjk321
fc16ee9498 Fix storage magic numbers 
I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?!
 2021-02-22 10:04:27 -06:00
GriffinR
b4c5559613
Merge pull request #393 from Kurausukun/text_printer 
[LEAK-INFORMED] match rest of text_printer
 2021-02-19 19:44:11 -05:00
Kurausukun
b061e68f21 oops forgot one 2021-02-19 17:50:00 -05:00
Kurausukun
885f4a8871 remove redundant parentheses 2021-02-19 17:47:56 -05:00
Deokishisu
57e3f5e0f8 Mirror pokeemerald PR#1329 & PR#1335 to pokefirered 
The `giftRibbons` field in `SaveBlock1` has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and FRLG. US & JP Colosseum Bonus Discs', Colosseum and XD's, Pokémon Channel's, and PokémonBox: Ruby & Sapphire's interactions with these fields has been documented.

The `giftRibbon#` fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the `obedient` bit was renamed `eventLegal`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.

I still maintain that `eventLegal` is a misnomer and it should be called `fatefulEncounter` in all three repos.
 2021-02-16 16:56:31 -05:00
Kurausukun
616200ee66 [LEAK-INFORMED] match rest of text_printer 2021-02-16 02:32:41 -05:00
Deokishisu
fc623d2abf Rename "Hidden" Movement Type to "Buried" 
This commit mirrors the change to pokeemerald that renames `MOVEMENT_TYPE_HIDDEN` to `MOVEMENT_TYPE_BURIED` to avoid confusion between it and `MOVEMENT_TYPE_INVISIBLE`.

As the files and function labels are not synced between the two repos, only the necessary changes were made based on what pokefirered calls its functions. More syncing of labels with pokeemerald will need to be done in the future.
 2021-02-14 14:59:10 -05:00
GriffinR
8c66bde715
Merge pull request #388 from GriffinRichards/constants-localids 
Use more LOCALID constants
 2021-02-14 14:07:32 -05:00
GriffinR
b422fd4a49
Merge pull request #389 from Kurausukun/dexmatching 
[LEAK-INFORMED] match the rest of pokedex_screen
 2021-02-14 11:18:46 -05:00
GriffinR
1b84bd395d Fix warning about gMonPaletteTable section 2021-02-12 17:18:14 -05:00
Kurausukun
ccd75ad32e words are hard 2021-02-11 23:12:55 -05:00
Kurausukun
2ff02b3c5a fix whitespace, update dex category macro 2021-02-11 23:06:33 -05:00
Kurausukun
6c77c7a714 [LEAK-INFORMED] match the rest of pokedex_screen 2021-02-11 21:50:39 -05:00
GriffinR
515dde69af Use more LOCALID constants 2021-02-10 20:20:15 -05:00
Deokishisu
60b9b0add2
Fix Trainer Tower Magic Number 
A magic number was missed that will lead to edited projects breaking the Trainer Tower if new map layouts are added. This commit fixes it.
 2021-02-09 11:20:52 -05:00
Deokishisu
b423d06cd9 Fix "Compatibility" Misspelling 
Someone misspelled "compatibility" as "compatability" in pokeemerald and the error was brought over to pokefirered.
 2021-02-05 01:17:54 -05:00
GriffinR
1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR
9d20f55a58 Move 'source' asm files to src 2021-01-19 01:54:14 -05:00
Deokishisu
90e5a5ff7e Fix Egregious Magic Numbers in GetBattleBGM 
Whoever originally decomped this function must've been really fed up with this file.

Renamed GetMUS_ForBattle to GetBattleBGM to be consistent with pokeemerald.

This entire function was magic numbers, so I replaced them with the appropriate constants.
 2021-01-08 04:09:59 -05:00
SatoMew
e5d0a4f35c Document the unused battle strings for downpour and rain weather 2021-01-01 14:38:25 +00:00
Deokishisu
6e77eef0cd
Fix Missed Magic Numbers in main_menu.c 
There were two lines where magic numbers were used instead of the constant for MAIN_MENU_WINDOW_ERROR, so I filled them in.
 2020-12-31 11:36:27 -05:00
GriffinR
f8a1bf14fb
Merge pull request #371 from GriffinRichards/data-pokedex 
Move pokedex_screen data from asm to C
 2020-11-27 11:12:05 -05:00
Ashley Coleman
06b6853fb8 Rename farfetchd graphics to match define 2020-11-26 11:26:05 -08:00
Ashley Coleman
83fe4e5dd8 Rename unknown trainer party variables 2020-11-12 21:06:49 -08:00
GriffinR
f2e7684b17 Fix modern build 2020-11-12 00:53:57 -05:00
GriffinR
1d820d4e0f Clean up pokedex screen text 2020-11-12 00:06:22 -05:00
GriffinR
66e9059578 Move pokedex_screen data from asm to C 2020-11-11 23:44:30 -05:00
Kurausukun
feb10af9f8 Match FadeOutBody (ported from pokeemerald) 2020-11-01 23:35:10 -05:00
GriffinR
0f21fc13ef Fix hang when releasing after adding new moves 2020-10-11 16:10:03 -04:00
PikalaxALT
a0fbb82a7c Match sub_8159AB8 2020-09-08 15:00:41 -04:00
BigBahss
abc2915eb0 Add "MAP_" prefix missing from 76e126a35b 2020-09-06 23:51:51 -04:00
BigBahss
76e126a35b Add "MAP_" prefix to LeafGreen "map" fields 2020-09-06 22:56:49 -04:00
PikalaxALT
ecc3da6e2f Fix agb_flash in modern frlg 2020-09-03 15:55:52 -04:00
tianmaru
1b5d054e0b fix wrong file names 2020-09-02 23:04:54 +02:00
tianmaru
7042c996c4 renamed title screen sprites 2020-09-02 22:25:39 +02:00
PokeCodec
26ac9c5faf Match Most of Remaining Functions 2020-09-01 11:42:28 -04:00
GriffinR
bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
GriffinR
d8f858d04e Wrap asm statements in NONMATCHING 2020-08-18 09:09:25 -04:00
PokeCodec
e1848ef54d Match sub_80D1F64 2020-08-17 14:23:41 -04:00
PikalaxALT
7b2d1082cc
Bugfix for access violation in MapPreview_CreateMapNameWindow 2020-07-10 19:41:44 -04:00
luckytyphlosion
4672e05560 Fix sub_8137C18 nonmatching. 2020-07-08 15:41:54 -04:00
luckytyphlosion
ed4a703838 Apply static modifier to static functions in PSS. 2020-07-04 20:54:24 -04:00
luckytyphlosion
1bea05746e Fix prefixes of static variables in PSS. 2020-07-04 20:46:19 -04:00
luckytyphlosion
c4d7037f49 Declare some data as static. 2020-07-04 20:38:04 -04:00
luckytyphlosion
1ad6f5270c Port over PSS data to src. 2020-07-04 20:32:44 -04:00
luckytyphlosion
d7df6bf6e3 Get rid of manual sym defines in sym_ewram.txt and ld_script_modern.txt 2020-07-04 18:14:40 -04:00
luckytyphlosion
aecf2dbf6e pokemon_summary_screen.c, part 13. 2020-07-04 17:15:04 -04:00
luckytyphlosion
db2fb7785d pokemon_summary_screen.c, part 12. 2020-07-04 16:07:40 -04:00
luckytyphlosion
4bf7e4f4fb pokemon_summary_screen.c, part 11. 2020-07-03 21:35:59 -04:00
luckytyphlosion
7cb48a704a pokemon_summary_screen.c, part 10. 2020-07-03 19:40:10 -04:00
luckytyphlosion
f8247cdd79 pokemon_summary_screen.c, part 9. 2020-07-03 17:42:40 -04:00
luckytyphlosion
9453c154d7 pokemon_summary_screen.c, part 8. 2020-07-02 20:19:37 -04:00
luckytyphlosion
d9d3ac1c5d pokemon_summary_screen.c, part 7. 2020-07-02 16:45:49 -04:00
luckytyphlosion
91fea55a24 pokemon_summary_screen.c, part 6. 2020-06-25 12:59:37 -04:00
luckytyphlosion
114a5b9b6f pokemon_summary_screen.c, part 5. 2020-06-24 13:57:19 -04:00
luckytyphlosion
a04106a011 pokemon_summary_screen.c, part 4. 2020-06-23 22:06:21 -04:00
luckytyphlosion
d096f37d75 pokemon_summary_screen.c, part 3. 
Also commit hgrep.sh for searching in non-c files.
 2020-06-23 17:13:23 -04:00
luckytyphlosion
7cabc3d1a5 pokemon_summary_screen.c, part 2. 
Also fix prototype of MenuHelpers_CallLinkSomething.
 2020-06-14 19:04:24 -04:00
luckytyphlosion
bc143a695d Initial work on pokemon_summary_screen.c 2020-06-14 16:08:21 -04:00
PikalaxALT
6a55484130
Merge pull request #344 from Missingmew/master 
Decompile unused decompress function, as seen in ruby
 2020-05-27 07:54:48 -04:00
PikalaxALT
e3769a2ee9
Merge pull request #340 from GriffinRichards/doc-inconnect 
Label in_connection's field in ObjectEventTemplate
 2020-05-27 07:53:11 -04:00
Missingmew
d632fb08b4 switch to pret short-types and tabs vs spaces 2020-05-21 00:26:10 +02:00
Missingmew
10d672da0d Decompile unused decompress function, as seen in ruby 2020-05-21 00:00:42 +02:00
GriffinR
7b18204a90
Merge branch 'master' into doc-inconnect 2020-05-14 19:27:02 -04:00
GriffinR
992fba2bc5 Fix nonmatching build 2020-05-14 19:14:34 -04:00
GriffinR
ea01b132b2 Label in_connection's field in ObjectEventTemplate 2020-05-14 16:29:19 -04:00
Evan
5a5e68269d fix PLAYER_AVATAR_FLAG_WATERING define 2020-05-05 11:00:39 -06:00
Evan
fcb999beea document battle_message.c 2020-05-01 19:54:35 -06:00
PikalaxALT
ece62fa4ba
Merge pull request #333 from jiangzhengwenjz/librfu 
fix librfu issues
 2020-04-27 19:11:59 -04:00