dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
3,072 Commits 4 Branches 0 Tags
1441ee6bc3731387f7a3cb31f0058d81a38a8db5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diegoisawesome 3d50d01a93 Merge pull request #346 from huderlem/mb 
Move metatile behavior constants to include/constants and sync closer…
 2018-10-04 18:56:14 -05:00
Diegoisawesome b557e7c9cb Merge pull request #345 from Kermalis/master 
Sound Effects Part 1/6
 2018-10-03 17:25:59 -05:00
Diegoisawesome 01242d642c Merge pull request #344 from Kermalis/master 
FRLG Music Part 2/2
 2018-10-03 00:33:25 -05:00
Diegoisawesome b05291aa42 Merge pull request #343 from Kermalis/master 
FRLG Music Part 1/2
 2018-10-02 13:16:11 -05:00
Diegoisawesome 250a451377 Merge pull request #342 from Kermalis/master 
Volume stuff
 2018-09-29 20:39:42 -05:00
Diegoisawesome da690aff9d Merge pull request #341 from Kermalis/master 
RSE Music (Part 2/2)
 2018-09-29 17:50:44 -05:00
Diegoisawesome 1c4ac53f58 Merge pull request #340 from Kermalis/master 
Music A-K
 2018-09-26 23:29:25 -05:00
Diegoisawesome 584cad6c0b Merge pull request #339 from Kermalis/master 
Rename voicegroups
 2018-09-22 15:48:29 -05:00
Diegoisawesome 925de13b44 Merge pull request #334 from Diegoisawesome/master 
Change order of inital vol command in mid2agb
 2018-09-22 14:20:33 -05:00
Diegoisawesome eb4408a6ff Merge pull request #338 from DizzyEggg/small 
Rename gRandomMove to gCalledMove
 2018-09-22 12:13:03 -05:00
Diegoisawesome a1edceb595 Merge pull request #336 from Kurausukun/master 
port keysplit_tables from pokeruby
 2018-09-21 11:45:27 -05:00
Diegoisawesome b787f8ca04 Merge pull request #335 from DizzyEggg/battledoc 
Document some not labeled battle things
 2018-09-21 10:10:04 -05:00
Diegoisawesome 25e469b664 Merge pull request #333 from Diegoisawesome/master 
Add defines for tile, metatile, and palette count
 2018-09-18 10:15:26 -05:00
Diegoisawesome 7f2d52d9e0 Merge pull request #332 from DizzyEggg/patch-5 
Use defines for BattleAI_ChooseMoveOrAction
 2018-09-17 10:11:25 -05:00
Diegoisawesome 6978a896d1 Merge pull request #331 from DizzyEggg/patch-3 
Use pokeruby's formatting for move descriptions
 2018-09-17 10:11:12 -05:00
Diegoisawesome 28f410737e Merge pull request #330 from DizzyEggg/patch-2 
Make it easier to edit ability text
 2018-09-17 10:10:33 -05:00
Diegoisawesome 6a8f27c1ac Merge pull request #326 from DizzyEggg/cablecarutil 
Decompile cable_car_util.c
 2018-09-16 01:06:33 -05:00
Diegoisawesome 2bba2f91d6 Merge pull request #328 from DizzyEggg/slotmachine 
Decompile/Port slot_machine.c
 2018-09-16 00:59:53 -05:00
Diegoisawesome b183b99694 Merge pull request #327 from Diegoisawesome/master 
Update mid2agb source
 2018-09-15 16:12:25 -05:00
Diegoisawesome b8c9d9a980 Merge pull request #324 from Diegoisawesome/master 
Document main_menu
 2018-09-14 12:17:11 -05:00
Diegoisawesome 095cbbc5c2 Merge pull request #321 from Slawter666/data 
Move more data to C
 2018-09-11 22:10:26 -05:00
Diegoisawesome b9e0cf9f6f Merge pull request #323 from Diegoisawesome/master 
Fix gbafix
 2018-09-11 17:34:37 -05:00
Diegoisawesome a9a50f1357 Merge pull request #322 from huderlem/fixspritesheets 
Fix event object spritesheets
 2018-09-11 17:33:14 -05:00
Diegoisawesome 6907187954 Merge pull request #319 from Diegoisawesome/master 
Make gbafix silent
 2018-09-10 12:19:36 -05:00
Diegoisawesome 9438613291 Merge pull request #318 from Diegoisawesome/master 
Standardize sprite visibility to boolean
 2018-09-10 10:43:32 -05:00
Diegoisawesome cb053b3a15 Merge pull request #312 from DizzyEggg/decompile_frontier_2 
Decompile Battle Factory
 2018-09-10 10:20:41 -05:00
Diegoisawesome 37edb063ba Merge pull request #317 from Tetrable/master 
Document trainer animations, correct unused table labelling
 2018-09-09 16:55:55 -05:00
