dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,399 Commits 1 Branch 0 Tags
265f8b5b259221dfa1a5fc5537059f262036eb52
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT 922411abeb Merge pull request #136 from PikalaxALT/pokeball_trade_dump 
Pokeball and Trade data dump
 2019-10-27 20:43:47 -04:00
PikalaxALT b1d7bd24aa Merge pull request #135 from PikalaxALT/more_data_dump 
More data dump
 2019-10-26 15:38:10 -04:00
PikalaxALT f10d7d01c5 Merge pull request #133 from PikalaxALT/script_menu 
Script menu
 2019-10-26 10:30:42 -04:00
PikalaxALT 1f569f0136 Merge pull request #134 from jiangzhengwenjz/sub_8115748 
real match sub_8115748
 2019-10-26 06:46:02 -04:00
PikalaxALT eafb77fbb9 Merge pull request #125 from jiangzhengwenjz/battle 
battle (3rd take)
 2019-10-26 06:45:00 -04:00
PikalaxALT 7579fc65c1 Merge pull request #132 from PikalaxALT/field_specials 
Field specials
 2019-10-24 17:22:11 -04:00
PikalaxALT 6e36c22920 Merge pull request #130 from PikalaxALT/trainers 
Trainers, event flags, mystery_event_msg, map object gfx
 2019-10-23 09:05:26 -04:00
PikalaxALT 3efd2e1210 Update back_pic_tables.h 2019-10-22 21:38:39 -04:00
PikalaxALT 14c10b1417 Update back_pic_anims.h 2019-10-22 21:38:13 -04:00
PikalaxALT 4bc284ff2c Merge pull request #128 from garakmon/more_event_script_dump 
Final Event Script Dump
 2019-10-18 10:11:33 -04:00
PikalaxALT 75f1c808cc Merge pull request #129 from Kermalis/music 
Finish music dump
 2019-10-17 21:25:18 -04:00
PikalaxALT 758a46aa1f Merge pull request #126 from ultima-soul/data_dump 
Some more data dumping
 2019-10-17 21:24:23 -04:00
PikalaxALT b919702f7d Merge pull request #127 from PikalaxALT/voice_group_dump 
Dump remaining sound data
 2019-10-17 14:08:14 -04:00
PikalaxALT a41ec7d401 Merge pull request #122 from ultima-soul/data_dump 
Port/dump some data and convert to C
 2019-10-15 21:05:56 -04:00
PikalaxALT efa8b91699 Merge pull request #123 from PikalaxALT/pokemon_icon 
Pokemon icon
 2019-10-15 20:23:53 -04:00
PikalaxALT a3b6e45c3d Merge pull request #124 from PikalaxALT/br_ips_cygwin 
Fix an issue where attempting to compile tools/br_ips/br_ips on Windows fails.
 2019-10-15 20:11:45 -04:00
PikalaxALT 8635868582 Fix cygwin define check 2019-10-15 14:07:35 -04:00
PikalaxALT 407fc23f3f Merge pull request #121 from PikalaxALT/mail 
Decompile mail
 2019-10-15 10:01:46 -04:00
PikalaxALT f3ee5e7511 Merge pull request #119 from ultima-soul/data_dump 
Port/dump some data
 2019-10-14 17:21:38 -04:00
PikalaxALT 8efae5c807 Merge pull request #118 from PikalaxALT/start_menu 
Decompile start_menu
 2019-10-14 10:29:13 -04:00
PikalaxALT 6bffe8613e Merge pull request #115 from PikalaxALT/player_pc 
Player PC
 2019-10-13 09:06:53 -04:00
PikalaxALT 094b29edb5 Merge pull request #117 from jiangzhengwenjz/battle 
#107 review commit
 2019-10-12 21:19:22 -04:00
PikalaxALT 807e03c25d Merge pull request #107 from jiangzhengwenjz/battle 
battle (2nd take)
 2019-10-12 21:08:06 -04:00
PikalaxALT c52ba041cb Merge pull request #116 from jiangzhengwenjz/InitBgsFromTemplates 
real match InitBgsFromTemplates
 2019-10-12 19:54:41 -04:00
PikalaxALT f2a4a0b4b3 Merge pull request #114 from PikalaxALT/song_names 
Rename song pointers
 2019-10-11 10:47:30 -04:00
