Commit Graph

3746 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
de02805388 Changed names. 2019-09-05 20:42:15 -05:00
Eduardo Quezada D'Ottone
e2689d2a27 Documented Mechadoll answers. 2019-09-05 20:42:15 -05:00
GriffinR
8c6b5648d4 document secret_base_1.inc 2019-09-05 16:16:21 -04:00
PikalaxALT
1e1a4076f0
Merge pull request #798 from GriffinRichards/constants-baction
Use misc battle constants
2019-09-05 09:06:31 -04:00
GriffinR
eb0b73c14e
Use CountAliveMonsInBattle constants 2019-09-04 17:47:29 -04:00
GriffinR
c647a8329f
Use gBattlerPositions constants 2019-09-04 17:45:04 -04:00
GriffinR
4a0cad80b0
Use B_SIDE constants
Also includes a CHAR_X constant use for X items
2019-09-04 17:06:59 -04:00
PikalaxALT
5c7eac7134
Merge pull request #744 from PikalaxALT/remove_tutor_casts
Remove unnecessary tutor learnset casts
2019-09-04 16:51:06 -04:00
PikalaxALT
36723a235a
Merge pull request #735 from garakmon/encounter_json
Add Different Field Info to Wild Encounters JSON
2019-09-04 16:50:39 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
GriffinR
5f457dd459
Use B_ACTION constants 2019-09-03 15:08:25 -04:00
DizzyEggg
cfb49cdd0b Truant not dumb 2019-09-01 14:23:11 +02:00
GriffinR
5d30304f4e Use OTID constants for CreateMon 2019-08-30 22:13:14 -05:00
DizzyEggg
a41ecf7101 more ai stuff, baton pass perish song strats 2019-08-30 17:57:19 +02:00
DizzyEggg
7647941ec4 Fix Truant in new switch in system 2019-08-30 12:51:56 +02:00
DizzyEggg
f979987c2f Fix Intimidate and Trace on new switch in system 2019-08-30 12:25:21 +02:00
tustin2121
cdae0c1444 Change event object graphics pointer table to use explicit indexes
- This makes it easier for future hack makers to rearrange, add, or delete graphic object ids without having to count indexes or keep them in order.
- Porymap will have to be updated, but I have some code for this already in a fork.
2019-08-29 16:44:10 -05:00
jiangzhengwenjz
4f9052cb96 get rid of goto in battle_script_commands 2019-08-28 06:06:17 +08:00
DizzyEggg
f19a51eea6 More ai tweaks 2019-08-27 18:54:01 +02:00
DizzyEggg
91b364e8d6 Ai use most powerful move smarrter 2019-08-27 18:29:34 +02:00
DizzyEggg
63355d6a3b Fix no targets issue and switching faint issu 2019-08-26 14:55:55 +02:00
DizzyEggg
cda75bca70 lol am dumb 2019-08-25 15:39:56 +02:00
DizzyEggg
c97869018d Fix Mega Indicator appearing and priority 2019-08-25 15:33:28 +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
ultima-soul
d3ea25ee7f Synchronize with pokefirered pokedex.c. 2019-08-24 11:17:11 -07:00
GriffinR
869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00
GriffinR
2cb174b4ea
rename BattleAICmd prefix 2019-08-23 08:10:37 -04:00
GriffinR
68905e3961
rename atk## prefixes 2019-08-23 07:55:36 -04:00
Diegoisawesome
8e7abad720
Merge pull request #786 from DizzyEggg/u8
GetAbilityBySpecies's arg from bool8 to u8
2019-08-22 17:45:56 -05:00
DizzyEggg
d09c290eba bool8 to u8 2019-08-22 16:46:33 +02:00
DizzyEggg
143cb7ad35 Updated switch mechanics 2019-08-22 15:57:33 +02:00
Kevin Mills
f76f395563 use MENU_FIELD_MOVES in sub_81B31B0 2019-08-21 18:20:45 -05:00
GriffinR
4228750e38 more documentation in match_call_data
Documents everything related to UnkStruct_08625388, names HasCheckPage functions, fixes mislabeled Brendan/May headers, and adds header count to pokenav_unk_3
2019-08-21 17:18:38 -05:00
PikalaxALT
5b8d0f1c33 Remove MNUM from oam flip constant names 2019-08-21 17:15:23 -05:00
PikalaxALT
f7cf4fa154 Use HFLIP, VFLIP 2019-08-21 17:15:23 -05:00
PikalaxALT
a4d5624ad6 Move asm srcs to src 2019-08-21 17:08:40 -05:00
GriffinR
f08615881e Changes from review 2019-08-21 17:06:55 -05:00
GriffinR
5fb7ab05dd clean up 2019-08-21 17:06:55 -05:00
GriffinR
d931ba9602 document remaining funcs 2019-08-21 17:06:55 -05:00
GriffinR
7fc99f3952 favor lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
771a7b25fa move data, more contest lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
009caa21c8 some contest lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
5d96a0cc97 minor fixes 2019-08-21 17:06:55 -05:00
GriffinR
fc467a9d52 standardize favour/favor 2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d initial documentation commit 2019-08-21 17:06:55 -05:00
DizzyEggg
f05375112b Erase isEgg field from battlemon, ability num to 2 bits 2019-08-21 11:56:49 +02:00
DizzyEggg
e4787bacbc merge 2019-08-19 14:50:47 +02:00
Diegoisawesome
90edf596d8
Merge pull request #780 from GriffinRichards/document-rematchconstants
trainer rematch macro
2019-08-17 22:41:41 -05:00
Tustin2121
a708caac6d Suggested changes from review 2019-08-17 13:32:26 -04:00
Tustin2121
d12a8c10ee Documenting credits a bit 2019-08-17 13:26:44 -04:00
Tustin2121
bac8974ce3 Added note about addvar
The contest scripts actually use addvar to add a -1 to a variable instead of using subvar to subtract a positive number. This is fine in vanilla, where addvar script command does NOT support adding the value of a variable to another variable (like subvar supports), but should anyone want to change it, contests will be inexplicably broken.
2019-08-17 13:26:31 -04:00
Tustin2121
9bcd39d86c Document the braille window id. 2019-08-17 13:20:18 -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
GriffinR
3c2576d3a3
trainer rematch macro 2019-08-16 13:48:45 -04:00
GriffinR
ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
DizzyEggg
fabbc9ae31 Merge with master 2019-08-14 11:48:08 +02:00
DizzyEggg
08fe3b21ed
Fix modern
Fixes freeze on entering Pokemon Storage System
2019-08-12 11:43:31 +02:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02:00
PikalaxALT
37d23230fa Address review comments 2019-08-06 09:26:55 -04:00
PikalaxALT
1cff6672cf fix s32/int type mismatch on modern 2019-08-06 09:13:19 -04:00
PikalaxALT
5040a5f96b Move pokenav syms around 2019-08-05 20:23:56 -04:00
PikalaxALT
b05df0377e Finish pokenav_unk_9 2019-08-05 17:17:05 -04:00
PikalaxALT
1f62caae43 Some cleanup 2019-08-05 15:49:05 -04:00
PikalaxALT
195137b001
Merge pull request #768 from PikalaxALT/pokenav_unk_8
Finish pokenav_unk_8
2019-08-05 15:21:20 -04:00
PikalaxALT
5d07123354 Remove unnecessary casts 2019-08-05 14:32:30 -04:00
PikalaxALT
a7eb4f9dd2 Make pokenav_unk_8 syms static, fix gcc-9 warnings 2019-08-05 14:00:38 -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
9beeba8424
Merge pull request #764 from GriffinRichards/document-varnames
Document vars that are used and unnamed
2019-08-05 11:59:53 -04:00
GriffinR
191f74525d
name unused route state vars 2019-08-05 11:50:29 -04:00
GriffinR
c2bf668fdd
rename town/city vars 2019-08-05 11:23:45 -04:00
PikalaxALT
18f29c566a through sub_81CF278 2019-08-05 10:54:56 -04:00
PikalaxALT
463e1eb6b8 Name some fields in Pokenav2Struct 2019-08-05 09:17:21 -04:00
PikalaxALT
329670e16e Minor fixes 2019-08-05 08:46:52 -04:00
PikalaxALT
a42e5c24e6 Use LT return defines 2019-08-05 08:40:03 -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
0dd9a3dd0c Fix Stealth Rock msg and target 2019-08-05 12:26:53 +02:00
DizzyEggg
9823d2bdf1 Fix mega evo indicator priority on lvl-up-box 2019-08-05 12:15:15 +02:00
DizzyEggg
2c2b807a57 Special Def boost for rock types in sandstorm 2019-08-05 11:48:50 +02:00
DizzyEggg
8542e7fb1f Blizzard 100% accuracy in hail 2019-08-05 11:39:31 +02:00
DizzyEggg
34a7b8bf76 Burn affects physical moves only 2019-08-05 11:30:25 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
PikalaxALT
ffc7a9be27 Fix build errors 2019-08-04 21:23:38 -04:00
PikalaxALT
ff2166b8fe pokenav_unk_2: unclutter global namespace 2019-08-04 21:10:08 -04: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
PikalaxALT
41e1f9b224
Merge pull request #763 from DizzyEggg/patch-8
Fakematch sub_819A080
2019-08-04 11:05:17 -04:00
DizzyEggg
252df94bc1 Decompile pokenav 10 2019-08-04 13:53:00 +02:00
DizzyEggg
bb7e5ecc19 Pokemon jump 2019-08-04 00:18:58 +02:00
DizzyEggg
1641579297 Merge branch 'master' into pok_jump 2019-08-04 00:02:13 +02:00
DizzyEggg
5fbb11313b
Fakematch sub_819A080
Really wanted to match this one, but it just doesn't cooperate, oh well
2019-08-03 20:10:28 +02:00
PikalaxALT
ce941e6f56
Merge pull request #762 from GriffinRichards/GriffinRichards-documentation
Documenting MAPSEC use in pokenav match call data
2019-08-03 11:10:42 -04:00
PikalaxALT
9f50c4fa80
Merge pull request #760 from ultima-soul/use_pokeblock_data
Decompile use_pokeblock data
2019-08-03 11:01:05 -04:00
GriffinR
851a814912
typo fix 2019-08-02 22:23:40 -04:00
GriffinR
cff8331a8f
Update pokenav_match_call_data.c 2019-08-02 13:47:30 -04:00
GriffinR
3c4843f273
Update pokenav_unk_3.c 2019-08-02 12:46:18 -04:00
GriffinR
38a69d3e5f
sub_81D16DC in pokenav_match_call_data 2019-08-02 12:43:49 -04:00
GriffinR
97d58669b7
Document MapSec get functions 2019-08-02 12:40:14 -04:00
GriffinR
37ebfa40f9
Two more uses of MAPSEC_NONE and mapSec field name 2019-08-02 12:30:00 -04:00
GriffinR
cf253062b9
Use MAPSEC constants in sWallyAdditionalData 2019-08-02 10:58:03 -04:00
GriffinR
a9247181e8
Update pokenav_match_call_data.c 2019-08-02 10:52:40 -04:00
DizzyEggg
3280d40506 Match sub_8026324 2019-08-02 11:20:15 +02:00
GriffinR
4cea2ffa32
Use MAPSEC constants for pokenav match call data
Wally and Prof. Birch are skipped. Wally has a variable location, and Prof Birch (despite being listed as .v1 = 0, which is Littleroot) is actually listed as location unknown in the pokenav. Rival is also skipped, as they dont have a location field and are also listed as unknown
2019-08-01 23:01:53 -04:00
DizzyEggg
02d975a837 Tabs to spaces 2019-08-02 00:49:31 +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
ultima-soul
07015aa7ae Fix tabs. 2019-07-30 17:25:19 -07:00
ultima-soul
9a152f8fe6 Decompile data/use_pokeblock.s 2019-07-30 17:21:17 -07: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
Diegoisawesome
242bed733f
Merge pull request #755 from DizzyEggg/patch-7
Functionally equivalent CopyGlyphToWindow
2019-07-30 14:35:04 -05:00
PikalaxALT
370e9afb37
Merge pull request #746 from garakmon/navdata
Pokenav Data
2019-07-30 15:03:12 -04:00
PikalaxALT
520eeae678
Merge pull request #756 from camthesaxman/vram
remove hardcoded VRAM addresses
2019-07-30 15:00:05 -04:00
DizzyEggg
7133f5db94 Clean up battle anim effects file 2019-07-30 15:08:49 +02:00
DizzyEggg
bcb17af751 Clean up contest link 80f57c4 file 2019-07-30 13:48:12 +02:00
ultima-soul
c77dc74410 Match TryInterruptEventObjectSpecialAnim without asm hack. 2019-07-29 17:52:01 -07:00
garak
08a3ff77dd index to slot in c file 2019-07-29 20:02:43 -04:00
DizzyEggg
81a11c4fc9 Gets rid of unnecesary casts in pokemon.c 2019-07-29 21:45:06 +02:00
DizzyEggg
af55029843 Prettier GetDeoxysStat 2019-07-29 21:44:03 +02:00
DizzyEggg
ff2dcf5413 Two fakematches out 2019-07-29 21:09:05 +02:00
garak
0c35ec2f7b fix build 2019-07-29 13:40:47 -04:00
garak
2580693ea5 INDEX to SLOT in encounter inja template 2019-07-29 13:12:20 -04:00
garak
5b57c001f5
Merge branch 'master' into navdata 2019-07-29 13:06:45 -04:00
garak
54c635683c fix some more pokenav 2019-07-29 13:03:03 -04:00
garak
b6483d7026 name match call messages by trainers 2019-07-29 12:58:15 -04:00
DizzyEggg
a4a382a004 Match sub_81D2278 and poke jump clean 2019-07-29 16:22:50 +02:00
DizzyEggg
e634e722cc Decompile pokemon jump 2019-07-29 12:35:57 +02:00
camthesaxman
87ac555e71 remove hardcoded VRAM addresses 2019-07-28 21:18:28 -05:00
DizzyEggg
3ad14f2b33
Functionally equivalent CopyGlyphToWindow 2019-07-28 10:37:44 +02:00
DizzyEggg
9ff4c0695e bss data to static 2019-07-26 10:16:00 +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
PikalaxALT
6ff1426abe Quieter "make tools" 2019-07-23 16:17:00 -04:00
DizzyEggg
8cc776e2ee
tilemap glitch gpu reg fix hopefully 2019-07-23 21:30:53 +02:00
garak
cd6fd3110f fix modern build 2019-07-20 13:27:57 -04:00
garak
c39d25ff4d
Merge branch 'master' into navdata 2019-07-20 12:30:41 -04:00
PikalaxALT
8d0d5cfd55 Merge branch 'master' into modern_gcc 2019-07-20 11:51:22 -04:00
garak
dfa3e079c0 finish pokenav data decomp 2019-07-19 22:57:33 -04:00
garak
f9a9297d4f decompile pokenav 7/8 data 2019-07-19 22:06:42 -04:00
garak
f6d55db535 decompile pokenav_unk_5 data 2019-07-19 21:05:55 -04:00
garak
690a0c4390 decompile pokenav_unk_4 rodata 2019-07-19 19:36:17 -04:00
garak
c400d1dc7f decompile pokenav_unk_3 data 2019-07-19 18:31:42 -04:00
garak
b68ab6106d pokenav unk 2 data decomp 2019-07-19 17:23:52 -04:00
PikalaxALT
20863ac85b Resolve compile warnings in modern 2019-07-18 20:46:00 -04:00
Xhyzi
d66b9022a6 Added 46 move animations
- Magnet Bomb.
- Mirror Shot.
- Aqua Ring.
- Aqua Tail.
- Aqua Jet.
- Attack Order.
- Defend Order.
- Heal Order.
- Dragon Rush.
- Dragon Pulse.
- Discharge.
- Magnet Rise.
- Charge Beam.
- Shadow Claw.
- Shadow Force.
- Ominous Wind.
- Lava Plume.
- Magma Storm.
- Avalanche.
- Vacuum Wave.
- Force Palm.
- Lucky Chant.
- Double Hit.
- Giga Impact.
- Captivate.
- Rock Climb.
- Last Resort.
- Grass Knot.
- Wood Hammer.
- Zen Headbutt.
- Lunar Dance.
- Trick Room.
- Psycho Cut.
- Power Gem.
- Stone Edge.
- Rock Wrecker.
- Head Smash.
- Sealth Rock.
- Punishment.
- Sucker Punch.
- Nasty Plot.
- Switcheroo.
- Earth Power.
- Gunk Shot.
- Defog.

