Commit Graph

1103 Commits

Author SHA1 Message Date
PikalaxALT 3362b7f671 Merge pull request #173 from ghoulslash/pokeball
Pokeball
2019-12-04 13:06:48 -05:00
Evan 11a52655f3 text fixes 2019-12-04 07:53:12 -07:00
Evan 2dacf6c1bf fix sBallOamData 2019-12-03 19:52:24 -07:00
Evan cf4b9de30f update sBallOamData 2019-12-03 18:46:19 -07:00
Evan d5537b8db9 fix build error
format fix

small update

all matching

remove unused var
2019-12-01 09:56:22 -05:00
Evan 8cdc65a8e4 minor fixes 2019-11-30 15:19:34 -05:00
Evan 8d06187781 small typos fix 2019-11-30 10:54:19 -05:00
Evan b626882708 all matching except Task_DoPokeballSendOutAnim 2019-11-30 10:50:58 -05:00
Evan fe6db41f2b fix formatting 2019-11-28 11:15:24 -05:00
Evan 52013cf052 remove errors 2019-11-28 11:13:26 -05:00
Evan d81a67ea2d fix nonmatchings 2019-11-28 11:04:49 -05:00
Evan cba5ebbd5a remove pokeball.s 2019-11-27 07:14:33 -07:00
Evan f4b6a8195a match BuyMenuPrintPriceInList 2019-11-26 17:05:02 -07:00
Evan 4b33546727 DoPokeballSendOutAnimation 2019-11-26 16:54:55 -07:00
Evan 5ad5764d4e fix return type 2019-11-26 14:02:20 -07:00
Evan 31d8bfb048 fix merge conflicts 2019-11-26 13:55:24 -07:00
Evan dd6239fe26 init branch 2019-11-26 12:36:27 -07:00
Evan d1142b4290 extract graphics data 2019-11-26 11:47:12 -07:00
Evan c73f061cc6 update ewram 2019-11-25 15:04:38 -07:00
Evan 3099483113 match BuyMenuCollectEventObjectData 2019-11-24 22:04:51 -07:00
Evan e6a882cc92 separate sea cottage anim functions 2019-11-24 17:22:02 -07:00
Evan 10ee4b2cf6 remove sea cottage funcs 2019-11-24 17:01:54 -07:00
Evan 3f92af3651 fix mart history struct 2019-11-24 16:57:31 -07:00
Evan 697fabb98a format fix 2019-11-24 16:27:26 -07:00
Evan 2cc4db0c78 remove .s files 2019-11-24 16:23:06 -07:00
PikalaxALT bb8c712f75 Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
2019-11-24 08:44:21 -05:00
jiangzhengwenjz 2b2dfa7e49 GetBattleEntryEligibility 2019-11-24 14:40:28 +08:00
jiangzhengwenjz 0ca414959b resolve change requests 2019-11-24 09:31:04 +08:00
jiangzhengwenjz 7817546781 clean up 2019-11-24 08:57:57 +08:00
PikalaxALT 14725e1592 Address review comments 2019-11-23 19:21:31 -05:00
PikalaxALT e3bc9c44cd battle_message 2 2019-11-23 18:12:33 -05:00
PikalaxALT 13e1ed54b2 battle_message 1 2019-11-23 16:51:05 -05:00
jiangzhengwenjz 972c044d71 party_menu fourth quarter 2019-11-24 03:03:29 +08:00
PikalaxALT 5579507837 fldeff_sweetscent ewram 2019-11-23 10:55:30 -05:00
jiangzhengwenjz 5c1bdd0eb5 party_menu third quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz 49eb350462 party_menu second quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz 499c09a49f party_menu first quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz 1d96920da0 party_menu data 2019-11-23 08:09:23 +08:00
jiangzhengwenjz a4e7a35960 document some symbols 2019-11-23 08:09:22 +08:00
Evan b18ec47b13 fix conflicts 2019-11-21 10:23:49 -07:00
PikalaxALT 2d28465444 Merge pull request #162 from PikalaxALT/dism_more_data
Data: tileset_anims, field_ground_effect
2019-11-21 11:36:08 -05:00
Evan 407d22af8e fix PR merge conflicts 2019-11-21 09:31:40 -07:00
Evan 359d345913 temp 2019-11-21 09:05:43 -07:00
PikalaxALT 81e1efbd9e Fix review comments 2019-11-21 10:59:22 -05:00
Evan e6bc189a03 remove unecessary cast 2019-11-21 08:24:42 -07:00
Evan 0001d360a6 function progress 2019-11-21 08:19:38 -07:00
PikalaxALT 3e12bd8e07 Minor refactor of tileset_anims 2019-11-21 09:48:20 -05:00
PikalaxALT 5142c037b6 Dump tileset anims data 2019-11-21 09:29:07 -05:00
Evan c39dcbc602 cast fixes 2019-11-20 15:10:56 -07:00
Evan 9e0db07ce9 refine ShopData 2019-11-20 15:06:09 -07:00