Commit Graph

1196 Commits

Author SHA1 Message Date
camthesaxman 680d3fd7b9 Merge branch 'master' of https://github.com/pret/pokeruby 2018-01-06 12:28:12 -06:00
camthesaxman b3551bc2f3 fix some code and formatting anomalies 2018-01-06 12:27:27 -06:00
PikalaxALT e6d86ff774 Merge branch 'master' into cable_car 2018-01-06 10:15:45 -05:00
PikalaxALT 8d035c8152 cable car util 2018-01-05 22:15:05 -07:00
camthesaxman 7d181ec03b minor cleanup 2018-01-05 22:18:57 -06:00
PikalaxALT e28c11ef95 Update delcarations of cable car util funtions 2018-01-05 23:07:57 -05:00
camthesaxman 60ab994a0f fix German build 2018-01-05 21:27:40 -06:00
PikalaxALT fe7e54d6d8 Make static what can be made static 2018-01-05 21:37:20 -05:00
camthesaxman 66a7a42a10 decompile sub_80EADC0 - sub_80EB37C 2018-01-05 20:23:49 -06:00
PikalaxALT 319eb710ed through sub_81245F4 2018-01-05 21:13:50 -05:00
PikalaxALT f6527d1242 Merge branch 'master' into cable_car 2018-01-05 18:53:19 -05:00
camthesaxman 4149e85883 decompile sub_80EA1E0 - sub_80EAD7C 2018-01-05 15:28:36 -06:00
camthesaxman 3d49abfecb fix merge conflicts 2018-01-04 23:42:42 -06:00
camthesaxman d7970fba2f decompile sub_80E9620 - sub_80EA184 2018-01-04 22:26:27 -06:00
PikalaxALT acf290ec6f Merge branch 'master' into slot_machine 2018-01-04 18:51:12 -05:00
camthesaxman c6fd37b0df decompile sub_80E8BF4 - sub_80E95A4 2018-01-04 17:29:36 -06:00
PikalaxALT 25bf575965 propagate SLOT_MACHINE_MATCHED enums 2018-01-04 18:03:10 -05:00
PikalaxALT 59c99b2d65 some renaming 2018-01-04 17:35:13 -05:00
PikalaxALT 0a70c2c693 Get sub_8103668 matching 2018-01-04 17:17:42 -05:00
PikalaxALT 86e1d1098e Declare as static what can be so declared 2018-01-04 00:09:07 -05:00
PikalaxALT 3c709ef2ed A little tidying 2018-01-03 23:55:30 -05:00
camthesaxman 324705201c decompile sub_80E8760 - sub_80E8B78 2018-01-03 20:24:50 -06:00
PikalaxALT 4df728666e Merge branch 'master' into slot_machine 2018-01-03 16:45:53 -07:00
camthesaxman cf37681831 decompile sub_80E810C - sub_80E872C 2018-01-03 14:30:23 -06:00
Marco Willems (M17.1) 56f960f676 Merge remote-tracking branch 'upstream/master' 2018-01-03 16:22:45 +01:00
Marco Willems (M17.1) b5ecdfa404 Decompiled fire_2.s 2018-01-03 16:22:06 +01:00
PikalaxALT 9b2ebe671f Remaining slot machine data 2018-01-02 21:35:41 -05:00
camthesaxman a2e854bb7c decompile sub_80E7324 - sub_80E7AD4 2018-01-02 19:22:51 -06:00
camthesaxman 82b9b4fc7e decompile sub_80E6AE4 - sub_80E7294 2018-01-02 15:38:48 -06:00
PikalaxALT aee62a5b24 data through gUnknown_083EDD08 2018-01-02 15:08:57 -05:00
camthesaxman 0f5b000567 Merge branch 'master' into decompile_easy_chat 2018-01-02 11:16:06 -06:00
PikalaxALT fb99fe5aa6 data through gSpriteImageTable_83ED228 2018-01-02 12:05:43 -05:00
camthesaxman 28e98d9df7 decompile sub_80E60D8 - sub_80E6AC4 2018-01-01 23:09:51 -06:00
Marcus Huderle 664b42470f Use var constants for direct uses of gSaveBlock1.vars 2018-01-01 17:06:17 -06:00
Marcus Huderle 7158286302 Label a bunch more specials 2018-01-01 17:06:17 -06:00
Marcus Huderle 2da819cabb Label TV specials, and port over some TV changes from pokeemerald 2018-01-01 17:06:16 -06:00
Marcus Huderle c8d963b26a Label DoPokeNews and PokeNews struct 2018-01-01 17:06:15 -06:00
Marcus Huderle 7f0ba30406 Port battle_setup names from pokeemerald 2018-01-01 17:05:58 -06:00
PikalaxALT f35549349e through sub_8105BF8 2017-12-31 21:45:59 -05:00
PikalaxALT 99c897b715 through sub_81059B8 2017-12-31 21:11:48 -05:00
PikalaxALT 39d2d1f37c through sub_81056C0 2017-12-31 20:18:22 -05:00
PikalaxALT a357c07d83 through sub_8105554 2017-12-31 19:58:37 -05:00
Marco Willems (M17.1) d0ae899529 merged 2017-12-31 13:16:44 +01:00
Marco Willems (M17.1) ba5e6c8a32 disassembled fire.s 2017-12-31 13:06:30 +01:00
Marcus Huderle c21bde0598 Remove redundant battle constants 2017-12-30 22:29:07 -06:00
PikalaxALT 26d22691dc through sub_810535C 2017-12-30 23:20:35 -05:00
PikalaxALT b628d68bae through sub_81049F8 2017-12-30 16:09:07 -05:00
PikalaxALT 13b2657c49 through sub_8104498; decompile some data 2017-12-30 13:31:22 -05:00
Marcus Huderle ea3a851403 Sync gAnimDisableStructPtr and gTransformedPersonalities with pokeemerald 2017-12-30 11:59:31 -06:00
Marcus Huderle cd2b75a677 Sync battle_script changes with pokeemerald 2017-12-30 11:03:18 -06:00