Commit Graph
100 Commits
Author SHA1 Message Date
PikalaxALT 7e2330e7fd Merge pull request #206 from PikalaxALT/region_map
Region map
2020-01-08 19:35:48 -05:00
PikalaxALT 26f7ba4823 Merge pull request #204 from mrgriffin/field-screen-effect
Decompile field_screen_effect
2020-01-06 13:35:48 -05:00
PikalaxALT ab4fa0e76e Merge pull request #203 from mrgriffin/field-tasks
Decompile field_tasks
2020-01-06 13:34:09 -05:00
PikalaxALT 4d7a5b165f Merge pull request #192 from mrgriffin/flash-scanline-effect
Describe flash scanline effect
2019-12-23 16:53:33 -05:00
PikalaxALT f1d821ecc2 Merge pull request #202 from PikalaxALT/pokedex_screen
Pokedex screen take 2
2019-12-22 17:54:34 -05:00
PikalaxALT dac32d3366 Merge pull request #201 from Kurausukun/patch-1
oops, extra align
2019-12-22 13:45:19 -05:00
PikalaxALT ba553271d7 Merge pull request #200 from PikalaxALT/post_battle_event_funcs
Decompile post_battle_event_funcs
2019-12-21 20:49:32 -05:00
PikalaxALT 213b4124bd Merge pull request #199 from Kurausukun/master
align directsound samples
2019-12-21 20:05:25 -05:00
PikalaxALT e1fa1869b5 Merge pull request #197 from PikalaxALT/pokedex_screen
Some documentation in pokedex_screen
2019-12-21 14:45:09 -05:00
PikalaxALT c75f0883a9 Merge pull request #198 from jiangzhengwenjz/clean_up
misc. clean up
2019-12-21 14:44:42 -05:00
PikalaxALT 2f7fec015c Merge pull request #195 from PikalaxALT/all_builds
Update .PHONY and tidy
2019-12-21 10:43:52 -05:00
PikalaxALT e6c571df95 Merge pull request #194 from PikalaxALT/split_librfu
Split librfu by function type (thumb/arm)
2019-12-21 09:42:44 -05:00
PikalaxALT b39bbb5e9d Grammar fix in README.md 2019-12-20 15:43:56 -05:00
PikalaxALT 510a5b8d35 Merge pull request #193 from PikalaxALT/leafgreen
Match Pokemon LeafGreen 1.0
2019-12-20 15:43:10 -05:00
PikalaxALT 9f604fe56c Merge pull request #189 from jiangzhengwenjz/nonmatching
fake match sub_815DC8C
2019-12-20 14:52:34 -05:00
PikalaxALT 9bdd62d651 Merge pull request #190 from jiangzhengwenjz/sub_8113AE8
fake match sub_8113AE8
2019-12-20 14:50:33 -05:00
PikalaxALT 72bd838403 Merge pull request #191 from jiangzhengwenjz/sub_804F284
'real' match sub_804F284
2019-12-20 14:50:14 -05:00
PikalaxALT 969efabaf5 Merge pull request #184 from jiangzhengwenjz/nonmatching
fake match sub_804C728 & sub_804CF14; fix build with NONMATCHING defined
2019-12-19 13:39:38 -05:00
PikalaxALT af6ff9956d Merge pull request #188 from pret/calcrom-no-baserom
No more baseroms in calcrom.pl
2019-12-19 13:38:05 -05:00
PikalaxALT b55c60f5e1 No more baseroms in calcrom.pl 2019-12-19 12:42:35 -05:00
PikalaxALT 44659b3705 Merge pull request #186 from Kurausukun/master
rename instrument samples
2019-12-19 12:36:40 -05:00
PikalaxALT a95b44b0aa Merge pull request #185 from LOuroboros/patch-1
Add VBA's save files to gitignore
2019-12-19 12:34:38 -05:00
PikalaxALT 567589d3dd Merge pull request #187 from PikalaxALT/leafgreen
Match Pokemon FireRed 1.1 US
2019-12-19 12:34:20 -05:00
PikalaxALT 7984a91c08 Merge pull request #183 from PikalaxALT/final_blow_to_baserom
Final Smash on FireRed baserom.gba
2019-12-18 09:15:59 -05:00
PikalaxALT 2f1285e439 Merge pull request #174 from garakmon/object_event
Dissassemble Event Object Data
2019-12-17 23:25:11 -05:00
PikalaxALT ebd3a13717 Merge pull request #182 from PikalaxALT/small_fix
Align two Japanese strings
2019-12-16 09:51:40 -05:00
PikalaxALT d064611e62 Merge pull request #181 from PikalaxALT/pokedex_screen
Pokedex screen
2019-12-14 22:14:50 -05:00
PikalaxALT f12824e3b1 Merge pull request #180 from ghoulslash/trainer-card
Trainer card
2019-12-11 18:20:58 -05:00
PikalaxALT 7526b2ccf1 Merge pull request #179 from jiangzhengwenjz/nonmatching
real match sub_815A1F8
2019-12-10 14:13:23 -05:00
PikalaxALT 764b19b470 Merge pull request #178 from ProjectRevoTPP/dump_link_rfu_3
dump baseroms in link_rfu_3.s
2019-12-09 20:29:07 -05:00
PikalaxALT f21b113bc6 Merge pull request #177 from ghoulslash/battle-anim
battle_anim*
2019-12-07 20:20:57 -05:00
PikalaxALT 22a73c654b Merge pull request #175 from ultima-soul/data_dump
Port/dump dodrio_berry_picking Data
2019-12-05 13:25:29 -05:00
PikalaxALT 326148cb2c Merge pull request #176 from ProjectRevoTPP/dump_graphics
get rid of baseroms in graphics.s
2019-12-04 13:58:58 -05:00
PikalaxALT 3362b7f671 Merge pull request #173 from ghoulslash/pokeball
Pokeball
2019-12-04 13:06:48 -05:00
PikalaxALT bc0fe11d16 Merge pull request #169 from ghoulslash/shop
Shop
2019-12-03 13:39:11 -05:00
PikalaxALT 6f127dca8f Merge pull request #172 from PikalaxALT/dism_more_data
Dump data/naming_screen
2019-12-02 13:30:29 -05:00
PikalaxALT 40d09c24e3 Merge pull request #171 from PikalaxALT/dism_pokesummary
Dism pokesummary
2019-11-27 17:32:09 -05:00
PikalaxALT d141445d2c Merge pull request #170 from PikalaxALT/dism_more_data
Dump data/pokemon_storage_system
2019-11-27 11:02:29 -05:00
PikalaxALT 19ecb1631b Merge pull request #168 from PikalaxALT/dism_more_data
Dump data/berry_crush
2019-11-26 10:49:37 -05:00
PikalaxALT 48f7dbc893 Merge pull request #167 from PikalaxALT/dism_more_data
pokemon_jump rodata
2019-11-25 16:11:51 -05:00
PikalaxALT 461743c045 Merge pull request #166 from PikalaxALT/dism_more_data
field_weather, link_rfu data
2019-11-25 14:39:11 -05:00
PikalaxALT bb8c712f75 Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
2019-11-24 08:44:21 -05:00
PikalaxALT 2177f1f40b Merge pull request #164 from PikalaxALT/dism_more_data
Battle Message et al
2019-11-23 19:37:52 -05:00
PikalaxALT 548490c675 Merge pull request #163 from PikalaxALT/dism_more_data
Data dism: item_menu, link_rfu_2, union_room_chat
2019-11-22 10:42:31 -05:00
PikalaxALT 2d28465444 Merge pull request #162 from PikalaxALT/dism_more_data
Data: tileset_anims, field_ground_effect
2019-11-21 11:36:08 -05:00
PikalaxALT 74b05cfb0a Merge pull request #159 from ghoulslash/master
option_menu to src
2019-11-21 11:35:50 -05:00
PikalaxALT 1234d0252c Merge pull request #161 from PikalaxALT/dism_more_data
Evolution Scene and other data dism
2019-11-21 09:04:10 -05:00
PikalaxALT 1849ad778d Merge pull request #158 from jiangzhengwenjz/nonmatching
real match OakSpeechNidoranFSetup
2019-11-19 14:05:42 -05:00
PikalaxALT 43efafa12c Merge pull request #157 from PikalaxALT/dism_more_data
Evolution Graphics and others
2019-11-19 14:05:18 -05:00
PikalaxALT 89dc26755a Merge pull request #138 from jiangzhengwenjz/battle
battle (4th take)
2019-11-19 10:58:44 -05:00
PikalaxALT 83cba31033 Merge pull request #156 from jiangzhengwenjz/nonmatching
real match sub_8112B3C
2019-11-14 17:47:20 -05:00
PikalaxALT f6dfeba742 Merge pull request #155 from PikalaxALT/dism_more_data
Battle anim scripts dump
2019-11-13 20:34:12 -05:00
PikalaxALT 4a6563b82d Merge pull request #154 from PikalaxALT/dism_more_data
Field Door
2019-11-12 15:38:42 -05:00
PikalaxALT 68ac755bb9 Merge pull request #153 from jiangzhengwenjz/nonmatching
real match sub_815DF54
2019-11-11 16:33:57 -05:00
PikalaxALT 8d70c54cd3 Merge pull request #152 from jiangzhengwenjz/nonmatching
real match sub_81406E8
2019-11-11 16:11:28 -05:00
PikalaxALT a0b2fa5d33 Merge pull request #151 from PikalaxALT/dism_more_data
Misc decomp/dism/splitting
2019-11-11 14:29:06 -05:00
PikalaxALT ab27f90e9f Merge pull request #150 from jiangzhengwenjz/nonmatching
real match sub_8141198
2019-11-11 06:02:09 -05:00
PikalaxALT 55dfa7d59e Merge pull request #149 from PikalaxALT/learn_move
Move Relearner
2019-11-10 20:36:01 -05:00
PikalaxALT 205a339526 Merge pull request #148 from jiangzhengwenjz/nonmatching
real match FillBattleTowerTrainerParty
2019-11-09 20:14:50 -05:00
PikalaxALT 895a09a263 Merge pull request #147 from PikalaxALT/battle_tower
Battle tower
2019-11-09 16:08:36 -05:00
PikalaxALT 4be0078064 Merge pull request #146 from PikalaxALT/dism_more_data
Battle Tower data and more
2019-11-08 17:28:40 -05:00
PikalaxALT 391ac755b3 Merge pull request #145 from PikalaxALT/hidemoneybox
hidemoneybox buries dummy args now
2019-11-07 14:56:34 -05:00
PikalaxALT d833c0ba01 Merge pull request #144 from PikalaxALT/dism_more_data
Dump battle scripts and several rfu3 strings
2019-11-07 11:23:15 -05:00
PikalaxALT 994b9cdbad Merge pull request #143 from jiangzhengwenjz/nonmatching
real match sub_8113550
2019-11-05 14:31:24 -05:00
PikalaxALT 9b7d57bb6b Merge pull request #142 from PikalaxALT/dism_more_data
Dism more data still
2019-11-04 20:52:41 -05:00
PikalaxALT 7bfa6d2058 Merge pull request #140 from PikalaxALT/dism_more_data
Disassemble more data
2019-11-03 15:53:52 -05:00
PikalaxALT f607501161 Merge pull request #141 from jiangzhengwenjz/nonmatching
Fake match sub_8110BE8
2019-11-03 12:01:35 -05:00
PikalaxALT 75fc4fd359 Merge pull request #139 from PikalaxALT/split_835b488
Split 835b488 part 2
2019-11-01 19:54:04 -04:00
PikalaxALT 193c12d401 Merge pull request #137 from PikalaxALT/split_835b488
Split 835b488
2019-10-31 21:05:45 -04:00
PikalaxALT c6cd74fed2 Merge pull request #120 from PikalaxALT/trade
Trade
2019-10-31 09:31:33 -04:00
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