Diegoisawesome cf8f73bde1 Merge pull request #314 from Slawter666/data 
Convert data to C
 2018-09-07 11:39:07 -05:00
Diegoisawesome ef62393289 Merge pull request #316 from huderlem/gbagfx-metatiles 
Add ability to specify metatile dimensions to gbagfx
 2018-09-06 12:56:04 -05:00
Diegoisawesome 48ee3ec959 Merge pull request #315 from Diegoisawesome/master 
Update scaninc and preproc with multi-file incbins
 2018-09-06 12:54:49 -05:00
Diegoisawesome f8f7a8e300 Merge pull request #304 from Slawter666/graphics 
Move data from graphics.s to C
 2018-09-05 20:32:23 -05:00
Diegoisawesome 8defc345f0 Merge pull request #313 from ultima-soul/overworld_and_mapping 
Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be de…
 2018-09-05 16:50:25 -05:00
Diegoisawesome 41fe72b95d Merge pull request #310 from DizzyEggg/patch-1 
Update item_menu.c
 2018-09-05 01:36:40 -05:00
Diegoisawesome c0687c7832 Merge pull request #311 from Slawter666/pss-label 
Bring some labels over from pokeruby + template formatting
 2018-09-05 01:36:05 -05:00
Diegoisawesome 4418189d4c Merge pull request #309 from DizzyEggg/types_manage 
Various labelling
 2018-09-01 16:07:57 -05:00
Diegoisawesome 1895383352 Merge pull request #308 from DizzyEggg/pyramid_bag 
Decompile pyramid bag
 2018-08-30 14:40:22 -05:00
Diegoisawesome 765e03846b Merge pull request #307 from Diegoisawesome/master 
Use gbafix to insert header and generate checksum

Closes #305.
 2018-08-30 00:34:06 -05:00
Diegoisawesome 8e5c72766c Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 
Decompile battle_dome
 2018-08-29 14:13:39 -05:00
Diegoisawesome aca96b07f0 Merge pull request #306 from Slawter666/data2b_2 
Convert more of data2b.s to C
 2018-08-27 01:50:46 -05:00
Diegoisawesome 60dff848aa Merge pull request #303 from Diegoisawesome/master 
Move data from include to src
 2018-08-23 02:50:29 -05:00
Diegoisawesome aba566c2c0 Merge pull request #302 from Slawter666/data2b 
Move some data from data2b.s to C
 2018-08-23 01:43:20 -05:00
Diegoisawesome 1fd1faef92 Merge pull request #297 from DizzyEggg/contest_table 
Decompile contest_effect
 2018-08-16 14:16:00 -07:00
Diegoisawesome 8ac98f7441 Merge pull request #298 from Diegoisawesome/master 
Finish decompiling pokemon_summary_screen
 2018-08-15 16:27:49 -07:00
Diegoisawesome f65da613cf Merge pull request #299 from DizzyEggg/contest_ai 
Decompile Contest ai
 2018-08-15 16:19:18 -07:00
Diegoisawesome d28398b8dd Merge pull request #301 from Tetrable/master 
Add national/hoenn dex defines, update dex arrays
 2018-08-15 14:17:41 -07:00
Diegoisawesome 335f4c1e81 Merge pull request #296 from DizzyEggg/event_data 
Event data
 2018-08-12 13:17:36 -07:00
Diegoisawesome 25832810f6 Merge pull request #288 from DizzyEggg/slot_machine 
Port a little bit of slot machine
 2018-08-12 12:27:23 -07:00
Diegoisawesome 32b0e102cf Merge pull request #287 from DizzyEggg/easy_chat 
Pikalax's Easy chat
 2018-08-12 12:17:23 -07:00
Diegoisawesome 6bb761a711 Merge pull request #277 from atasro2/player_field_avatar 
decompile a portion of field_player_avatar.s
 2018-08-12 12:09:09 -07:00
Diegoisawesome 26e18f2292 Merge pull request #289 from DizzyEggg/contests 
Pikalax's contests
 2018-08-12 12:04:53 -07:00
Diegoisawesome 21060091d1 Merge pull request #295 from DizzyEggg/pokemon_storage_system 
Decompile a bit of pokemon storarage system
 2018-08-12 11:38:39 -07:00
Diegoisawesome 40cf61307b Merge pull request #267 from garakmon/master 
macOS support
 2018-08-11 18:37:09 -07:00
Diegoisawesome 73bdef2f67 Merge pull request #293 from Diegoisawesome/master 
Decompile field_specials
 2018-08-11 16:37:06 -07:00
Diegoisawesome 94eef0bfa5 Merge pull request #294 from DizzyEggg/learnsets 
Make learnsets easier to edit
 2018-08-11 16:27:52 -07:00
Diegoisawesome 0c29447717 Merge pull request #292 from DizzyEggg/move_desc 
Move move descriptions to C
 2018-08-11 16:26:16 -07:00