PikalaxALT c61603fb38 Merge pull request #113 from PikalaxALT/main_menu 
Main menu and Song Constants
 2019-10-09 20:33:28 -04:00
PikalaxALT 77a6ee507f Merge pull request #96 from SatoMew/master 
Replace labels for used and unused Saffron City maps
 2019-10-09 08:40:14 -04:00
PikalaxALT 2a7205dec6 Merge pull request #111 from PikalaxALT/link 
Port link from Emerald
 2019-10-07 13:15:34 -04:00
PikalaxALT fb9b695f9a Merge pull request #112 from ultima-soul/new_game 
Decompile/port new_game
 2019-10-06 18:03:21 -04:00
PikalaxALT b4b509f684 Merge pull request #110 from PikalaxALT/mailbox_pc 
Decompile mailbox_pc and dump decorations
 2019-10-05 14:34:13 -04:00
PikalaxALT 712ee66e61 Merge pull request #109 from PikalaxALT/wild_pokenmon_area 
Wild pokemon area
 2019-10-04 16:33:09 -04:00
PikalaxALT 0cf4c9f25c Merge pull request #108 from PikalaxALT/itemfinder 
Itemfinder
 2019-10-03 20:57:28 -04:00
PikalaxALT d9ab841b0d Merge pull request #106 from PikalaxALT/berry_pouch 
Berry pouch
 2019-10-02 20:16:47 -04:00
PikalaxALT 872d5eaf4a Merge pull request #105 from jiangzhengwenjz/palette 
palette
 2019-10-02 19:36:19 -04:00
PikalaxALT 3ab2de40cf Merge pull request #103 from jiangzhengwenjz/PUIE2 
real match PokemonUseItemEffects2
 2019-09-27 09:09:37 -04:00
PikalaxALT f1e1e1b9ad Merge pull request #104 from jiangzhengwenjz/credit 
closer RollCredits
 2019-09-27 09:08:34 -04:00
PikalaxALT 9f0ca438d6 Merge pull request #102 from PikalaxALT/field_fadetransition 
Field fadetransition
 2019-09-26 14:45:58 -04:00
PikalaxALT 9c6cee5d6c Merge pull request #100 from jiangzhengwenjz/PIE2 
closer PokemonUseItemEffects2
 2019-09-25 14:03:15 -04:00
PikalaxALT 1d4234bd7e Merge branch 'master' into PIE2 2019-09-25 13:56:50 -04:00
PikalaxALT 44f8d694ce Merge pull request #86 from jiangzhengwenjz/battle 
battle
 2019-09-25 13:49:34 -04:00
PikalaxALT 0e217e22d8 Merge branch 'master' into battle 2019-09-25 13:49:16 -04:00
PikalaxALT 6539884c88 Merge pull request #97 from jiangzhengwenjz/text 
real match RenderText
 2019-09-25 13:47:24 -04:00
PikalaxALT 55caa1fcf8 Merge pull request #98 from jiangzhengwenjz/sub_812E768 
attempt sub_812E768
 2019-09-25 13:46:46 -04:00
PikalaxALT f8f5f415b1 Merge pull request #101 from PikalaxALT/credits 
Credits
 2019-09-25 13:45:22 -04:00
PikalaxALT 6c0fd9884c Merge pull request #95 from PikalaxALT/no_struct_textcolor 
Eliminate `struct TextColor` definition and use
 2019-08-28 14:56:08 -04:00
PikalaxALT 634fe80e9d Merge pull request #94 from PikalaxALT/map_preview_screen 
Decompile map_preview_screen
 2019-08-26 11:52:43 -04:00
PikalaxALT b77fd7ff21 Delete map_preview_screen.ddump 2019-08-24 22:27:02 -04:00
PikalaxALT 74e2a0e123 Merge pull request #88 from ultima-soul/pokedex_2 
Port/Decompile pokedex.c and Dump Pokedex Entries and Text to C
 2019-08-24 13:14:50 -04:00
PikalaxALT 3edbbb1758 Merge pull request #92 from jiangzhengwenjz/battle_transition 
'real' match BT_Phase2FullScreenWave_UpdateWave
 2019-08-23 21:50:49 -04:00
