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

3580 Commits

Author SHA1 Message Date
PikalaxALT
7eaabab3f0
Merge pull request #1020 from GriffinRichards/doc-unkanim 
Give partial labels to unknown anims
 2020-04-10 14:07:23 -04:00
PikalaxALT
c08b4ff3e1
Merge pull request #1019 from GriffinRichards/constants-party 
Add misc party constant usage
 2020-04-10 14:05:35 -04:00
PikalaxALT
8188615db8
Merge pull request #1018 from GriffinRichards/sync-util 
Sync link game util files
 2020-04-10 14:02:53 -04:00
PikalaxALT
384a7cdef8
Merge pull request #1011 from GriffinRichards/doc-avflag 
Minor player avatar doc
 2020-04-10 13:56:52 -04:00
PikalaxALT
6133c6b0af
Merge pull request #1006 from AsparagusEduardo/UsingBattleAction 
Using Battle Action constants
 2020-04-10 13:56:25 -04:00
GriffinR
2615a6838e Label unknown anims 2020-04-09 19:24:47 -04:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
GriffinR
e485857df3 Sync minigame_countdown 2020-04-08 17:23:32 -04:00
GriffinR
8853588af0 Sync digit_obj_util 2020-04-08 16:27:11 -04:00
jiangzhengwenjz
afdcb69bf4 better matching approach than upstream 2020-04-02 20:30:31 +08:00
jiangzhengwenjz
61b7b45084 Merge branch 'master' of https://github.com/pret/pokeemerald into nonmatching 2020-04-02 20:26:16 +08:00
Sewef
1c895bb8d0
Match HighlightSubmenuScreenSelectBarItem 2020-04-02 13:17:33 +02:00
Sewef
096e57f56c
Match HighlightScreenSelectBarItem 2020-04-02 13:11:18 +02:00
jiangzhengwenjz
0fe5ff34dc Pokeblock_BufferEnhancedStatText 2020-04-02 13:53:53 +08:00
jiangzhengwenjz
cd60736e36 PrintMonWeight 2020-04-02 12:15:03 +08:00
jiangzhengwenjz
69f6d2afad HighlightSubmenuScreenSelectBarItem 2020-04-02 01:03:44 +08:00
jiangzhengwenjz
3d2c42adfe HighlightScreenSelectBarItem 2020-04-02 01:03:25 +08:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
Sewef
685f120b5e
Fix 'AnimMovmentWaves' typo 2020-03-27 14:50:15 +01:00
GriffinR
8e4b987699 Revert more porymap-breaking changes 2020-03-18 03:22:07 -04:00
AsparagusEduardo
f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
GriffinR
ab87c90998 Revert city_zoom_tiles.png name 2020-03-17 12:08:05 -04:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
PikalaxALT
784e29352d
Merge pull request #985 from mrgriffin/decoration 
Document decoration.c
 2020-03-17 10:39:37 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap 
Document some pokenav and region map
 2020-03-17 10:38:20 -04:00
garakmon
b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04:00
AsparagusEduardo
c73fdb8954 Restored some tItemCount instances as requested. 2020-03-10 17:46:26 -05:00
AsparagusEduardo
130929a7a4 Slight item_menu.c documentation 2020-03-10 17:46:26 -05:00
AsparagusEduardo
97096aab07 Applied review changes 2020-03-10 17:45:29 -05:00
AsparagusEduardo
1b9a01798e monMarks 2020-03-10 17:45:29 -05:00
AsparagusEduardo
fdf1faa563 SetMonIconTransparency 2020-03-10 17:45:29 -05:00
AsparagusEduardo
1159180a25 sMovingItemId 2020-03-10 17:45:29 -05:00
AsparagusEduardo
f9725affd0 MODE_2 renamed to MODE_MOVING 2020-03-10 17:45:29 -05:00
GriffinR
a495379ff0 Document pokedex cry screen 2020-03-10 14:02:03 -04:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
Eduardo Quezada
f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
Martin Griffin
4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00
jiangzhengwenjz
93f0bff49c sub_8021A28 2020-03-06 07:01:12 +08:00
jiangzhengwenjz
69aff34afd sub_8027E30 2020-03-06 05:31:27 +08:00
GriffinR
8e1e09562e Use array count for InitBgsFromTemplates 2020-03-03 22:46:48 -05:00
PikalaxALT
9259b378ef
Merge pull request #991 from GriffinRichards/fix-eventticket 
Clarify event ticket flag names
 2020-03-03 16:15:27 -05:00
