GriffinR
b2e2648d15
Use C preprocessor directives
2024-06-22 11:51:16 -04:00
Deokishisu
4578a59673
Fix Localization Oversight in Daisy's Text
...
Based on the FONT_NORMAL and FONT_FEMALE control codes in Daisy's text when finishing her grooming of a Pokémon, it seems the original intention was for the first part of this text to be NPC_TEXT_COLOR_NEUTRAL and for Daisy's dialogue to be NPC_TEXT_COLOR_FEMALE. If the localizers had caught it, they would've replaced FONT_NORMAL with COLOR DARK_GRAY and FONT_FEMALE with COLOR RED. This commit creates a .ifdef BUGFIX for this oversight.
2024-05-24 22:09:31 -04:00
Deokishisu
fb0c7dc3f2
Fix Typo in Nurse Script
...
EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom => EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom
2024-05-24 21:58:35 -04:00
Edward Nolan
93d4e3ff66
Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER
2023-09-10 21:16:06 -04:00
GriffinR
10c1e1298f
Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql
2023-08-18 11:26:22 -04:00
GriffinR
c212795217
Fix index comment for ScrCmd_playslotmachine
2023-05-31 21:47:33 -04:00
GriffinR
45e4c30d38
Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql
2023-04-10 10:18:07 -04:00
GriffinR
a2f30a3382
Merge pull request #611 from GriffinRichards/sync-pokemon
...
Sync pokemon.c
2023-03-18 13:24:51 -04:00
cbt6
242bb41682
Document src/graphics.c
2023-03-11 23:57:01 +08:00
GriffinR
ab417d1255
Sync pokemon.c
2023-03-06 15:23:11 -05:00
GriffinR
ef12c2a7f9
Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql
2023-01-30 10:23:08 -05:00
SphericalIce
8e2d4b179e
Add missing newline in gOakSpeech_Text_LetsGo
2022-12-31 14:48:57 +00:00
SphericalIce
2070ea7896
Format strings in new_game_intro.inc
2022-12-31 14:42:41 +00:00
SphericalIce
0348b58899
Rename gOakText_AskPlayerGender to fit naming convention
2022-12-31 14:39:34 +00:00
SphericalIce
d080ebd0f0
Document oak_speech.c
2022-12-30 23:59:45 +00:00
GriffinR
fd81669091
Remove old move descriptions
2022-12-16 09:46:31 -05:00
GriffinR
66e279611b
Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql
2022-11-30 15:03:21 -05:00
GriffinR
673c86c56f
Merge branch 'master' into sync-text
2022-11-26 18:08:49 -05:00
GriffinR
e78094de85
Document fonts
2022-11-22 14:20:27 -05:00
GriffinR
a19cb44458
Clean up mystery gift sync, document wonder news
2022-11-22 01:58:30 -05:00
GriffinR
6d6f207eb4
Initial mystery gift sync
2022-11-19 21:01:35 -05:00
GriffinR
519443e214
Sync battle transitions
2022-11-18 21:16:08 -05:00
GriffinR
ae38640a3b
Continue documenting quest log
2022-11-11 02:10:16 -05:00
GriffinR
a7609df31b
Sync union_room_player_avatar
2022-11-08 13:37:11 -05:00
GriffinR
9983b41c1d
Sync union room
2022-11-08 01:19:15 -05:00
GriffinR
403cbeded2
Fix Marcos/Macros typo
2022-10-30 22:01:45 -04:00
GriffinR
f096196c91
Merge branch 'master' into porymap-5
2022-10-27 14:16:25 -04:00
GriffinR
2b2bf84502
Use actual flag values for hidden items
2022-10-25 14:51:01 -04:00
GriffinR
c77adaf6bf
Sync map data macros
2022-10-25 14:31:01 -04:00
GriffinR
32ab6087d8
Merge pull request #484 from GriffinRichards/clone-union
...
Separate connection clone objects from normal objects
2022-10-17 21:29:52 -04:00
GriffinR
5dfc494c00
Convert tilesets.s to C
2022-10-08 03:54:27 -04:00
GriffinR
aeb1c74bbf
Label remaining scripts
2022-10-05 15:32:51 -04:00
GriffinR
7b2da8e402
Sync/document the rest of strings.c
2022-09-13 14:48:54 -04: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
ccd527b782
Merge pull request #542 from GriffinRichards/sync-cableclub
...
Sync cable club
2022-09-03 14:27:13 -04:00
GriffinR
56fead7d16
Merge pull request #543 from Jaizu/common_movement_naming
...
Add Common_ to movements.inc
2022-09-03 14:20:33 -04:00
GriffinR
76ec1837aa
Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub
2022-09-03 14:19:50 -04:00
GriffinR
17a8498701
Fix battle message charmap copied from emerald
2022-08-30 14:07:57 -04:00
Jaizu
ce612de462
Add Common_ to movements.inc
2022-08-28 16:51:45 +02:00
GriffinR
321f5371d8
Sync cable club
2022-08-25 18:48:54 -04:00
GriffinR
feccd302d7
Merge pull request #540 from GriffinRichards/sync-b-anim
...
Sync battle anim
2022-08-25 10:09:32 -04:00
GriffinR
b06d2045fc
Script_HeartIcon -> Script_XIcon
2022-08-24 18:17:18 -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
b3590324b8
Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim
2022-08-19 11:30:00 -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
5813cb43c2
Sync battle anim.c
2022-08-17 15:57:46 -04:00