dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
5,806 Commits 4 Branches 0 Tags
42b7f11db0ece78171690da1d220d2b7774ab5fa
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT 99dd461bef Merge pull request #1189 from aaaaaa123456789/reverts 
Undo PokeCodec's PRs and port changes
 2020-11-03 09:28:45 -05:00
PikalaxALT 4a773ce18d Merge pull request #1217 from ipatix/fix_O3 
rewrite MultiBootWaitCycles as naked function
 2020-10-03 12:34:02 -04:00
PikalaxALT f0012504c6 Merge pull request #1218 from MeatLoaf3/patch-3 
Change toOrrX and toOrrY to u8 in void FillBitmapRect4Bit, glib/blit.c
 2020-10-03 12:33:44 -04:00
PikalaxALT cb69835536 Merge pull request #1210 from ExpoSeed/pull-request-template 
More concise pull request template
 2020-09-27 19:25:19 -04:00
PikalaxALT 46d748a219 Create pull_request_template.md 2020-09-27 17:40:30 -04:00
PikalaxALT 00b8208914 Merge pull request #1205 from GriffinRichards/constants-itemdigits 
Use constants for item digits
 2020-09-27 17:24:48 -04:00
PikalaxALT 0088f59b1d Merge pull request #1197 from MeatLoaf3/patch-1 
Changed casts to volatile
 2020-09-19 10:28:45 -04:00
PikalaxALT b352d1be32 Merge pull request #1198 from PokeCodec/patch-1 
Specify to install Libpng-dev, not libpng
 2020-09-18 16:46:51 -04:00
PikalaxALT c0987169dd Merge pull request #1183 from PokeCodec/PokemonLogicFix 
Match Dewford
 2020-09-10 19:36:21 -04:00
PikalaxALT d260943249 Merge pull request #1182 from PokeCodec/PokemonLogicFix 
Fix more fakematches
 2020-09-09 16:27:24 -04:00
PikalaxALT 8f6d6b933e Merge pull request #1181 from PokeCodec/trainer-hill 
Remove fakematch in trainer_hill.c
 2020-09-08 21:55:29 -04:00
PikalaxALT fb29a464e6 Merge pull request #1180 from PokeCodec/splitTableMatch 
Match BattleIntroOpponent1SendsOutMonAnimation
 2020-09-08 20:01:04 -04:00
PikalaxALT 818bc4ebe5 Merge pull request #1179 from PokeCodec/Maintenance 
Match CheckBagHasSpace
 2020-09-08 16:31:47 -04:00
PikalaxALT 16ecbc6446 Merge pull request #1177 from PokeCodec/MatchEmerald 
Match All but 2 remaining naked functions
 2020-09-05 10:25:10 -04:00
PikalaxALT bb98e346e5 Merge pull request #1178 from AsparagusEduardo/typo-pacifidlog 
Fixed Pacifidlog typo.
 2020-09-05 08:30:52 -04:00
PikalaxALT 2c25e126e7 Merge pull request #1056 from SatoMew/master 
Clean up, include feedback, and update INSTALL.md
 2020-09-04 19:53:39 -04:00
PikalaxALT c3f6c56e19 Merge pull request #1161 from GriffinRichards/doc-wallclock 
Document wall clock data
 2020-09-04 19:48:04 -04:00
PikalaxALT 135ed6a162 Merge pull request #1163 from GriffinRichards/doc-animthrow 
Minor battle_anim_throw cleanup
 2020-09-04 19:44:33 -04:00
PikalaxALT 8324a35517 Merge pull request #1166 from ketsuban/tidying 
Tidy up naked functions
 2020-09-04 19:41:18 -04:00
PikalaxALT d7e31f5a85 Merge pull request #1148 from PokeCodec/savedIme 
Remove unused var from ruby and other minor refactors.
 2020-08-23 19:47:08 -04:00
PikalaxALT d2c7a862c7 Merge pull request #1147 from GriffinRichards/doc-contestai 
Document contest AI
 2020-08-21 15:16:37 -04:00
