45adad79cf
feat: initialise VanivilleTown and resize (from LittlerootTown)
2025-01-07 13:36:26 +00:00
Frank DeBlasio
1ba0875654
Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS ( #5166 )
...
* Removed FRONTIER_BRAIN_SPRITES
* Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE
* Updated TRAINER_CLASS macro
* Removed FRONTIER_BRAIN_TEXTS
* Turned Frontier Brain text to COMPOUND_STRINGs
* Removed frontier_brain.inc from event_scripts.s
* Addressed front sprite comment
* Addressed backsprite comments
2024-09-22 09:54:01 +02:00
Frank DeBlasio
3aa24f527e
Converted Mechadoll text to COMPOUND_STRINGs ( #5276 )
2024-09-04 14:56:19 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything ( #3949 )" ( #4525 )
...
This reverts commit e2d70d440e0d2b400953
2024-05-13 19:19:37 +02:00
Bassoonian
2f2d7c281f
Clean up contest strings ( #3876 )
...
* Move contest move descriptions out of inc file
* Clean up unused contest strings
* More contest cleanup
* sRoundResultTexts cleanup
---------
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2024-02-02 10:55:39 +01:00
Eduardo Quezada D'Ottone
c8d73c0827
Merge branch 'upcoming' into guillotine-expansion
2024-01-26 10:10:27 -03:00
psf
bf8b09b1b6
Item Ball refactor / Pluralize item names for giveitem and finditem ( #3942 )
...
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem
* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem
* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c
* Updated ObjectEventTemplate
* Updated inc files to support plural item names
* Refactored CopyItemNameHandlePlural to handle all items
* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT
* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130
* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 21:35:45 +01:00
Ariel A
85aab338a9
Merge branch 'guillotine' into guillotine-expansion
2024-01-08 19:43:06 -05:00
Ariel A
1ce961768e
Added automatic runtime decapitalization.
2024-01-07 20:21:14 -05:00
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald ( #3256 )
...
* First version of Vs. Seeker
* Update movement.inc
98f7e9978d (r1306721924)https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004
* Update field_effect_scripts.s
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024
* Update item_use.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401
* Update movement_action_func_tables.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828
* Update event_object_movement.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887
* Update overworld.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396
* Update vs_seeker.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158
* Update vs_seeker.c
Addressed some cleanup comments from SBird
* Update UpdateRandomTrainerRematches
Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId
* Updated UseVsSeekerEffect_2
* Updated UseVsSeekerEffect_3
* Updated UseVsSeekerEffect_4
* Fixed bug that allowed Vs Seeker to be used indoors in correct places
Moved VsSeeker function declarations into header
* Refactored FieldUseFunc_VsSeeker
* Added curly braces to else case in FieldUseFunc_VsSeeker
* renamed data[x] in Task_ResetObjectsRematchWantedState
* Refactored Task_ResetObjectsRematchWantedState
* Refactored VsSeekerResetObjectMovementAfterChargeComplete
* Refactored ResetMovementOfRematchableTrainers
* Refactored GatherNearbyTrainerInfo
* Refactored Task_VsSeeker_3
* CanUseVsSeeker
* Refactored GetVsSeekerResponseInArea
* GetCurVsSeekerResponse refactored
* Cleaned up GetTrainerFlagFromScript
* Gave sensible names to Task_VsSeeker
* Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater
* Renamed UseVsSeeker Functions
* Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
Removed extra VsSeeker animation code
* Addressed PR feedback
* Fixed issue with building non-modern
* Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId
* Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function
* Added changes in response to Jasper's feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522
* Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392
* Removed ifdef tags around the repo unless needed
b5dc744ced
2023-11-26 18:58:43 +01:00
Eduardo Quezada
63e4a8adcd
Fixed instances of .string being used with spaces instead of tabs
2022-08-15 14:32:01 -04:00
GriffinR
21ed288f50
Merge pull request #1687 from SimplyBLGDev/patch-1
...
Format newlines in surf.inc
2022-06-18 11:04:39 -04:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier
...
Add some battle frontier constant usage
2022-06-18 10:22:58 -04:00
Simply BLG
324a157b34
Format newlines in surf.inc
...
One of the strings declared in surf.inc was poorly formatted.
## Description
Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
2022-06-17 15:21:12 -03:00
Simply BLG
380cc8615b
Format newlines in pc_transfer.inc
2022-06-17 14:22:31 -03:00
Simply BLG
1860b61fe3
Corrected two missing newlines
2022-06-17 12:05:32 -03:00
Simply BLG
e48341f7fc
Format newlines in contest_string.inc
...
Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.
2022-06-17 11:52:54 -03:00
GriffinR
4660f8c88b
Document battle tower TV show
2022-06-14 09:37:39 -04:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
GriffinR
13cd2a41f0
Better braille support
2021-10-30 16:19:10 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
24b4e898ad
More mauville_old_man clean up
2021-10-18 14:40:04 -04:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
GriffinR
8f43d1ebeb
Document smart shopper TV show
2021-07-02 01:45:23 -04:00
GriffinR
c8be6a1fbb
Remove leftover berry descriptions
2021-05-17 03:06:02 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
GriffinR
8be2c5d60b
Document Contest Lady TV Show
2021-04-02 01:49:38 -04:00
GriffinR
771a434730
Label Trend Watcher TV show texts
2021-03-31 16:29:42 -04:00
GriffinR
734a15135f
Clean up a few unlabeled scripts
2021-03-04 19:30:19 -06:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -05:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
GriffinR
e98e4652fd
Document contest live updates
2020-08-16 05:18:09 -04:00
GriffinR
22931846d6
Fix Colosseum name porymap issue
2020-01-13 20:20:48 -06:00
huderlem
fa5816915d
Merge pull request #949 from GriffinRichards/doc-dome
...
Document Battle Dome and add facility party constants
2020-01-12 20:10:03 -06:00
GriffinR
c27a4778ee
Standardize prebattle -> intro
2020-01-12 19:39:30 -06:00
GriffinR
6a470ddfda
Some script clean up, document secret base secrets show
2020-01-12 19:39:30 -06:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
3efc8199d4
More battle_dome.c documentation
2019-12-25 22:27:33 -08:00
huderlem
edb5df1716
Merge pull request #933 from GriffinRichards/doc-tents
...
Document Battle Tent scripts
2019-12-17 18:09:49 -06:00
GriffinR
97b5560bdb
Document Battle Tent scripts
2019-12-15 01:47:01 -05:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall
2019-12-10 20:43:27 -05:00
GriffinR
a4191040c9
Sync weather names
2019-12-06 19:05:28 -06:00
GriffinR
7beddd16dd
Document missed scripts/text
2019-12-05 21:20:55 -06:00
GriffinR
548af3c0f1
Document a bit of Match Call
2019-12-05 15:33:36 -05:00
GriffinR
4dfa959fa2
Begin documenting Battle Pike and Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
4e6a69c297
WIP Document Apprentice
2019-11-19 11:36:38 -05:00
GriffinR
a486c8affd
Begin documenting Apprentice, merge with master
2019-11-18 12:47:10 -05:00
GriffinR
2c3726a328
Document contest strings
2019-11-16 12:50:01 -06:00
huderlem
0a43f2ce53
Merge pull request #899 from GriffinRichards/doc-scriptclean
...
Document interview and TV scripts, and misc script clean up
2019-11-16 11:34:47 -06:00