GriffinR
b6c9ad505d Minor fixes in trainer_battle.inc 2020-03-03 14:47:14 -05:00
GriffinR
4637085390 Clarify event ticket flag names 2020-03-03 01:36:20 -05:00
PikalaxALT
afe081cbba Match MultiplyInvertedPaletteRGBComponents and MultiplyPaletteRGBComponents 2020-02-27 14:00:36 -06:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00
GriffinR
dc3c2b72f2 Clean up move anim doc 2020-02-25 12:54:08 -06:00
GriffinR
68dc68907b Label move anim data 2020-02-25 12:54:08 -06:00
GriffinR
efd53d080c Clean up battle anim C for doc 2020-02-25 12:54:08 -06:00
GriffinR
afa1ae2209 Finish documenting move anim scripts 2020-02-25 12:54:08 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
GriffinR
208057d7ae Document move anims S-Z 2020-02-25 12:54:08 -06:00
GriffinR
0d651c7c9e Some battle anim review changes 2020-02-25 12:54:08 -06:00
GriffinR
1ba12dc050 Document move anims I-S 2020-02-25 12:54:08 -06:00
GriffinR
501d0d3c18 Document move anims C-H 2020-02-25 12:54:08 -06:00
GriffinR
faf0ba8662 Use macro for randomization with ISO value 2020-02-25 12:54:08 -06:00
GriffinR
6eb44dc507 Document move anims A-C 2020-02-25 12:54:08 -06:00
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
jiangzhengwenjz
097b847303 sub_802C838 2020-02-19 06:23:01 +08:00
GriffinR
3456578c0f Move berry crush data to src 2020-02-17 13:10:23 -06:00
GriffinR
f6275cce57 Misc constant use in TV 2020-02-17 13:09:35 -06:00
GriffinR
e7ff7fb032 Fix move relearner struct 2020-02-17 13:08:03 -06:00
PikalaxALT
867734a791 Fix alignment in AgbRfu_LinkManager.h 2020-02-16 15:32:10 -05:00
PikalaxALT
91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
GriffinR
ac1738e11d Move smokescreen data to src 2020-02-13 14:48:19 -06:00
GriffinR
d11cd5d217 Move text input strings to src 2020-02-13 14:48:19 -06:00
Marcus Huderle
49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06:00
GriffinR
956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR
689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
faeb974c46 Minor berry fix data clean up 2020-02-08 14:23:41 -06:00
GriffinR
43ec11b92a Move berry powder data to src 2020-02-08 14:22:53 -06:00
GriffinR
d1035f027e Move contest_link_80F57C4 data to src 2020-02-08 14:22:53 -06:00
GriffinR
85dc8a528c Move rotating tile puzzle data to src 2020-02-08 14:22:53 -06:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR
8a96aa9e97 Name pokenav files 2020-02-04 08:02:28 -06:00
GriffinR
be5d417236 Document some pokenav menu handlers 2020-02-04 08:02:28 -06:00
Sebastian Gabl
0cf84d13ef Use correct prefix 2020-02-04 07:42:04 -06:00
Sebastian Gabl
0bd9639478 Name Wally struct and use bag macros 2020-02-04 07:42:04 -06:00
PikalaxALT
462acaa7dc sCombinedMoves 2020-02-01 12:07:40 -05:00
GriffinR
9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR
9a6c2c25d0 Add some capacity constants 2020-01-26 09:42:55 -06:00
GriffinR
7232bfecc2 Name null palettes 2020-01-26 09:40:35 -06:00
GriffinR
a152900211 Combine animated door frames 2020-01-26 09:40:35 -06:00
GriffinR
25d7577d9d Label animated doors 2020-01-26 09:40:35 -06:00
Sahith Nallapareddy
25df146054 using item constant 2020-01-20 07:51:18 -06:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
GriffinR
a40f054900 Move/rename gfx start/end vars 2020-01-18 08:49:34 -06:00
jiangzhengwenjz
aa631825fc resolve data sections 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
46b00b11d4 match all the functions 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
c2be2e8c69 sync documentation from firered 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
8a5f292618 document symbols 2020-01-16 08:14:27 -06:00
GriffinR
ea8b1011d3 Merge master into fix-eventobj 2020-01-15 16:11:20 -05:00
Sebastian Gabl
5fff2f2234 Use SHINY_ODDS macro where intended 
The 3 locations where SHINY_ODDS was added generate mon sprites for
display in the dex, at game start and on starter choice.
The arguments are intended for otId but in this case they are set to the
same value as SHINY_ODDS to prevent the pictures created from using the
shiny palette.
 2020-01-15 08:10:20 -06:00
