dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
4,954 Commits 4 Branches 0 Tags
3a7bb65077058566557ed84360757ae38e741da7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Diegoisawesome 3b240b2ad4 Merge pull request #938 from pret/ubuntu_bionic 
Bump travis to bionic (Ubuntu 18.04 LTS)
 2019-12-18 13:32:25 -08:00
Diegoisawesome 49b56d0136 Merge pull request #929 from jiangzhengwenjz/nonmatching 
fake match InitEventObjectStateFromTemplate
 2019-12-10 14:32:57 -08:00
Diegoisawesome 809811e722 Merge pull request #917 from GriffinRichards/fix-stringptr 
Fix hard-coded string ptr
 2019-11-28 23:53:26 -06:00
Diegoisawesome c14e2cdbe2 Merge pull request #916 from Fontbane/patch-3 
Fix Hondrew Berry typo
 2019-11-28 09:35:09 -08:00
Diegoisawesome ad941680d8 Merge pull request #788 from ultima-soul/documentation 
Synchronize with pokefirered pokedex.c.
 2019-08-25 23:56:09 -05:00
Diegoisawesome 8e7abad720 Merge pull request #786 from DizzyEggg/u8 
GetAbilityBySpecies's arg from bool8 to u8
 2019-08-22 17:45:56 -05:00
Diegoisawesome d68497f823 Merge pull request #783 from tustin2121/tustin2121-patch-3 
Replace {STRING 5} with {KUN}
 2019-08-21 16:06:59 -05:00
Diegoisawesome 90edf596d8 Merge pull request #780 from GriffinRichards/document-rematchconstants 
trainer rematch macro
 2019-08-17 22:41:41 -05:00
Diegoisawesome 40fa9ddbb8 Merge pull request #782 from tustin2121/trihard-giveback2 
Giving back from TriHard Emerald development
 2019-08-17 22:38:28 -05:00
Diegoisawesome 242bed733f Merge pull request #755 from DizzyEggg/patch-7 
Functionally equivalent CopyGlyphToWindow
 2019-07-30 14:35:04 -05:00
Diegoisawesome cb4ba65560 Merge pull request #758 from ultima-soul/nonmatching 
Match TryInterruptEventObjectSpecialAnim without asm hack.
 2019-07-30 00:03:36 -05:00
Diegoisawesome 3f762629e8 Merge pull request #745 from Gudf/master 
Use a constant instead of integer literals when checking for shinyness
 2019-07-12 06:58:23 +09:00
Diegoisawesome ae01afdd30 Merge pull request #743 from aaaaaa123456789/master 
Fix LD script to not contain huge gap sections
 2019-07-11 15:26:15 +09:00
Diegoisawesome 81b84503fa Merge pull request #734 from DizzyEggg/patch-1 
Match sub_81D1B40
 2019-07-02 20:25:31 +09:00
Diegoisawesome ba7fe29d47 Merge pull request #736 from DizzyEggg/patch-2 
Match sub_802671C
 2019-07-02 20:07:20 +09:00
Diegoisawesome f25a75f9e9 Merge pull request #737 from DizzyEggg/patch-3 
Match sub_800EFB0
 2019-07-02 20:06:33 +09:00
Diegoisawesome b123e4a73b Merge pull request #738 from DizzyEggg/patch-4 
Match unref_sub_8119094
 2019-07-02 20:05:58 +09:00
Diegoisawesome c3e683789c Merge pull request #739 from DizzyEggg/patch-5 
Clean up code in HoldContestPainting
 2019-07-02 20:05:27 +09:00
Diegoisawesome b58c4bff3e Merge pull request #740 from DizzyEggg/patch-6 
Get rid of unneccesary cast in text.c
 2019-07-02 20:04:44 +09:00
Diegoisawesome f125de3e66 Merge pull request #659 from ultima-soul/pokemon 
Remove pokemon_3.h
 2019-04-04 12:49:46 -05:00
Diegoisawesome 8361ada4ba Merge pull request #656 from ultima-soul/menu_specialized 
Decompile some of menu_specialized
 2019-04-04 12:49:17 -05:00
Diegoisawesome e476a6d02d Merge pull request #624 from Wyrserth/master 
Use constants for naming screen's pages
 2019-04-04 12:44:18 -05:00
Diegoisawesome 0081474018 Merge pull request #606 from DizzyEggg/angery 
Fix Controllers end command function names
 2019-03-05 14:17:44 -06:00
