PALPATlNE
|
136f767f1f
|
Replaced tab spaces with 4 spaces
|
2019-02-10 19:30:00 +01:00 |
|
DizzyEggg
|
4c535a1b03
|
Merge pull request #71 from thechurchofcage/partingshot
Parting Shot
|
2019-02-10 18:18:49 +01:00 |
|
DizzyEggg
|
b5d0253890
|
Merge with master
|
2019-02-10 18:17:33 +01:00 |
|
Phlosioneer
|
f2f1b1978b
|
Done documenting link code in overworld.c
|
2019-02-10 03:54:50 -05:00 |
|
Phlosioneer
|
3fd878483f
|
Start renaming symbols
I finally figured out what the code is trying to do. I have a foothold;
the rest should follow.
|
2019-02-10 00:50:46 -05:00 |
|
Papa Cancer
|
dd34272620
|
Parting Shot v3
|
2019-02-09 17:40:04 +00:00 |
|
Papa Cancer
|
a1be618c47
|
Parting Shot v2
With DizzyEgg's amendment
|
2019-02-09 16:05:59 +00:00 |
|
Marcus Huderle
|
6f1d2b870c
|
Give proper names to dynamic map layouts
|
2019-02-09 09:57:30 -06:00 |
|
DizzyEggg
|
10536196f9
|
AI edge case with atk up
|
2019-02-09 16:45:02 +01:00 |
|
DizzyEggg
|
3d616dfffe
|
Add Surge Abilities
|
2019-02-09 14:30:16 +01:00 |
|
DizzyEggg
|
691544fa0b
|
AI takes split into account, debug view ai move points
|
2019-02-09 13:21:32 +01:00 |
|
DizzyEggg
|
413cf4f0ae
|
Merge pull request #68 from Fontbane/patch-2
AI uses Swagger on allies with Own Tempo
|
2019-02-09 12:35:52 +01:00 |
|
Marcus Huderle
|
40dc6833c5
|
Fully document tileset animations
|
2019-02-08 15:07:42 -06:00 |
|
Marcus Huderle
|
6add3e1794
|
Document some battle dome stuff
|
2019-02-08 11:08:25 -06:00 |
|
PALPATlNE
|
e7f8186ccc
|
Mud bomb and Shadow Sneak Animations
|
2019-02-08 03:13:36 +01:00 |
|
DizzyEggg
|
aa33a61e58
|
Merge branch 'master' into battle_engine_v2
|
2019-02-07 21:17:30 +01:00 |
|
Marcus Huderle
|
3a88ab831d
|
Document more battle pyramid
|
2019-02-07 11:51:03 -06:00 |
|
Marcus Huderle
|
a1ad1bad3a
|
Document a bunch of battle pyramid
|
2019-02-06 21:14:28 -06:00 |
|
Papa Cancer
|
62fd90caa0
|
Parting Shot
Effect plus animation (looks like Snarl)
|
2019-02-05 21:47:50 +00:00 |
|
huderlem
|
b0ee100975
|
Merge pull request #543 from pret/mapdata
Convert map data to JSON
|
2019-02-04 21:36:18 -06:00 |
|
Marcus Huderle
|
d4125fef9b
|
Cleanup and add game version flag to mapjson tool
|
2019-02-04 17:28:45 -06:00 |
|
AJ Fontaine
|
b10c2ecf04
|
Use Swagger on allies with Own Tempo
|
2019-02-04 11:55:26 -05:00 |
|
DizzyEggg
|
f415871369
|
Merge with master
|
2019-02-03 10:44:05 +01:00 |
|
DizzyEggg
|
a7f94bbeea
|
Dump last battle anim file
|
2019-02-02 11:55:11 +01:00 |
|
DizzyEggg
|
a42bba755b
|
Add Crafty Shield effect
|
2019-02-01 14:34:16 +01:00 |
|
DizzyEggg
|
a3460c9e45
|
Code Belch effect
|
2019-02-01 14:17:24 +01:00 |
|
DizzyEggg
|
fab5b86d31
|
Fix Embargo string
|
2019-02-01 13:41:08 +01:00 |
|
Marcus Huderle
|
29d6221935
|
Convert map data to JSON
|
2019-01-31 15:51:20 -06:00 |
|
Marcus Huderle
|
5c1667b41a
|
Define layout constants
|
2019-01-29 16:55:25 -06:00 |
|
DizzyEggg
|
7bc4a3b3f7
|
Merge with master
|
2019-01-29 22:12:53 +01:00 |
|
Marcus Huderle
|
14641e916e
|
Cleanup Rustboro City House layout label
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
bd667102fa
|
Fix PetaburgCity map scripts label
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
e43f341799
|
Cleanup link contest map scripts
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
d2d44a97b8
|
Cleanup link contest map events
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
36a1825bbe
|
Document trainer approach funcs, and use movement type constants in scripts
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
e81838dba3
|
Misc. documentation and move some data into .c files
|
2019-01-29 14:36:02 -06:00 |
|
DizzyEggg
|
94d2a30d44
|
Merge with master
|
2019-01-28 20:41:46 +01:00 |
|
Diegoisawesome
|
183b6857ff
|
Merge pull request #458 from ultima-soul/contest
Decompile more of contest
|
2019-01-27 23:08:24 -06:00 |
|
DizzyEggg
|
736826e863
|
New feature - battle 2 vs 1 opponent
|
2019-01-27 20:54:34 +01:00 |
|
DizzyEggg
|
88b788bfab
|
Fix Charge Beam effect
|
2019-01-27 11:57:13 +01:00 |
|
DizzyEggg
|
897592a8d4
|
Merge branch 'master' into battle_engine_v2
|
2019-01-27 10:58:57 +01:00 |
|
Diegoisawesome
|
6b2dda422b
|
Merge branch 'master' of github.com:pret/pokeemerald
|
2019-01-27 00:11:44 -06:00 |
|
Diegoisawesome
|
7a60f36954
|
Clean up variable numbers mistakenly written as decimal
|
2019-01-27 00:11:32 -06:00 |
|
DizzyEggg
|
01c3f3fc05
|
Document all of frontier pass
|
2019-01-26 20:56:06 +01:00 |
|
DizzyEggg
|
ebfaf3f6be
|
Merge branch 'master' into dump
|
2019-01-24 21:30:19 +01:00 |
|
DizzyEggg
|
524db6068e
|
Merge branch 'master' into trainer_card
|
2019-01-22 21:59:32 +01:00 |
|
Diegoisawesome
|
900f294011
|
Add var const prefix for some missed var numbers
|
2019-01-21 22:34:01 -06:00 |
|
DizzyEggg
|
4e396207d3
|
document more of trainer card
|
2019-01-20 18:24:35 +01:00 |
|
DizzyEggg
|
576d1b3474
|
Document and match somne trainer card
|
2019-01-19 23:04:33 +01:00 |
|
DizzyEggg
|
f84b22fca4
|
Dump trainer hill trainers
|
2019-01-19 12:57:18 +01:00 |
|
DizzyEggg
|
f34ab49f63
|
Merge pull request #56 from SBird1337/feature/battle-engine-animpack1
Add some animations (see below)
|
2019-01-18 23:06:19 +01:00 |
|
DizzyEggg
|
2c3210f4d1
|
merge with master
|
2019-01-18 22:30:34 +01:00 |
|
Diegoisawesome
|
6857b73ee3
|
Split pokenav so calcrom works properly
|
2019-01-14 15:25:29 -06:00 |
|
Karathan
|
5ad85f0d55
|
add bullet punch animation
|
2019-01-14 00:21:36 +01:00 |
|
DizzyEggg
|
edddd847c5
|
Document and clean up trainer hill
|
2019-01-13 20:50:08 +01:00 |
|
Karathan
|
200f0a09d3
|
add sticky web
|
2019-01-13 19:35:29 +01:00 |
|
Karathan
|
bb38edad23
|
add x-scissor animation
|
2019-01-13 19:13:37 +01:00 |
|
Karathan
|
cb617401a6
|
add air slash
|
2019-01-13 17:03:23 +01:00 |
|
DizzyEggg
|
c0bc01d301
|
Move some vars to C
|
2019-01-13 13:15:23 +01:00 |
|
SBird1337
|
3a5e5d04e7
|
add iceshard
|
2019-01-13 01:21:05 +01:00 |
|
Karathan
|
74ae0a6e83
|
add thunder fang and fire fang animations
|
2019-01-12 17:03:44 +01:00 |
|
Karathan
|
768af79b36
|
add ice fang animation
|
2019-01-12 17:02:24 +01:00 |
|
Karathan
|
e0be163978
|
add seed bomb animation
|
2019-01-12 17:02:24 +01:00 |
|
Karathan
|
832c0d6333
|
add toxic spike animation
|
2019-01-12 17:02:24 +01:00 |
|
Karathan
|
8c73045fd6
|
add brave bird animation
|
2019-01-12 17:02:24 +01:00 |
|
ultima-soul
|
284751e761
|
Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present.
|
2019-01-06 13:41:18 -08:00 |
|
Slawter666
|
f8c2fcb9b2
|
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
|
2019-01-05 19:54:26 +00:00 |
|
DizzyEggg
|
4827776a3c
|
Merge with master
|
2019-01-05 10:14:20 +01:00 |
|
Tetrable
|
30e7ac0dca
|
Fix merge conflicts
|
2019-01-03 02:28:18 +00:00 |
|
Tetrable
|
50aa222aff
|
Corrected typos
|
2019-01-03 01:54:55 +00:00 |
|
Marcus Huderle
|
b471bba55e
|
Use better names for match call texts
|
2019-01-02 19:46:15 -06:00 |
|
Marcus Huderle
|
e1092028ec
|
Decompile match_call.c
|
2019-01-02 19:46:15 -06:00 |
|
Diegoisawesome
|
0053e61535
|
Merge pull request #504 from Diegoisawesome/roulette
Port/decompile roulette
|
2019-01-02 17:00:33 -06:00 |
|
Diegoisawesome
|
6202ae1df0
|
Extract rodata from roulette
|
2019-01-02 16:40:40 -06:00 |
|
Tetrable
|
a3ebca4d81
|
Fix merge conflicts
|
2019-01-02 21:25:14 +00:00 |
|
Tetrable
|
1e3da62d24
|
Finish off labelling flags
|
2019-01-02 21:12:43 +00:00 |
|
Diegoisawesome
|
af1e44befe
|
Continue porting roulette
|
2018-12-31 18:07:29 -06:00 |
|
Marcus Huderle
|
fb2d1591c1
|
Document more battle anim effects
|
2018-12-31 16:53:38 -06:00 |
|
Diegoisawesome
|
d004ce065c
|
Merge branch 'master' of github.com:pret/pokeemerald into trade
|
2018-12-31 02:30:30 -06:00 |
|
Diegoisawesome
|
c5c6e437ec
|
Document, cleanup, extract data from trade
|
2018-12-31 01:23:27 -06:00 |
|
Marcus Huderle
|
58f130d007
|
Document some battle anims and helpers
|
2018-12-30 11:04:17 -06:00 |
|
Diegoisawesome
|
2fb9f490fb
|
Almost done with trade
|
2018-12-29 12:46:15 -06:00 |
|
Melody
|
dc6c0ed17e
|
add event object var references
|
2018-12-29 11:56:53 -06:00 |
|
Marcus Huderle
|
6e7bdb3ca4
|
Document misc field_specials things
|
2018-12-29 11:36:54 -06:00 |
|
Marcus Huderle
|
67636b7c64
|
Document deoxys rock
|
2018-12-29 11:36:54 -06:00 |
|
DizzyEggg
|
27b1d74dad
|
Merge branch 'master' into battle_engine_v2
|
2018-12-29 15:11:54 +01:00 |
|
Melody
|
6d556f8cf7
|
improve checkplayergender calls
clean up constant definitions
make tweaks from review
|
2018-12-28 08:22:21 -06:00 |
|
Marcus Huderle
|
c3dde7353d
|
Add newline to Route111_NoMirageTower layout.inc
To match all other layout.inc files.
|
2018-12-26 17:04:24 -06:00 |
|
Marcus Huderle
|
a1ea3b5e39
|
Use map_header_flags macro (#483)
|
2018-12-26 12:20:15 -06:00 |
|
DizzyEggg
|
6411d1d693
|
Merge pull request #55 from huderlem/anims
Some battle anims
|
2018-12-26 17:48:03 +01:00 |
|
DizzyEggg
|
517573eb4b
|
Update with master
|
2018-12-26 17:46:51 +01:00 |
|
Marcus Huderle
|
dcbc8db6a3
|
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
|
2018-12-25 11:46:35 -06:00 |
|
Melody
|
c7971ecb20
|
improve event script object calls
|
2018-12-25 11:20:33 -06:00 |
|
Diegoisawesome
|
a54aa03d20
|
Merge pull request #475 from DizzyEggg/learn
asm party and fldeff clean-up
|
2018-12-24 16:50:14 -06:00 |
|
Diegoisawesome
|
c2ca57e8ac
|
Merge pull request #477 from melthelesbian/object_script_commands
use player constant in obj script commands
|
2018-12-24 16:09:42 -06:00 |
|
Melody
|
38293d4293
|
use player constant in obj script commands
|
2018-12-24 16:31:24 -05:00 |
|
Melody
|
1e87810414
|
document setweather calls
|
2018-12-24 16:23:58 -05:00 |
|
DizzyEggg
|
442b1826a2
|
asm party and fldeff clean-up
|
2018-12-24 21:59:05 +01:00 |
|
DizzyEggg
|
6fa5f33519
|
Merge branch 'master' into battle_engine_v2
|
2018-12-24 09:07:18 +01:00 |
|
Marcus Huderle
|
c17f7d73fa
|
Merge remote-tracking branch 'origin/battle_engine_v2' into features
# Conflicts:
# ld_script.txt
# src/effects_1.c
|
2018-12-23 17:24:14 -06:00 |
|
Diegoisawesome
|
81b38c00e4
|
Merge pull request #466 from melthelesbian/compare_macros
improve compare macros
|
2018-12-23 11:17:30 -06:00 |
|
DizzyEggg
|
efa820469a
|
move data to c
|
2018-12-23 14:52:47 +01:00 |
|
DizzyEggg
|
6d57a9dfc8
|
start data converting
|
2018-12-23 13:52:53 +01:00 |
|
DizzyEggg
|
ef55bdac89
|
Merge branch 'master' into battle_engine_v2
|
2018-12-22 23:57:42 +01:00 |
|
Diegoisawesome
|
ebbe826133
|
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
|
2018-12-22 16:12:27 -06:00 |
|
DizzyEggg
|
bea1faec10
|
some ai scripts touch
|
2018-12-22 21:43:21 +01:00 |
|
DizzyEggg
|
e54dd6a02b
|
Merge with master
|
2018-12-22 13:53:07 +01:00 |
|
Melody
|
55005f1588
|
improve call_if macros
|
2018-12-21 21:32:45 -05:00 |
|
Melody
|
ac2e4adf2d
|
improve goto_if macros
|
2018-12-21 20:28:24 -05:00 |
|
golem galvanize
|
314b718471
|
finish porting ice
|
2018-12-21 01:37:59 -05:00 |
|
DizzyEggg
|
ecee02816d
|
Merge with master
|
2018-12-20 22:53:08 +01:00 |
|
DizzyEggg
|
7dcb614cca
|
PSS is done
|
2018-12-20 22:14:36 +01:00 |
|
Marcus Huderle
|
efd7013f62
|
Add poison bubble effect to Poison Jab
|
2018-12-20 14:58:13 -06:00 |
|
Marcus Huderle
|
4aecea2ce8
|
Add Night Slash animation
|
2018-12-20 12:46:08 -06:00 |
|
Marcus Huderle
|
ecda59a406
|
Add Poison Jab animation
|
2018-12-20 11:58:21 -06:00 |
|
Marcus Huderle
|
0369780db9
|
Add Rock Polish animation
|
2018-12-20 10:18:17 -06:00 |
|
Diegoisawesome
|
6ef9671718
|
Merge pull request #440 from garakmon/fldeff
Decompile / port fldeff_80F9BCC
|
2018-12-19 22:16:59 -06:00 |
|
Marcus Huderle
|
b7ce383a96
|
Document a bunch of battle anims
|
2018-12-19 21:19:44 -06:00 |
|
Diegoisawesome
|
48d7c0a7a3
|
Merge pull request #454 from golemgalvanize/decompile_party_menu
Decompile party menu
|
2018-12-19 19:57:31 -06:00 |
|
Marcus Huderle
|
fe66019bc5
|
Fix ROOST healing effect graphical bug
|
2018-12-19 16:36:55 -06:00 |
|
Melody
|
5e6ceeb631
|
update applymovement to remove magic numbers
|
2018-12-19 14:08:01 -05:00 |
|
Marcus Huderle
|
d2b5a0e83f
|
Convert battle_anim_815A0D4 data to .c
|
2018-12-18 19:15:59 -06:00 |
|
golem galvanize
|
8781d969ff
|
finish party_menu
|
2018-12-18 05:38:08 -05:00 |
|
Marcus Huderle
|
c74468fd11
|
Document a bunch of battle anim stuff
|
2018-12-17 22:16:17 -06:00 |
|
Marcus Huderle
|
c04ce0ee64
|
Decompile battle_anim_effects_2.c
|
2018-12-17 22:16:17 -06:00 |
|
DizzyEggg
|
9ffd0c7382
|
3.5 asm left
|
2018-12-17 23:00:08 +01:00 |
|
garak
|
e292d0ca83
|
Merge branch 'master' into fldeff
|
2018-12-16 20:05:31 -05:00 |
|
DizzyEggg
|
aae36b5653
|
6k left
|
2018-12-16 21:10:01 +01:00 |
|
DizzyEggg
|
f1421d94c3
|
Up to sub 0x80ce580
|
2018-12-15 23:58:47 +01:00 |
|
Marcus Huderle
|
1ca3656d74
|
Decompile contest_painting.c (#447)
|
2018-12-15 13:07:07 -06:00 |
|
Marcus Huderle
|
5e92481f51
|
Merge pull request #443 from Meowsy/misc-renamings
Misc renamings.
|
2018-12-13 21:35:36 -06:00 |
|
Marcus Huderle
|
2c6849bee8
|
Decompile battle_anim_8170478.c (#445)
|
2018-12-13 21:33:54 -06:00 |
|
Marcus Huderle
|
170b6ef449
|
Decompile battle_intro.c (#444)
|
2018-12-12 23:18:25 -06:00 |
|
DizzyEggg
|
59a69eb627
|
Storage up to icon palettes
|
2018-12-12 23:19:50 +01:00 |
|
DizzyEggg
|
c5b5f4bd77
|
More storage
|
2018-12-10 23:42:44 +01:00 |
|
Meowsy
|
d3e32ab287
|
Rename Mauville Man text.
|
2018-12-10 15:50:10 -05:00 |
|
DizzyEggg
|
c2d8876174
|
Document PSS functions
|
2018-12-10 21:36:52 +01:00 |
|
Diegoisawesome
|
bfdfe367e8
|
Merge pull request #422 from garakmon/frontier_data_1
Battle tower data
|
2018-12-10 11:22:16 -06:00 |
|
garak
|
e1e2132a37
|
sync fldeff function names with pokeruby
|
2018-12-09 22:24:54 -05:00 |
|
garak
|
b4312648e2
|
decompile fldeff_80F9BCC with data
|
2018-12-09 19:22:59 -05:00 |
|
Marcus Huderle
|
a7722a0b93
|
Decompile cable_car.c (#438)
|
2018-12-09 13:41:52 -06:00 |
|
DizzyEggg
|
e0f3de0b74
|
Start pokemon storage system
|
2018-12-09 16:44:01 +01:00 |
|
DizzyEggg
|
180aa839c4
|
Fix conflicts
|
2018-12-09 13:12:02 +01:00 |
|
DizzyEggg
|
58c4cec946
|
decompile field screen
|
2018-12-08 21:42:36 +01:00 |
|
DizzyEggg
|
5caca7a4d6
|
Clean up field weather
|
2018-12-08 19:43:21 +01:00 |
|
DizzyEggg
|
4c23adb5f5
|
Decompile field weather
|
2018-12-08 19:05:03 +01:00 |
|
DizzyEggg
|
b60915539d
|
Fix Phantom Force
|
2018-12-08 16:19:50 +01:00 |
|
DizzyEggg
|
6068495619
|
Document trainer battle scripts (#430)
|
2018-12-07 16:50:56 -06:00 |
|
DizzyEggg
|
470df386c9
|
Fix conflicts
|
2018-12-07 23:01:14 +01:00 |
|
Melody
|
2615ece23b
|
Use normal apostrophes like adults
|
2018-12-07 10:41:08 -05:00 |
|