dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
3,602 Commits 4 Branches 0 Tags
af1e44befe89102144a5223e56532c33f1a5e242
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diegoisawesome 8064b011d1 Merge pull request #424 from DizzyEggg/labels 
Clean up src/data
 2018-12-03 12:33:47 -06:00
Diegoisawesome ffa8655f4c Merge pull request #423 from Slawter666/pokedex-doc 
Document some of pokedex.c
 2018-12-03 10:53:21 -06:00
Diegoisawesome cd378ec676 Merge pull request #421 from melthelesbian/trainer_class_lookups 
clean up trainer class lookups
 2018-12-03 10:52:24 -06:00
Diegoisawesome 7914220acd Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup 
cleans up trainer battle scripts
 2018-12-02 14:31:19 -06:00
Diegoisawesome 2912ec0e37 Merge pull request #420 from DizzyEggg/bored 
Get rid of static functions in includ and add req macro arguments
 2018-12-02 14:05:35 -06:00
Diegoisawesome c123b8d6f1 Merge pull request #417 from melthelesbian/msgbox_documentation 
adds constants, cleans up callstd and msgbox code
 2018-12-02 12:31:54 -06:00
Diegoisawesome ee05197eba Merge pull request #418 from DizzyEggg/link_rfu 
Finish Link rfu
 2018-12-02 12:29:31 -06:00
Diegoisawesome 145047d438 Merge pull request #416 from melthelesbian/fix_pokefan 
fixes pokefan graphics naming
 2018-12-02 00:02:43 -06:00
Diegoisawesome a2186dcdd7 Merge pull request #415 from melthelesbian/trainer_defs 
cleans up trainer name defines
 2018-12-01 22:44:17 -06:00
Diegoisawesome 8e24a49b78 Merge pull request #413 from DizzyEggg/do 
Match 2 field effect functions
 2018-11-30 17:17:20 -06:00
Diegoisawesome 275ce5deff Merge pull request #410 from DizzyEggg/will_i_match_sth_again 
match 2 field functions
 2018-11-29 17:46:30 -06:00
Diegoisawesome a7a317f6cc Merge pull request #408 from DizzyEggg/pass_time 
Match 3 link rfu functions
 2018-11-28 16:51:53 -06:00
Diegoisawesome 4a9b4ba0b3 Merge pull request #407 from DizzyEggg/max_sprites 
Use MAX_SPRITES define
 2018-11-28 14:34:11 -06:00
Diegoisawesome 0cdd1cc1da Merge pull request #405 from DizzyEggg/frontier_data 
Finish frontier data
 2018-11-27 16:48:11 -06:00
Diegoisawesome 2e2cd59160 Merge pull request #404 from garakmon/frontier-data 
Some frontier data
 2018-11-27 12:58:31 -06:00
Diegoisawesome c909aa92de Merge pull request #403 from nullableVoidPtr/master 
Clean up aligned variables in src/
 2018-11-27 10:11:29 -06:00
Diegoisawesome 977e0bc345 Merge pull request #402 from Slawter666/pokedex-data 
Convert pokédex data to C
 2018-11-27 03:18:28 -06:00
Diegoisawesome dc7764f60c Merge pull request #394 from DizzyEggg/text 
DecompressGlyphTile - cleaner code
 2018-11-21 18:25:28 -06:00
Diegoisawesome 0b59dbf2b8 Merge pull request #393 from DizzyEggg/text 
Match one function in text.c
 2018-11-21 16:11:03 -06:00
Diegoisawesome 3c77ce5b5b Merge pull request #392 from Kermalis/master 
Sound Effects Part 3/6
 2018-11-20 17:18:58 -06:00
Diegoisawesome 6acf6aed04 Merge pull request #391 from DizzyEggg/frontier 
Clean up bss/common/ewram symbols and decompile mossdeep
 2018-11-19 13:29:07 -06:00
Diegoisawesome 963989d760 Merge pull request #389 from DizzyEggg/num_stats 
Use PARTY_SIZE and rename BATTLE_STATS_NO to NUM_BATTLE_STATS
 2018-11-18 13:36:34 -06:00
Diegoisawesome 0bbe03f170 Merge pull request #388 from DizzyEggg/clean_savve 
Clean up save related files
 2018-11-18 13:13:56 -06:00
Diegoisawesome e8415c51d1 Merge pull request #387 from DizzyEggg/battle_pyramid 
Battle pyramid
 2018-11-18 13:09:19 -06:00
Diegoisawesome 032dd251e6 Merge pull request #383 from garakmon/createsprite 
Update createsprite macro and rename BANK to BATTLER
 2018-11-15 14:45:13 -06:00
Diegoisawesome 09d09122bc Merge pull request #384 from garakmon/subdirs 
Subdirectories in build
 2018-11-15 14:25:21 -06:00
Diegoisawesome 39f54b346d Merge pull request #382 from Slawter666/synchronise 
Move field effects enum to defines
 2018-11-15 14:24:22 -06:00
Diegoisawesome 216c388001 Merge pull request #385 from garakmon/nodep 
fix dependency scanning
 2018-11-15 14:19:57 -06:00
Diegoisawesome f639c7c309 Merge pull request #380 from DizzyEggg/frontier_2 
More battle frontier
 2018-11-12 14:05:40 -06:00
Diegoisawesome 54ad6794bc Merge pull request #361 from Slawter666/synchronise 
Synchronise with pokeruby
 2018-11-12 11:37:18 -06:00
Diegoisawesome a052e45f27 Merge pull request #379 from DizzyEggg/derp 
ScriptMenu_MultichoiceGrid
 2018-11-07 14:41:29 -06:00