Diegoisawesome 842e3c8b42 Merge pull request #605 from DizzyEggg/rename 
Rename an erroneously named battlescript
 2019-03-05 10:41:30 -06:00
Diegoisawesome fd4a0c499d Merge pull request #604 from DizzyEggg/flying 
Clean up flying.c
 2019-03-05 10:41:15 -06:00
Diegoisawesome cb2922e7d7 Merge pull request #603 from Phlosioneer/makefile-map-fix 
Fix make to look for .json files instead of folders
 2019-03-05 01:15:40 -06:00
Diegoisawesome deb555310d Merge pull request #602 from garakmon/fly 
match sub_810EE14 in flying.c
 2019-03-04 23:37:57 -06:00
Diegoisawesome 7995cf5b61 Merge pull request #578 from DizzyEggg/pokenav 
pokenav
 2019-02-23 16:04:59 -06:00
Diegoisawesome 1b0079445d Merge pull request #559 from Phlosioneer/finish-newgame-docs 
Finish and polish new_game.c
 2019-02-18 13:28:50 -06:00
Diegoisawesome 924cbe9ee4 Merge pull request #560 from Phlosioneer/regi-documentation 
Document the regi* code more
 2019-02-18 13:23:19 -06:00
Diegoisawesome 047d8288cc Merge pull request #557 from Phlosioneer/navgear-decompile 
Navgear decompile
 2019-02-18 00:34:01 -06:00
Diegoisawesome 367c7b5f89 Merge pull request #558 from Phlosioneer/check-pokedex-asm 
Add comments explaining the remaining asm in pokedex.c
 2019-02-17 12:59:52 -06:00
Diegoisawesome 9c33214510 Merge pull request #564 from garakmon/vram 
use macros for VRAM offsets
 2019-02-17 12:37:06 -06:00
Diegoisawesome e95140270b Merge pull request #556 from DizzyEggg/patch-2 
Fix two battle scripting macros
 2019-02-14 10:35:12 -06:00
Diegoisawesome efc5494834 Merge pull request #555 from Diegoisawesome/master 
scaninc: Fix C comment consumption logic
 2019-02-13 22:00:32 -06:00
Diegoisawesome 047c282763 Merge pull request #548 from Phlosioneer/intro-movie-state-machine 
Document the intro movie state machine
 2019-02-13 21:24:20 -06:00
Diegoisawesome aa5d5fa34a Merge pull request #550 from Phlosioneer/name-palette-return-values 
Name the possible return values of palette fading functions
 2019-02-13 20:15:47 -06:00
Diegoisawesome 16eff049a1 Merge pull request #552 from Phlosioneer/ignore-trigraph-warning 
Ignore trigraph warning
 2019-02-10 21:40:15 -06:00
Diegoisawesome 646533cfa3 Merge pull request #542 from Slawter666/pss 
Label some summary screen functions
 2019-02-04 09:46:39 -06:00
Diegoisawesome ff48e5ada0 Merge pull request #541 from Diegoisawesome/master 
Misc documentation
 2019-02-02 16:00:56 -06:00
Diegoisawesome 59807c0f2c Merge pull request #536 from DizzyEggg/menu 
Use Menu and List Menu input defines
 2019-02-02 12:45:35 -06:00
Diegoisawesome e8952c2374 Merge pull request #539 from DizzyEggg/ram_vars 
Move ram vars in sym files to C
 2019-02-02 11:17:50 -06:00
Diegoisawesome 47c105bef6 Merge pull request #538 from DizzyEggg/data 
Dump last battle anim file
 2019-02-02 11:12:29 -06:00
Diegoisawesome f7cb3719e2 Merge pull request #537 from DizzyEggg/bttle 
Name battle's action 11
 2019-02-02 11:11:55 -06:00
Diegoisawesome 9d8a43a1fb Merge pull request #534 from DizzyEggg/patch-1 
Get rid of an unnecessary extern
 2019-02-01 14:51:04 -06:00
Diegoisawesome 437457c0c6 Merge pull request #533 from DizzyEggg/item 
Match GetItemEffectType
 2019-02-01 14:50:51 -06:00
Diegoisawesome b26c24ffee Merge pull request #532 from DizzyEggg/bored 
Fix some fakematches
 2019-02-01 10:04:42 -06:00
Diegoisawesome b4f83b4f0f Merge pull request #531 from DizzyEggg/lol 
CgbSound
 2019-02-01 10:00:55 -06:00
Diegoisawesome d2c17c7fb3 Merge pull request #529 from DizzyEggg/rename 
Rename a palace battle field
 2019-01-29 17:22:13 -06:00
