ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,960 Commits 1 Branch 0 Tags 235 MiB
539a88207e
Commit Graph

288 Commits

Author SHA1 Message Date
Slawter666
877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Slawter666
dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Slawter666
ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
Slawter666
5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
Slawter666
52aa9cedcf Merge May frames into sprite sheets 
Plus fix Brendan's surfing and watering frame order.
 2018-07-29 17:29:36 +01:00
Slawter666
d5825230e5 Merge "brendan" frames into sprite sheets 2018-07-28 18:11:28 +01:00
DizzyEggg
3bcd30969a cut field effect is decompiled and documented 2018-06-16 14:04:29 +02:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
Edouard Veyrier
75b07292c9 Translate first functions of learn move 2018-03-28 19:20:20 +02: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
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
camthesaxman
3ec68d5f79 reorganize berry graphics files 2018-02-06 11:51:43 -06:00
camthesaxman
89e6170748 remove some redundant .pal files 2018-02-06 11:46:34 -06:00
DizzyEggg
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
Diegoisawesome
3793152bc3 More work on menu 2018-01-29 17:26:36 -06:00
Diegoisawesome
5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
Devin
8f1bfcbf3a Fix more of them sneaky executables 2018-01-21 15:25:18 -05:00
Devin
35cc20c9aa Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms 2018-01-21 15:22:05 -05:00
DizzyEggg
ad2ef517bd option menu fix conflicts 2018-01-21 12:46:19 +01:00
golem galvanize
bce63b3694 REMOVE BASEROM 2018-01-20 22:41:02 -05:00
golem galvanize
f22d295cfc Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 21:37:47 -05:00
Diegoisawesome
28c9f40b3e Extract data from fossil_special_fldeff_groundshake 2018-01-20 19:18:03 -06:00
golem galvanize
33ebcabc3a Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 19:45:38 -05:00
golem galvanize
bdc8cf6ac4 fixing conflicts 2018-01-20 19:44:34 -05:00
Diegoisawesome
8d7a830151 Extract data from field_effect_misc 2018-01-20 18:30:33 -06:00
Diegoisawesome
ed8269889b Extract data from pokedex.s 2018-01-20 17:17:51 -06:00
golem galvanize
59e1aacd26 DIEGO SEND HELP 2018-01-20 17:26:30 -05:00
Diegoisawesome
b47b9e5758 Extract data from starter_choose 2018-01-20 16:22:16 -06:00
Diegoisawesome
d10c91f1b0 Extract data from item_menu_icons.s 2018-01-20 15:37:37 -06:00
Diegoisawesome
971b47755d Extract data from naming screen 2018-01-20 14:16:01 -06:00
Diegoisawesome
2ef7467951 Extract data from pokemon_summary_screen 2018-01-20 02:37:28 -06:00
Diegoisawesome
098671750b Extract data from text window 2018-01-20 00:49:21 -06:00
Diegoisawesome
7abfc6a989 Extract data from trainer card 2018-01-19 23:42:30 -06:00
Diegoisawesome
fbb51bc24b Extract baseroms from party_menu.s 2018-01-19 21:38:57 -06:00
Diegoisawesome
b22a800581 Extract data from trade.s 
Also rename window_template_terminator to null_window_template, in keeping with naming conventions
 2018-01-19 19:52:46 -06:00
Devin
c408110319 Fix file permissions. 2018-01-19 15:06:49 -05:00
Diegoisawesome
fd544ba438 Start extracting data from trade.s 2018-01-19 12:38:09 -06:00
Diegoisawesome
4c6511c8f9 Extract data from field_screen.s 
Also move files incorrectly placed in interface dir
 2018-01-18 22:36:24 -06:00