PikalaxALT cd895e497d Merge pull request #1141 from GriffinRichards/add-nonmatch 
Wrap asm statements in NONMATCHING
 2020-08-21 12:44:07 -04:00
PikalaxALT 3372993a63 Merge pull request #1133 from GriffinRichards/doc-pblock 
Document use_pokeblock
 2020-08-17 16:28:15 -04:00
PikalaxALT 03eba6a62c Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
PikalaxALT 96b904bf80 Merge pull request #1115 from PokeCodec/Matching 
Match InitObjectEventStateFromTemplate
 2020-07-28 15:56:58 -04:00
PikalaxALT 70617d56e4 Merge pull request #1104 from PokeCodec/Explcit-Casting 
Reduce "Implicit conversion" warnings
 2020-07-28 11:10:00 -04:00
PikalaxALT 79cc659d7e Merge pull request #1113 from DizzyEggg/patch-4 
Fix undefined behaviour in protect animation
 2020-07-27 06:37:37 -04:00
PikalaxALT 2e077f09e4 Merge pull request #1111 from GriffinRichards/sync-flags 
Sync unused flags with pokeruby
 2020-07-23 09:12:33 -04:00
PikalaxALT 5348674bc4 Merge pull request #1102 from GriffinRichards/doc-faraway 
Document faraway island
 2020-07-23 09:12:19 -04:00
PikalaxALT 617e411aca Merge pull request #1092 from PikalaxALT/ubfix 
Fix some UB exposed with GCC 10.1.0
 2020-07-11 10:32:30 -04:00
PikalaxALT 038d247e14 Merge pull request #1091 from Flametix/target 
Replace magic number with MOVE_TARGET_BOTH
 2020-07-09 15:45:36 -04:00
PikalaxALT 5a326a11f4 Merge pull request #1090 from Ryuhouji/patch-3 
Made documentation more readable
 2020-07-09 15:45:11 -04:00
PikalaxALT ebade7affb Merge pull request #1079 from GriffinRichards/doc-confetti 
Document Contest Util and confetti effects
 2020-07-08 16:01:27 -04:00
PikalaxALT 9ff261ac2a Merge pull request #1078 from GriffinRichards/move-cries 
Move Pokemon cries to own directory
 2020-07-08 15:45:32 -04:00
PikalaxALT 8b80b417e2 Merge pull request #1069 from GriffinRichards/doc-link 
Document linking
 2020-07-08 15:43:45 -04:00
PikalaxALT 550875757b Merge pull request #1087 from ipatix/fix_aggressive_loop_optimizations 
fix aggressive loop optimizations
 2020-07-08 15:42:08 -04:00
PikalaxALT b7532903d7 Merge pull request #1089 from PokeCodec/patch-1 
Match CreatePokeDexList
 2020-07-07 21:15:49 -04:00
PikalaxALT 70c5f923ad Merge pull request #1072 from nullableVoidPtr/master 
Match sub_80F0708
 2020-06-10 09:23:38 -04:00
PikalaxALT 8c54454923 Merge pull request #1066 from pret/revert-1065-transitions 
Revert "More transitions documentation"
 2020-06-01 18:26:07 -04:00
PikalaxALT 72b332d551 Revert "More transitions documentation" 2020-06-01 18:05:31 -04:00
PikalaxALT 24075e9e72 Merge pull request #1061 from GriffinRichards/fix-egg 
Clear up misleading egg step name
 2020-05-29 16:50:37 -04:00
PikalaxALT e0ae696479 Merge pull request #1027 from PikalaxALT/gbagfx_tilemap 
Add tilemap rendering capability to gbagfx
 2020-05-29 16:49:46 -04:00
PikalaxALT 7c248947f4 Merge pull request #1038 from ProjectRevoTPP/master 
restore SeedRngWithRtc comment and declaration of GF oversight.
 2020-05-19 13:31:41 -04:00
PikalaxALT 3c4b9dfacc Merge pull request #1044 from DizzyEggg/sss 
Document pokemon summary screen
 2020-05-19 13:30:42 -04:00
PikalaxALT 44f348a8e1 Merge pull request #1040 from PikalaxALT/toolfix 
Fix building modern from clean
 2020-05-15 09:59:56 -04:00