Diegoisawesome 5bfd802dbb Merge pull request #527 from DizzyEggg/contest 
Finish up Contest.c
 2019-01-28 12:48:39 -06:00
Diegoisawesome 183b6857ff Merge pull request #458 from ultima-soul/contest 
Decompile more of contest
 2019-01-27 23:08:24 -06:00
Diegoisawesome f4af987c01 Merge pull request #526 from DizzyEggg/frontier_pass 
Frontier Pass
 2019-01-26 15:14:17 -06:00
Diegoisawesome 29b9483f39 Merge pull request #521 from DizzyEggg/dump 
Dump trainer hill trainers
 2019-01-24 17:21:04 -06:00
Diegoisawesome 0827945698 Merge pull request #525 from pret/revert-524-master 
Revert "Obsolete common_syms and rewrite sym files, to keep up with pokeruby"
 2019-01-24 14:49:57 -06:00
Diegoisawesome dedc289914 Revert "Obsolete common_syms and rewrite sym files, to keep up with pokeruby" 2019-01-24 14:18:01 -06:00
Diegoisawesome dcf79a29ba Merge pull request #524 from nullableVoidPtr/master 
Obsolete common_syms and rewrite sym files, to keep up with pokeruby
 2019-01-24 14:13:24 -06:00
Diegoisawesome 4cd4cbe133 Merge pull request #522 from DizzyEggg/trainer_card 
Trainer card
 2019-01-23 14:43:37 -06:00
Diegoisawesome b4b4fb951a Merge pull request #519 from DizzyEggg/trainer_hill 
Trainer Hill
 2019-01-14 14:18:29 -06:00
Diegoisawesome 1285f96e1d Merge pull request #517 from Diegoisawesome/master 
Rename non-mapsec constants
 2019-01-08 14:18:24 -06:00
Diegoisawesome 37d7348e01 Merge pull request #505 from Slawter666/secret-base 
Use constants in secret_base.c
 2019-01-05 14:55:41 -06:00
Diegoisawesome cbf7d6cee5 Merge pull request #513 from DizzyEggg/hmmm 
Get rid of 3 fakematchings and 1 nonmatching
 2019-01-05 13:37:52 -06:00
Diegoisawesome f8c708a82a Merge pull request #506 from Slawter666/menu 
Minor labelling of menu.c
 2019-01-02 17:29:27 -06:00
Diegoisawesome 0053e61535 Merge pull request #504 from Diegoisawesome/roulette 
Port/decompile roulette
 2019-01-02 17:00:33 -06:00
Diegoisawesome 530a20354c Merge pull request #500 from Deokishisu/patch-1 
Consolidate unused escapeRope MapHeader field into filler_18 field
 2018-12-31 11:55:33 -06:00
Diegoisawesome 17ac8e29ef Merge pull request #497 from garakmon/rm_sec 
index gRegionMapEntries by map section constants
 2018-12-31 11:51:12 -06:00
Diegoisawesome 4099f871e6 Merge pull request #502 from nullableVoidPtr/master 
Remove sed from ld_script, replace with INCLUDEs
 2018-12-31 11:50:28 -06:00
Diegoisawesome 935a098843 Merge pull request #456 from Diegoisawesome/trade 
trade.c
 2018-12-31 02:34:42 -06:00
Diegoisawesome 2c2554e2ae Merge pull request #495 from DizzyEggg/patch-4 
Match and clean up battle anim 3
 2018-12-29 14:26:30 -06:00
Diegoisawesome 40e94a7c96 Merge pull request #491 from melthelesbian/count_undocumented 
count undocumented globals
 2018-12-29 12:23:17 -06:00
Diegoisawesome ec61336a1f Merge pull request #490 from DizzyEggg/patch-3 
Remove superfluous compiler flags
 2018-12-29 10:59:02 -06:00
Diegoisawesome 720007e457 Merge pull request #3 from DizzyEggg/patch-1 
Match nonmatching except the loop one
 2018-12-25 15:04:12 -06:00
Diegoisawesome a54aa03d20 Merge pull request #475 from DizzyEggg/learn 
asm party and fldeff clean-up
 2018-12-24 16:50:14 -06:00
Diegoisawesome c2ca57e8ac Merge pull request #477 from melthelesbian/object_script_commands 
use player constant in obj script commands
 2018-12-24 16:09:42 -06:00
Diegoisawesome ed1961a926 Merge pull request #476 from melthelesbian/weather_scripts 
document setweather calls
 2018-12-24 16:08:10 -06:00
