ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 10:03:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,296 Commits 1 Branch 0 Tags 235 MiB
6cb152e452
Commit Graph

4913 Commits

Author SHA1 Message Date
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
sphericalice
48bf1ab98d
Use SPECIES_NONE and ITEM_NONE in battle_tower.c 2022-01-04 13:46:46 +00:00
Eduardo Quezada D'Ottone
4f9e6faa48
Merge branch 'item_expansion' into flingIE 2022-01-02 18:31:03 -03:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu 2022-01-02 21:02:53 +00:00
LOuroboros
b88d9c4cdc Updated gItemEffectTable 
-Rearranged the entries therein, keeping them consistent with the item ID order.
-Removed pointless duplicates of certain effects such as the Full Heal's.
-Added entries for the items that needed one.
-gItemEffect_EvoStone -> gItemEffect_EvoItem.
 2022-01-01 19:02:40 -03:00
LOuroboros
5cdfe0a9fb Fixed the Lures and adjusted 2 charms' descriptions 2022-01-01 18:03:00 -03:00
LOuroboros
74aa4f29df Corrections and additions 
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
 2022-01-01 17:17:21 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1 Removed Redundant Key Stone item 2021-12-31 18:22:23 -03:00
LOuroboros
9b1fd796ae Gave the Gracidea's old hold effect slot to the Enigma Berry 2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone
313df31e7e Removed Jade Orb, since it has no use besides being a key-lock item. 2021-12-31 17:44:03 -03:00
LOuroboros
0c5652596b Removed HOLD_EFFECT_GRACIDEA 2021-12-31 17:34:16 -03:00
LOuroboros
e961bdee14 Fixes 
-Used Buffel Saft's sprite for the Ability Patch.
-Fixed the Mints' descriptions.
-Fixed the Damp Mulch's palette.
-Decapped the Pokémon Box Link's name.
-Fixed the target pocket of the Key Stone and the Dynamax Band.
 2021-12-31 17:10:02 -03:00
LOuroboros
5a8e51d858 Filled in missing items' sprite data 2021-12-31 16:27:06 -03:00
sphericalice
61a0036c47
Clarify ScrollableMultichoice_ProcessInput comment 2021-12-31 17:34:46 +00:00
sphericalice
9e660b2cdf
Update src/field_specials.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-31 16:29:11 +00:00
sphericalice
4f6323606f
Update field_specials.c to match the style 2021-12-31 16:24:44 +00:00
LOuroboros
d4dc672088 Filled in missing item data 2021-12-31 13:23:06 -03:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
sphericalice
50522fdea4
Remove some magic numbers from TryPushBoulder 2021-12-30 12:21:47 +00:00
GriffinR
4192a40adf
Merge pull request #1583 from GriffinRichards/renametilemaps 
Give less generic names to some tilemaps, some misc fixes
 2021-12-29 00:57:37 -05:00
GriffinR
aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
GriffinR
aba5264260 RGB macro use in slot_machine 2021-12-28 17:46:05 -05:00
GriffinR
4fc345fff5 Rename unused frontier pass tilemap 2021-12-28 14:54:09 -05:00
GriffinR
3acf002a9c Rename generic jp contest tilemaps 2021-12-28 13:16:40 -05:00
GriffinR
ee5e65d9ed Rename generic title screen tilemaps 2021-12-28 03:57:44 -05:00
LOuroboros
599ca58059
Update main_menu.c 2021-12-25 07:04:19 -03:00
LOuroboros
03205c995d
Update battle_script_commands.c 2021-12-24 01:59:40 -03:00
LOuroboros
d94dae18f7 Removed more commented out addresses 
I like to help.
 2021-12-21 22:49:30 -03:00
ghoulslash
7839750d7e
Merge pull request #1926 from AsparagusEduardo/IE_itemDesc 
Update to item descriptions based on configured effect.
 2021-12-21 09:39:11 -05:00
