ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-14 15:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,261 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

396 Commits

Author SHA1 Message Date
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
GriffinR
06351bf63c Remove address comments 2021-07-20 15:18:31 -04:00
TheXaman
20ca83bb20 Added menu to run custom scripts easily, credit: @Jaizu 2021-06-20 15:48:44 +02:00
SphericalIce
0a94dba4a7 Rename item script labels to fit the established name scheme 2021-06-13 13:21:23 +01:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07:00
ExpoSeed
6a977bdbfc Document second parameter of playbgm 2021-05-21 15:08:00 -05:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
4a1cfbead2 Document remaining overworld 2021-04-06 16:55:43 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
GriffinR
f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
GriffinR
fd3175bde4 Note missing end in Trainer Hill 2021-03-13 16:40:29 -05:00
GriffinR
734a15135f Clean up a few unlabeled scripts 2021-03-04 19:30:19 -06:00
Deokishisu
7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

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 `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
SphericalIce
56e047f949 Fix Lilcove Motel typos 2021-02-14 21:38:39 +00:00
GriffinR
20b76c6071 Fix swapped route 102 berries 2021-02-10 16:26:09 -05:00
GriffinR
0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
GriffinR
de52df5613 Fix some mislabeled scripts 2021-01-19 04:51:34 -05:00
TheXaman
e6ab3122e8 Merge branch 'tx_debug_system_public' of https://github.com/TheXaman/pokeemerald_openworld into tx_debug_system 2020-10-20 21:59:43 +02:00
TheXaman
6456009a44 Implementation if Pyredrid and AsparagusEduardo debug menu plus huge rewrite and tons of additions 
V2: Fly, Warp, Flags, Vars, give items, give pkm 2 versions

Improved cheats, reworked the vars system

vars function now starts at VARS_START and end VARS_END

Figured out how to display FieldMessages, reimplemented CheckSafeBlock, cleanup

DebugAction_DestroyExtraWindow instead of multiple, renamed text variables

cleanup + pokemon simple

give pokemon complex nearly done

Complex pkm works, items now with icons

if statement cleanup

alter build tools to include maps per map group

Warp functionallity

added hex value to flags and vars

cleanup

Credits
 2020-10-20 20:37:02 +02:00
ExpoSeed
d649bcabbc Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-12 12:43:55 -05:00
GriffinR
1472111c5d Fix PutAwayDecorationLoop UB comment 2020-10-11 19:02:10 -04:00
ExpoSeed
d2464b59a3 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-05 11:42:19 -05:00
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05:00
Eduardo Quezada
96e4b43ce5 Documenting where each of the berries are generated in new_game.inc 2020-10-03 21:52:09 -03:00
Eduardo Quezada
46ccb91155 Fixed "Ultra Rope" name. 2020-09-13 11:35:05 -03:00
GriffinR
921f389e4e Fix Rusboro and Lavarige typos 2020-09-11 14:47:47 -04:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
GriffinR
c830731734
Merge branch 'master' into doc-blender 2020-08-28 16:16:00 -04:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest 
Document contest
 2020-08-20 16:03:47 -04:00
GriffinR
503dafd210 Fix wallys parents misnamed as uncle/aunt 2020-08-18 17:51:41 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
3779422489 Split contest funcs from script_pokemon_util 2020-08-13 17:42:12 -04:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
89bcf3cbd9
Merge branch 'master' into add-localids 2020-07-08 15:47:45 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
eb80012757 Document more misc field effects 2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00