DizzyEggg
e736c369d6
Merge with master
2019-10-19 17:47:55 +02:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2
2019-10-16 04:22:34 -04:00
GriffinR
0f15264595
Document rotating_tile_puzzle
2019-10-16 04:09:30 -04:00
GriffinR
90a05cf824
Finish Mossdeep Gym doc, beging documenting rotating tile puzzle
2019-10-15 05:06:13 -04:00
Marcus Huderle
e47b3efdfe
Unify showmonpic and hidemonpic script command names with their function names
2019-10-12 18:58:54 -05:00
DizzyEggg
bae5d2038f
Update with master
2019-10-10 16:18:48 +02:00
Marcus Huderle
799edaf3e6
Document hide/show reflection movement actions
2019-10-06 14:17:34 -05:00
GriffinR
b6dffcf8b7
Clean up script_menu documentation
2019-09-19 19:23:24 -04:00
GriffinR
06af24bce5
Use misc ScrCmd constants
2019-09-16 19:44:47 -05:00
DizzyEggg
a41ecf7101
more ai stuff, baton pass perish song strats
2019-08-30 17:57:19 +02:00
DizzyEggg
e96e98a8de
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
2019-08-25 13:10:32 +02:00
PikalaxALT
a4d5624ad6
Move asm srcs to src
2019-08-21 17:08:40 -05:00
DizzyEggg
e4787bacbc
merge
2019-08-19 14:50:47 +02:00
Tustin2121
18dee14170
Review fixes
2019-08-17 23:26:46 -04:00
Tustin2121
f4d4424618
Folded nops into hidemoneybox and updatemoneybox
...
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
2019-08-17 13:25:36 -04:00
Tustin2121
6508469259
Rename movobjectoffscreen to copyobjectxytoperm
...
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00
DizzyEggg
fabbc9ae31
Merge with master
2019-08-14 11:48:08 +02:00
DizzyEggg
c9de753ecc
Illusion
2019-08-08 13:06:55 +02:00
PikalaxALT
b05df0377e
Finish pokenav_unk_9
2019-08-05 17:17:05 -04:00
PikalaxALT
e2e667d4b5
Finish pokenav_unk_8
2019-08-05 13:47:04 -04:00
PikalaxALT
330fc46df8
through sub_81CF3F8
2019-08-05 12:21:45 -04:00
PikalaxALT
18f29c566a
through sub_81CF278
2019-08-05 10:54:56 -04:00
PikalaxALT
51d5ee771d
Merge branch 'master' into pokenav_unk_2
2019-08-05 08:33:45 -04:00
PikalaxALT
1fc64b8582
Merge pull request #767 from DizzyEggg/pokenav_8
...
More pokenav
2019-08-05 08:21:36 -04:00
DizzyEggg
2863045241
Fix switch-in abilities text/pop-up
2019-08-05 11:24:49 +02:00
PikalaxALT
299c3cf1dc
Finish pokenav_unk_2
2019-08-04 20:39:36 -04:00
PikalaxALT
2dee42dbaf
through sub_81CA474
2019-08-04 18:15:02 -04:00
DizzyEggg
c219776034
Merge with master
2019-08-04 23:09:28 +02:00
PikalaxALT
cd876292d1
Merge branch 'master' into pokenav_unk_2
2019-08-04 15:35:35 -04:00
DizzyEggg
c8cc39cb57
More pokemav, massive clean-up, seriously who the left the file in this state???
2019-08-04 19:09:12 +02:00
PikalaxALT
fa5bfc1627
Merge pull request #766 from DizzyEggg/pokenav_10
...
Decompile pokenav 10
2019-08-04 11:07:10 -04:00
DizzyEggg
252df94bc1
Decompile pokenav 10
2019-08-04 13:53:00 +02:00
DizzyEggg
1641579297
Merge branch 'master' into pok_jump
2019-08-04 00:02:13 +02:00
DizzyEggg
9306c142b3
Merge dodrio with master
2019-08-02 00:45:49 +02:00
DizzyEggg
4d2d8779bf
Dodrio berry picking decompiled
2019-08-02 00:41:55 +02:00
DizzyEggg
02cadbee60
MORE DODRIO BERRY PICKINGgit status!
2019-08-01 19:01:50 +02:00
PikalaxALT
a08cbaee0a
pokenav_unk_2 staging
2019-07-30 19:46:56 -04:00
DizzyEggg
ba1a70419a
Start dodrio magic
2019-07-31 00:27:30 +02:00
garak
5b57c001f5
Merge branch 'master' into navdata
2019-07-29 13:06:45 -04:00
DizzyEggg
e634e722cc
Decompile pokemon jump
2019-07-29 12:35:57 +02:00
DizzyEggg
56b124fdec
Some more pokenav
2019-07-25 21:41:02 +02:00
DizzyEggg
fd07c608fc
Decompile pokemon unk 6
2019-07-25 18:56:08 +02:00
DizzyEggg
33c036e7ff
Decompile pokemonav 7
2019-07-24 17:02:52 +02:00
garak
b68ab6106d
pokenav unk 2 data decomp
2019-07-19 17:23:52 -04:00
DizzyEggg
fc84033e3d
Merge with master
2019-07-12 11:20:24 +02:00
DizzyEggg
c3733f4b95
Decompile 4 berry crush functions
2019-07-09 16:39:29 -05:00
DizzyEggg
11fb13d635
Some pokemon jump work
2019-07-09 16:39:29 -05:00
DizzyEggg
3e476adf4a
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
DizzyEggg
10c27ac6a6
Fix a typo that crashes the gamae
2019-06-25 12:26:27 +02:00
DizzyEggg
9e175c9f1b
Merge branch 'master' into battle_engine_v2
2019-06-10 11:21:16 +02:00