LOuroboros
211c8c684d
Update items.h 2021-12-19 20:30:03 -03:00
LOuroboros
4a74d288d4 Review corrections 2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82 [LEAK INFORMED] Documented the unk19 item field 2021-12-17 19:41:39 -03:00
ultima-soul
356cf96654 Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries. 2021-12-15 19:33:35 -08:00
GriffinR
6e5520207f
Merge pull request #1573 from GriffinRichards/tilesetanim 
Clean up tileset_anims
 2021-12-15 09:47:54 -05:00
GriffinR
961dbee5e3 Clean up tileset_anims 2021-12-14 21:41:07 -05:00
LOuroboros
660a3df929
Update trade.c 2021-12-14 14:47:04 -03:00
ultima-soul
26f29a04fd Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" 
This reverts commit ac2bcece75, reversing
changes made to 349262ebc3.
 2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync 2021-12-09 14:16:05 -08:00
ultima-soul
349262ebc3 Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync 2021-12-03 17:31:02 -08:00
ultima-soul
d408b56549 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-12-01 20:18:57 -08:00
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
GriffinR
1a08d8fcb4 Add BUGFIX for roamer's status 2021-11-29 12:56:03 -05:00
ultima-soul
d0623d7b71 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-27 21:40:08 -08:00
GriffinR
4c64863bc5
Merge pull request #1567 from LOuroboros/sBattleTerrainTable 
Renamed gBattleTerrainTable
 2021-11-27 23:43:22 -05:00
LOuroboros
b042eb6436 gBattleTerrainTable -> sBattleTerrainTable 2021-11-28 01:22:27 -03:00
cbt6
c59c7b0518 Use enums for jump distances 2021-11-28 12:01:29 +08:00
cbt6
b6430098d4 Rename speed parameter to distance in jump functions 2021-11-28 12:01:29 +08:00
ultima-soul
a8f9a54787 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-21 10:41:32 -08:00
Eduardo Quezada D'Ottone
5500954129 Update to item descriptions based on configured effect. 2021-11-21 00:08:46 -03:00
LOuroboros
8c014e94a3 Assigned a flingPower value to the Moon Stone 2021-11-20 20:34:52 -03:00
GriffinR
c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR
1b35f9adad Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
GriffinR
b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
700425ef5f Index sMapHealLocations 2021-11-17 15:52:04 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav 
Document Pokénav
 2021-11-17 14:47:34 -05:00
GriffinR
eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
LOuroboros
7ae30f8913 I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY 
Also fixed its inaccurate description.
 2021-11-17 07:15:14 -03:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
d414787932 Some TV clean-up 2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR
63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
GriffinR
c1130592fa Drop some overworld prefixes 2021-11-15 10:58:05 -05:00
GriffinR
65d3b58374 Add PARTY_NOTHING_CHOSEN 2021-11-15 10:57:06 -05:00
LOuroboros
ea12dfdf2c Implemented Fling 2021-11-15 12:41:00 -03:00
GriffinR
d98bd4dba7 Name pokenav region map structs 2021-11-15 01:37:22 -05:00
GriffinR
4275cf4b90 Rename pokenav match call files 2021-11-15 01:30:21 -05:00
GriffinR
14d78d7633 Finish match call menu doc 2021-11-15 01:20:03 -05:00
GriffinR
c779d03b3e Rename pokenav_match_call_ui 2021-11-15 00:21:40 -05:00
GriffinR
d4d4234283 Finish pokenav list ui doc 2021-11-15 00:09:02 -05:00
GriffinR
7e27a0746d Misc text clean-up 2021-11-14 22:21:17 -05:00
Wiz
927f9d27df Designate gBattleAnimBgImage_Attract and related as arrays 2021-11-14 17:08:03 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim 2021-11-13 23:26:46 -05:00
GriffinR
159bb37bbe
Merge branch 'master' into fix_saveblock_reorder 2021-11-13 23:19:57 -05:00
GriffinR
9a932cd9c3
Merge pull request #1549 from GriffinRichards/doc-binterface 
Document remaining symbols in battle_interface, palette, and save
 2021-11-13 23:19:08 -05:00
