ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 13:15:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,292 Commits 1 Branch 0 Tags 235 MiB
03c21c3b71
Commit Graph

4909 Commits

Author SHA1 Message Date
GriffinR
a274cc6a76
Merge branch 'master' into flatten_sprite_pos 2021-07-12 01:39:28 -04:00
Collin Styles
eab1d7b5b1 Use the IS_TYPE_PHYSICAL macro in AddMovePoints 2021-07-11 22:02:24 -07:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower 
Clean up Mirage Tower
 2021-07-10 23:26:41 -04:00
GriffinR
32fe412755
Merge pull request #1475 from GriffinRichards/doc-minor 
Label remaining symbols in a few files
 2021-07-08 00:24:56 -04:00
GriffinR
fced9e507d
Merge pull request #1478 from Kurausukun/itemprint 
Change ItemPrintFunc to Use u32 Instead of s32
 2021-07-08 00:15:45 -04:00
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
ultima-soul
ad8cfda831 Add and rearrange Key Items. 2021-07-06 17:03:46 -07:00
ultima-soul
2d8d38f44c Add TM51 through TM100. 2021-07-05 18:11:57 -07:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
Kurausukun
42730a8315 Revert "remove gflib" 
This reverts commit 8b59909ac5.
 2021-07-03 17:39:33 -04:00
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock 
Fix some object lock names
 2021-07-03 11:21:10 -04:00
SnorlaxMonster
43c5107e4d Correct card lines in Battle Dome comments 
The comments regarding the lines that Trainer information is displayed
on the Battle Dome Trainer Card were off-by-one.
 2021-07-03 22:41:18 +10:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
GriffinR
c42b5d783a Fix 'determining' typo 2021-07-02 03:26:50 -04:00
GriffinR
64d06f4c8f Condense battle AI scripts, minor clean up 2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
d73b3c05c6 Label remaining hall_of_fame symbols 2021-07-02 01:02:28 -04:00
GriffinR
fe89a4d147 Label remaining region_map symbols 2021-07-02 00:52:36 -04:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
GriffinR
3964820a84
Merge pull request #1473 from GriffinRichards/fix-div0 
Fix divide by 0 in Cmd_getexp
 2021-07-01 14:26:34 -04:00
GriffinR
93188ef0a8 Fix divide by 0 in Cmd_getexp 2021-07-01 00:18:52 -04:00
garakmon
d391c136d8 fix encounter slot logic to accomodate changes 2021-06-27 21:14:21 -04:00
GriffinR
6d92b466e7 Add missing use of F_TRAINER_FEMALE 2021-06-25 11:50:09 -04:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts 
Clarify contest heart tiles
 2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
ultima-soul
9e0b866f09 Rearranged Poke Ball item ids. 2021-06-18 21:46:20 -07:00
ultima-soul
9407a1ac76
Replace hardcoded number in MakeCaptureStars. 2021-06-18 19:20:05 -07:00
Kurausukun
10c80230c4 change printItemFunc to use u32 instead of s32 
also change a use of -2 to LIST_CANCEL
 2021-06-18 00:15:45 -04:00
Kurausukun
8b59909ac5 remove gflib 2021-06-17 22:09:48 -04:00
Sewef
fd55a0d015
Update src/battle_message.c 
Nothing happened.

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-06-17 14:12:06 +02:00
Sewef
d02be421bc
Fix sATypeMove_Table definition 2021-06-17 14:06:40 +02:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
ultima-soul
bca67ac683 Refactor Poke Ball code to not rely on Master Ball being the first item internally. 2021-06-11 18:22:50 -07:00
ultima-soul
b7706f1b99 Remove ball catch rate modifier effects. 2021-06-10 21:59:13 -07:00
ExpoSeed
3ed06c2cc2 Remove remaining grey and replace with gray 2021-06-10 11:36:10 -05:00
ultima-soul
d30ab7760f Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-06-07 13:52:08 -07:00
AJ Fontaine
2fe7184d10
Rename sText_WildPkmnAppeared2 to reflect its use 
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
 2021-06-04 22:32:33 -04:00
Jaizu
a500b04a51
Feathr > Feather 
We do have enough space to put the whole word.
 2021-06-03 12:08:31 +02:00
ultima-soul
fc19023087
Merge pull request #1493 from LOuroboros/feathers 
Corrected the Wings/Feathers
 2021-06-02 22:56:16 -07:00
LOuroboros
1b13db80fc
Syntax fix 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-02 16:43:01 -03:00
Kurausukun
5c6b8ea8d6 re-add const to gEvolutionTable in daycare.c 2021-06-01 17:14:45 -04:00
Kurausukun
9f5bf65fb3 [PROBABLY LEAK-INFORMED] fix battle_transition fakematch, make 
consistent use of SOME_VRAM_STORE
 2021-05-31 18:12:35 -05:00
Kurausukun
2bbaf71998 [LEAK-INFORMED] fix CreateShedinja fakematch 
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
 2021-05-31 08:20:46 -05:00