Marcus Huderle
755ae0facc Use empty braces for last null entry in sTransitionTypes array 2020-01-13 20:31:40 -06:00
Marcus Huderle
5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 2020-01-13 20:26:20 -06:00
GriffinR
22931846d6 Fix Colosseum name porymap issue 2020-01-13 20:20:48 -06:00
GriffinR
e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
huderlem
6d6c57f383
Merge pull request #953 from GriffinRichards/sync-script 
Port some macro/script fixes from pokefirered
 2020-01-13 19:33:47 -06:00
GriffinR
c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05: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
43962fe141 Fix BuffeInGameTradeMonName typo 2020-01-12 19:45:04 -06:00
GriffinR
10220d3b76 Label TryRecordMixLinkup 2020-01-12 19:39:30 -06:00
GriffinR
e736c2d2fd Document some easy chat specials 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
0284014e0e Add missing save status use 2020-01-12 18:42:41 -06:00
GriffinR
58e64b9524 Clean up some of save.c 2020-01-12 18:42:41 -06:00
PikalaxALT
98b2ab9a77 Match sub_8072308 2020-01-10 16:38:47 -05:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
017fa294b5 Add battle tent mon/trainer constants 2020-01-08 01:07:53 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
Slawter666
8b1595ebc3 Pokédex search menu documentation 2020-01-06 15:18:58 -06:00
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
GriffinR
379f7f5149 Add braces to trainer party moves 2020-01-06 15:16:49 -06:00
GriffinR
bb692a03eb Add frontier mon constants 2020-01-03 23:20:11 -05:00
Marcus Huderle
ef751c8d1b Fix formatting and remove unnecessary comments 2019-12-28 12:07:02 -06:00
huderlem
3b05398975
Merge pull request #945 from Fontbane/patch-5 
Give rival and Maxie parties better names
 2019-12-28 12:06:35 -06:00
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
Fontbane
31b4656324 Labels better 2019-12-25 22:39:06 -05:00
Fontbane
2e8c20d72f Update trainers.h 2019-12-25 20:48:40 -05:00
huderlem
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse 
Document item_use.c
 2019-12-25 11:59:07 -06:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
AJ Fontaine
b80fa767ab
Give rivals and Maxie battles better names 
Name describes where the battle is and for rivals, which starter the player chose.
 2019-12-23 10:42:06 -05:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
GriffinR
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
Diegoisawesome
773a599bbb
Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo 
'real' match DrawTradeMenuPartyInfo
 2019-12-20 15:49:14 -08:00
jiangzhengwenjz
4d8ea3a2d9 CanSpinTradeMon 2019-12-21 06:18:20 +08:00
jiangzhengwenjz
681d929892 DrawTradeMenuPartyInfo 2019-12-21 06:09:59 +08:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR
23f952b34e Merge master into doc-tower 2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
huderlem
f8cef9a6a8
Merge pull request #932 from jiangzhengwenjz/berry_crush 
berry crush
 2019-12-17 19:35:00 -06:00
GriffinR
4879c1eab2
Merge branch 'master' into constants-fade 2019-12-17 19:11:51 -05:00
jiangzhengwenjz
420b4b3fea use STR_CONV_MODE_* constants 2019-12-18 06:42:53 +08:00
jiangzhengwenjz
5bec27aa34 nonmatch sub_8024604 2019-12-18 03:36:51 +08:00
jiangzhengwenjz
67690df65f sub_8023CAC 2019-12-17 23:12:01 +08:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
jiangzhengwenjz
50c48d7ef6 sub_8023BC0 2019-12-17 14:49:57 +08:00
jiangzhengwenjz
efa1ee1822 sub_8022250 2019-12-16 14:17:29 +08:00
jiangzhengwenjz
3f858c1c26 sub_8022F04 2019-12-16 14:17:29 +08:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj 2019-12-15 11:47:27 -05:00
GriffinR
96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall 
Document some pokenav match call
 2019-12-15 09:42:13 -06:00