Eduardo Quezada D'Ottone
70609ac742 Fixed Jacoba Berry Tree not using its own palette 2021-11-14 00:41:00 -03:00
ProjectRevoTPP
9d3345a6d6 Enforce structs to enforce save block order for modern toolchains. 2021-11-13 21:41:16 -05:00
GriffinR
8e8b70c15c Add clarifying comment to LinkFullSave_WriteSector 2021-11-13 17:23:03 -05:00
GriffinR
4c4fa1f25e Typo fix 2021-11-13 16:56:45 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata 
Clean up sound, add CRY_MODE constants
 2021-11-13 15:54:40 -05:00
GriffinR
b3e593dff5 Continue pokenav list ui doc 2021-11-13 15:52:58 -05:00
GriffinR
ec05157568 Move pokenav list item union out of list struct 2021-11-13 11:27:11 -05:00
GriffinR
3b91d8fdaf Start pokenav list ui doc 2021-11-12 20:36:19 -05:00
GriffinR
da5752fd0d Start match call menu doc 2021-11-12 20:17:06 -05:00
GriffinR
ffe2970e30 Rename pokenav menu handler files 2021-11-12 17:13:50 -05:00
GriffinR
baeacbe2f1 Clean up pokenav general menus, organize pokenav graphics 2021-11-12 17:08:12 -05:00
Eduardo Quezada D'Ottone
1f1b45e165 Review changes 2021-11-12 14:34:04 -03:00
GriffinR
004d1cab3f Clean up pokenav conditions doc 2021-11-12 11:13:49 -05:00
GriffinR
35aeff1b6d Rename pokenav conditions files 2021-11-12 11:07:52 -05:00
GriffinR
f5152094a9 Finish pokenav conditions doc 2021-11-12 11:01:22 -05:00
Eduardo Quezada D'Ottone
67f78ce960
Removed comment 2021-11-11 22:43:14 -03:00
Eduardo Quezada D'Ottone
ae26a7529c Restored FRLG items 2021-11-11 22:26:58 -03:00
GriffinR
7efdc0902b Finish condition graph doc 2021-11-11 15:29:15 -05:00
GriffinR
4590887359 Clean up some register constant use 2021-11-10 17:01:21 -05:00
GriffinR
343ac99049 Start pokenav conditions doc 2021-11-10 17:00:54 -05:00
GriffinR
57be596ce4 Fix calcrom partial doc becoming negative 2021-11-10 13:14:11 -05:00
GriffinR
342b7da5d3 Fix CRY_MODE_ECHO 2021-11-10 11:59:15 -05:00
ultima-soul
c74e19c062 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-11-09 20:58:19 -08:00
GriffinR
ef935f6f4a
Merge pull request #1544 from GriffinRichards/romheadergf 
Split headers from crt0.s
 2021-11-09 23:54:57 -05:00
ultima-soul
69e3719f75 Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar. 2021-11-09 19:19:48 -08:00
GriffinR
8e424b6985
Merge branch 'master' into doc-binterface 2021-11-09 16:09:48 -05:00
GriffinR
43e942c3af Clean up pokenav ribbons 2021-11-09 12:50:35 -05:00
GriffinR
1c82571fa0
Merge pull request #1542 from GriffinRichards/doc-menu 
Document menu
 2021-11-08 21:23:21 -05:00
GriffinR
adf773f1ed Document remainder of save.c 2021-11-08 19:45:14 -05:00
GriffinR
ab1074e629 Label unknown palette functions 2021-11-08 16:08:36 -05:00
GriffinR
684f599a44 Label remaining battle_interface symbols 2021-11-08 16:03:44 -05:00
GriffinR
e3b6337c3a Finish battle_anim_mons doc 2021-11-08 14:29:37 -05:00
GriffinR
ae2602b5a5 Add missing BATTLER_COORD usage 2021-11-08 11:54:29 -05:00
GriffinR
d20341646a Start battle_anim_mons doc 2021-11-08 11:46:13 -05:00
GriffinR
1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
Eduardo Quezada D'Ottone
b282bbc270 Using WEATHER_SANDSTORM in battle_setup 2021-11-06 14:55:27 -03:00
GriffinR
abab6cef09 Label remaining m4a functions 2021-11-06 11:42:34 -04:00
GriffinR
f9e8c88eb5
Merge pull request #1543 from cbt6/move-fastest 
Rename WalkFastest functions to WalkFaster
 2021-11-06 10:32:59 -04:00