Diegoisawesome 57ce548020 Merge pull request #291 from DizzyEggg/patch-3 
Update battle_script_commands.c
 2018-08-11 16:24:34 -07:00
Diegoisawesome 4070152b0e Merge pull request #284 from DizzyEggg/patch-1 
Use constant in a battle script.
 2018-08-04 18:32:04 -07:00
Diegoisawesome 002016e764 Merge pull request #283 from DizzyEggg/battle_pr_again 
Battle code enums in switches
 2018-08-04 18:31:49 -07:00
Diegoisawesome 759bc2671c Merge pull request #280 from DizzyEggg/decompile_part_mon_summary 
Decompile a few pokemon summary screen functions
 2018-08-02 08:27:05 -07:00
Diegoisawesome 722b07707c Merge pull request #282 from DizzyEggg/stats_bits 
Add some more stat defines for battle scripts
 2018-08-02 08:11:44 -07:00
Diegoisawesome df4c20f1f8 Merge pull request #281 from einstein95/master 
Port over preproc commit from pokeruby
 2018-07-29 02:19:09 -07:00
Diegoisawesome 919e7b4387 Merge pull request #279 from Diegoisawesome/master 
Move strings to C, misc cleanup
 2018-07-25 08:10:18 -07:00
Diegoisawesome 5883f867f0 Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
Diegoisawesome c47aac3538 Merge pull request #260 from DizzyEggg/decompile_union_room 
Decompile part of union room
 2018-07-24 18:48:23 -07:00
Diegoisawesome 06b3ce408f Merge pull request #272 from DizzyEggg/final_battle_files_touches 
Thoroughly document and label battle files
 2018-07-16 13:35:17 -07:00
Diegoisawesome 07ef762770 Merge pull request #275 from Diegoisawesome/master 
Document list_menu.c and main_menu.c
 2018-07-15 04:43:03 -07:00
Diegoisawesome abc1905cab Merge pull request #273 from Slawter666/pokedex-doc 
Minor labelling of pokedex.c
 2018-07-08 15:13:03 -07:00
Diegoisawesome efebc51972 Merge pull request #268 from DizzyEggg/decompile_battle_tent 
Decompile a bit of battle tent
 2018-06-30 11:25:19 -07:00
Diegoisawesome 0b09575fd4 Merge pull request #249 from golemgalvanize/decompile_pokedex 
Decompile pokedex
 2018-06-01 00:02:46 -07:00
Diegoisawesome dd28854a22 Merge pull request #255 from DizzyEggg/decomp_record_mixing 
Fix pika's Record Mixing PR
Also closes #107.
 2018-05-30 16:51:30 -07:00
Diegoisawesome f6350bc003 Merge pull request #258 from DizzyEggg/decompile_rom_8034C54 
Decompile rom 8034c54
 2018-05-29 17:35:47 -07:00
Diegoisawesome 06186561f2 Merge pull request #257 from Diegoisawesome/master 
Clean up Makefile (with help from devkitPro maintainers)
 2018-05-25 01:08:57 -05:00
Diegoisawesome de60bdf2fe Merge pull request #256 from DizzyEggg/decompile_field_tasks 
Decompile field tasks
 2018-05-19 23:34:30 -05:00
Diegoisawesome ecfe49ec61 Merge pull request #254 from DizzyEggg/decompile_menu_indicators 
Decompile menu indicators
 2018-05-19 23:23:45 -05:00
Diegoisawesome 0c1f85f200 Merge pull request #253 from DizzyEggg/decompile_menu_helpers 
Decompile menu helpers
 2018-05-15 17:44:41 -05:00
Diegoisawesome d1df98361f Merge pull request #252 from Diegoisawesome/master 
Fix sym_common end, rename ASM_DIRECT to NAKED
 2018-05-11 17:36:11 -05:00
Diegoisawesome 3e93615e38 Merge pull request #251 from Diegoisawesome/master 
Use song constants
 2018-05-11 00:53:58 -05:00
Diegoisawesome bc60000755 Update mauville_old_man.txt to fix warning 2018-05-10 21:49:51 -05:00
Diegoisawesome 7c551ef373 Merge pull request #250 from Diegoisawesome/master 
Port/decompile field_effect
 2018-05-10 18:45:35 -05:00
Diegoisawesome e01253ebe1 Merge pull request #247 from Diegoisawesome/master 
Port/decompile fieldmap.c
 2018-05-09 05:30:57 -05:00
Diegoisawesome 867b496f2e Merge pull request #239 from DizzyEggg/patch-1 
Use DMA large macro in option menu
 2018-04-18 14:58:28 -05:00
Diegoisawesome d10844f1fe Merge pull request #237 from KDSKardabox/master 
Decompile mon markings, rotating_gate & field_camera
 2018-04-18 14:12:51 -05:00