ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,889 Commits 1 Branch 0 Tags 235 MiB
0bbbd1e7a9
Commit Graph

7889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
amiosi
f7651fd592 most fixes from requested changes 2021-05-27 15:55:19 -04:00
amiosi
fc81994579 Merge branch 'battle_engine' into old_findings 2021-05-27 15:28:02 -04: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
GriffinR
2b062e89c1
Merge pull request #1448 from Kurausukun/dumb 
[LEAK-INFORMED] Fix Fakematch in DrawWallpaper
 2021-05-25 04:41:15 -04: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
Kurausukun
94939e395b one last goto 2021-05-24 13:31:54 -05:00
gAlfonso-bit
aca96a1510 Mark 0xFFF8 as ~7 
Since 7 is used as a mask, I wondered if 0xFFF8 was used to undo the mask and it turns out it was.
 2021-05-24 07:36:08 -05:00
ghoulslash
c91240068c add sun check to flower gift ally boosts 2021-05-23 14:45:21 -06:00
ExpoSeed
f7d6d42e6c
Merge pull request #1506 from AsparagusEduardo/Fix_BE_Compile 
Fixed compile error & updated names and value to correspond to the change.
 2021-05-23 14:49:57 -05:00
Eduardo Quezada D'Ottone
6afe2ec74e Fixed compile error & updated names and value to correspond to the change. 2021-05-23 15:28:29 -04:00
MandL27
28273af5ed
Merge pull request #1308 from ghoulslash/ai 
Overhaul AI
 2021-05-23 14:43:58 -04:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d fix SIDE_STATUS_SCREEN_ANY 2021-05-23 12:22:07 -06:00
gAlfonso-bit
ff16812f99
UBFix: uninitialized variables in m4a engine and siirtc.c (#1432) 2021-05-23 09:56:37 -05:00
luckytyphlosion
c723d980e7 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
gAlfonso-bit
ffbbc88801
BUGFIX: battle scripts (#1436) 2021-05-23 09:35:03 -05:00
gAlfonso-bit
a454f9c187
UBFIX: sprite.c (#1442) 
Fix out-of-bounds array access in `SortSprites()`.

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
 2021-05-23 09:10:55 -05:00
MissingNoL
dd9920e80b
Update move_descriptions.h 2021-05-23 02:41:41 -07:00
MissingNoL
8b6906bf32
Update abilities.h 2021-05-23 02:39:57 -07:00
ultima-soul
265824531e
Merge pull request #1399 from LOuroboros/2turn_move_tweaks 
Corrected the order of actions in BattleScript_FirstChargingTurn
 2021-05-22 13:50:24 -07:00
LOuroboros
9b46b6fb45
pause 0x40 -> pause B_WAIT_TIME_LONG 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-22 16:34:39 -03:00
LOuroboros
5ef106f061
Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT 2021-05-22 10:29:57 -03:00
LOuroboros
8cbdde3fba waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG 2021-05-21 20:22:04 -03:00
LOuroboros
1bd451e232 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2turn_move_tweaks 2021-05-21 20:21:51 -03:00
GriffinR
ef6d91b0e3
Merge pull request #1443 from ExpoSeed/document-playbgm 
Document second parameter of playbgm
 2021-05-21 17:07:07 -04:00
ExpoSeed
6a977bdbfc Document second parameter of playbgm 2021-05-21 15:08:00 -05:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
Eduardo Quezada D'Ottone
d1d95df409 Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7 2021-05-21 11:29:13 -04:00
LOuroboros
83a1351e82 Tweaked Task_ShowAiPoints to comply with the PE 
Due to the removal of the Deoxys hack, this function needed some minor adjustments that could have always been handled by using the #ifdef preproc directive.
 2021-05-17 18:33:12 -03:00
GriffinR
58d83bf9a7
Merge pull request #1440 from GriffinRichards/remove-berry 
Remove leftover berry descriptions
 2021-05-17 03:12:23 -04:00
GriffinR
c8be6a1fbb Remove leftover berry descriptions 2021-05-17 03:06:02 -04:00
GriffinR
9358ab33a5
Merge pull request #1439 from AsparagusEduardo/MissingTreeckoAnim 
Added missing Treecko from animation list.
 2021-05-16 20:58:13 -04:00
Eduardo Quezada D'Ottone
76b99e66dc Added missing Treecko from animation list. 2021-05-16 20:46:58 -04:00
GriffinR
9e690c07ed
Merge pull request #1437 from ExpoSeed/bugfixes 
Various BUGFIXes and UBFIXes
 2021-05-16 12:24:04 -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
ghoulslash
cd84e8f05c
Merge pull request #1468 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-05-13 21:49:56 -06:00
GriffinR
f62b42eb59
Merge pull request #1386 from SatoMew/master 
Remove Travis badge
 2021-05-13 14:54:47 -04:00
SatoMew
7061e66212 Undo secondary changes 2021-05-13 19:49:15 +01: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