Commit Graph

1367 Commits

Author SHA1 Message Date
Prof-Holon
604ddc7148 Distribution updates
Also adding Cacophony and Snow Warning
2026-04-02 15:50:44 +01:00
Prof-Holon
48a9d7db58 More move changes
HP, Conversion, Conversion2
2026-04-02 11:06:21 +01:00
Prof-Holon
cca14d92da partial trapping mechanics
Added flinch, lock-in for duration
2026-04-02 10:28:56 +01:00
Frank DeBlasio
aac6ebbc27
Fix object event graphic names (#731)
* Fixed object event graphic names

* Updated files and other variable names

* Fix from finding and replacing without matching case

* spritesheet updates

* Update flag name

---------

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
2026-03-22 08:28:44 -05:00
Rairii
8f00ac8fe6
Add revision 10 changes (#722)
* revision 10 changes

* add rev10 to github actions

* add no-intro entry for leafgreen rev10
2026-03-21 16:12:48 -05:00
GriffinR
82d2283108 Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6 2025-05-14 11:52:22 -04:00
GriffinR
5f9f173b6a Generate heal location constants automatically, move data back to a single file. 2025-02-03 16:00:29 -05:00
Kevin
d844877218
Rename the Move Relearner specials. (#684)
Some checks failed
CI / build (push) Has been cancelled
2025-01-19 14:14:55 -05:00
GriffinR
94b8dc79de Use LOCALID constants for clone's target_local_id 2024-10-16 15:27:53 -04:00
GriffinR
50babdb07f Move local IDs to map.json 2024-10-15 02:51:08 -04:00
GriffinR
4dc5c47799 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-14 22:48:30 -04:00
GriffinR
bb50006fc9
Move heal locations data to their associated map.json (#673) 2024-10-11 15:17:18 -04:00
GriffinR
5e464c2091 Sync map macro change with pokeemerald 2024-08-27 13:57:07 -04:00
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