PikalaxALT f64e3c50ce Merge pull request #91 from jiangzhengwenjz/nonmatching2 
'real' match CopySpriteTiles
 2019-08-23 21:50:21 -04:00
PikalaxALT 60b2c75191 Merge pull request #90 from jiangzhengwenjz/nonmatching 
'real' match CopyTileMapEntry
 2019-08-23 21:49:49 -04:00
PikalaxALT 7147706d2d Merge pull request #89 from ultima-soul/tileset_anims 
Decompile tileset_anims
 2019-08-23 21:43:30 -04:00
PikalaxALT 201418cd4d Merge pull request #87 from PikalaxALT/title_screen 
Title screen
 2019-08-01 21:04:28 -04:00
PikalaxALT 00cf527c16 Merge pull request #85 from pret/slot_machine 
Slot machine
 2019-08-01 21:04:16 -04:00
PikalaxALT 1a34a06758 Merge pull request #84 from jiangzhengwenjz/battle_transition 
battle_transition
 2019-07-30 19:39:07 -04:00
PikalaxALT e4acfdf20b Merge pull request #82 from jiangzhengwenjz/pokemon 
pokemon
 2019-07-20 12:41:34 -04:00
PikalaxALT 96a39a14bd Merge pull request #81 from pret/battle_records 
Battle records
 2019-07-16 08:47:35 -04:00
PikalaxALT 53b950019a Merge pull request #80 from jiangzhengwenjz/misc 
menu
 2019-07-14 11:28:21 -04:00
PikalaxALT ad274b9561 Merge pull request #79 from gwimm/master 
decompile: diploma.s
 2019-07-12 17:10:52 -04:00
PikalaxALT 39d68ebd44 Merge pull request #77 from jiangzhengwenjz/misc 
corrected sprite.h + finished safari_zone, list_menu, menu_indicators, field_poison, buy_menu_helpers, dynamic_placeholder_text_util
 2019-07-08 08:07:53 -04:00
PikalaxALT 7980c4aa07 Merge pull request #78 from pret/intro 
Intro
 2019-07-06 13:42:42 -04:00
PikalaxALT 74d771ef90 Merge pull request #76 from jiangzhengwenjz/misc 
new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*
 2019-07-01 21:45:36 -04:00
PikalaxALT 5b7c34096c Merge pull request #74 from jiangzhengwenjz/misc 
menu_helpers
 2019-06-23 22:00:47 -04:00
PikalaxALT e0a5896de3 Merge pull request #75 from SatoMew/master 
Refresh INSTALL.md
 2019-06-23 20:05:26 -04:00
PikalaxALT 64498f4107 Add src/data/items.h to .gitignore 2019-06-23 14:23:19 -04:00
PikalaxALT e5137684f4 Add src/data/items.h 2019-06-23 14:15:23 -04:00
PikalaxALT 34bebdc56e Merge pull request #73 from Delta456/master 
Fix build
 2019-06-23 10:01:30 -04:00
PikalaxALT e33356d841 Merge pull request #72 from pret/battle_anim_mon_movement 
Battle anim mon movement
 2019-06-22 14:24:04 -04:00
PikalaxALT 010db05e73 Merge pull request #71 from pret/item_use 
item_use and item
 2019-06-21 13:12:56 -04:00
PikalaxALT e3de3422a8 Merge pull request #69 from pret/item_pc 
Item pc
 2019-06-17 13:46:53 -04:00
PikalaxALT 308bf88e60 Merge pull request #68 from pret/ss_anne 
Ss anne
 2019-06-14 12:50:57 -04:00
PikalaxALT 117c3fb8cc Merge pull request #67 from pret/help_system 
Help system
 2019-06-14 09:05:18 -04:00
PikalaxALT ad25741237 Merge pull request #66 from pret/help_system_812B1E0 
Decompile help_system_812b1e0
 2019-06-12 20:29:24 -04:00
PikalaxALT 8ffa9b4b65 Merge pull request #65 from jiangzhengwenjz/teachy_tv 
graphic decomp, should have been in the previous PR
 2019-06-11 07:05:04 -04:00
