Commit Graph

1023 Commits

Author SHA1 Message Date
Marcus Huderle 7bf330e9f2 Merge pull request #508 from huderlem/friendly_macros
call_if and goto_if macros
2018-01-06 10:03:30 -08:00
PikalaxALT e6d86ff774 Merge branch 'master' into cable_car 2018-01-06 10:15:45 -05:00
PikalaxALT 2692979c40 some renaming 2018-01-05 21:46:59 -05:00
PikalaxALT f6527d1242 Merge branch 'master' into cable_car 2018-01-05 18:53:19 -05:00
Marcus Huderle 43b4ba34dc Add friendly macros for checking trainer flags 2018-01-05 12:39:57 -08:00
Marcus Huderle aed64560bc Add friendly macros for goto_if and call_if variants 2018-01-05 11:36:47 -08:00
camthesaxman 737e1403b6 decompile German code 2018-01-05 00:18:16 -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
Marcus Huderle f5fbe5b662 Merge pull request #507 from huderlem/script_constants
Script constants
2018-01-04 20:22:37 -08:00
Marcus Huderle f0097860b0 Use MSGBOX_YESNO and YES/NO constants for yes/no message boxes 2018-01-04 18:54:20 -08:00
Marcus Huderle 2702464743 Use constants for some item names stored in script vars 2018-01-04 16:03:26 -08: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
Marcus Huderle c748287725 Use -1 instead of 65535 for compare macro 2018-01-04 15:24:19 -08:00
Marcus Huderle 88c42ade4b Use weather constants in scripts (and giveegg) 2018-01-04 14:52:51 -08:00
Marcus Huderle 5c427e8afe Use song constants in scripts 2018-01-04 14:37:52 -08: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) 6649ab0876 Updated with pull request remarks 2018-01-03 20:55:10 +01: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
PikalaxALT aee62a5b24 data through gUnknown_083EDD08 2018-01-02 15:08:57 -05:00
PikalaxALT d1b6882fb2 data through gSubspriteTables_83EDB54 2018-01-02 12:36:14 -05:00
PikalaxALT e6f56f2936 data through gSpriteTemplate_83ED6CC 2018-01-02 12:17:54 -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
PikalaxALT 8f0ea5f965 data through gOamData_83ED0B8 2018-01-02 11:52:15 -05:00
PikalaxALT 865dcd79aa data through gUnknown_083ECE12 2018-01-02 10:54:50 -05:00
camthesaxman 28e98d9df7 decompile sub_80E60D8 - sub_80E6AC4 2018-01-01 23:09:51 -06:00
PikalaxALT d84dfb66de Decompile enough data to nuke the explicit calls to memcpy 2018-01-01 21:11:54 -05:00
Marcus Huderle 7158286302 Label a bunch more specials 2018-01-01 17:06:17 -06:00
Marcus Huderle 56e2fe07d4 Label trendy phrase specials 2018-01-01 17:06:16 -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
Marcus Huderle c21bde0598 Remove redundant battle constants 2017-12-30 22:29:07 -06:00
PikalaxALT 7f6d7c107b through sub_8104F8C 2017-12-30 20:18:52 -05:00
PikalaxALT 1989ffb9a8 through sub_8104C5C 2017-12-30 17:11:00 -05:00
PikalaxALT 13b2657c49 through sub_8104498; decompile some data 2017-12-30 13:31:22 -05:00
Marcus Huderle cd2b75a677 Sync battle_script changes with pokeemerald 2017-12-30 11:03:18 -06:00
PikalaxALT 9d2ee97519 Merge branch 'master' into slot_machine 2017-12-28 22:14:47 -05:00
Marcus Huderle 4767f21f2e Port updated battle_script macros from pokeemerald 2017-12-27 15:43:29 -06:00
Marcus Huderle d34de50d34 Use descriptive name for the BLACK GLASSES hidden item flag 2017-12-27 09:23:30 -06:00
Marcus Huderle 0eb231352a Fully enumerate secret base constants 2017-12-26 22:24:06 -06:00
PikalaxALT da62907ec5 through sub_8103008 2017-12-26 21:25:47 -05:00
Marcus Huderle 82230589d1 Add bg_secret_base_event macro, and define secret base id constants 2017-12-26 16:08:40 -06:00
Marcus Huderle 80cddf0cd4 Add bg_hidden_item_event macro, and define hidden item flags 2017-12-26 16:08:40 -06:00