Commit Graph

56 Commits

Author SHA1 Message Date
Cameron Hall 11a9371349 resolve merge conflicts and make it compile 2018-01-21 13:53:32 -06:00
camthesaxman 6553903150 start labeling field_weather 2018-01-18 18:56:44 -06:00
Cameron Hall e11494a4c1 Merge branch 'master' into german_debug 2018-01-16 22:39:45 -06:00
Cameron Hall 91cfb6a564 add debug ifdefs 2018-01-16 22:25:35 -06:00
Cameron Hall 76250c7ab0 Merge pull request #538 from easyaspi314/song-names
Add most English song and SFX names as comments in songs.h and song_t…
2018-01-16 16:44:50 -06:00
camthesaxman 3295ffbd5b clean up pokemon_item_effect.c 2018-01-15 17:36:16 -06:00
Devin e342649f56 Fixed typos 2018-01-15 14:08:51 -05:00
Devin 72b9e7b2c2 Add most English song and SFX names as comments in songs.h and song_table.inc
Ported from my work in pokeemerald.
2018-01-15 14:00:13 -05:00
camthesaxman 58b71865c9 improve TM/HM constants and add macro for TM/HM learnsets 2018-01-14 13:41:50 -06:00
Marcus Huderle be36c50638 Finish battle_2.c and battle_util.c decompilation 2018-01-07 20:07:36 -08:00
Marcus Huderle 82ab732d67 Finish decompiling battle_2 2018-01-07 20:07:36 -08:00
Marcus Huderle c0e0004ffa Decompile through HandleEndTurn_BattleWon, and update trainer class constant names 2018-01-07 20:07:36 -08:00
camthesaxman 7d181ec03b minor cleanup 2018-01-05 22:18:57 -06:00
Marcus Huderle 664b42470f Use var constants for direct uses of gSaveBlock1.vars 2018-01-01 17:06:17 -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
Marcus Huderle cd2b75a677 Sync battle_script changes with pokeemerald 2017-12-30 11:03:18 -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
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
Marcus Huderle 6000e19e94 Add coord_weather_event macro, and define COORD_EVENT_WEATHER_* constants 2017-12-26 16:08:39 -06:00
Marcus Huderle 2c4d972f7c 'VAR_SPECIAL_X' instead of 'SPECIALVAR_X' 2017-12-24 14:00:44 -06:00
Marcus Huderle 1c8b05e7b0 Name and use constants for special vars 2017-12-24 10:14:54 -06:00
Marcus Huderle 51247c3eb9 Name and use general purpose vars 2017-12-24 10:14:53 -06:00
Marcus Huderle 2379a5b6eb Name and use dynamic object gfx ids 2017-12-24 10:14:53 -06:00
Marcus Huderle e696b89ff2 Name and use dynamic object gfx id vars 2017-12-24 10:14:52 -06:00
Marcus Huderle 4b5ad9de04 Name and use temp var constants 2017-12-24 10:13:52 -06:00
camthesaxman 9c9bcee1e2 fix merge conflicts 2017-12-22 14:51:12 -06:00
camthesaxman ce74d72c31 label and clean up some things in contest.c 2017-12-22 14:19:09 -06:00
Marcus Huderle 0ed3cab7a4 Use SYSTEM_FLAGS offset for upper flags 2017-12-17 20:47:07 -08:00
Marcus Huderle 88716f4c0e Use FLAG_ prefix for all flags 2017-12-17 20:07:53 -08:00
Marcus Huderle b14cdde8bd Label landmark and daily flags. 2017-12-15 14:59:25 -08:00
Marcus Huderle 0a634a60c9 Label item flags 2017-12-15 13:25:19 -08:00
Marcus Huderle 03c75cfd9c Finish all regular hide-show flags 2017-12-15 10:49:58 -08:00
Marcus Huderle 8d346b1bab A few more flags 2017-12-14 20:10:36 -08:00
Marcus Huderle 58bf5392b3 Label flags up to 973 2017-12-10 15:41:21 -08:00
Marcus Huderle 65207e0366 Label all flags up to 901 2017-12-09 14:43:21 -08:00
Marcus Huderle 8dd25bcad0 Start using constants for hide-show flags 2017-12-04 20:48:25 -08:00
Marcus Huderle 861bd9292d Use decoration flag constants 2017-12-03 16:44:29 -08:00
Marcus Huderle dde446225f More script flags 2017-12-03 15:57:11 -08:00
Marcus Huderle 503bd8e491 Label script flags up to flag 288. 2017-12-03 13:20:55 -08:00
Marcus Huderle c9f38d2206 Label scripts flags up to flag 256. 2017-12-03 12:32:57 -08:00
Marcus Huderle 24a90b9acb Label script flags up to flag 199. 2017-12-02 19:12:33 -08:00
Marcus Huderle 765526b99f Label flags up to flag 119. 2017-12-02 14:01:50 -08:00
Marcus Huderle d1b967444e Label flags up to flag 99. 2017-12-02 12:39:11 -08:00
Marcus Huderle 82f8159152 Flag for buggy rock smash rock 2017-11-28 21:07:04 -08:00
Marcus Huderle 4d93db09a3 Use constants for temporary map flags 2017-11-28 20:36:12 -08:00
camthesaxman bc8f4541f3 convert wild_encounter data to C 2017-11-27 17:54:49 -06:00
camthesaxman 4fd33b1035 mauville_man constants 2017-11-26 17:19:05 -06:00