Diegoisawesome
6445394929 Extract rotating_gate.s 2018-01-18 15:38:31 -06:00
Diegoisawesome
b7ee548897 Merge remote-tracking branch 'Bird/dump_pokenav.s' 2018-01-18 14:38:45 -06:00
Diegoisawesome
7086bf0048 Merge remote-tracking branch 'Bird/dump_slot_machine.s' 2018-01-18 14:19:13 -06:00
Diegoisawesome
dcdf91c111 Merge remote-tracking branch 'Bird/dump_learn_move.s' 2018-01-18 13:46:34 -06:00
Diegoisawesome
b806ee8bed Finish extracting pokemon storage system data 2018-01-18 12:52:37 -06:00
Diegoisawesome
ec8594fd10 Extract Wanda PC box wallpapers 2018-01-18 04:06:43 -06:00
golem galvanize
c9a3ef7a6e dump pokenav.s 2018-01-17 23:01:33 -05:00
Diegoisawesome
184fedc870 Extract PC box background images 2018-01-17 20:57:19 -06:00
golem galvanize
173c5923cb clean up reel_time_gfx 2018-01-17 19:19:47 -05:00
golem galvanize
442398261e fix tabs and add forgotten image 2018-01-17 14:48:50 -05:00
golem galvanize
84c6a97429 dump slot_machine.s 2018-01-17 14:44:38 -05:00
golem galvanize
820c11358d dump learn_move.s 2018-01-16 15:31:43 -05:00
DizzyEggg
4dd06dbcd3 optiom menu move data to C 2018-01-16 19:39:35 +01:00
golem galvanize
5a5eb4ff59 dumped most of pokenav.s 2018-01-15 23:38:10 -05:00
Diegoisawesome
90c175b73f Extract baseroms from field_effect.s 2018-01-15 02:49:52 -06:00
Diegoisawesome
79451b5bb4 Extract data around Deoxys icon 2018-01-14 23:40:55 -06:00
Diegoisawesome
75f9c16504 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-01-07 18:47:05 -06:00
Diegoisawesome
efe19e95c8 Extract door animations 2018-01-07 01:29:26 -06:00
ProjectRevoTPP
48378f791c last wave of graphics.s dumps 2017-12-30 01:09:06 -05:00
ProjectRevoTPP
06aa07306e sixteenth wave of graphics.s dumps 2017-12-29 20:25:32 -05:00
Diegoisawesome
f0df833f37 Extract easy chat and pokemon animation 2017-12-29 13:34:24 -06:00
ProjectRevoTPP
cfe17cc552 fifteenth wave of graphics.s dumps 2017-12-28 22:05:30 -05:00
ProjectRevoTPP
77b7462dbb merge 2017-12-28 17:26:58 -05:00
ProjectRevoTPP
03a2a3b81b fourteenth wave of graphics.s dumps 2017-12-28 17:15:37 -05:00
Diegoisawesome
1496ea3a24 Merge branch 'master' of github.com:pret/pokeemerald 2017-12-28 03:00:15 -06:00
Diegoisawesome
2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
Diegoisawesome
ca49f8438d Extract battle_transition data 2017-12-27 15:25:15 -06:00
ProjectRevoTPP
8a338f44db thirteenth wave of graphics.s dumps 2017-12-26 22:37:36 -05:00
Diegoisawesome
eff0caf759 Split and extract roulette data 2017-12-26 01:42:08 -06:00
ProjectRevoTPP
0af942e0b8 twelfth wave of graphics.s dumps 2017-12-26 01:39:01 -05:00
ProjectRevoTPP
770714dcee eleventh wave of graphics.s dumps 2017-12-25 22:00:56 -05:00
ProjectRevoTPP
d6bac7f9f8 tenth wave of graphics.s dumps (battle_frontier) 2017-12-25 15:51:01 -05:00
Diegoisawesome
15c92318d3 Extract data from misc files 
Also split data4d.s
 2017-12-25 00:32:01 -06:00