Diegoisawesome 980b055bf0 Merge pull request #471 from DizzyEggg/clean 
Get rid of externs and add includes
 2018-12-24 01:33:57 -06:00
Diegoisawesome f835a35662 Merge pull request #470 from Rangi42/master 
Fix OLD_UNOWN_BASE_STATS formatting
 2018-12-23 21:10:37 -06:00
Diegoisawesome 81b38c00e4 Merge pull request #466 from melthelesbian/compare_macros 
improve compare macros
 2018-12-23 11:17:30 -06:00
Diegoisawesome e874267edb Merge pull request #469 from DizzyEggg/data 
Move some data to C
 2018-12-23 10:45:19 -06:00
Diegoisawesome f1ee374e93 Merge pull request #468 from KDSKardabox/resolve_ice_electric_split 
Move 2 incorrectly split functions of electric from ice
 2018-12-23 10:42:01 -06:00
Diegoisawesome 36c7b5f183 Merge pull request #467 from DizzyEggg/nonmatchings 
Match some functions
 2018-12-22 18:17:52 -06:00
Diegoisawesome ebbe826133 Merge pull request #437 from DizzyEggg/storage 
Pokemon Storage System
 2018-12-22 16:12:27 -06:00
Diegoisawesome 87fd6b8dc2 Merge pull request #463 from ShinyDragonHunter/old_unown_macro 
Use a macro for OLD_UNOWN base stats
 2018-12-21 12:15:34 -06:00
Diegoisawesome e1ada979db Merge pull request #465 from golemgalvanize/decompile_ice 
Decompile ice
 2018-12-21 02:18:03 -06:00
Diegoisawesome 6ef9671718 Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Diegoisawesome c74bfbe110 Merge pull request #462 from Deokishisu/Move-data-out-of-wild_encounter.c 
Move data out of wild_encounter.c
 2018-12-19 22:11:57 -06:00
Diegoisawesome 48d7c0a7a3 Merge pull request #454 from golemgalvanize/decompile_party_menu 
Decompile party menu
 2018-12-19 19:57:31 -06:00
Diegoisawesome 5b73fe138c Merge pull request #457 from golemgalvanize/decompile_water 
Decompile water
 2018-12-19 19:16:40 -06:00
Diegoisawesome 864b383177 Merge pull request #460 from melthelesbian/applymovement_tweaks 
update applymovement to remove magic numbers
 2018-12-19 17:19:02 -06:00
Diegoisawesome d7755fda6c Merge pull request #459 from Deokishisu/patch-1 
Add requirements to the fields of the object_event macro
 2018-12-19 17:17:48 -06:00
Diegoisawesome 2c7948bae8 Merge pull request #452 from Meowsy/pokemon-adding-easer 
Add macros to simplify defining front animations and still pics.
 2018-12-18 14:27:01 -06:00
Diegoisawesome 26bfd93b35 Merge pull request #451 from shinny456/master 
decompile electric.s
 2018-12-17 15:59:08 -06:00
Diegoisawesome d10ffe6dba Merge pull request #446 from Slawter666/master 
Document some of item_menu.c
 2018-12-15 12:31:26 -06:00
Diegoisawesome 58ca87accc Merge pull request #441 from Meowsy/document-pockets 
Document bag pocket magic numbers.
 2018-12-10 11:23:41 -06:00
Diegoisawesome bfdfe367e8 Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
Diegoisawesome 0b91d2948a Merge pull request #429 from nullableVoidPtr/master 
Various fixes and cleanups
 2018-12-08 21:44:12 -06:00
Diegoisawesome fe06bbe3f6 Merge pull request #431 from melthelesbian/apostrophe 
Use normal apostrophes like adults
 2018-12-07 14:18:31 -06:00
Diegoisawesome 6df2042b3b Merge pull request #427 from Slawter666/pokedex 
Document some more of pokedex.c
 2018-12-06 13:39:32 -06:00
Diegoisawesome 800c6a901b Merge pull request #428 from melthelesbian/pokedex_documentation 
document pokédex options
 2018-12-06 13:38:58 -06:00
Diegoisawesome 1b33ad6c26 Merge pull request #426 from DizzyEggg/patch-1 
Match and clean rotating_gate.c
 2018-12-04 12:26:12 -06:00
Diegoisawesome d9a5de5317 Merge pull request #425 from DizzyEggg/patch-1 
Match battle_tower.c function
 2018-12-03 14:18:03 -06:00