GriffinR
a04347816f Split PokenavMatchCallEntries from PokenavMonList 2019-12-15 10:25:47 -05:00
GriffinR
82f55f2381 Merge master into ObjEvent rename 2019-12-15 02:00:00 -05:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR
ea9a2c848a Define start and ends for temp vars and daily/temp/special flags 2019-12-14 08:27:49 -06:00
GriffinR
09840efc64 Name last event_data funcs 2019-12-14 08:27:49 -06:00
GriffinR
1a672dac8d Use constant for daily flag offset 2019-12-14 08:27:49 -06:00
GriffinR
6556b556dd
Merge branch 'master' into fix-eventobj 2019-12-11 01:09:06 -05:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall 2019-12-10 20:43:27 -05:00
GriffinR
49f1a90534 Document Battle Pike scripts 2019-12-10 19:31:27 -06:00
GriffinR
b7ab9cbf4c Update JP translation and fix typo 2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR
8da7a94423
Merge branch 'master' into fix-eventobj 2019-12-10 17:41:08 -05:00
Diegoisawesome
49b56d0136
Merge pull request #929 from jiangzhengwenjz/nonmatching 
fake match InitEventObjectStateFromTemplate
 2019-12-10 14:32:57 -08:00
jiangzhengwenjz
f34b8f564a InitEventObjectStateFromTemplate 2019-12-11 05:35:40 +08:00
GriffinR
77bf40d32b Fix modern build for #925 2019-12-08 16:57:09 -05:00
GriffinR
51179df017 Clean up match call doc 2019-12-08 15:49:36 -05:00
GriffinR
0086cd1efa More pokenav match call documentation 2019-12-08 15:25:21 -05:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
Slawter666
47ea65b96e Requested changes 2019-12-06 19:06:21 -06:00
Slawter666
9fc176f272 Document pokedex info page 2019-12-06 19:06:21 -06:00
GriffinR
05af6b467c Fix Subsprite formatting 2019-12-06 19:05:44 -06:00
GriffinR
c26e8b8ddb More SPRITE macro usage 2019-12-06 19:05:44 -06:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR
22fd579fd9 Add comment for ABNORMAL_WEATHER 2019-12-06 19:05:28 -06:00
GriffinR
7f22fc9879 Update old weather names in field_weather_effect 2019-12-06 19:05:28 -06:00
GriffinR
efaea2a3ab Revert WEATHER_CLOUDY to WEATHER_SHADE 2019-12-06 19:05:28 -06:00
GriffinR
a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
GriffinR
1b30f0c973 Rename event_obj_lock to event_object_lock 2019-12-06 02:55:30 -05:00
GriffinR
cc9b923dc2 More pokenav match call documentation 2019-12-06 02:35:08 -05:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR
467a103bcc Set up Battle Tent macros 2019-12-05 21:11:17 -06:00
GriffinR
fdae25eab2 Set up Battle Pyramid macros 2019-12-05 21:11:17 -06:00
GriffinR
9fcfbdbef5 Set up Battle Factory macros 2019-12-05 21:11:17 -06:00
GriffinR
41c1c9ca8a Set up Battle Pike macros 2019-12-05 21:11:17 -06:00
GriffinR
9b3d1cfab6 Set up Battle Dome and Tower macros 2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d Set up remaining facility script doc, use Palace macros 2019-12-05 21:11:17 -06:00
GriffinR
548af3c0f1 Document a bit of Match Call 2019-12-05 15:33:36 -05:00
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -05:00
GriffinR
cb90f22c5e Merge master into ObjEvent rename 2019-11-27 12:51:10 -05:00
GriffinR
8d870d94c9 Document Battle Arena scripts 2019-11-26 18:47:48 -06:00
GriffinR
f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
08a8dc46e3 Use macros for Trainer Hill 2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2 Begin documenting Battle Pike and Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
cfdde42b00 Name text speed delays 2019-11-25 09:16:05 -06:00
huderlem
9a81661075
Merge pull request #851 from Sewef/patch-3 
battle_anim_effects_3
 2019-11-24 12:02:54 -06:00
Sewef
07b79c3fc3 battle_anim_effects_3 (5) 2019-11-24 18:00:51 +01:00
huderlem
bef6150b59
Merge pull request #909 from GriffinRichards/doc-apprentice 
Document Apprentice
 2019-11-23 09:27:02 -06:00
GriffinR
f039e897ca Use APPRENTICE_COUNT for record_mixing mod 2019-11-23 10:11:05 -05:00