Fix Pyscho Shift

Hollow Orb graphics were not being loaded before creating the sprite

Fix Gastro Acid anim

Fix gastro acid palette asignation.

.
2019-07-13 01:02:09 +02:00
DizzyEggg
fc84033e3d Merge with master 2019-07-12 11:20:24 +02:00
Gudf
75f165ed74 Use a constant instead of integer literals when checking for shinyness 2019-07-11 20:16:39 +02:00
PikalaxALT
71dff6dbf1 Remove unnecessary tutor learnset casts 2019-07-10 16:38:05 -04:00
pokballs
717c3350c4 updated function name for deposit item amount to pc 2019-07-09 16:40:04 -05: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
d3d9051c4a Allow evolution after exp from mon catching 2019-07-08 13:26:21 +02:00
PikalaxALT
7fd327d632 Stack-free IWRAM clear 2019-07-07 21:41:11 -04:00
DizzyEggg
d1fa9c24cc Fix Wory Seed string 2019-07-07 09:58:36 +02:00
DizzyEggg
ed28b46cc5 Merge branch 'master' into battle_engine_v2 2019-07-07 09:49:21 +02:00
DizzyEggg
385fc49ef3
Merge pull request #163 from SBird1337/feature/animpack2
Some animations
2019-07-07 09:49:09 +02:00
Karathan
bcffc2655e fix style issues 2019-07-06 05:25:56 +02:00
Karathan
d9b54c3c1c add power swap, guard swap, worry seed 2019-07-06 05:22:18 +02:00
Karathan
8126662cfb update wring out with trace, remove AGBPrintf 2019-07-03 14:10:29 +02:00
Karathan
e9884154a9 added acupressure and wring out 2019-07-03 03:45:11 +02:00
PikalaxALT
8d224bf941 Merge branch 'master' into modern_gcc 2019-07-02 13:47:34 -04:00
Karathan
f1c82abc7e fix change requests 2019-07-02 18:34:53 +02:00
Karathan
501ae27390 add trump card, fix a few issues with pluck 2019-07-02 18:26:59 +02:00
Diegoisawesome
81b84503fa
Merge pull request #734 from DizzyEggg/patch-1
Match sub_81D1B40
2019-07-02 20:25:31 +09:00
Diegoisawesome
ba7fe29d47
Merge pull request #736 from DizzyEggg/patch-2
Match sub_802671C
2019-07-02 20:07:20 +09:00
Diegoisawesome
f25a75f9e9
Merge pull request #737 from DizzyEggg/patch-3
Match sub_800EFB0
2019-07-02 20:06:33 +09:00
Diegoisawesome
b123e4a73b
Merge pull request #738 from DizzyEggg/patch-4
Match unref_sub_8119094
2019-07-02 20:05:58 +09:00
Diegoisawesome
c3e683789c
Merge pull request #739 from DizzyEggg/patch-5
Clean up code in HoldContestPainting
2019-07-02 20:05:27 +09:00
Karathan
5f7b5ba453 add feint and pluck animation sprites and implementations 2019-07-02 06:22:05 +02:00
garak
4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
DizzyEggg
2da0e73ec7
Get rid of unneccesary cast in text.c 2019-07-01 21:08:49 +02:00
DizzyEggg
548f486398
Clean up code in HoldContestPainting 2019-07-01 17:47:47 +02:00
DizzyEggg
5ce047c26c
Match unref_sub_8119094
Gotta match these unused functions, am I right?
2019-07-01 15:06:58 +02:00
PikalaxALT
f300f9e699 Revert FLOAT_U* and DOUBLE_U* macros 2019-06-30 19:31:29 -04:00
PikalaxALT
92f17e8812 Document pokemon_animations sprite ptr bug 2019-06-30 19:19:26 -04:00
DizzyEggg
42462b6730
Match sub_800EFB0 2019-06-30 21:07:25 +02:00
DizzyEggg
11ef698344
Match sub_802671C
Also got sub_8026324 a bit closer, but it's still a mess.
2019-06-30 20:26:48 +02:00
PikalaxALT
04c9793429 Fix pokemon_animation.c 2019-06-30 13:49:24 -04:00
garak
adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -04:00
DizzyEggg
c409d19530
Match sub_81D1B40 2019-06-30 17:14:41 +02:00
Michael Panzlaff
7500534676 fix unaligned memory access in BlendPalette
This problem is only going to occur in versions where the palette
buffer isn't aligned to 4 bytes (which it is in a matching pokeemerald).

