Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,646 Commits 3 Branches 0 Tags 882 MiB
Commit Graph

4646 Commits

Author SHA1 Message Date
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
ultima-soul d3ea25ee7f Synchronize with pokefirered pokedex.c. 2019-08-24 11:17:11 -07: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
GriffinR 23979c4d7d initial documentation commit 2019-08-21 17:06:55 -05:00
Diegoisawesome d68497f823
Merge pull request #783 from tustin2121/tustin2121-patch-3 
Replace {STRING 5} with {KUN}
 2019-08-21 16:06:59 -05:00
tustin2121 82744ba636 Replace {STRING 5} with {KUN} 
Since we already have the KUN placeholder, there's no need for this {STRING 5} stuff.

Also, it makes it easier to delete all the {KUN}s in hacks later on if desired.
 2019-08-21 14:05:22 -04:00
Diegoisawesome 90edf596d8
Merge pull request #780 from GriffinRichards/document-rematchconstants 
trainer rematch macro
 2019-08-17 22:41:41 -05:00
Diegoisawesome 40fa9ddbb8
Merge pull request #782 from tustin2121/trihard-giveback2 
Giving back from TriHard Emerald development
 2019-08-17 22:38:28 -05:00
Tustin2121 18dee14170 Review fixes 2019-08-17 23:26:46 -04:00
Tustin2121 d63a8ba817 Replaced createvobject numbers with EVENT_OBJ_GTX defines 
Doing this allows someone to renumber the event object graphics and still have working contests.
 2019-08-17 13:38:13 -04:00
Tustin2121 a708caac6d Suggested changes from review 2019-08-17 13:32:26 -04:00
Tustin2121 1069adae46 Renaming unknown link room ids to be the same as name 
This descrepency was causing a lot of annoyance when using porymap, because porymap generated the ids in map_groups.h from the name, and mapjson was generating map_groups.h from the id in the json files. So just name them the same already like every other map in the repo.
 2019-08-17 13:26:57 -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 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 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
Tustin2121 ea724278b7 Juan text buffer overflow note 2019-08-17 13:05:55 -04:00
PikalaxALT 4663564e02
Merge pull request #775 from DizzyEggg/patch-9 
Fix modern
 2019-08-17 05:17:05 -04:00
GriffinR 3c2576d3a3
trainer rematch macro 2019-08-16 13:48:45 -04:00
PikalaxALT 4541b959b6
Deprecate build_tools.sh 2019-08-15 15:17:13 -04:00
GriffinR ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
DizzyEggg 08fe3b21ed
Fix modern 
Fixes freeze on entering Pokemon Storage System
 2019-08-12 11:43:31 +02:00
PikalaxALT ca8048c300
Merge pull request #771 from aaaaaa123456789/master 
Fix Makefiles to account for the $CC and $CXX environment variables
 2019-08-06 20:16:36 -04:00
aaaaaa123456789 e28cf5406b Fix Makefiles to account for the $CC and $CXX environment variables 2019-08-06 20:30:57 -03:00
PikalaxALT 2a0517f0fd Report data decomp in calcrom 2019-08-06 13:00:03 -04:00
PikalaxALT 1bda9ef2f6
Merge pull request #769 from PikalaxALT/pokenav_unk_9 
Pokenav unk 9
 2019-08-06 12:49:03 -04:00
PikalaxALT 37d23230fa Address review comments 2019-08-06 09:26:55 -04:00