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

3084 Commits

Author SHA1 Message Date
Diegoisawesome 2a3ba78831
Merge pull request #369 from garakmon/pan-constants 
Use sound pan constants in data/battle_anim_scripts.s
 2018-10-19 20:27:54 -05:00
garak ecd482fa2c fix merge conflicts in battle_anim_scripts 2018-10-19 16:19:36 -04:00
garak 38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak 901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04:00
Diegoisawesome bf8fa23462
Merge pull request #365 from garakmon/event-flags 
[WIP] Event flags
 2018-10-19 14:24:34 -05:00
garak 113a8d1efd clean flags and remove temp macro 2018-10-19 14:59:18 -04:00
garak 1441ee6bc3 finish event object flags 2018-10-19 13:04:47 -04:00
Diegoisawesome 95d8815721
Merge pull request #368 from Diegoisawesome/master 
Finish porting/decompiling field_player_avatar
 2018-10-19 00:08:59 -05:00
Diegoisawesome dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05:00
garak cb5981cdf2 name more event flags 2018-10-18 21:32:21 -04:00
Diegoisawesome 442baf1a00
Merge pull request #367 from DizzyEggg/move_blitmap 
Move Bitmap struct and clear sprite/text files a bit
 2018-10-18 19:18:44 -05:00
garak c27043bd3c more event flags 2018-10-18 15:28:59 -04:00
DizzyEggg dfee5deca8 Move Bitmap struct and clear sprite/text files 2018-10-18 21:24:37 +02:00
Diegoisawesome b23dc9a123
Merge pull request #366 from Diegoisawesome/master 
Finish shop and fldeff_escalator
 2018-10-18 12:08:38 -05:00
Diegoisawesome 6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
garak d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
garak 7d88b9647f
Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
garak 624a7552b6 use event flags in event scripts 2018-10-17 09:05:22 -04:00
garak da1b5365a7 label a flag in the asm 2018-10-17 08:55:09 -04:00
Diegoisawesome f67bbbdaaa
Merge pull request #364 from Diegoisawesome/master 
Port/decompile field_control_avatar
 2018-10-16 21:54:14 -05:00
Diegoisawesome e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Diegoisawesome 832947f329
Merge pull request #363 from DizzyEggg/patch-1 
Use constants
 2018-10-16 17:07:54 -05:00
DizzyEggg 1f358fbb07
Use constants 2018-10-16 22:34:53 +02:00
garak 0051947414 Merge remote-tracking branch 'upstream/master' into event-flags 2018-10-16 14:31:45 -04:00
Diegoisawesome ed1bb3030b
Merge pull request #362 from Deokishisu/patch-1 
Fix "Vigaroth" misspelling in event_objects.h
 2018-10-16 11:26:48 -05:00
Deokishisu b52b05368c
Fix "Vigaroth" misspelling in May's House 1F 2018-10-16 12:08:17 -04:00
Deokishisu e377c323c4
Fix "Vigaroth" misspelling in Brendan's House 1F 2018-10-16 12:07:47 -04:00
Deokishisu 78a912a039
Fix "Vigaroth" misspelling to "Vigoroth" 2018-10-16 12:06:38 -04:00
Diegoisawesome a9abb930aa
Merge pull request #352 from huderlem/shop 
[WIP] Shop
 2018-10-14 19:03:48 -05:00
Diegoisawesome 7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Diegoisawesome eafea33dd9
Merge pull request #360 from Deokishisu/Fix-Event-Object-Defines 
Update All EVENT_OBJ_GFX References
 2018-10-14 18:26:31 -05:00
Deokishisu bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04:00
Slawter666 137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
Diegoisawesome 9496c50518
Merge pull request #358 from Deokishisu/LabelOWsProperly 
Label OWs More Descriptively
 2018-10-14 15:36:00 -05:00
Deokishisu 94bec0b8db Fix Double Underscores 
Whoops.
 2018-10-14 16:14:01 -04:00
Deokishisu d7ba8a306c Rename OW Sprites 
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.

Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge

Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
 2018-10-14 15:49:55 -04:00
Deokishisu a8afec762b Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:22:56 -04:00
Diegoisawesome 02049d52ee
Merge pull request #351 from DizzyEggg/apprentice 
Decompile apprentice
 2018-10-14 13:20:38 -05:00
Deokishisu c89b14f5ef Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:19:23 -04:00
Diegoisawesome 43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct 
Clean a couple of battlestructs' fields
 2018-10-14 13:18:29 -05:00
Deokishisu e129f4864f Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:16:07 -04:00
Diegoisawesome 0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap 
Move HEAP_SIZE to malloc and use void instead of empty argument list
 2018-10-14 13:15:31 -05:00
DizzyEggg c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02:00
Diegoisawesome d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers 
Decompile field effect helpers
 2018-10-14 12:48:18 -05:00
Diegoisawesome e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos 
Use defines for text chars
 2018-10-14 12:21:37 -05:00
Diegoisawesome 355f014909
Merge pull request #354 from DizzyEggg/move_blendpal 
Move blend_palette to util
 2018-10-14 12:11:50 -05:00
DizzyEggg ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
Deokishisu 2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00