Marcus Huderle
35c0fb5154
Decompile ground.c
2018-11-26 09:55:31 -06:00
Marcus Huderle
839c629d5b
Decompile dragon.c
2018-11-26 09:31:03 -06:00
Marcus Huderle
2c2431aa4c
Decopmile bug.c ( #399 )
2018-11-26 09:03:50 -06:00
Marcus Huderle
5947e0d229
Decompile rock
2018-11-25 17:00:18 -06:00
Marcus Huderle
19e235867a
Merge pull request #395 from Slawter666/battle-ui-doc
...
Document some battle ui
2018-11-25 15:58:37 -06:00
Marcus Huderle
fb6120da5b
Fixup some names
2018-11-25 15:50:54 -06:00
Marcus Huderle
256bfc3caa
Decompile script_pokemon_util_80F87D8
2018-11-25 15:32:22 -06:00
DizzyEggg
8e10d7c0e5
Match some functions
2018-11-25 20:16:41 +01:00
Slawter666
3b501cb470
Document battle ui
2018-11-22 01:10:50 +00:00
DizzyEggg
d70c3a94c5
match DecompressGlyphTile nicer
2018-11-21 23:30:04 +01:00
DizzyEggg
c7ca38ccf3
Match DecompressGlyphTile
2018-11-21 21:58:35 +01:00
DizzyEggg
37d49b34e0
Move vars to battle_main.c
2018-11-19 17:36:39 +01:00
DizzyEggg
5d5b4b853c
Merge branch 'master' into frontier
2018-11-19 17:32:32 +01:00
DizzyEggg
8a00334102
document mossdeep gym
2018-11-19 17:31:46 +01:00
DizzyEggg
d22c2110de
Decompile mossdeep hym
2018-11-19 17:16:01 +01:00
Marcus Huderle
72f0a079a9
Decompile all of battle_anim_utility_funcs
2018-11-19 09:37:25 -06:00
DizzyEggg
27ee7d567e
fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT
2018-11-18 20:19:10 +01:00
Diegoisawesome
0bbe03f170
Merge pull request #388 from DizzyEggg/clean_savve
...
Clean up save related files
2018-11-18 13:13:56 -06:00
DizzyEggg
1b0cfb0757
Party Size and Num Stats
2018-11-18 20:00:36 +01:00
DizzyEggg
7ce3473b0e
Clean up save related files
2018-11-18 19:37:18 +01:00
DizzyEggg
4e37723288
Document Battle Pyramid
2018-11-18 17:52:22 +01:00
DizzyEggg
eb66b60f38
Begin battle pyramid
2018-11-17 15:30:34 +01:00
Diegoisawesome
032dd251e6
Merge pull request #383 from garakmon/createsprite
...
Update createsprite macro and rename BANK to BATTLER
2018-11-15 14:45:13 -06:00
Slawter666
6fcf878e2f
Tidy up header files
2018-11-13 22:28:46 +00:00
garak
c6833c903c
remove extra macro and shorten names
2018-11-13 16:19:52 -05:00
garak
269aebaca7
update createsprite macro and rename BANK to BATTLER
2018-11-13 15:35:46 -05:00
Slawter666
1d46507110
Move field effects enum to defines
2018-11-13 14:19:04 +00:00
DizzyEggg
b5ea69cf74
Fix conflicts
2018-11-12 19:22:23 +01:00
DizzyEggg
69683f9572
Decompile Battle Palace
2018-11-12 15:41:19 +01:00
Slawter666
1b895ff52c
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-11-12 14:14:50 +00:00
DizzyEggg
d5abd7b696
Document Battle Pie
2018-11-12 14:36:31 +01:00
DizzyEggg
3b3cffac44
Decompile battle pike
2018-11-12 14:07:31 +01:00
DizzyEggg
4fb463377c
Start battle pike
2018-11-12 00:46:02 +01:00
DizzyEggg
a4235c9ff8
Document battle arena
2018-11-11 18:33:16 +01:00
DizzyEggg
81410fee17
Factory done
2018-11-11 16:44:27 +01:00
Diegoisawesome
9f50ba1ce3
Fix incorrect compressed types, part 2
2018-11-07 12:35:31 -06:00
Diegoisawesome
18839a4872
Merge remote-tracking branch 'pret/master' into script_menu
2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95
Finish decompiling/porting script_menu
2018-11-06 20:13:40 -06:00
Slawter666
15117a8d09
Remove redundancy in berry.c
2018-11-06 23:15:57 +00:00
Diegoisawesome
9afe7a896e
Merge remote-tracking branch 'pret/master' into render_text
2018-11-06 11:40:17 -06:00
Diegoisawesome
43a8534fce
Merge remote-tracking branch 'origin/master' into render_text
2018-11-06 11:33:21 -06:00
Diegoisawesome
f8d337e491
Finish cleaning up text.c
2018-11-06 11:30:21 -06:00
Diegoisawesome
6d38431c33
Begin cleaning text.c
2018-11-06 10:44:48 -06:00
DizzyEggg
258ec3162f
frontier util review changes
2018-11-05 22:13:59 +01:00
Diegoisawesome
7dd4ed7060
r5/r6 swap on sub_80E2578
2018-11-05 14:45:54 -06:00
DizzyEggg
487a6c2b2c
this file is
2018-11-05 21:42:12 +01:00
DizzyEggg
6d0d69f3a5
Match Render Text
2018-11-04 23:09:10 +01:00
DizzyEggg
0bb51037d7
Finish frontier util
2018-11-01 21:31:10 +01:00
DizzyEggg
37d742cbd8
Document recorded battle
2018-11-01 15:06:50 +01:00
Diegoisawesome
645830624d
Continue script_menu.c
2018-10-31 23:03:41 -05:00
DizzyEggg
7de1c4bd14
Make frontier util compile
2018-10-30 22:17:03 +01:00
DizzyEggg
90ef269426
Merge branch 'master' into battle_frontier_2
2018-10-30 21:48:18 +01:00
DizzyEggg
0da7d7e6ae
why is this function so hard to match
2018-10-30 21:45:26 +01:00
Diegoisawesome
9adbb5d871
Merge pull request #375 from garakmon/animation-test-temp
...
Back animation names
2018-10-30 12:00:37 -05:00
Diegoisawesome
2837859bdb
Merge pull request #373 from garakmon/battle-anim
...
Split battle_anim_80FE840 and move data to C
2018-10-30 11:53:05 -05:00
garak
3cb7a33f42
label back animations
2018-10-30 12:37:53 -04:00
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags
...
Synchronize sprite tags
2018-10-30 11:26:44 -05:00
Diegoisawesome
f3af20d3cf
Merge pull request #370 from DizzyEggg/battle_tower
...
Decompile Battle Tower
2018-10-30 11:18:24 -05:00
DizzyEggg
3a9eeef844
Frontier, finish ranking hall
2018-10-28 21:11:53 +01:00
DizzyEggg
98d8dbfd8a
Up to sub_81a443c
2018-10-28 00:50:06 +02:00
DizzyEggg
e850517123
more battle frontier 2
2018-10-27 21:01:35 +02:00
DizzyEggg
826d0ea2ab
Begin frontier records
2018-10-27 15:44:29 +02:00
DizzyEggg
b252bd0292
Window priority to window bg
2018-10-27 00:53:07 +02:00
DizzyEggg
52be8eeaf1
Merge branch 'master' into battle_tower
2018-10-26 23:55:36 +02:00
DizzyEggg
dc273cc19d
Battle tower - ewram variables
2018-10-26 23:54:41 +02:00
garak
de90ce9123
finish 80FE840 data (almost)
2018-10-25 17:46:23 -04:00
DizzyEggg
1efdaebe23
finish decompiling battle tower
2018-10-25 21:27:10 +02:00
garak
17c26fae1a
fire, electric, ice data
2018-10-24 20:01:40 -04:00
DizzyEggg
549b669f2a
battle tower, match sth and dumb loop instead of goto
2018-10-24 23:14:45 +02:00
garak
22a0b58e57
effects_2 and water data
2018-10-24 15:52:21 -04:00
garak
2f4b00e34b
finish effects_1 data
2018-10-23 12:17:31 -04:00
garak
68814c42de
begin 80FE840 data
2018-10-23 08:25:51 -04:00
DizzyEggg
b330bdba51
More and more battle tower
2018-10-22 19:22:57 +02:00
garak
6cf39e8a6e
clean up sprite tags
2018-10-22 10:51:40 -04:00
garak
d267fcbfb1
name remaining tags
2018-10-22 10:36:43 -04:00
garak
2b9fd18dd4
battle_anims.s data to C
2018-10-21 22:30:20 -04:00
garak
f2363f5982
more tag names
2018-10-21 19:30:27 -04:00
garak
7a9c7e5f06
Merge branch 'master' into sprite-tags
2018-10-21 15:12:18 -04:00
garak
2bb286ab4e
begin ANIM_TAG port
2018-10-21 15:07:10 -04:00
DizzyEggg
0ab27e44b1
more tower, fail
2018-10-21 20:13:12 +02:00
Diegoisawesome
8e7202ec3d
Fix LZ compressed data alignment
2018-10-21 12:05:34 -05:00
Diegoisawesome
97bbb326b8
GameClear nonsense
2018-10-20 19:53:41 -05:00
golem galvanize
ba3247d5cd
decompiled more, stuck on sub_81B1760
2018-10-20 20:25:28 -04:00
Slawter666
3d8874d919
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-10-21 00:20:09 +01:00
DizzyEggg
16026fe91d
More battle tower.
2018-10-21 00:06:42 +02:00
Slawter666
7a072d4527
Continue synchronising
2018-10-20 21:01:45 +01:00
Diegoisawesome
2a3ba78831
Merge pull request #369 from garakmon/pan-constants
...
Use sound pan constants in data/battle_anim_scripts.s
2018-10-19 20:27:54 -05:00
DizzyEggg
f4e55999a5
begin porting and decomping battle tower
2018-10-20 00:33:51 +02:00
garak
38fcc46abb
Merge remote-tracking branch 'upstream/master' into pan-constants
2018-10-19 16:05:14 -04:00
garak
901f3ff557
use sound panning constants in battle_anim_scripts
2018-10-19 15:57:19 -04:00
Diegoisawesome
bf8fa23462
Merge pull request #365 from garakmon/event-flags
...
[WIP] Event flags
2018-10-19 14:24:34 -05:00
garak
113a8d1efd
clean flags and remove temp macro
2018-10-19 14:59:18 -04:00
garak
1441ee6bc3
finish event object flags
2018-10-19 13:04:47 -04:00
Diegoisawesome
95d8815721
Merge pull request #368 from Diegoisawesome/master
...
Finish porting/decompiling field_player_avatar
2018-10-19 00:08:59 -05:00
Diegoisawesome
dd3689fdbf
Finish porting/decompiling field_player_avatar
2018-10-19 00:05:54 -05:00
garak
cb5981cdf2
name more event flags
2018-10-18 21:32:21 -04:00
garak
c27043bd3c
more event flags
2018-10-18 15:28:59 -04:00
DizzyEggg
dfee5deca8
Move Bitmap struct and clear sprite/text files
2018-10-18 21:24:37 +02:00
Diegoisawesome
6206acd2d2
Finish shop and fldeff_escalator
2018-10-18 12:05:02 -05:00
golem galvanize
dded980cde
fix building
2018-10-17 23:36:18 -04:00
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
golem galvanize
2c6d634acd
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
2018-10-17 20:03:31 -04:00
golem galvanize
65a0c48eec
decompiled some more of the file
2018-10-17 20:03:02 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags
2018-10-17 12:30:45 -04:00
garak
ff97873c30
label temp flags, test replace script
2018-10-17 12:25:12 -04:00
Slawter666
b7b1d609d0
More synchronisation
2018-10-17 13:52:26 +01:00
Diegoisawesome
e75f0b4f80
Port/decompile field_control_avatar
2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41
Further synchronisation
2018-10-17 01:11:44 +01:00
Deokishisu
78a912a039
Fix "Vigaroth" misspelling to "Vigoroth"
2018-10-16 12:06:38 -04:00
Slawter666
3aff112127
Begin synchronising with pokeruby
2018-10-16 14:55:16 +01: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
Deokishisu
bf2063cc1a
Update All EVENT_OBJ_GFX References
...
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14 19:09:18 -04:00
Slawter666
137f6549ff
label field_effect_helpers
2018-10-14 23:43:40 +01: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
DizzyEggg
c3113db931
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14 20:00:14 +02: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
DizzyEggg
ecdf0fd69d
Clean battle structs
2018-10-14 18:37:52 +02:00
DizzyEggg
b73611bccb
clean battle structs
2018-10-14 18:10:54 +02:00
DizzyEggg
f47ed3268c
Finish documenting apprentice for now
2018-10-14 17:00:41 +02:00
DizzyEggg
7952cfeba5
document more of apprentice
2018-10-14 16:27:48 +02:00
DizzyEggg
84936b4260
Merge branch 'master' into apprentice
2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661
Use defines for text chars
2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a
Move 'blend_palette'.c to util.c
2018-10-14 14:43:19 +02:00
DizzyEggg
145df49063
Document more of apprentice
2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832
Decompile apprentice
2018-10-14 11:37:44 +02:00
DizzyEggg
36b8a6a9a2
More apprentice work
2018-10-13 23:23:33 +02:00
DizzyEggg
a496a763ca
Merge record mixing, pokemon and global with apprentice
2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop
2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c
Merge branch 'master' of github.com:pret/pokeemerald
2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814
Port/decompile cable_club.s
2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b
Merge remote-tracking branch 'upstream/master' into shop
...
# Conflicts:
# asm/shop.s
2018-10-13 10:22:58 -05:00
DizzyEggg
74b81bf229
start apprentice
2018-10-13 00:48:26 +02:00
golem galvanize
d3d725cc83
decompiled up to sub_81B0948
2018-10-11 21:23:39 -04:00
Diegoisawesome
04836db167
Start porting cable_club.c
2018-10-11 16:02:58 -05:00
golem galvanize
803c2388ce
finish porting field_effect_helpers
2018-10-10 12:02:02 -04:00
golem galvanize
35ee9f67c0
ported some of field_effect_helpers
2018-10-09 17:32:39 -04:00
Diegoisawesome
72c9abbb66
Remove invalid version entries
2018-10-07 23:28:36 -05:00
Marcus Huderle
807050a048
Merge pull request #348 from DizzyEggg/anim_files
...
Decompile/Port battle_anim_80A5C6C
2018-10-07 12:23:07 -05:00
DizzyEggg
413e26e83d
port 80d51ac
2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069
Decompile battle_anim_80A9C70
2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8
battle anim 80a5c6c decompiled
2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92
Start porting ruby battle anim file
2018-10-06 23:04:53 +02: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
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims
...
Document battle animation scripts
2018-10-06 08:20:41 -05:00
Deokishisu
2070c246f9
Added new findings about invalid version IDs.
...
After transferring Pokemon up to Gen 6 and then to Gen 7, I discovered that invalid version IDs display the "a distant land" string that is used for the Gamecube games, so that information was added in a comment.
Also clarified that it's not just Gen 4 that displays the Johto string, it's Gen 4 and up.
2018-10-06 07:40:56 -04:00
DizzyEggg
17c5b4089a
Label most of the anim tags
2018-10-06 09:37:52 +02:00
Deokishisu
76a9cf0d54
Fix captitalization of HGSS in comment and match FRLG formatting in enum
2018-10-06 01:56:03 -04:00
Deokishisu
cc0d2288d5
Match comment formatting
2018-10-06 01:46:17 -04:00
Deokishisu
024700769a
Document all possible VERSION_ numbers and add them to the enum
2018-10-06 01:45:36 -04:00
Tetrable
61ab631dec
Fixed a small error
2018-10-05 23:02:04 +01:00
Tetrable
e80a53060b
Start anim tags
2018-10-05 23:00:07 +01:00
Marcus Huderle
ec0d350137
Move metatile behavior constants to include/constants and sync closer to pokeruby
2018-10-04 17:57:07 -05:00
Diegoisawesome
584cad6c0b
Merge pull request #339 from Kermalis/master
...
Rename voicegroups
2018-09-22 15:48:29 -05:00
Kermalis
e93f1182e6
Rename voicegroups
2018-09-22 16:42:34 -04:00
Diegoisawesome
58a5e4a261
Merge branch 'master' of github.com:pret/pokeemerald
2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe
Merge remote-tracking branch 'Tetra/master'
2018-09-22 15:23:47 -05:00
Diegoisawesome
d50554bb8e
Use macros and defines in tileset_anims
2018-09-22 15:02:49 -05:00
DizzyEggg
e362c06aea
gRandomMove to gCalledMove
2018-09-22 18:41:00 +02:00
DizzyEggg
66fd9b2ddf
Label trainer hill battle type
2018-09-20 22:00:00 +02:00
DizzyEggg
bf64333299
Give labels to healthbox gfx
2018-09-20 21:42:38 +02:00
DizzyEggg
e4b7ba0977
Document some not labeled battle things
2018-09-20 11:55:35 +02:00
Diegoisawesome
8a05bf82ec
Merge branch 'master' of github.com:pret/pokeemerald
2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a
Add defines for tile, metatile, and palette count
2018-09-18 10:03:24 -05:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil
...
Decompile cable_car_util.c
2018-09-16 01:06:33 -05:00
DizzyEggg
0547e260a4
More of slot machine
2018-09-15 18:01:20 +02:00
DizzyEggg
ff13cb6352
decompile cable car util which has nothing to do with actual cable car
2018-09-15 13:50:23 +02:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master
...
Document main_menu
2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4
Document main_menu
2018-09-14 12:15:46 -05:00
DizzyEggg
a08d9dd451
Merge branch 'master' into anims
2018-09-12 22:59:04 +02:00
DizzyEggg
8a81bd1bce
Sync battle anim labels with pokeruby
2018-09-12 22:58:03 +02:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data
...
Move more data to C
2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398
Move battle_bg data to C
2018-09-11 23:37:47 +01:00
Slawter666
991151f461
Move item_use data to C
2018-09-11 03:04:19 +01:00
DizzyEggg
10b479a3ca
Document battle animation scripts.
2018-09-10 21:19:19 +02:00
DizzyEggg
b87856b58e
Battle Factory is decompiled and documented.
2018-09-10 01:01:39 +02:00
Slawter666
1ba17e1666
Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data
2018-09-09 15:51:13 +01:00
DizzyEggg
2f59df03ab
Standartize AddTextPrinterParametrized functions,
2018-09-08 23:38:30 +02:00
Diegoisawesome
e1834c9d7b
Change overworld_frame macro to use tiles
2018-09-08 03:07:44 -05:00
Diegoisawesome
12521fb1a8
Merge branch 'Slawter666-spritesheet'
2018-09-08 02:37:33 -05:00
Diegoisawesome
d945a8bf2f
Macroize main_menu and general cleanup
2018-09-07 19:24:33 -05:00
Slawter666
54d5a7ad97
Format event object pic tables
2018-09-07 14:14:52 +01:00
Marcus Huderle
fa9d1759bd
checkpoint
2018-09-06 11:37:45 -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
ultima-soul
857ac33adb
Fixed a typo.
2018-09-05 17:25:44 +00:00
ultima-soul
f505ba1bc7
Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent.
2018-09-05 01:13:17 +00:00
Slawter666
4c54212b1f
Bring labels for overworld.c over from pokeruby
2018-09-04 23:31:37 +01:00
DizzyEggg
24b9cd721f
More Battle Factory
2018-09-03 22:55:55 +02:00
Slawter666
5c66b8a7ef
Label event_object_movement.c
2018-09-02 23:20:45 +01:00
DizzyEggg
0238b1c8ec
More battle factory work
2018-09-02 19:41:33 +02:00
DizzyEggg
10eb952db5
Start battle factory
2018-09-02 18:10:36 +02:00
Marcus Huderle
8ecf3b2159
Start decompiling shop.c
2018-09-01 17:15:35 -05:00
DizzyEggg
e28ce3be78
Fix the strings length issue
2018-09-01 22:03:21 +02:00
DizzyEggg
44ba432dad
Label various battle scripts
2018-09-01 20:00:13 +02:00
DizzyEggg
ead21250a6
Label all battle ai scripts
2018-09-01 19:05:06 +02:00
DizzyEggg
38c89b9d0f
Bank to battler
2018-09-01 18:36:08 +02:00
DizzyEggg
ce949ba705
document move type variables in pss
2018-09-01 18:31:53 +02:00