Since agbcc returns sizeof(PlttData) = 4, it will read words
instead of half words. This causes unnecessary emulator warnings
in the function "BlendPalette".
Aligning the buffers to 4 bytes fixes this.
2019-06-29 11:08:46 -05:00
PikalaxALT
f9d8678db4 Additional fixes
Rearrange gbafix to not modify file in the event of failure
Fix bug where Dma3Manager may get stuck when compiled with gcc-9.1.0
2019-06-29 11:41:26 -04:00
PikalaxALT
4b759da714 Wildcard bss, ewram_data, and COMMON in modern toolchain 2019-06-29 08:35:52 -04:00
DizzyEggg
c14cc798af Add bs cap to switching 2019-06-28 09:30:35 +02:00
PikalaxALT
b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
PikalaxALT
fb06e4a3c9 Modernize code
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
DizzyEggg
48c801245c Fix Synchronize 2019-06-25 13:04:14 +02:00
DizzyEggg
a98c5ab78a Merge branch 'master' into battle_engine_v2 2019-06-24 12:12:56 +02:00
PikalaxALT
f3c7e1cc81 Add comment to merged field 2019-06-21 18:18:29 -05:00
PikalaxALT
d22c630b2b Merge two fields in party_menu heap struct 2019-06-21 18:18:29 -05:00
PikalaxALT
3f43523352 Add comment to merged field 2019-06-21 12:38:11 -04:00
PikalaxALT
d0bd1df531 Merge two fields in party_menu heap struct 2019-06-21 09:54:48 -04:00
garak
fbbc2b1d8b finish src metatile labels 2019-06-16 10:08:07 -05:00
garak
9f8a30e4e7 label metatiles in fldeff_cut.c 2019-06-16 10:08:07 -05:00
garak
8b26bd1e09 label metatiles for general, fallarbor, and sootopolis gym tilesets 2019-06-16 10:08:07 -05:00
garak
aad839995f label metatiles for pacifidlog and fortree bridges 2019-06-16 10:08:07 -05:00
garak
724add638c label regi cave metatiles 2019-06-16 10:08:07 -05:00
garak
7e35b8a710 label remaining metatiles in field_specials.c 2019-06-16 10:08:07 -05:00
garak
a9560d9c62 give metatile labels to petalburg gym and pcs 2019-06-16 10:08:07 -05:00
garak
c68ba9f4e8 label mauville gym metatiles 2019-06-16 10:08:07 -05:00
DizzyEggg
aade9f5f5a Cherrim 2019-06-16 09:30:05 +02:00
DizzyEggg
c80861d85e Add hopefully support for Cherrim 2019-06-15 14:46:35 +02:00
DizzyEggg
aaea5398f4 Fix Castfrom ability pop-up and refactor one function 2019-06-14 12:58:29 +02:00
DizzyEggg
594b363730 Fix Assurance 2019-06-12 13:57:14 +02:00
DizzyEggg
dd5c9c790d Fix Flash Fire string 2019-06-11 10:57:02 +02:00
DizzyEggg
272fa07799 AI switch mons if all moves are not usable 2019-06-11 10:45:12 +02:00
DizzyEggg
30bd85a58a Fix changed name 2019-06-10 11:32:23 +02:00
DizzyEggg
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +02:00
DizzyEggg
f64c1dfabf Some pokenav work 2019-05-26 07:20:51 -05:00
DizzyEggg
818e1909ff Make nonmatching PSS functions functionally equivalent 2019-05-26 07:17:05 -05:00
Slawter666
5f292d621a Use event object constants 2019-05-25 14:41:48 -05:00
DizzyEggg
453be19670 change cooltrainer unused class name 2019-05-25 08:26:40 -05:00
DizzyEggg
a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
DizzyEggg
ad63540522 Fix mega evo issues 2019-05-24 11:27:02 +02:00
DizzyEggg
65be7868ec Fix string 2019-05-23 12:38:41 +02:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
32aeba21e0 Some AI tweaking 2019-05-23 11:41:35 +02:00
DizzyEggg
1b7493e47a Fix Flame Burst crashing the game 2019-05-23 10:02:04 +02:00
DizzyEggg
01ee73adf6 Fix Flame Body Static ability pop-up activation 2019-05-23 09:47:21 +02:00
DizzyEggg
28227dfd88 Fix Life Orb string 2019-05-23 09:20:02 +02:00
Papa Cancer
e53ba4773d Documenting bags, berries and graphics
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
DizzyEggg
8e904ebacb helping hand ai 2019-05-20 14:36:46 +02:00
DizzyEggg
e00890a555 Fix Air Baloon msg 2019-05-20 12:20:49 +02:00
DizzyEggg
e1ea4b62e9 Natural Gift 2019-05-20 12:03:00 +02:00
DizzyEggg
269f573297 Fix powder and resist berry string 2019-05-20 10:10:00 +02:00
DizzyEggg
e9829c16c4 Correct effect for seed flare 2019-05-20 09:18:49 +02:00
DizzyEggg
7ec9123b0a Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:16:13 +02:00
DizzyEggg
a70dceefb2
Merge pull request #154 from LOuroboros/patch-1
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance
2019-05-20 09:15:58 +02:00
DizzyEggg
88bbdc494b Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:14:32 +02:00
DizzyEggg
09c0a195ac Merge branch 'master' into battle_engine_v2 2019-05-20 09:05:12 +02:00
LOuroboros
a14016240a
Razor Leaf is a Physical move, not a Special one. 2019-05-20 03:34:13 -03:00
LOuroboros
f81daeab45
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance
Title is self-explanatory. As of Gen. 5, Healing Wish and Lunar Dance are affected by Snatch.
2019-05-19 23:32:59 -03:00
Flametix
dbdb827e54 Fix typos (#713)
* fix typos
2019-05-18 21:56:19 -05:00
DizzyEggg
ab421f1089 Use array count for trainer parties 2019-05-17 07:33:22 -05:00
DizzyEggg
a9b4d0208b Move new species to battle_config.h 2019-05-17 10:38:48 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
garak
60baf19d45 rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses 2019-05-16 17:10:13 -05:00
garak
daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -05:00
DizzyEggg
188f2aa29e ability random define for battle pyramind 2019-05-16 17:09:43 -05:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
6624306024 Ring Target 2019-05-16 10:40:44 +02:00
Slawter666
2fdc489bc0 Further documentation of party_menu.c 2019-05-15 16:55:39 -05:00
Slawter666
d1a12be53a Minor party_menu.c documentation 2019-05-15 16:55:39 -05:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
DizzyEggg
d027bb0d7a Life Flame toxic orbs 2019-05-10 11:03:33 +02:00
DizzyEggg
875b413a09 Various battle target items 2019-05-09 20:31:58 +02:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
DizzyEggg
5bc63ab550 Merge branch 'master' into battle_engine_v2 2019-05-07 10:23:14 +02:00
huderlem
fe59902b8a Fix indentation 2019-05-03 18:21:11 -05:00
hjk321
26114d4579 Update comparison 2019-05-03 18:21:11 -05:00
hjk321
ee4049d93e Fix indentation Error 2019-05-03 18:21:11 -05:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
hjk321
106a89eace Document magic number from atk04_critcalc 2019-05-03 18:21:11 -05:00
DizzyEggg
c0470c3932 Remove skarmory mega evo 2019-05-03 17:31:23 +02:00
DizzyEggg
900c15c20c Mega evo animation 2019-05-03 17:27:49 +02:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
PikalaxALT
a14162eb9f through sub_81C9F28 2019-05-02 16:43:32 -04:00
PikalaxALT
518865d8d9 sub_81C9A10 2019-05-02 16:19:25 -04:00
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
DizzyEggg
a7f2fa67ef
Merge pull request #142 from thechurchofcage/beta
Magnetic Flux + Gear Up
2019-05-01 11:11:46 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
Fontbane
901a83d249 Fix some labels and include decorations.h
Include decorations.h in shop.c

Include decorations.h in event_scripts.s
2019-04-22 17:23:59 -05:00
Fontbane
6cf06d5f95 Doc some event scripts
Doc decoration shops

Revert "Doc decoration shops"

This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.

Document through comments

Un-revert decor documentation
2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
Papa Cancer
3cde800bd0 Magnetic Flux + Gear Up
Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities.
Magnetic Flux uses Charge animation.
2019-04-20 20:17:56 +01:00
Papa Cancer
b50007e861 Instruct
Re-PR'd due to excess "merges"
2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus
Re-PR'd due to excess "merges"
2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
DizzyEggg
5b43a9289d
Merge pull request #134 from thechurchofcage/epsilon
Baneful Bunker + King's Shield
2019-04-20 08:42:35 +02:00
Papa Cancer
e310d0f10e Core Enforcer
New code - uses Gastro Acid script instead through own move effect
2019-04-18 12:10:18 +01:00
Papa Cancer
754befe393 Baneful Bunker + King's Shield
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
2019-04-17 14:54:21 +01:00
Papa Cancer
e5e45bbcf5 Throat Chop
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-17 13:52:25 +01:00
Marcus Huderle
b8d5c5fb76 Match sub_81D199C 2019-04-16 18:15:03 -05:00
Marcus Huderle
90e555d23e Match sub_81A1224 2019-04-16 16:11:59 -05:00
Marcus Huderle
9915a3fd7f Decompile pokenav_unk_5.c 2019-04-16 14:29:00 -05:00
DizzyEggg
912b87564f Compact item data, make descriptions easier to read 2019-04-16 11:25:26 -05:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
Marcus Huderle
f9f5f34b0c Finish decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
c7954e1212 Decompile pokenav_unk_4.c through sub_81CB678() 2019-04-16 11:21:13 -05:00
Marcus Huderle
394c0f5546 Start decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
f40f2c5e9c Decompile all of pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle
e3bdb08efa Start decompiling pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
DizzyEggg
19fdfaa5f2 Use constants for ball particles 2019-04-14 10:19:50 -05:00
DizzyEggg
59797e4801 Use constants in battle_anim_special.c 2019-04-14 10:19:50 -05:00
DizzyEggg
dc764698c9 Use implicilt berry indexes in arrays 2019-04-14 10:15:18 -05:00
AJ Fontaine
390a68d4a7
Use Dance Flag 2019-04-13 21:13:04 -04:00