dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
2,521 Commits 4 Branches 0 Tags
78cad0dee52e69ab7cca6b8ddc793820697ba01f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diegoisawesome 4e63a52832 Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks 
decompile battle_anim_sound_tasks
 2018-04-18 11:40:01 -05:00
Diegoisawesome b5a269545a Merge pull request #236 from KDSKardabox/master 
Decompile dewford trend
 2018-04-16 11:24:48 -05:00
Diegoisawesome 2ecbe252a2 Merge pull request #219 from Mother-Of-Dragons/master 
Fixed label names: battle_ai_scripts.s
 2018-03-14 17:47:46 -05:00
Diegoisawesome d2d587406a Merge pull request #228 from DizzyEggg/decompile_item_menu_icons 
Decompile item menu icons
 2018-03-09 16:12:09 -06:00
Diegoisawesome ae214eca8b Merge pull request #226 from DizzyEggg/decompile_list_menu 
Decompile list menu
 2018-03-09 15:49:36 -06:00
Diegoisawesome f1b180d89d Merge pull request #229 from DizzyEggg/patch-2 
Use EGG_HATCH_LEVEL define
 2018-03-06 08:38:36 -06:00
Diegoisawesome 29e51811f4 Merge pull request #225 from DizzyEggg/clear_battle_files 
Clean some battle files
 2018-03-04 14:11:26 -06:00
Diegoisawesome 0a9f0d80f5 Merge pull request #216 from KDSKardabox/master 
Decompile Ground Shake, Fossil Special & Flash
 2018-02-28 22:46:11 -06:00
Diegoisawesome 318eb470cf Fix SourceForge link (again) 2018-02-28 22:07:10 -06:00
Diegoisawesome c0357cea46 Merge pull request #222 from DizzyEggg/decompile_battle_link_817C95C 
Decompile battle_tv previously known as battle_link_817C95C
 2018-02-28 18:18:51 -06:00
Diegoisawesome bcef4e7d1c Merge pull request #221 from DizzyEggg/data_to_c 
Move some data to C
 2018-02-28 16:55:45 -06:00
Diegoisawesome a57e04e14d Merge pull request #220 from PikalaxALT/trainer_rematch 
Decompile trainer_rematch
 2018-02-28 16:41:54 -06:00
Diegoisawesome 0cd9ba36ce Merge pull request #224 from DizzyEggg/another_try 
Fix two nonmatching functions
 2018-02-28 13:05:05 -06:00
Diegoisawesome 19b467e49f Merge pull request #223 from DizzyEggg/decompile_blit 
Decompile blit
 2018-02-28 09:29:28 -06:00
Diegoisawesome 5162393c16 Merge pull request #218 from DizzyEggg/patch-1 
match ScrCmd_braillemessage
 2018-02-18 19:03:44 -06:00
Diegoisawesome 20bff7014f Merge pull request #217 from DizzyEggg/some_nonmatchings 
match some functions
 2018-02-18 18:09:52 -06:00
Diegoisawesome bc90a4fc1d Merge pull request #215 from Diegoisawesome/intro 
Decompile intro and credits
 2018-02-17 04:14:13 -06:00
Diegoisawesome e2932a38de Merge pull request #214 from KDSKardabox/master 
Decompile fledd_softboiled.h
 2018-02-15 22:33:55 -06:00
Diegoisawesome cfec30413c Merge pull request #209 from DizzyEggg/decompile_overworld 
Decompile overworld
 2018-02-15 17:04:55 -06:00
Diegoisawesome fcf3f97da9 Merge pull request #210 from KDSKardabox/master 
[Ready to Merge] fldeff_strength.s, fldeff_sweetscent.s
 2018-02-14 22:23:11 -06:00
Diegoisawesome e706d89ff1 Merge pull request #213 from golemgalvanize/decompile_main_menu 
Decompile main menu
 2018-02-14 21:16:47 -06:00
Diegoisawesome 8318898fbd Merge pull request #212 from PikalaxALT/travis_use_r47 
Update devkitARM to r47
 2018-02-14 14:11:54 -06:00
Diegoisawesome bb8c53f898 Merge pull request #208 from KDSKardabox/master 
Decompile birch_pc.c
 2018-02-12 22:36:55 -06:00
Diegoisawesome 398e775d90 Merge pull request #201 from golemgalvanize/decompile_item_menu 
Decompile item menu
 2018-02-12 13:29:21 -06:00
Diegoisawesome a4787bc06a Merge pull request #207 from DizzyEggg/decompile_pokemon_123 
Decompile and clean pokemon files
 2018-02-11 22:13:15 -06:00
Diegoisawesome 98860220e9 Merge pull request #110 from PikalaxALT/link 
Link and some RFU
 2018-02-11 21:10:32 -06:00
Diegoisawesome 14a76793e5 Merge pull request #206 from DizzyEggg/battle_labels 
More battle code clean up
 2018-02-11 14:50:18 -06:00
Diegoisawesome 387dbf48d0 Merge pull request #202 from DizzyEggg/move_mon_data 
Move data from asm to pokemon_1.c
 2018-02-08 14:06:57 -06:00
