Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,270 Commits 1 Branch 0 Tags
Commit Graph

4894 Commits

Author SHA1 Message Date
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