Kurausukun
2705f2e5f4 [LEAK-INFORMED] also pretty dumb 2021-05-31 08:20:46 -05:00
Kurausukun
42021db743 [LEAK-INFORMED] literal dumbest fakematch ever 2021-05-31 08:20:46 -05:00
gAlfonso-bit
c9c5586068
Fixed ChangeBgY_ScreenOff‘s signature. (#1447) 
* Fix Functions

* Fix ChangeBgY_ScreenOff signature

* Remove unneeded changes

* Fix argument mismatch

Just to get this out of the way

* Not needed

* Update palette.c
 2021-05-27 07:32:09 -05:00
Kurausukun
5d5327c0b7 better match 2021-05-25 04:32:47 -04:00
Kurausukun
5ae5cf110d [LEAK-INFORMED] fix fakematch in DrawWallpaper 2021-05-25 04:03:11 -04:00
ultima-soul
1f859e340d
Merge pull request #1415 from ghoulslash/item_expansion 
Add Berry Hold Effects
 2021-05-24 11:07:35 -07:00
ghoulslash
64815a5f85
Update src/data/items.h 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-05-24 10:18:05 -06:00
ghoulslash
5aa1b5b1ee
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:59 -06:00
ghoulslash
39974b05f7
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:55 -06:00
ghoulslash
a3b092c9a3
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:51 -06:00
ghoulslash
6b868a028a
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:47 -06:00
ghoulslash
aafc8e2109
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:39 -06:00
ghoulslash
f7c00d2366
Update src/data/items.h 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-05-24 10:17:34 -06:00
gAlfonso-bit
ff16812f99
UBFix: uninitialized variables in m4a engine and siirtc.c (#1432) 2021-05-23 09:56:37 -05:00
gAlfonso-bit
ffbbc88801
BUGFIX: battle scripts (#1436) 2021-05-23 09:35:03 -05:00
Eduardo Quezada D'Ottone
ff296efb5c
Merge pull request #1484 from LOuroboros/patch-1 
Corrected the item descriptions of some berries
 2021-05-21 11:41:14 -04:00
LOuroboros
0bc8ed59f5 Wings -> Feathers 2021-05-17 21:58:17 -03:00
LOuroboros
972ed0d5a7 Adjusted the item data of the Wings/Feathers 
Now they work. Yay.
 2021-05-17 21:34:42 -03:00
Eduardo Quezada D'Ottone
76b99e66dc Added missing Treecko from animation list. 2021-05-16 20:46:58 -04:00
ExpoSeed
a7e3da2301 pyramidWinStreas 2021-05-15 15:59:54 -05:00
ExpoSeed
361fa594b3 Various BUGFIXes and UBFIXes 2021-05-15 15:56:17 -05:00
gAlfonso-bit
ab8318cc79 Fix UB: Destoyed task is modified. 
After destruction, task is no longer used, so updating its values is worthless.
 2021-05-15 14:35:32 -05:00
ultima-soul
88861abb29
Merge pull request #1470 from ultima-soul/item_expansion_sync 
Item Expansion Upstream Sync
 2021-05-13 20:56:23 -07:00
Kurausukun
3a403dc520 [LEAK-INFORMED] fix do {} while (0) in apprentice 2021-05-13 11:29:46 -05:00
Kurausukun
e737f1f924 fix main_menu goto 2021-05-13 11:29:11 -05:00
Kurausukun
2cc38acb84 fix item.c gotos 2021-05-13 11:29:11 -05:00
Kurausukun
3b7f708eb0 fix player_pc goto 2021-05-13 11:29:11 -05:00
Kurausukun
0c7773ad75 fix mystery_gift gotos 2021-05-13 11:29:11 -05:00
Kurausukun
f0453871a2 fix battle_dome goto 2021-05-13 11:29:11 -05:00
Kurausukun
dbc1b9aacf fix goto in bike.c 2021-05-13 11:29:11 -05:00
Kurausukun
7740ca1303 replace raw values with char constants 2021-05-13 11:26:15 -05:00
Kurausukun
fa23b196a9 [LEAK-INFORMED] fix battle_interface fakematch 2021-05-13 11:26:15 -05:00
gAlfonso-bit
9a195c0fef Cherry-pick roamer bug fix from pokefirered 
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
 2021-05-13 11:23:42 -05:00
gAlfonso-bit
3e15a3ef8f Update IsPokemonCryPlaying 2021-05-13 11:23:11 -05:00
ExpoSeed
43854664b5 Fix UB in RotatingGate_RotateInDirection 2021-05-11 10:12:01 -05:00
LOuroboros
16573a36eb
Update item_descriptions.h 2021-05-08 18:32:37 -03:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04:00
ghoulslash
6703517f6d
Merge pull request #1456 from ExpoSeed/IE/razor-claw 
Razor claw effect
 2021-05-04 09:33:40 -06:00
GriffinR
4206359862 Fix some object lock names 2021-05-04 01:21:50 -04:00
Kurausukun
608c829acd change usages of float/double to f32/f64 2021-05-01 01:41:27 -04:00
GriffinR
2608018862 Use some missing fieldmap constants in trainer hill 2021-04-29 16:12:50 -04:00
ultima-soul
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix 
Document TV
 2021-04-29 00:25:01 -04:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -07:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims 
Document battler affine anims, default pokeball throw
 2021-04-28 13:56:42 -04:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp 
Sync e-reader helpers, document trainer hill e-reader
 2021-04-28 06:08:57 -04:00
GriffinR
c6300b5325
Merge pull request #1417 from GriffinRichards/doc-pyramidbag 
Document Battle Pyramid Bag
 2021-04-27 14:48:09 -04:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil 
Some Contest clean up
 2021-04-27 02:29:41 -04:00
GriffinR
265b49c47b Label missing sprite anims 2021-04-26 14:41:15 -04:00
GriffinR
d74017d256
Merge pull request #1419 from GriffinRichards/doc-animstatus 
Label more unused battle anims
 2021-04-26 13:32:15 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata 
Document trade sequence animation, some trade cleanup
 2021-04-26 13:26:12 -04:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bee60f4c64 Document battler sprite affine anims, default pokeball throw 2021-04-25 02:18:34 -04:00
GriffinR
e065c0c285 Label more unused battle anims 2021-04-24 18:26:25 -04:00
GriffinR
86475c5ded Document trainer hill ereader 2021-04-24 18:04:27 -04:00
GriffinR
004c37bf02 Sync ereader_helpers with pokefirered 2021-04-24 18:03:06 -04:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
GriffinR
f823cd224f
Merge pull request #1416 from ProjectRevoTPP/apprentice_fix 
[LEAK INFORMED] Fix apprentice.c do{}while(0)
 2021-04-22 17:25:52 -04:00
ProjectRevoTPP
6ebd0ccb57 add NO_COND macro 2021-04-22 17:20:28 -04:00
ProjectRevoTPP
5c51a3ecc6 get rid of apprentice fakematching(s) 2021-04-22 16:40:46 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
e874dfcbc8
Merge pull request #1408 from GriffinRichards/doc-pokemonstorage 
Document Pokémon Storage System
 2021-04-22 01:32:16 -04:00
ProjectRevoTPP
ddc1534098 idiot, get rid of code in block 2021-04-21 21:38:42 -04:00
ProjectRevoTPP
00eeb727db fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy 2021-04-21 21:37:12 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
ProjectRevoTPP
57948b86a8 Eliminate the last fakematching. We are free of nonmatchings/fakematchings! 2021-04-20 21:31:39 -04:00
GriffinR
a2a9f22612 Clean up contest_util 2021-04-20 21:16:47 -04:00
ProjectRevoTPP
21f05a3c01 Resolve sio32intr_clock_slave fakematching. One left! 2021-04-20 12:58:50 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
Kurausukun
d542baf14b THE BEAST IS SLAIN 2021-04-19 23:44:24 -04:00
GriffinR
342ebbf406
Merge branch 'master' into doc-pokemonstorage 2021-04-18 01:49:09 -04:00
GriffinR
52495e889f Doc storage - cleanup 2021-04-18 01:44:25 -04:00
GriffinR
6f967ff6ad Doc storage - standardize names, drop PSS 2021-04-17 23:40:27 -04:00
GriffinR
33c68255de Doc storage - unk utility 2021-04-17 23:31:29 -04:00
GriffinR
7bf89d6446 Doc storage - icon scroll 2021-04-17 23:00:08 -04:00
GriffinR
c921994ce1 Doc storage - tilemap util, place change 2021-04-17 19:02:30 -04:00
GriffinR
1c3e387d43 Doc storage - party menu 2021-04-17 14:33:00 -04:00
GriffinR
cd2a99b7c4 Doc storage - misc cleanup, some item/cursor 2021-04-17 13:33:29 -04:00
GriffinR
96dabc1a7f Doc storage - multi move 2021-04-16 22:36:37 -04:00
GriffinR
80cc7d46ae Doc storage - fix row/column flip 2021-04-16 15:07:10 -04:00
GriffinR
e5f0d2f736 Doc storage - releasing, some cursor 2021-04-16 04:30:09 -04:00
GriffinR
c1da6b29bc
Merge pull request #1405 from GriffinRichards/constants-display 
Add more usage of DISPLAY constants, misc REG constants
 2021-04-16 01:30:03 -04:00
Kurausukun
3e804cb7d1 document decoding buffer 2021-04-16 00:58:54 -04:00
GriffinR
84e1cbaaa6 Doc storage - misc gfx, item icons 2021-04-15 22:07:12 -04:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
a1ed59450e Doc storage - wallpaper and titles 2021-04-15 16:09:41 -04:00
GriffinR
30fecca109 Doc storage - menu texts 2021-04-15 13:31:18 -04:00
GriffinR
f94540c2b8 Misc reg constant cleanup 2021-04-15 03:14:42 -04:00
GriffinR
8368b753df More usage of WININ/OUT constants 2021-04-15 02:43:09 -04:00
GriffinR
62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
GriffinR
c4ef45c161
Merge pull request #1403 from GriffinRichards/doc-pokeblock 
Document Pokéblock menu and feeding scene
 2021-04-14 14:17:36 -04:00
GriffinR
be84499b56 Drop static function argument names 2021-04-14 12:24:09 -04:00
GriffinR
98ab546d3a Label misc unused move anims 2021-04-13 04:04:09 -04:00
GriffinR
7645be27eb Label unused move anims in anim_effects_3 2021-04-13 03:28:03 -04:00
GriffinR
f9f33b643e Label unused move anims in anim_effects_2 2021-04-13 03:17:39 -04:00
GriffinR
56057d3c32 Label more unused battle anims 2021-04-13 02:50:37 -04:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim 
Document Pokémon animation
 2021-04-13 01:36:15 -04:00
GriffinR
042a2ecc41 Document pokeblock feed scene 2021-04-12 18:44:37 -04:00
Marcus Huderle
e92d2005c4 Use designated initializers for gTypeNames 2021-04-12 17:41:16 -05:00
GriffinR
c786a9b20c Document pokeblock menu 2021-04-11 18:10:05 -04:00
GriffinR
2166e337a1 Label unused move anims 2021-04-11 13:21:22 -04:00
ghoulslash
98bccaa35d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-04-10 14:28:07 -06:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field 
Document field
 2021-04-10 13:05:51 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc 
Clean up battle scripts
 2021-04-10 12:41:35 -04:00
GriffinR
fb24336e8f Pokemon animation misc cleanup 2021-04-10 01:36:06 -04:00
GriffinR
72ba8cf58d Document pokemon animation types 2021-04-10 00:50:28 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
LOuroboros
75b6d2837e Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller 2021-04-07 17:10:52 -03:00
GriffinR
c95e89e083 Remove old variables 2021-04-07 13:32:08 -04:00
GriffinR
356e63db03 Clean up fieldmap, port frlg macros 2021-04-07 13:26:02 -04:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
0dc7ff8994 Minor misc field doc 2021-04-06 17:17:41 -04:00
GriffinR
7d2a94282a Label horizontal fog data 2021-04-06 17:05:38 -04:00
GriffinR
4a1cfbead2 Document remaining overworld 2021-04-06 16:55:43 -04:00
GriffinR
86a9d94ce1 Document fieldmap 2021-04-06 16:05:43 -04:00
GriffinR
8bad478b49 Document disguise field effects 2021-04-06 14:51:39 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
802d2b2f0f Label Kyogre/Groudon anims 2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ExpoSeed
5eed23b5d8 Razor claw effect 2021-04-05 23:19:03 -05:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
GriffinR
553fe6239a Document more field effects 2021-04-05 18:21:17 -04:00
GriffinR
f90026826a Document some weather, field effects 2021-04-04 17:52:07 -04:00
ExpoSeed
3517baae2d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into IE/item-use-form-change 2021-04-04 01:21:18 -05:00
GriffinR
5fa20534f9 Label remaining fields in Weather struct 2021-04-04 00:52:17 -04:00
GriffinR
b926fa6b07 Document thunderstorm 2021-04-04 00:44:20 -04:00
GriffinR
1494a83035 Sync drought with pokefirered, add weather tags 2021-04-03 22:47:58 -04:00
GriffinR
fe1b757af5 Some constant use in WallyHandleActions 2021-04-03 16:37:00 -04:00
GriffinR
b6711441f5 Fix AI Guard Spec use, and Specs->Spec 2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
LOuroboros
f04f35f5c3 Added a config for the amount of HP recovered by healing items 2021-04-02 20:34:57 -03:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b Document Contest Lady TV Show 2021-04-02 01:49:38 -04:00
GriffinR
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred 
Document intro and credits sequences
 2021-04-01 23:13:59 -04:00
GriffinR
51970f97b0
Merge pull request #1393 from GriffinRichards/doc-dewfordtrend 
Document Dewford Trend and match_call.c
 2021-04-01 22:19:48 -04:00
GriffinR
1ff6aaf57d Add constant use for match call text ids 2021-04-01 04:21:26 -04:00
GriffinR
f58465a274 Document match_call.c 2021-04-01 03:29:15 -04:00
GriffinR
69a6a97468 Remove incorrect comment 2021-03-31 17:29:09 -04:00
GriffinR
5ba858d19c Label missing easy chat symbols 2021-03-31 16:56:10 -04:00
GriffinR
771a434730 Label Trend Watcher TV show texts 2021-03-31 16:29:42 -04:00
GriffinR
86856098a3 Document Dewford Trend 2021-03-31 16:08:42 -04:00
GriffinR
6b070010b2
Merge pull request #1392 from GriffinRichards/multichoicebool 
Use bool for multichoice ignoreBPress
 2021-03-31 01:27:42 -04:00
GriffinR
5d7c438efc
Merge pull request #1391 from GriffinRichards/objvram 
Add some uses of OBJ_VRAM/VRAM_SIZE
 2021-03-31 00:36:20 -04:00
GriffinR
f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
GriffinR
d5d1caf965 Add some uses of OBJ_VRAM/VRAM_SIZE 2021-03-30 15:07:04 -04:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00
GriffinR
dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR
09ff1524b4 Finish documenting credits 2021-03-29 19:58:29 -04:00
Kurausukun
102582a3df Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc 2021-03-29 18:36:18 -04:00
Kurausukun
79a8eb481f 1 to true 2021-03-29 18:32:22 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush 
Document Berry Crush
 2021-03-29 12:38:16 -04:00
Marcus Huderle
6cceb05cb7 Document some text-related things 2021-03-29 11:20:00 -05:00
GriffinR
62968895ca Add MON_PIC_SIZE constant 2021-03-29 09:38:19 -04:00
GriffinR
357c5439f5 Document some credits 2021-03-29 08:52:40 -04:00
GriffinR
c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
Scott
5cb8ec4247 Rename IsNotEventLegalMewOrDeoxys 2021-03-27 17:27:32 -05:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
GriffinR
0f869fb266 Remaining labels in trainer_card 2021-03-22 15:30:19 -05:00
GriffinR
2be0c52c17 Remaining labels in map_name_popup 2021-03-22 15:30:19 -05:00
GriffinR
1cc0a3506f Label misc field effects 2021-03-22 15:30:19 -05:00
GriffinR
4077c53338 A few labels in party, start, option menus 2021-03-22 15:30:19 -05:00
GriffinR
9773b436d2 Clean up shop.c 2021-03-22 15:30:19 -05:00
GriffinR
6127c6f32e Misc labels in battle facilities 2021-03-22 15:30:19 -05:00
Kurausukun
9eb5794482 cleanup some m4a code (thanks to shoomer) 2021-03-21 13:43:53 -05:00
GriffinR
dfc6ee0e9e Add SAFE_DIV 2021-03-21 13:43:14 -05:00
GriffinR
28aff5b179 Correct ClearRankingHallRecords bugfix 2021-03-21 13:43:14 -05:00
GriffinR
557152b06e Minor link cleanup 2021-03-21 13:40:40 -05:00
Kurausukun
7198d40ec8 port some documentation from FR 2021-03-19 18:49:19 -04:00
Kurausukun
5b910a11b4 port miscellaneous fr documentation 2021-03-18 20:35:39 -04:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
Kurausukun
3baac6ef3c port some missed berry crush documentation 2021-03-15 23:55:10 -04:00
GriffinR
ecd269ba2c
Merge pull request #1372 from GriffinRichards/doc-countdown 
Document minigame countdown
 2021-03-15 21:39:58 -04:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8352ebcc48 Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer 2021-03-15 09:46:57 -04:00
Seth Barberee
4158f07dee move bgBuffers back to unk138 2021-03-12 19:24:03 -06:00
Seth Barberee
fda56d6f47 berry_crush: sync some pokefirered names with pokeemerald 2021-03-12 18:39:25 -06:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
PikalaxALT
e6b1b97aa1 Nonmatching resoltuion 
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
 2021-03-12 13:55:07 -05:00
GriffinR
b1a69d95ea Document minigame countdown 2021-03-11 14:25:22 -05:00
GriffinR
6c297d19e8
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking 
Document Dodrio Berry Picking
 2021-03-10 18:55:41 -05:00
GriffinR
6274acfe5f Fix out of bounds access for fighting anims 2021-03-08 14:32:20 -05:00
N
94a883d600 Fix space 2021-03-04 19:36:44 -06:00
N
99c6a504e0 Finish renaming functions 2021-03-04 19:36:44 -06:00
N
b9b33b6f2b Some renaming 2021-03-04 19:36:44 -06:00
N
7b046ebd1d rename gBerryCrushGame 2021-03-04 19:36:44 -06:00
N
d5a63681e8 Fixed faulty define 2021-03-04 19:33:40 -06:00
N
d63431ae88 Fix comment 2021-03-04 19:33:40 -06:00
N
a2f757c7a6 Document BG_PLTT usage in Agb_Main 2021-03-04 19:33:40 -06:00
Kurausukun
204e95dfea remove unnecessary changes 2021-03-04 19:32:16 -06:00
Kurausukun
dec5e8eee5 steal matching from #1333 2021-03-04 19:32:16 -06:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
GriffinR
734a15135f Clean up a few unlabeled scripts 2021-03-04 19:30:19 -06:00
ExpoSeed
08bd8f8403 Support form changes with PE 2021-03-03 15:34:22 -06:00
GriffinR
69f7882b5e Label missed pokemon jump anims 2021-03-03 14:32:09 -05:00
GriffinR
b9c733495b Document dodrio berry picking 2021-03-03 14:26:05 -05:00
Evan
791fd5e709 finish berry hold effects 2021-03-03 09:25:25 -07:00
GriffinR
91ab30fa71 Rename mon markings struct 2021-02-28 17:11:46 -06:00
GriffinR
ed0347476c Remove old declaration and define 2021-02-28 17:11:46 -06:00
GriffinR
031da44cab Document mon markings 2021-02-28 17:11:46 -06:00
GriffinR
8bfd1370c9
Merge pull request #1352 from huderlem/GetOpponentMostCommonMonType 
Document GetOpponentMostCommonMonType and fix its fake matching
 2021-02-28 17:27:39 -05:00
Marcus Huderle
200e8214cf Document GetOpponentMostCommonMonType and fix its fake matching 2021-02-28 10:43:56 -06:00
GriffinR
cbc7a72814
Merge pull request #1346 from GriffinRichards/doc-pokejump 
Document pokemon jump
 2021-02-28 11:19:02 -05:00
N
6c07031c85 Remove redundant statements 2021-02-28 10:06:07 -06:00
N
cab3728e96 Strangest match 2021-02-28 10:06:07 -06:00
huderlem
10c77f1bc2
Merge pull request #1345 from GriffinRichards/doc-rtcscreen 
Document/clean up some minor screens
 2021-02-28 10:03:22 -06:00
Marcus Huderle
c900de35e7 Fix build and cleanup mistakes 2021-02-28 09:54:55 -06:00
Marcus Huderle
a85fada314 Document more battle anim effects 2021-02-28 09:54:55 -06:00
GriffinR
1912b0cf0a
Merge branch 'master' into doc-rtcscreen 2021-02-28 10:28:43 -05:00
GriffinR
3f59362397
Merge branch 'master' into doc-pokejump 2021-02-28 10:27:50 -05:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec 
Document easy chat and mail, script.c cleanup, add/use some general constants
 2021-02-28 10:26:49 -05:00
Marcus Huderle
c323e7f061 Document some battle anim funcs and data 2021-02-27 11:04:45 -06:00
GriffinR
763724a980 Shifts to mult in ShowBonus 2021-02-26 21:13:16 -05:00
GriffinR
117b90a261 Document pokemon jump 2021-02-26 17:26:39 -05:00
GriffinR
2dfa84c10f Clean up berry_fix_program 2021-02-24 16:46:57 -05:00
GriffinR
f172ff84c9 Clean up save_failed_screen 2021-02-24 14:53:32 -05:00
GriffinR
f09278393e Document reset_rtc_screen 2021-02-24 14:29:33 -05:00
GriffinR
293df1887f Fix comment typo 2021-02-24 11:26:26 -05:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
GriffinR
e52b46ab43 Clean up script.c 2021-02-24 11:03:17 -05:00
GriffinR
81a7f491b7 Use WINDOW_NONE constant 2021-02-24 11:03:08 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
GriffinR
65433c790e
Merge pull request #1342 from sphericalice/heart-icon-palette-tag-constant 
Use the field effects palette tag constant for the heart icon
 2021-02-22 10:43:55 -05:00
SphericalIce
2d7b25428a Use the field effects palette tag constant for the heart icon 2021-02-22 15:35:09 +00:00
SphericalIce
381116b3c4 Add labels for cracked floor metatiles 2021-02-22 15:29:14 +00:00
Sahith Nallapareddy
dafca0ba22 changing to use constants 2021-02-21 19:27:59 -05:00
HornedCrusader
84cb04fa38
Fix bike flag 2021-02-20 11:52:41 -05:00
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -05:00
GriffinR
02c1fbd733 Document ribbon TV show, add new ribbon IDs/size 2021-02-18 09:59:24 -05:00
GriffinR
642ae8295e Some constant use in pokemon_icon.c 2021-02-17 14:11:59 -05:00
GriffinR
e059c4fdfa Use new gift ribbons size, label unused ribbons 2021-02-17 14:11:45 -05:00
GriffinR
2e355ac848
Merge pull request #1329 from Kurausukun/fakematches 
[LEAK-INFORMED] Resolve Fakematches
 2021-02-15 23:59:55 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb 
Document remainder of secret_base.c
 2021-02-15 17:41:55 -05:00
Deokishisu
d418321627 Update crt0.s 2021-02-15 17:25:36 -05: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
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried 
Rename 'hidden' Trainers/obj events to 'buried'
 2021-02-14 21:48:21 -05:00
SphericalIce
27dc32de26 Use RGB macros 2021-02-14 22:08:19 +00:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts 
Label unused layouts
 2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree 
Add berry tree id constants
 2021-02-14 14:15:51 -05:00
Kurausukun
10e430ae15 oops 2021-02-14 04:03:53 -05:00
Kurausukun
7c4116b32a fix indentation 2021-02-14 04:01:20 -05:00
Kurausukun
6b5db889dd [LEAK-INFORMED] remove fakematching comment 
it is in fact not a fakematch
 2021-02-14 03:57:50 -05:00
Kurausukun
bf062f5547 [LEAK-INFORMED] fix battle dome fakematching 
yes they actually fucking did this
 2021-02-14 03:51:38 -05:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene 
Document evolution scene
 2021-02-08 18:21:30 -05:00
GriffinR
487e04d269
Merge pull request #1319 from GriffinRichards/crt0comm 
Add comments for some data in crt0.s
 2021-02-08 17:15:52 -05:00
GriffinR
2237d0748f Label unused layouts 2021-02-08 14:45:56 -05:00
GriffinR
6899acfb6f
Merge pull request #1317 from opakedragon/master 
Fix Spelling of BagMenu_RemoveBagItemMessageindow
 2021-02-07 13:43:05 -05:00
GriffinR
0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
GriffinR
2e57a00d17 Use GAME_LANGUAGE instead of LANGUAGE_ENGLISH 2021-02-05 12:08:49 -05:00
GriffinR
a240481d5f Document secret_base.c 2021-02-05 12:08:25 -05:00
GriffinR
2b5f7fe151
Merge pull request #1323 from LOuroboros/newCursorArea 
newCurosrArea -> newCursorArea
 2021-02-05 07:16:38 -05:00
LOuroboros
2e51a69400 newCurosrArea -> newCursorArea 2021-02-05 04:59:26 -03:00
Deokishisu
ac43365d58 Fix "Compatibility" Misspelling 
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
 2021-02-05 01:27:11 -05:00
GriffinR
15906ca143 Document evolution scene 2021-02-03 17:55:37 -05:00
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers 
Document battle controllers, misc other battle
 2021-02-02 00:24:16 -05:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd 
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
 2021-02-01 21:04:00 -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
90513a9d72
Merge pull request #1318 from GriffinRichards/bardmoves 
Minor bard music clean up
 2021-02-01 14:59:45 -05:00
GriffinR
45ee3a687d Add comments for some data in crt0.s 2021-01-29 18:36:39 -05:00
opakedragon
1e8edcbfcd Revert "Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow"" 
This reverts commit be50fab8f2.
 2021-01-29 13:36:24 -05:00
opakedragon
be50fab8f2 Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow" 
This reverts commit 3a6be5a34c.
 2021-01-29 13:30:09 -05:00
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -05:00
ExpoSeed
857fc9ce95
Merge pull request #1320 from amiosi/item_expansion 
update item effects, prices, names & descriptions
 2021-01-28 12:15:11 -06:00
opakedragon
3a6be5a34c Fix Spelling of BagMenu_RemoveBagItemMessageindow 2021-01-27 06:18:29 -05:00
luckytyphlosion
b0de03356b
Merge pull request #1315 from PokeCodec/patch-3 
Use INTR_FLAG_VBLANK instead of constant 0x1
 2021-01-26 15:22:24 -05:00
luckytyphlosion
ff8952a3f0
Merge pull request #1308 from PokeCodec/pain 
Get rid of Task_data_OP macro
 2021-01-26 15:22:13 -05:00
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05: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
N
b1a29e5017
Use INTR_FLAG_VBLANK instead of constant 0x1 2021-01-25 21:37:04 -05:00
GriffinR
3fd5e143a9 Misc battle anim documentation 2021-01-23 00:40:46 -05:00
GriffinR
a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR
4228509e95 Sync link opponent controller doc to opponent 2021-01-22 21:47:00 -05:00
GriffinR
6f71569fbd Sync recorded opponent controller doc to opponent 2021-01-22 21:41:49 -05:00
GriffinR
c106f7f130 Document battle_controller_opponent.c 2021-01-22 21:35:16 -05:00
GriffinR
d1878f933b Sync link partner controller doc to player 2021-01-22 20:49:14 -05:00
GriffinR
74990a5a76 Sync player partner controller doc to player 2021-01-22 20:48:43 -05:00
GriffinR
1042426cc6 Sync recorded player controller doc to player 2021-01-22 20:47:59 -05:00
GriffinR
b9baf9437d Sync safari/wally controller doc to player 2021-01-22 20:13:34 -05:00
GriffinR
63a7828772 Document battle_controller_player.c 2021-01-22 20:03:27 -05:00
N
07d19ba526
Update main.c 2021-01-22 18:40:08 -05:00
N
3102d94e3c Undo change 2021-01-22 17:41:57 -05:00
N
c636b7c3ae Some more tweaks 2021-01-22 17:41:07 -05:00
amiosi
44a0983624 missed some 2021-01-22 07:43:48 -05:00
GriffinR
4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
amiosi
9456382a32 yellow shmellow 2021-01-21 19:05:01 -05:00
amiosi
184dad1874 changes according to review 2021-01-21 19:04:26 -05:00
ghoulslash
fcc6444c2e
Merge pull request #1329 from ultima-soul/add_fairy_frlg_icon_ie 
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
 2021-01-21 12:20:15 -07:00
ghoulslash
c5491664bd
Merge pull request #1326 from ultima-soul/add_fairy_type_icon_ie 
Add Fairy-type Icon to Fix Contest Move Viewing Crash
 2021-01-21 12:19:10 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv 
Document battle tv data
 2021-01-21 12:27:14 -05:00
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald 
Fix misnamed ground effect flags & document reflections
 2021-01-20 18:50:31 -05:00
SphericalIce
c0489199c0 Rename GetObjEventReflectionType & fix fakematch in GetGroundEffectFlags_Reflection 2021-01-20 22:32:04 +00:00
ghoulslash
9b1a482837
Merge pull request #1317 from ultima-soul/form_species_tables_ie 
Add Form Species ID Tables
 2021-01-20 13:54:58 -07:00
ultima-soul
f571c8af2a Merge branch 'form_species_tables' into form_species_tables_ie 2021-01-20 11:34:59 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
SphericalIce
86297398e6 Move the definition of RETURN_REFLECTION_TYPE_AT and make use of REFL_TYPE_NONE 2021-01-20 10:34:33 +00:00
SphericalIce
4334f7a379 Include NUM_REFLECTION_TYPES in the ReflectionTypes enum 2021-01-20 10:17:07 +00:00
GriffinR
18b8e0ee8e
Merge pull request #1311 from GriffinRichards/clean-unused 
Remove unused local variables and functions
 2021-01-19 23:22:44 -05:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro 
Use constants for item data, misc other constants/fixes
 2021-01-19 20:49:58 -05:00
SphericalIce
2746fd1f95 Name object event ID arguments properly 2021-01-19 23:35:57 +00:00
SphericalIce
6dd973012b Correct ground effect flag names for reflections & document sprite data usage 2021-01-19 23:21:50 +00:00
GriffinR
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
N
e5e390d64b
Revert zero initialization 2021-01-19 14:33:11 -05:00
N
d720520de8
Clarified comment again 2021-01-19 13:47:09 -05:00
N
b6c483394e
Clarified comments 
Made comments clearer.
 2021-01-19 13:43:57 -05:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472 Name color return values more accurately 2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533 Make broader use of RGB macros 2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
4e845b6395 Use constants for contestLinkResults 2021-01-19 04:40:06 -05:00
GriffinR
3f36529cba Use NUMBER_OF_MON_TYPES in pokedex search 2021-01-19 04:34:50 -05:00
GriffinR
9dd867689e Use ARRAY_COUNT in PrintMenuTable 2021-01-19 04:19:14 -05:00
GriffinR
3f9037d63a Use ARRAY_COUNT in InitBgsFromTemplates 2021-01-19 04:14:07 -05:00
GriffinR
bc20fda604 Use GET_UNOWN_LETTER macro 2021-01-19 04:03:16 -05:00
N
7134763b73
Update task.c 2021-01-17 13:00:53 -05:00
N
8297090267
Update task.c 2021-01-17 12:49:50 -05:00
N
ad6ab09e30
Update comment 2021-01-17 12:46:08 -05:00
N
3b80f3caf1
Make variable name shorter 2021-01-17 12:44:08 -05:00
N
d3259ebe2c renamed taskNum to followupFuncDataIndex 2021-01-16 21:56:49 -05:00
N
72e8683975 FIxed the comments 2021-01-16 21:50:59 -05:00
N
e7436ab4c8 Update task.c 2021-01-16 21:35:40 -05:00
N
0159c0c1ae Update task.c 2021-01-16 21:09:51 -05:00
N
a950167d89 Remove define 2021-01-16 21:05:35 -05:00
N
6b5ce647df Update task.c 2021-01-16 20:31:09 -05:00
N
26246ce281 Update task.c 2021-01-16 20:29:42 -05:00
N
926ef40c52 Get rid of Task_data_OP macro 
This macro is so annoying. Can we please do away with it?
 2021-01-16 20:19:00 -05:00
ghoulslash
b006f04ad5
Merge pull request #1256 from ghoulslash/item_expansion 
add z crystal and z ring
 2021-01-15 11:50:54 -07:00
ExpoSeed
5250aaf265
Merge pull request #1277 from LOuroboros/x_items_IE 
Reworked the effects of the X Items #2
 2021-01-15 12:04:54 -06:00
GriffinR
564278fd49 Document battle tv data 2021-01-14 06:29:59 -05:00
GriffinR
8e06d5679c Index gBardSoundsTable 2021-01-14 03:54:59 -05:00
GriffinR
46e0a0607d Array count for easy chat word groups 2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a Index sTMHMMoves 2021-01-14 03:41:28 -05:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
ghoulslash
e013c44340
Merge pull request #1319 from LOuroboros/item_tweaks 
Updated the type-enhancing items' boost
 2021-01-12 09:24:55 -07:00
amiosi
7e91129332 may as well do the rest 2021-01-11 20:18:23 -05:00
amiosi
eaca987879 more fixes 
light ball and gen 6 evolution held items
 2021-01-11 19:54:41 -05:00
amiosi
3aadd69303 fixes 
pokeblock berries and evolution items
 2021-01-11 19:49:03 -05:00
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
GriffinR
fa3acd79e7 Fix missing header for sub_817F77C BUGFIX 2021-01-11 10:37:22 -05:00
GriffinR
4a7a3df205 Move SeedRngWithRtc fix to BUGFIX conditional 2021-01-11 10:36:53 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master 
Document the unused battle strings for downpour weather
 2021-01-11 10:01:57 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage 2021-01-11 08:49:31 -05:00
SatoMew
ead437e89b Document the unused battle strings for downpour weather 2021-01-10 22:26:00 +00:00
amiosi
8d7d819cde beast ball cannot be sold 2021-01-10 15:08:48 -05:00
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo 
Add missing braces to bugfix in CalculateMonStats
 2021-01-10 12:34:39 -05:00
GriffinR
8afc28c98f Add missing braces to bugfix in CalculateMonStats 2021-01-10 12:24:59 -05:00
LOuroboros
f4d34f70c4 Renamed some X Defend labels to reflect its new name 2021-01-10 01:54:41 -03:00
LOuroboros
db37c4f25c Review correction to src/data/pokemon/item_effects.h 2021-01-09 21:47:58 -03:00
SphericalIce
f02afc134b Use the correct constant for max-IV masks 2021-01-07 22:34:57 +00:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
SphericalIce
fb69d97b24 Use the constant for the max total of EVs 2021-01-07 21:11:45 +00:00
GriffinR
c506cf747f
Merge pull request #1293 from GriffinRichards/typo-pyramind 
Fix sPyramindFloorNames typo
 2021-01-05 00:16:24 -05:00
GriffinR
fe5269b875 Fix sPyramindFloorNames typo 2021-01-04 23:58:33 -05:00
GriffinR
a291bc4a2c
Merge pull request #1292 from GriffinRichards/fix-partymenu 
Remove unnecessary subtraction in switch
 2021-01-04 20:49:08 -05:00
GriffinR
1b2c9d00ca
Merge pull request #1291 from Sierraffinity/master 
Fix/document possible division by zero in ConvertScaleParam
 2021-01-04 20:48:58 -05:00
GriffinR
eba7933c0c Remove unnecessary subtraction in switch 2021-01-04 19:50:05 -05:00
Sierraffinity
67a656a4df Fix/document possible division by zero in ConvertScaleParam 2021-01-04 16:26:28 -08:00
GriffinR
0ca76fc179 Some decoration labels, use constant for tileset size 2021-01-04 16:27:57 -06:00
GriffinR
039108284d Clean up gDecorations with gItems format 2021-01-04 16:27:57 -06:00
GriffinR
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
LOuroboros
91c92e9c04 #if X_ITEMS_REWORK == TRUE -> #ifdef BATTLE_ENGINE 2021-01-04 06:49:18 -03:00
amiosi
5392c101d0 tabs 2021-01-03 19:11:24 -05:00
GriffinR
06af0f0fe5 Remove unnecessary string.h includes 2021-01-03 13:36:07 -05:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen 
Document battle factory screen
 2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr 
Minor field_screen_effect / field_player_avatar documentation
 2021-01-03 01:59:36 -05:00
ultima-soul
3c8194c612 Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:30:41 -08:00
ultima-soul
9c34121a50 Fix crash when viewing Contest Moves in Summary Screen by adding Fairy type icon. 2021-01-02 14:03:46 -08:00
GriffinR
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc 
Index battle controller cmd tables
 2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2 Label a few flash effect functions 2021-01-01 13:34:25 -05:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
GriffinR
84fbcc9dd6 Fix modern -> UBFIX macro change 2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
093610b46e Finish factory swap screen doc 2020-12-31 00:26:14 -05:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
amiosi
2e5575385a pr commit 2020-12-30 20:27:37 -05:00
GriffinR
7ae78dc773 Finish factory select screen doc 2020-12-30 17:56:31 -05:00
LOuroboros
7049413ce2 Updated the type-enhancing items' boost 2020-12-30 15:59:13 -03:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d Index battle controller cmd tables 2020-12-29 17:21:58 -05:00
Sierraffinity
127bb97c0e Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite 2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d Add UBFIX for null deref in sub_80D08CC 2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6 Add UBFIX for null derefs in sub_8088950 2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea Add UBFIX for null deref in CameraObjectReset2 2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower 
Label remaining subs in battle_tower.c
 2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
Kurausukun
254b4e621c change "filler" to "unk", remove newline 2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8 fix remaining functions, finally matches 2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390 oops 2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6 fix sub_8021A28 2020-12-21 20:24:36 -05:00