Diegoisawesome 250538fcae Merge pull request #205 from Diegoisawesome/menu 
Decompile menu.s and new_menu_helpers.s
 2018-02-07 18:24:42 -06:00
Diegoisawesome 48e63979c8 Merge pull request #200 from DizzyEggg/decompile_title_screen 
decompile title screen
 2018-02-07 16:53:08 -06:00
Diegoisawesome 802b505d7b Merge pull request #199 from DizzyEggg/decompile_rtc_screen 
decompile rtc reset screen
 2018-02-07 13:03:59 -06:00
Diegoisawesome ccae0ee970 Merge pull request #198 from DizzyEggg/decompile_item_icon 
decompile item icon
 2018-02-07 12:59:40 -06:00
Diegoisawesome 1ae5adbb19 Merge pull request #196 from DizzyEggg/decompile_ray_scene 
Decompile rayquaza scene
 2018-02-07 12:59:13 -06:00
Diegoisawesome 3fb2471016 Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen 
Decompile berry tag screen
 2018-02-07 12:27:25 -06:00
Diegoisawesome db97098b91 Merge pull request #204 from DizzyEggg/match_nonmatchings 
Match a couple of nonmatching functions
 2018-02-07 09:34:32 -06:00
Diegoisawesome eb6aed50e5 Update save.c with recorded battle sector 2018-01-31 16:12:46 -06:00
Diegoisawesome 9b1eb0b903 Merge pull request #195 from ProjectRevoTPP/save_rodata 
save.c rodata
 2018-01-31 14:58:34 -06:00
Diegoisawesome ef3df1d40c Merge pull request #189 from ProjectRevoTPP/field_map_obj_helpers 
field_map_obj_helpers
 2018-01-30 23:21:18 -06:00
Diegoisawesome 3167dec946 Merge pull request #188 from golemgalvanize/decompile_field_message_box 
decompile field_message_box
 2018-01-30 23:11:53 -06:00
Diegoisawesome eb5737357d Merge pull request #194 from DizzyEggg/decompile_mystery_event_menu 
decompile mystery event menu
 2018-01-30 20:33:27 -06:00
Diegoisawesome f56ce33258 Merge pull request #192 from DizzyEggg/decompile_coord_event_weather 
decompile_coord_event_weather
 2018-01-30 20:16:26 -06:00
Diegoisawesome b3315b64a1 Merge pull request #187 from golemgalvanize/decompile_item_use 
decompile item_use
 2018-01-30 15:41:43 -06:00
Diegoisawesome 232dea1a63 Merge pull request #193 from DizzyEggg/decompile_scanline_effect 
decompile scanline effect
 2018-01-30 15:37:34 -06:00
Diegoisawesome ef4313d42f Merge pull request #191 from DizzyEggg/patch-2 
Delete option_menu.s
 2018-01-30 15:21:29 -06:00
Diegoisawesome 6873f47821 Merge pull request #190 from DizzyEggg/decompile_time_events 
decompile time events
 2018-01-30 15:20:24 -06:00
Diegoisawesome b08b94978b Merge pull request #184 from DizzyEggg/decompile_pokemon_animation 
decompilie pokemon animation
 2018-01-30 13:06:32 -06:00
Diegoisawesome e5596be256 Merge pull request #185 from Diegoisawesome/master 
Decompile naming_screen
 2018-01-23 23:37:45 -06:00
Diegoisawesome 2ba141eac4 Merge pull request #182 from DizzyEggg/decompile_hof_pc 
decompile hof pc
 2018-01-21 15:10:26 -06:00
Diegoisawesome f4455bb2a5 Merge pull request #180 from DizzyEggg/decompile_mystery_event_script 
Decompile mystery event script
 2018-01-21 14:38:09 -06:00
Diegoisawesome 5feb270e97 Merge pull request #173 from easyaspi314/fix_perms 
Fix file permissions.
 2018-01-21 14:29:35 -06:00
Diegoisawesome ee8b53bb41 Merge pull request #181 from yenatch/fix-install 
fix shell scripts in install instructions
 2018-01-21 14:28:53 -06:00
Diegoisawesome eec225e983 Merge pull request #178 from PikalaxALT/libc 
Use standard flags to link libgcc, libc
 2018-01-21 14:19:22 -06:00
Diegoisawesome a1aa645f23 Merge pull request #179 from yenatch/travis 
travis badge
 2018-01-21 14:17:50 -06:00
Diegoisawesome 852b858571 Merge pull request #177 from DizzyEggg/patch-1 
Add a comment about one battle transition
 2018-01-21 14:13:19 -06:00
Diegoisawesome 0db23bc215 Merge pull request #164 from DizzyEggg/decompile_option_menu 
Decompile option menu
 2018-01-21 06:59:13 -06:00
Diegoisawesome 3897c01d58 Merge pull request #176 from yenatch/travis 
travis
 2018-01-21 03:46:09 -06:00
Diegoisawesome 5c00be143d Merge pull request #156 from Diegoisawesome/master 
Extract baseroms and port field_door
 2018-01-07 19:00:16 -06:00