PikalaxALT 03e47515e1 Merge pull request #62 from jiangzhengwenjz/teachy_tv 
teachy_tv
 2019-06-10 20:20:24 -04:00
PikalaxALT 19c9e0851a Merge pull request #64 from garakmon/unown_decap 
fix unown dir capitalization / update .gitattributes linguist language and json eol
 2019-06-10 08:37:11 -04:00
PikalaxALT a923cf6b52 Merge pull request #60 from garakmon/split_battle_anims 
Split battle_anim_80A22E8
 2019-06-01 13:24:28 -04:00
PikalaxALT 2812a2bd7a Merge pull request #59 from garakmon/mon_sprites 
Move Mon Graphics
 2019-06-01 12:32:58 -04:00
PikalaxALT 405a4352c3 Merge pull request #61 from garakmon/parameterized 
Parametrized to Parameterized
 2019-06-01 12:21:52 -04:00
PikalaxALT 337c817721 Merge pull request #58 from garakmon/text_dump 
Some Text Dump
 2019-05-22 08:49:36 -04:00
PikalaxALT 4661be7836 Merge pull request #57 from SatoMew/master 
Add weather labels and missing constants
 2019-05-19 12:10:26 -04:00
PikalaxALT fa52c7fc15 Merge pull request #56 from pret/document_map_vars 
Document map vars, 1
 2019-05-16 14:59:02 -04:00
PikalaxALT e885a81ed6 Merge pull request #55 from PikalaxALT/unk_8159F40 
Some more decomp and porting
 2019-05-14 16:20:43 -04:00
PikalaxALT 31e1a9e759 Merge pull request #48 from garakmon/mapdump 
map data
 2019-05-14 16:20:13 -04:00
PikalaxALT ee839a3cd9 Merge pull request #50 from ultima-soul/fldeff 
Port fldeff_teleport and decompile fldeff_berrytree
 2019-04-29 13:20:00 -04:00
PikalaxALT f3decabb39 Merge pull request #54 from pret/bag 
Bag
 2019-04-29 12:32:17 -04:00
PikalaxALT a1e8de5098 Merge pull request #53 from PikalaxALT/mystery_gift_menu 
Mystery gift menu
 2019-04-26 12:50:51 -04:00
PikalaxALT 1a4867a4bf Merge pull request #52 from PikalaxALT/seagallop 
Decompile seagallop
 2019-04-24 23:10:28 -04:00
PikalaxALT f4b8673938 Merge pull request #45 from SatoMew/master 
decompile roulette_util.c
 2019-04-15 14:03:39 -04:00
PikalaxALT 5bf1c29cee Merge pull request #49 from PikalaxALT/tm_case 
Tm case
 2019-04-15 13:59:00 -04:00
PikalaxALT f40038533a Merge pull request #43 from garakmon/dump1 
Dumping some data
 2019-04-13 12:36:48 -04:00
PikalaxALT 24bb85896d Merge pull request #47 from PikalaxALT/roamer 
Roamer
 2019-04-11 19:21:51 -04:00
PikalaxALT c17af4853c Merge pull request #46 from PikalaxALT/oak_speech 
Oak speech
 2019-04-11 13:21:26 -04:00
PikalaxALT d0a68de6e0 Merge pull request #44 from SatoMew/master 
Documentation fixes and updates
 2019-04-09 09:21:59 -04:00
PikalaxALT d61ffb2b99 Match sub_8146C30 2019-03-26 15:13:19 -04:00
PikalaxALT 097a22753b Merge pull request #41 from SatoMew/master 
Update INSTALL.md
 2019-03-18 09:52:04 -04:00
PikalaxALT d7f1682283 Merge pull request #42 from Diegoisawesome/master 
scaninc: Fix C comment consumption logic
 2019-03-18 09:47:35 -04:00
PikalaxALT 01e0d0430f Merge pull request #40 from PikalaxALT/trainer_tower 
Trainer tower (finish)
 2019-01-08 11:01:15 -05:00
PikalaxALT 8f74008096 Merge pull request #39 from PikalaxALT/fieldmap 
fieldmap
 2019-01-07 16:53:40 -05:00
PikalaxALT e70a084aa9 Merge pull request #38 from PikalaxALT/scrcmd 
scrcmd
 2019-01-06 16:19:18 -05:00