PikalaxALT 724ffe14ee Merge pull request #1028 from jiangzhengwenjz/misc 
sync with pokefirered
 2020-04-27 19:38:38 -04:00
PikalaxALT a12de6e480 Merge pull request #1022 from GriffinRichards/doc-gcn 
Label GCN link flags field
 2020-04-14 15:54:34 -04:00
PikalaxALT c21175d6b8 Merge pull request #1023 from GriffinRichards/fix-decor 
Misc decoration gfx fixes
 2020-04-14 15:16:42 -04:00
PikalaxALT 8a31778733 Merge pull request #1021 from Brainface1/master 
Named some bike-related functions
 2020-04-12 13:30:04 -04:00
PikalaxALT ee1744865e Merge pull request #1014 from GriffinRichards/fix-png 
Re-export tileset anim pngs to use palettes
 2020-04-12 13:29:50 -04:00
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
PikalaxALT 7d65645756 Merge pull request #1017 from pret/PikalaxALT-patch-1 
Bump devkitARM
 2020-04-04 16:22:58 -04:00
PikalaxALT 055d13fa38 Bump devkitARM 2020-04-04 16:09:36 -04:00
PikalaxALT 22fa4cb178 Merge pull request #1012 from jiangzhengwenjz/nonmatching 
resolve some naked functions
 2020-04-02 09:52:03 -04:00
PikalaxALT 3a0a4385f6 Merge pull request #1013 from Sewef/patch-2 
Two pokedex matching
 2020-04-02 07:46:37 -04:00
PikalaxALT f1cccc975b Merge pull request #1009 from Sewef/patch-1 
Fix 'AnimMovmentWaves' typo
 2020-03-27 09:52:31 -04:00
PikalaxALT c2d95be156 Merge pull request #1007 from GriffinRichards/fix-healloc 
Revert more porymap-breaking changes from #968
 2020-03-19 16:30:45 -04:00
PikalaxALT 33ecfb46e4 Merge pull request #1005 from GriffinRichards/fix-rme 
Revert city_zoom_tiles.png name
 2020-03-17 12:39:08 -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
PikalaxALT 08bced2cbb Merge pull request #999 from ProjectRevoTPP/patch-1 
Fix the source of pain and suffering for the last 2 years.
 2020-03-09 16:28:27 -04:00
PikalaxALT c805c4cc6f Merge pull request #995 from AsparagusEduardo/Ignore-mGBA-savestate 
Ignores mGBA's first savestate file.
 2020-03-06 13:11:50 -05:00
PikalaxALT b3244301b7 Merge pull request #994 from jiangzhengwenjz/nonmatching 
real match sub_8021A28
 2020-03-05 18:14:08 -05:00
PikalaxALT e26293448c Merge pull request #993 from jiangzhengwenjz/nonmatching 
real match sub_8027E30
 2020-03-05 16:39:00 -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
PikalaxALT 0eae6d0d07 Merge pull request #992 from GriffinRichards/fix-trainerbattle 
Minor fixes in trainer_battle.inc
 2020-03-03 15:56:28 -05:00
PikalaxALT da7e797236 Merge pull request #982 from jiangzhengwenjz/nonmatching 
real match sub_802C838
 2020-02-19 08:47:03 -05:00
PikalaxALT 39d70e364a Merge pull request #964 from PikalaxALT/combined_moves 
sCombinedMoves
 2020-02-01 13:10:03 -05:00
PikalaxALT de49445a79 Merge pull request #952 from PikalaxALT/real_match_8072308 
Match sub_8072308
 2020-01-10 17:39:18 -05:00
PikalaxALT 5f1c7c9e93 Bump travis to bionic (Ubuntu 18.04 LTS) 2019-12-18 13:03:00 -05:00
PikalaxALT 6efa51f8ad Bump discord invite 
New invite link points to landing channel
 2019-11-25 18:38:13 -06:00
PikalaxALT bab1458cb4 Merge pull request #898 from DizzyEggg/imgp 
Match ConvertImageProcessingToGBA
 2019-11-12 15:26:25 -05:00