Diegoisawesome 1507a290d5 Merge pull request #378 from Diegoisawesome/script_menu 
[WIP] Decompile/port script_menu
 2018-11-06 20:24:04 -06:00
Diegoisawesome 93ff71fcfd Merge pull request #377 from DizzyEggg/render_text 
Match Render text and attempt to clean up
 2018-11-06 11:44:14 -06:00
Diegoisawesome ccc5d27fcb Merge pull request #376 from DizzyEggg/battle_frontier_2 
Decompile part of battle_frontier_2
 2018-11-06 10:06:21 -06:00
Diegoisawesome 9adbb5d871 Merge pull request #375 from garakmon/animation-test-temp 
Back animation names
 2018-10-30 12:00:37 -05:00
Diegoisawesome 2837859bdb Merge pull request #373 from garakmon/battle-anim 
Split battle_anim_80FE840 and move data to C
 2018-10-30 11:53:05 -05:00
Diegoisawesome c8ef69a00d Merge pull request #372 from garakmon/sprite-tags 
Synchronize sprite tags
 2018-10-30 11:26:44 -05:00
Diegoisawesome f3af20d3cf Merge pull request #370 from DizzyEggg/battle_tower 
Decompile Battle Tower
 2018-10-30 11:18:24 -05:00
Diegoisawesome b1b97c1da9 Merge pull request #374 from DizzyEggg/win_name 
Rename struct Window' priority field to bg
 2018-10-27 19:55:44 -05:00
Diegoisawesome 804d0a4b6a Merge pull request #371 from Diegoisawesome/align_lz 
Fix LZ compressed data alignment
 2018-10-21 12:24:24 -05:00
Diegoisawesome 2a3ba78831 Merge pull request #369 from garakmon/pan-constants 
Use sound pan constants in data/battle_anim_scripts.s
 2018-10-19 20:27:54 -05:00
Diegoisawesome bf8fa23462 Merge pull request #365 from garakmon/event-flags 
[WIP] Event flags
 2018-10-19 14:24:34 -05:00
Diegoisawesome 95d8815721 Merge pull request #368 from Diegoisawesome/master 
Finish porting/decompiling field_player_avatar
 2018-10-19 00:08:59 -05:00
Diegoisawesome 442baf1a00 Merge pull request #367 from DizzyEggg/move_blitmap 
Move Bitmap struct and clear sprite/text files a bit
 2018-10-18 19:18:44 -05:00
Diegoisawesome b23dc9a123 Merge pull request #366 from Diegoisawesome/master 
Finish shop and fldeff_escalator
 2018-10-18 12:08:38 -05:00
Diegoisawesome f67bbbdaaa Merge pull request #364 from Diegoisawesome/master 
Port/decompile field_control_avatar
 2018-10-16 21:54:14 -05:00
Diegoisawesome 832947f329 Merge pull request #363 from DizzyEggg/patch-1 
Use constants
 2018-10-16 17:07:54 -05:00
Diegoisawesome ed1bb3030b Merge pull request #362 from Deokishisu/patch-1 
Fix "Vigaroth" misspelling in event_objects.h
 2018-10-16 11:26:48 -05:00
Diegoisawesome a9abb930aa Merge pull request #352 from huderlem/shop 
[WIP] Shop
 2018-10-14 19:03:48 -05:00
Diegoisawesome 7f211b2588 Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Diegoisawesome eafea33dd9 Merge pull request #360 from Deokishisu/Fix-Event-Object-Defines 
Update All EVENT_OBJ_GFX References
 2018-10-14 18:26:31 -05:00
Diegoisawesome 9496c50518 Merge pull request #358 from Deokishisu/LabelOWsProperly 
Label OWs More Descriptively
 2018-10-14 15:36:00 -05:00
Diegoisawesome 02049d52ee Merge pull request #351 from DizzyEggg/apprentice 
Decompile apprentice
 2018-10-14 13:20:38 -05:00
Diegoisawesome 43316ffae8 Merge pull request #356 from DizzyEggg/clean_battlestruct 
Clean a couple of battlestructs' fields
 2018-10-14 13:18:29 -05:00
Diegoisawesome 0979ea91fb Merge pull request #357 from DizzyEggg/move_heap 
Move HEAP_SIZE to malloc and use void instead of empty argument list
 2018-10-14 13:15:31 -05:00
Diegoisawesome d40e737d52 Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers 
Decompile field effect helpers
 2018-10-14 12:48:18 -05:00
Diegoisawesome e0bc3fd59c Merge pull request #355 from DizzyEggg/use_eos 
Use defines for text chars
 2018-10-14 12:21:37 -05:00
Diegoisawesome 355f014909 Merge pull request #354 from DizzyEggg/move_blendpal 
Move blend_palette to util
 2018-10-14 12:11:50 -05:00
Diegoisawesome 32fbf67d47 Merge branch 'master' into shop 2018-10-13 12:55:06 -05:00
Diegoisawesome 0c1d33da4f Merge pull request #353 from Diegoisawesome/master 
Port/decompile cable_club.s
 2018-10-13 12:53:09 -05:00
Diegoisawesome a2a6700966 Merge pull request #350 from Kermalis/master 
Sound Effects Part 2/6
 2018-10-10 16:04:01 -05:00
Diegoisawesome 72c9abbb66 Remove invalid version entries 2018-10-07 23:28:36 -05:00
Diegoisawesome 7a7aeed5e8 Merge pull request #347 from Deokishisu/GamV 
Fill out VERSION_ enum with all possible values
 2018-10-06 13:45:21 -05:00