sphericalice
6e49b45eb6 Use relevant constants for BlendPalettes 2021-11-05 21:58:13 +00:00
LOuroboros
ab2dab9d05 Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs 2021-11-05 17:42:12 -03:00
LOuroboros
10a3c8f119 Added an item config for the Soul Dew 2021-11-04 17:29:17 -03:00
cbt6
0fe3881961 Rename WalkInPlaceFastest to WalkInPlaceFaster 2021-11-05 01:54:34 +08:00
GriffinR
c6b83bbb21 Fix merge 2021-11-04 12:18:34 -04:00
GriffinR
be7d0bd3b0
Merge branch 'master' into doc-menu 2021-11-04 12:11:31 -04:00
GriffinR
17b657d83a Finish menu documentation 2021-11-04 11:52:43 -04:00
GriffinR
c291fa8e7f Propagate BG_COORD constants 2021-11-03 23:02:06 -04:00
PikalaxALT
7940f121f6
Merge pull request #1539 from GriffinRichards/doc-finalmisc 
Document files with a few remaining symbols
 2021-11-03 20:49:14 -04:00
PikalaxALT
6bdf6f25f4
Merge pull request #1540 from GriffinRichards/sync-libgcn 
Sync libgcnmultiboot
 2021-11-03 20:45:54 -04:00
GriffinR
d6f873ba69 Continue menu documentation 2021-11-03 20:38:23 -04:00
GriffinR
50d3003a0d Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW 2021-11-03 19:54:20 -04:00
GriffinR
085f8adec6 Start remaining menu documentation 2021-11-03 17:38:08 -04:00
GriffinR
9a0618afc3 Add COPYWIN constants 2021-11-03 15:29:18 -04:00
GriffinR
3e49ac804b
Merge branch 'master' into doc-finalmisc 2021-11-03 13:56:22 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille 
Add font id constants, better braille support
 2021-11-03 13:17:29 -04:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans 
Document battle transition
 2021-11-03 11:26:20 -04:00
cbt6
fca863244b Index sStepTimes and sNpcStepFuncTables 2021-11-03 23:07:05 +08:00
cbt6
680f5f4458 Revert movement speed constants for jump movements 2021-11-03 23:00:37 +08:00
cbt6
87a094edcb Use constants for movement speeds 2021-11-03 20:51:41 +08:00
GriffinR
dc44548e43 Sync libgcnmultiboot 2021-11-02 20:28:17 -04:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
cbt6
510ccbdf4c Move definition of constants for movement speed 2021-11-03 02:56:23 +08:00
cbt6
3556024a06 Distinguish clearly the two enums related to speed 2021-11-03 02:51:30 +08:00
cbt6
3f5f057ebe Rename GoSpeedX functions to WalkNormal, WalkFast, etc. 2021-11-03 01:50:53 +08:00
cbt6
4cedd2d551 Rename WalkFastest functions to WalkFaster 2021-11-03 01:50:53 +08:00
cbt6
a2c2d7e230 Label indexes for movement speeds 2021-11-03 01:50:47 +08:00
Eduardo Quezada D'Ottone
f3013d8ee9 Standarized Solarbeam into Solar Beam 2021-11-01 18:36:35 -03:00
GriffinR
54a70ca4d4
Merge pull request #1530 from GriffinRichards/doc-graphics 
Label remaining symbols in graphics.c
 2021-11-01 17:00:06 -04:00
GriffinR
9b2038a9a5 Additional GF ROM header doc 2021-11-01 02:54:53 -04:00
GriffinR
e0e2212db3 Avoid changed section warning 2021-11-01 01:47:38 -04:00
GriffinR
ef2971d8dc Convert GF ROM header to C 2021-11-01 01:42:02 -04:00