Commit Graph
100 Commits
Author SHA1 Message Date
garakmon b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04:00
garak 9b9b14ad0a remove empty groups from wild encounter fields json objects 2019-10-14 18:12:03 -05:00
garak 4a79081197 replace inja license text 2019-10-14 18:12:03 -05:00
garak 92d28c5daf add MIN_LEVEL define to pokemon constants 2019-10-14 18:12:03 -05:00
garak c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
garak 74477471a6 update inja 2019-10-14 18:12:03 -05:00
garak b420b98d63 allow CRLF line endings in asm files for preproc 2019-08-29 16:37:32 -05:00
garak 08a3ff77dd index to slot in c file 2019-07-29 20:02:43 -04:00
garak 0c35ec2f7b fix build 2019-07-29 13:40:47 -04:00
garak 2580693ea5 INDEX to SLOT in encounter inja template 2019-07-29 13:12:20 -04:00
garak 5b57c001f5 Merge branch 'master' into navdata 2019-07-29 13:06:45 -04:00
garak 54c635683c fix some more pokenav 2019-07-29 13:03:03 -04:00
garak b6483d7026 name match call messages by trainers 2019-07-29 12:58:15 -04:00
garak cd6fd3110f fix modern build 2019-07-20 13:27:57 -04:00
garak c39d25ff4d Merge branch 'master' into navdata 2019-07-20 12:30:41 -04:00
garak dfa3e079c0 finish pokenav data decomp 2019-07-19 22:57:33 -04:00
garak f9a9297d4f decompile pokenav 7/8 data 2019-07-19 22:06:42 -04:00
garak f6d55db535 decompile pokenav_unk_5 data 2019-07-19 21:05:55 -04:00
garak 690a0c4390 decompile pokenav_unk_4 rodata 2019-07-19 19:36:17 -04:00
garak c400d1dc7f decompile pokenav_unk_3 data 2019-07-19 18:31:42 -04:00
garak b68ab6106d pokenav unk 2 data decomp 2019-07-19 17:23:52 -04:00
garak 4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
garak adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -04:00
garak 2c22a82a25 clean metatile constants file 2019-06-16 10:08:07 -05:00
garak a43dcd26bd finish labeling metatiles 2019-06-16 10:08:07 -05:00
garak 713f61de7c continue labeling metatiles for scripts 2019-06-16 10:08:07 -05:00
garak fbbc2b1d8b finish src metatile labels 2019-06-16 10:08:07 -05:00
garak 9f8a30e4e7 label metatiles in fldeff_cut.c 2019-06-16 10:08:07 -05:00
garak 8b26bd1e09 label metatiles for general, fallarbor, and sootopolis gym tilesets 2019-06-16 10:08:07 -05:00
garak aad839995f label metatiles for pacifidlog and fortree bridges 2019-06-16 10:08:07 -05:00
garak 724add638c label regi cave metatiles 2019-06-16 10:08:07 -05:00
garak 7e35b8a710 label remaining metatiles in field_specials.c 2019-06-16 10:08:07 -05:00
garak a9560d9c62 give metatile labels to petalburg gym and pcs 2019-06-16 10:08:07 -05:00
garak c68ba9f4e8 label mauville gym metatiles 2019-06-16 10:08:07 -05:00
garak f1f420954b add METATILE_ID macro 2019-06-16 10:08:07 -05:00
garak 60baf19d45 rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses 2019-05-16 17:10:13 -05:00
garak daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -05:00
garak d0115db565 move pokemon graphics to mon-specific directories 2019-03-16 12:21:47 -05:00
garak 14211fb495 fix incbin paths 2019-03-16 12:21:47 -05:00
garak 1758eb99df match sub_810EE14 in flying.c 2019-03-03 22:08:58 -05:00
garak 22657c7087 use BG_SCREEN_ADDR macro for tilemap addresses 2019-02-17 00:35:26 -05:00
garak 35575b57a0 use BG_CHAR_ADDR define 2019-02-16 23:51:06 -05:00
garak 0b1bb9e4e9 use strings for map json coord_event var_value 2019-02-16 16:14:43 -06:00
garak 82abc164dc convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00
garak 261955b6ed trainer hill easy chat constants 2019-01-21 12:01:49 -05:00
garak ed25326140 fix formatting 2018-12-29 21:52:38 -05:00
garak 1baa17c632 index gRegionMapEntries by map section constants 2018-12-29 21:49:29 -05:00
garak 5eac3ce1a2 rename fldeff_misc 2018-12-19 22:19:54 -05:00
garak af208a6bbb Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff 2018-12-19 21:35:32 -05:00
garak f801eed3a8 clean fldeff file 2018-12-19 20:52:41 -05:00
garak e292d0ca83 Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
garak 7e170a06cc label some sprite templates 2018-12-14 19:39:01 -05:00
garak c8cad8a389 re-add explicit array sizes 2018-12-10 10:33:51 -05:00
garak 2187dbb10a remove explicit array lengths from battle_tower.c 2018-12-10 10:17:03 -05:00
garak 10237e8d13 move externs and remove comments 2018-12-10 09:52:36 -05:00
garak 62384e7a61 use facility class constants 2018-12-09 22:57:46 -05:00
garak e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
garak b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
garak 7ee2f9f2e6 Merge pull request #4 from DizzyEggg/help_garak
Finish porting battle frontier data
2018-12-05 16:24:37 -05:00
garak d9287f3261 extern gTower trainer data 2018-12-04 12:15:13 -05:00
garak 80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak e69cb6b276 update frontier class names 2018-12-03 17:21:34 -05:00
garak 2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
garak d6a88e0eaa remove frontier asm constants to fix build 2018-12-03 16:39:51 -05:00
garak 462e7c8295 begin batle tower data 2018-12-02 23:22:42 -05:00
garak 50f00b0827 Merge remote-tracking branch 'upstream/master' into fldeff 2018-11-27 13:31:07 -05:00
garak f316d53c58 Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data 2018-11-27 13:28:44 -05:00
garak 2707bd9b91 clean frontier data 2018-11-27 13:27:49 -05:00
garak a636005066 delete createsprite.py 2018-11-27 11:40:29 -05:00
garak 73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak 091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
garak f02cb667bb first 4 functions in fldeff 2018-11-20 09:51:54 -05:00
garak c067c4e617 fix dependency scanning 2018-11-14 19:12:12 -05:00
garak 87ec71f71b subdirs in build 2018-11-14 17:59:30 -05:00
garak c6833c903c remove extra macro and shorten names 2018-11-13 16:19:52 -05:00
garak 269aebaca7 update createsprite macro and rename BANK to BATTLER 2018-11-13 15:35:46 -05:00
garak 678156ff0e remove linker script extra 2018-10-30 12:43:13 -04:00
garak 3cb7a33f42 label back animations 2018-10-30 12:37:53 -04:00
garak 7747a891a2 finish 80FE840 data (actually) 2018-10-25 18:59:05 -04:00
garak de90ce9123 finish 80FE840 data (almost) 2018-10-25 17:46:23 -04:00
garak 17c26fae1a fire, electric, ice data 2018-10-24 20:01:40 -04:00
garak 22a0b58e57 effects_2 and water data 2018-10-24 15:52:21 -04:00
garak 2f4b00e34b finish effects_1 data 2018-10-23 12:17:31 -04:00
garak 68814c42de begin 80FE840 data 2018-10-23 08:25:51 -04:00
garak 5ddf6655bc split battle_anim_80FE840.s 2018-10-22 22:08:38 -04:00
garak 6cf39e8a6e clean up sprite tags 2018-10-22 10:51:40 -04:00
garak d267fcbfb1 name remaining tags 2018-10-22 10:36:43 -04:00
garak 2b9fd18dd4 battle_anims.s data to C 2018-10-21 22:30:20 -04:00
garak f2363f5982 more tag names 2018-10-21 19:30:27 -04:00
garak 7a9c7e5f06 Merge branch 'master' into sprite-tags 2018-10-21 15:12:18 -04:00
garak 2bb286ab4e begin ANIM_TAG port 2018-10-21 15:07:10 -04: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
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
garak cb5981cdf2 name more event flags 2018-10-18 21:32:21 -04:00
garak c27043bd3c more event flags 2018-10-18 15:28:59 -04: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