Commit Graph

5340 Commits

Author SHA1 Message Date
GriffinR
8c6b5648d4 document secret_base_1.inc 2019-09-05 16:16:21 -04:00
GriffinR
1d703e786b move some data out of event_scripts, use game stat constants 2019-09-05 14:56:34 -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
PikalaxALT
a4270cfdae
Merge pull request #779 from pret/deprecate-tools
Deprecate build_tools.sh
2019-09-04 16:45:34 -04:00
PikalaxALT
48b8d68872
Merge pull request #797 from PikalaxALT/common_syms
Fix issue with ramscrgen invoke for some users
2019-09-04 09:12:46 -04:00
PikalaxALT
8d3771d24e Fix issue with ramscrgen invoke for some users 2019-09-04 09:07:08 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
PikalaxALT
1f4c88c952
Copy Berry Fix MB dism from FR (#777)
* Copy Berry Fix MB dism from FR
2019-09-03 15:33:11 -04:00
GriffinR
5f457dd459
Use B_ACTION constants 2019-09-03 15:08:25 -04:00
GriffinR
5d30304f4e Use OTID constants for CreateMon 2019-08-30 22:13:14 -05:00
PikalaxALT
45767f9c00
Merge pull request #793 from DizzyEggg/patch-1
Use item constant in pretty petal flower shop
2019-08-30 05:56:17 -04:00
DizzyEggg
6a3b74c59c
Use item constant in pretty petal flower shop 2019-08-30 09:48:59 +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
Marcus Huderle
1a2b430646 Update scaninc to include missing .include files in assembler files 2019-08-29 16:37:42 -05:00
garak
b420b98d63 allow CRLF line endings in asm files for preproc 2019-08-29 16:37:32 -05:00
jiangzhengwenjz
4f9052cb96 get rid of goto in battle_script_commands 2019-08-28 06:06:17 +08:00
PikalaxALT
40c1db1106 Update deprecated build_tools script 2019-08-27 09:15:44 -04:00
Diegoisawesome
ad941680d8
Merge pull request #788 from ultima-soul/documentation
Synchronize with pokefirered pokedex.c.
2019-08-25 23:56:09 -05:00
DizzyEggg
8d128be459 Merge branch 'toto' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-08-25 13:09:31 +02:00
DizzyEggg
cef9dfe22c Make room for hidden abilities 2019-08-25 13:08:58 +02:00
DizzyEggg
6677d72d55
Merge pull request #190 from LOuroboros/pokemon_expansion
Fixed Araquanid's cry
2019-08-25 12:53:31 +02:00
DizzyEggg
5891b63325
Merge pull request #191 from LOuroboros/leavanny
Fixed Leavanny's icon
2019-08-25 12:52:39 +02:00
DizzyEggg
58b313956d Merge with master 2019-08-25 12:51:09 +02:00
ultima-soul
d3ea25ee7f Synchronize with pokefirered pokedex.c. 2019-08-24 11:17:11 -07:00
LOuroboros
b6f6beb6a8 Fixed Leavanny's icon. 2019-08-23 15:59:00 -03: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
LOuroboros
d3bf843350 Fixed Araquanid's cry. 2019-08-23 01:38:03 -03: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
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
GriffinR
a46f7952f9 Use DIR constants for createvobject
Also uses event object ids in LinkContestRoom1
2019-08-21 17:11:06 -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