PikalaxALT 00fc8ec98a Merge pull request #842 from PikalaxALT/song_vol 
Fix volume in mus_me_b_big.mid
 2019-10-17 11:47:20 -04:00
PikalaxALT 48e54ae387 Merge pull request #825 from GriffinRichards/ignore-lib 
Update .gitignore
 2019-10-02 13:43:59 -04:00
PikalaxALT cb528cb543 Merge pull request #821 from GriffinRichards/document-textinput 
Document text input strings
 2019-10-02 09:49:26 -04:00
PikalaxALT 0d13a85855 Merge pull request #822 from GriffinRichards/document-fieldspecials 
Document a few field specials
 2019-10-02 09:22:09 -04:00
PikalaxALT 9317d114a9 Merge pull request #823 from GriffinRichards/constants-strconv 
Use STR_CONV constants
 2019-10-02 09:18:48 -04:00
PikalaxALT 301822603e Merge pull request #802 from PikalaxALT/gflib 
Gflib and libagbsyscall
 2019-09-27 11:34:55 -04:00
PikalaxALT 3d9bad5558 Merge pull request #778 from GriffinRichards/document-eventscripts 
Document some of event_scripts.s
 2019-09-27 10:18:27 -04:00
PikalaxALT 1e1a4076f0 Merge pull request #798 from GriffinRichards/constants-baction 
Use misc battle constants
 2019-09-05 09:06:31 -04:00
PikalaxALT 5c7eac7134 Merge pull request #744 from PikalaxALT/remove_tutor_casts 
Remove unnecessary tutor learnset casts
 2019-09-04 16:51:06 -04:00
PikalaxALT 36723a235a Merge pull request #735 from garakmon/encounter_json 
Add Different Field Info to Wild Encounters JSON
 2019-09-04 16:50:39 -04:00
PikalaxALT a4270cfdae Merge pull request #779 from pret/deprecate-tools 
Deprecate build_tools.sh
 2019-09-04 16:45:34 -04:00
PikalaxALT 48b8d68872 Merge pull request #797 from PikalaxALT/common_syms 
Fix issue with ramscrgen invoke for some users
 2019-09-04 09:12:46 -04:00
PikalaxALT 1f4c88c952 Copy Berry Fix MB dism from FR (#777) 
* Copy Berry Fix MB dism from FR
 2019-09-03 15:33:11 -04:00
PikalaxALT 45767f9c00 Merge pull request #793 from DizzyEggg/patch-1 
Use item constant in pretty petal flower shop
 2019-08-30 05:56:17 -04:00
PikalaxALT 4663564e02 Merge pull request #775 from DizzyEggg/patch-9 
Fix modern
 2019-08-17 05:17:05 -04:00
PikalaxALT 4541b959b6 Deprecate build_tools.sh 2019-08-15 15:17:13 -04:00
PikalaxALT ca8048c300 Merge pull request #771 from aaaaaa123456789/master 
Fix Makefiles to account for the $CC and $CXX environment variables
 2019-08-06 20:16:36 -04:00
PikalaxALT 1bda9ef2f6 Merge pull request #769 from PikalaxALT/pokenav_unk_9 
Pokenav unk 9
 2019-08-06 12:49:03 -04:00
PikalaxALT 195137b001 Merge pull request #768 from PikalaxALT/pokenav_unk_8 
Finish pokenav_unk_8
 2019-08-05 15:21:20 -04:00
PikalaxALT 9beeba8424 Merge pull request #764 from GriffinRichards/document-varnames 
Document vars that are used and unnamed
 2019-08-05 11:59:53 -04:00
PikalaxALT f5e18718d9 Merge pull request #702 from PikalaxALT/pokenav_unk_2 
Pokenav unk 2
 2019-08-05 09:49:21 -04:00
PikalaxALT 1fc64b8582 Merge pull request #767 from DizzyEggg/pokenav_8 
More pokenav
 2019-08-05 08:21:36 -04:00
PikalaxALT 483e5173c9 Merge pull request #696 from SatoMew/master 
Make installation documentation more straightforward
 2019-08-04 21:16:41 -04:00