ProjectRevoTPP
2c7112ce8f ninth wave of graphics.s dumps 2017-12-24 22:39:43 -05:00
ProjectRevoTPP
addfdfbcba eighth wave of graphics.s dumps 2017-12-24 02:54:08 -05:00
Diegoisawesome
e8153598ef Extract contest painting 2017-12-24 01:09:18 -06:00
ProjectRevoTPP
d0659a3ec6 seventh wave of graphics.s dumps 2017-12-24 01:00:53 -05:00
ProjectRevoTPP
e56f04ae2e sixth wave of graphics.s dumps 2017-12-24 00:08:28 -05:00
ProjectRevoTPP
ac74d6f100 fifth wave of graphics.s dumps 2017-12-23 22:06:01 -05:00
ProjectRevoTPP
4ad2c5c941 fourth wave of graphics.s dumps 2017-12-23 18:30:48 -05:00
ProjectRevoTPP
d137b7f0a8 third wave of graphics.s dumps (battle_anim part 2) 2017-12-23 15:50:58 -05:00
Diegoisawesome
a64b5cd31f Extract start of battle_frontier_2 2017-12-23 01:16:45 -06:00
ProjectRevoTPP
3499ff51b5 second wave of graphics.s dumps (battle_anim part 1) 2017-12-23 01:45:04 -05:00
ProjectRevoTPP
d10c645353 first wave of graphics.s dump 2017-12-22 19:18:09 -05:00
Diegoisawesome
04b64dda0b Extract baseroms from battle frontier and tent files 2017-12-22 15:04:05 -06:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
PikalaxALT
da2e0dfe50 Merge branch 'master' into clock 2017-12-15 21:04:25 -05:00
DizzyEggg
37ae6a7758 move more pokeblock data to C and label 2017-12-10 16:38:27 +01:00
DizzyEggg
ddcf52bcae get rid of ball pal files 2017-12-04 23:22:48 +01:00
DizzyEggg
2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
PikalaxALT
2280614a14 Start decompiling data 2017-11-24 19:06:01 -05:00
PikalaxALT
89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
DizzyEggg
5c44c64050 add hof graphics 2017-11-13 21:55:38 +01:00
DizzyEggg
4d615350c8 added berry blender start gfx 2017-11-13 19:36:23 +01:00
DizzyEggg
ac68187895 review changes adding a pal file 2017-11-13 18:18:12 +01:00
PikalaxALT
1ca032c6ff Address review items, 1 2017-11-12 21:13:18 -05:00
PikalaxALT
567b2af081 Drop tracking on gbapal files 2017-11-11 14:38:53 -05:00
DizzyEggg
4d4d642285 dump berry blender and script menu 2017-11-04 22:40:36 +01:00
PikalaxALT
9cfdc8b7e8 Merge branch 'master' into heal_location 2017-11-01 23:37:41 -04:00
PikalaxALT
7eacb24cf7 Start ripping graphics/data for region_map 2017-11-01 21:10:47 -04:00
PikalaxALT
6fcde15bb6 Decompile heal location data 2017-10-28 20:43:33 -04:00
DizzyEggg
f4e134569f evo graphics file is done 2017-10-27 15:49:14 +02:00
PikalaxALT
9fc2c99d18 Move these palettes to INCBINs 2017-10-22 19:05:32 -04:00
PikalaxALT
c042e5148b Decoration + decoration_inventory (#89) 
* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor
 2017-10-22 17:55:07 -05:00
DizzyEggg
ccd7e8b3b1 battle interface review changes 2017-10-20 19:24:46 +02:00
Diegoisawesome
41db025975 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-10-09 13:32:26 -05:00
ProjectRevoTPP
f0775000a1 decompile diploma.c 2017-10-07 22:54:32 -04:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -04:00
Diegoisawesome
cfc70c9806 Extract baseroms from miscellaneous files 
Had to leave some unfinished due to complexity at the moment
 2017-10-04 02:38:25 -05:00
Diegoisawesome
ba758afc14 Extract baseroms from and combine fldeff_emotion and trainer_see 
Also extract from bike
 2017-10-01 14:48:29 -05:00
Diegoisawesome
8982501b78 Extract baseroms from reset_rtc_screen 2017-10-01 13:03:51 -05:00
Diegoisawesome
c9cad220de Extract baseroms from intro_credits_graphics.s 2017-10-01 03:08:19 -05:00
Diegoisawesome
1a55966f1b Extract baseroms from battle_interface 2017-09-30 16:37:53 -05:00
Diegoisawesome
6f22bf385d Extract baseroms from battle_anim_80FE840 2017-09-29 17:34:39 -05:00
Diegoisawesome
ee777d7b17 Extract baseroms from title_screen 2017-09-27 00:51:09 -05:00
Diegoisawesome
6cc1ec7bb1 Extract intro gfx from graphics.s 2017-09-26 23:06:25 -05:00
Diegoisawesome
d18eaa3502 Extract baserom calls from intro.s 2017-09-26 18:13:58 -05:00
Diegoisawesome
d1efbcd282 Extract scattered baseroms and cleanup 2017-09-25 16:27:02 -05:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
DizzyEggg
67a8ac72ec add egg graphics 2017-09-19 21:02:35 +02:00
Diegoisawesome
9f87103ea0 Extract baserom calls from files 
Extract calls from crt0.s, bard_music.s, battle_4.s
 2017-09-17 20:33:32 -05:00
Diegoisawesome
3c63063831 Add missing file and rename data2.s to link.s 2017-09-16 14:08:47 -05:00
Diegoisawesome
582a3795ac Remove unneeded files 2017-09-16 03:24:19 -05:00
Diegoisawesome
6ba1dc8169 Merge remote-tracking branch 'pret/master' 2017-09-16 03:21:42 -05:00
Diegoisawesome
448497dfbb Finish extracting data2.s 2017-09-16 03:21:09 -05:00
DizzyEggg
4c16bb5ee6 decompile util.s 2017-09-13 12:58:57 +02:00
Diegoisawesome
3e1c6024a7 Continue extracting from data2.s 2017-09-13 01:10:12 -05:00
Diegoisawesome
04598f0749 Rename data2 external file symbols 2017-09-12 00:00:05 -05:00
Diegoisawesome
54e18f3f2e Add missing files for building 2017-09-11 01:50:55 -05:00
Diegoisawesome
ab189ecec5 Begin extracting baserom calls from data2.s 2017-09-11 00:40:47 -05:00
Diegoisawesome
4df1937738 Ported task.c and others from pokeruby 2016-10-31 09:43:17 -05:00
YamaArashi
a43a1cd76f move trainer graphics 2016-09-03 14:04:23 -07:00
YamaArashi
a824690dbd move title screen graphics 2016-09-03 14:01:37 -07:00
YamaArashi
8e8d5dcba5 move pokemon graphics 2016-09-03 13:57:41 -07:00
YamaArashi
92d2c4ea10 move birch speech graphics 2016-09-03 11:13:17 -07:00
YamaArashi
4c543a3e5c move item graphics 2016-09-03 11:10:34 -07:00
YamaArashi
1af50a809c move map object graphics 2016-09-03 11:02:35 -07:00
YamaArashi
0a89eb1e66 move berry graphics 2016-09-03 10:38:37 -07:00