Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-12 15:06:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,838 Commits 2 Branches 0 Tags 366 MiB
0e14ff8084
Commit Graph

306 Commits

Author SHA1 Message Date
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
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
Details
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
Edward Nolan
93d4e3ff66 Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER 2023-09-10 21:16:06 -04: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
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
aeb1c74bbf Label remaining scripts 2022-10-05 15:32:51 -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
Jaizu
ce612de462 Add Common_ to movements.inc 2022-08-28 16:51:45 +02:00
GriffinR
ab56ac41a1
Merge branch 'master' into clone-union 2022-08-17 15:41:50 -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
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +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
f113da30ad Use 'goto_if_eq VAR, value, Script' syntax 2022-08-09 20:41:54 -04:00
GriffinR
3add78dbd1 Use constants for setfieldeffectargument 2022-08-09 20:12:26 -04:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
0c1adf2115 Use seteventmon 2022-08-09 15:29:16 -04:00
GriffinR
8e7dd94eca Drop some optional script command arguments 2022-08-09 15:25:44 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
Eduardo Quezada
ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR
daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
Eduardo Quezada
95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada
dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
GriffinR
9cde4e0f74 Remove address comments 2022-06-24 21:10:48 -04:00
GriffinR
75c7e67f00 Fix Museum_1F -> PokemonCenter_1F text 2022-06-24 19:02:11 -04:00
GriffinR
23d7c00c62
Merge branch 'master' into clone-union 2022-02-22 18:42:20 -05:00
GriffinR
2598b285bb Add missing trainer type constant usage 2022-02-11 13:26:55 -05: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
LOuroboros
cdfaa6a3ac Informative note about PewterCity_Gym_Text_BrockDefeat 2021-06-26 04:10:05 -03:00
GriffinR
7deccc36b7 Name unused house maps/map groups 2021-05-13 12:51:45 -04:00
GriffinR
75f2be2e29 Name map groups 2021-04-28 16:37:08 -04:00
SatoMew
c128e68062 Replace rival labels 2021-04-17 16:32:55 +01:00
SatoMew
9b6469a7a3 Fix Record Corner labels 2021-04-10 18:43:10 +01:00