Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,955 Commits 3 Branches 0 Tags 878 MiB
Commit Graph

403 Commits

Author SHA1 Message Date
Phlosioneer 99bfd8c80f VAR_0x3F20 is not a var 2019-02-28 00:10:44 -05:00
Phlosioneer 373d73eb3b Fix last special var 2019-02-28 00:06:27 -05:00
Phlosioneer bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00
Phlosioneer 782979f1fc Finish documenting trainer hill 
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
 2019-02-27 22:16:01 -05:00
Phlosioneer 66f0616a2d I guess I'm documenting Trainer Hill now 2019-02-27 21:31:05 -05:00
Phlosioneer e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
Phlosioneer 648fc3d4f3 Name more unknown vars 2019-02-27 15:18:56 -05:00
Phlosioneer 4137dd7b0b Identify unused, never read, and never written vars 2019-02-27 14:42:32 -05:00
Marcus Huderle 4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
Phlosioneer fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -05:00
Phlosioneer 3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
huderlem 153f134318
Merge pull request #583 from huderlem/easy_chat 
Decompile more easy_chat.c
 2019-02-25 14:12:18 -06:00
Marcus Huderle 7ea05431a5 Decompile more easy_chat.c 2019-02-25 14:11:31 -06:00
huderlem b3a7a1278a
Merge pull request #577 from Phlosioneer/weather-15 
Document the weather state functions
 2019-02-25 08:03:22 -06:00
huderlem 84573f1774
Merge pull request #574 from Phlosioneer/event-vars 
Event vars
 2019-02-25 08:02:28 -06:00
Phlosioneer 5f7a971313 Source file part of map script renaming 2019-02-25 08:01:22 -06:00
Phlosioneer 87859a655b Fix flag formatting for fun 2019-02-25 02:20:38 -05:00
Phlosioneer b2866fae21 Document the weather state functions 
All weather types are now documented (including WEATHER_15)
 2019-02-22 22:20:42 -05:00
Phlosioneer cea5696f23 Finish moving pokeruby vars 2019-02-22 04:18:43 -05:00
Phlosioneer e12a7790cf Start porting pokeruby vars to pokeemerald 2019-02-22 04:01:38 -05:00
Phlosioneer eca329f9c5 Merge branch 'master' into multiplayer-stuff 2019-02-21 21:22:10 -05:00
Phlosioneer 486cf449b8 Make flag names more consistent 2019-02-18 14:17:02 -05:00
Phlosioneer fcb541189d Rename some flags, and use map ID macros 2019-02-18 02:02:20 -05:00
Phlosioneer e90e3458cb Document the regi* code more 
Fixed some confusing naming, named some unknown symbols, and fixed the
names of some flags.
 2019-02-15 18:24:55 -05:00
Phlosioneer e75f45dbcf Reverse engineered many of the multiplayer events 
Some corrections to the way events are handled and identified.
 2019-02-10 20:42:50 -05:00
Marcus Huderle 6f1d2b870c Give proper names to dynamic map layouts 2019-02-09 09:57:30 -06:00
Marcus Huderle d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
Marcus Huderle 29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Marcus Huderle 5c1667b41a Define layout constants 2019-01-29 16:55:25 -06:00
Diegoisawesome 900f294011 Add var const prefix for some missed var numbers 2019-01-21 22:34:01 -06:00
DizzyEggg 4b420643dc Merge branch 'master' into trainer_hill 2019-01-13 20:51:05 +01:00
DizzyEggg c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
Diegoisawesome af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
Slawter666 aeaf390706 Update constants 2019-01-05 20:12:50 +00:00
Tetrable 97ebeef1db Relabel TEMP_FLAG_20 into FLAG_UNUSED_0x020 2019-01-03 18:13:16 +00:00
Tetrable 30e7ac0dca Fix merge conflicts 2019-01-03 02:28:18 +00:00
Tetrable 50aa222aff Corrected typos 2019-01-03 01:54:55 +00:00
Marcus Huderle e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Tetrable a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable 1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00
Melody dc6c0ed17e add event object var references 2018-12-29 11:56:53 -06:00
DizzyEggg 55e44b0951 a bit more of contest painting effect 2018-12-29 11:48:28 -06:00
Marcus Huderle d0d870e193 Cleanup formatting 2018-12-29 11:36:54 -06:00
Marcus Huderle 67636b7c64 Document deoxys rock 2018-12-29 11:36:54 -06:00
Melody 6d556f8cf7 improve checkplayergender calls 
clean up constant definitions

make tweaks from review
 2018-12-28 08:22:21 -06:00
Marcus Huderle d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
Marcus Huderle dcbc8db6a3 Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c) 2018-12-25 11:46:35 -06:00
DizzyEggg ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
Diegoisawesome 6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Melody 5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
garak e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
DizzyEggg f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Diegoisawesome bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
garak 62384e7a61 use facility class constants 2018-12-09 22:57:46 -05:00
garak b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
DizzyEggg 4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
DizzyEggg 5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
nullableVoidPtr 8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
DizzyEggg 6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
nullableVoidPtr f24584cd31 Tabs -> spaces & align in include/ 2018-12-07 21:01:59 +08:00
DizzyEggg a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
Melody 2347e36d60 document pokédex options 2018-12-05 10:10:33 -05:00
garak 2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
DizzyEggg 0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
DizzyEggg a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody 0e5e487b78 tweak alignment 2018-12-03 08:04:11 -05:00
Melody 2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
Melody 52fa5137c9 tweak alignment 2018-12-03 00:31:15 -05:00
garak 462e7c8295 begin batle tower data 2018-12-02 23:22:42 -05:00
Melody eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
Melody 10725def8e trainerbattle_normal → trainerbattle_single 
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
 2018-12-02 15:08:19 -05:00
Melody bad5323642 cleans up trainer battle scripts 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
 2018-12-02 15:08:19 -05:00
Melody b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
DizzyEggg 1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
Diegoisawesome 032dd251e6
Merge pull request #383 from garakmon/createsprite 
Update createsprite macro and rename BANK to BATTLER
 2018-11-15 14:45:13 -06: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
Slawter666 1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
DizzyEggg a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg 258ec3162f frontier util review changes 2018-11-05 22:13:59 +01:00
Diegoisawesome 9adbb5d871
Merge pull request #375 from garakmon/animation-test-temp 
Back animation names
 2018-10-30 12:00:37 -05:00
garak 3cb7a33f42 label back animations 2018-10-30 12:37:53 -04:00
Diegoisawesome c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags 
Synchronize sprite tags
 2018-10-30 11:26:44 -05:00
DizzyEggg 52be8eeaf1 Merge branch 'master' into battle_tower 2018-10-26 23:55:36 +02:00
DizzyEggg dc273cc19d Battle tower - ewram variables 2018-10-26 23:54:41 +02:00
DizzyEggg 549b669f2a battle tower, match sth and dumb loop instead of goto 2018-10-24 23:14:45 +02: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 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
DizzyEggg 0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
Diegoisawesome 2a3ba78831
Merge pull request #369 from garakmon/pan-constants 
Use sound pan constants in data/battle_anim_scripts.s
 2018-10-19 20:27:54 -05: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
garak ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
Diegoisawesome e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Deokishisu 78a912a039
Fix "Vigaroth" misspelling to "Vigoroth" 2018-10-16 12:06:38 -04:00
Deokishisu bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04:00
DizzyEggg 145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +02:00
Marcus Huderle b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
DizzyEggg 17c5b4089a Label most of the anim tags 2018-10-06 09:37:52 +02:00
Tetrable 61ab631dec
Fixed a small error 2018-10-05 23:02:04 +01:00
Tetrable e80a53060b Start anim tags 2018-10-05 23:00:07 +01:00
Marcus Huderle ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
DizzyEggg 66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
DizzyEggg 8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
DizzyEggg 10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
Slawter666 1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
ultima-soul 857ac33adb Fixed a typo. 2018-09-05 17:25:44 +00:00
ultima-soul f505ba1bc7 Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent. 2018-09-05 01:13:17 +00:00
DizzyEggg 10eb952db5 Start battle factory 2018-09-02 18:10:36 +02:00
DizzyEggg 44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg ead21250a6 Label all battle ai scripts 2018-09-01 19:05:06 +02:00
DizzyEggg 2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg 447e65860c Merge branch 'master' into decompile_battle_frontier_1 2018-08-25 20:02:09 +02:00
DizzyEggg edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
DizzyEggg fb19a8fc59 battle dome cards sensibly renamed 2018-08-19 01:06:10 +02:00
DizzyEggg e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
Diegoisawesome 13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Tetrable 8896b54e8f Add national/hoenn dex defines, update dex arrays 2018-08-15 20:10:28 +01:00
Diegoisawesome 0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07:00
DizzyEggg f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
Diegoisawesome 18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
garak c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome 90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
DizzyEggg 68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
vblm12 c41b8123e3 Move trainer defines to one place in opponent.h... 
... to match pokeruby
 2018-07-20 22:03:22 -05:00
DizzyEggg bf0178238a Battle files - review changes 2018-07-16 20:47:30 +02:00
DizzyEggg ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
Marcus Huderle 546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle 7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h 2018-07-10 18:04:41 -05:00
DizzyEggg 1c48e58574 small fixes 2018-07-07 14:24:19 +02:00
DizzyEggg f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg 30c85a5128 more battle documentation 2018-06-30 14:12:17 +02:00
Marcus Huderle 5e00c0bfcf Fix map constants 2018-06-20 19:54:21 -05:00
Marcus Huderle acc1a5d446 Get all map constants from include/ rather than constants/ 2018-06-15 07:49:21 -05:00
Marcus Huderle aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
DizzyEggg d1798d0ed9 decompile field tasks 2018-05-19 18:02:43 +02:00
PikalaxALT 58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT 4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg 25c669e36b decompile item 2018-04-29 13:36:26 +02:00
PikalaxALT df128cbfed Merge branch 'master' into pokenav_match_call 2018-03-02 21:49:09 -05:00
PikalaxALT 988be1ab86 Carve out Match Call functions 2018-02-28 22:47:50 -05:00
Diegoisawesome bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c 
Move some data to C
 2018-02-28 16:55:45 -06:00
Diegoisawesome a57e04e14d
Merge pull request #220 from PikalaxALT/trainer_rematch 
Decompile trainer_rematch
 2018-02-28 16:41:54 -06:00
DizzyEggg 305a4fa744 match two functions 2018-02-28 19:37:48 +01:00
PikalaxALT 1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05:00
PikalaxALT f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
DizzyEggg 919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg 90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
golem galvanize c3c30417ef fixes 2018-02-14 20:45:27 -05:00
DizzyEggg f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg 382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
DizzyEggg 5e781f5b3f change some constants to male and female 2018-02-12 00:11:10 +01:00
DizzyEggg 2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
DizzyEggg 1a1bad3129 decompile pokemon_item_effect 2018-02-09 18:46:00 +01:00
DizzyEggg bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
Diegoisawesome 387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data 
Move data from asm to pokemon_1.c
 2018-02-08 14:06:57 -06:00
DizzyEggg 96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
DizzyEggg a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg 5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
DizzyEggg 4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
DizzyEggg c5e2092e8b title screen with master 2018-02-07 20:10:56 +01:00
DizzyEggg a61dc815b0 bag arrow to item count plus 1 2018-02-07 19:51:41 +01:00
DizzyEggg 541fef5368 move wild data to C 2018-02-05 22:27:29 +01:00
DizzyEggg ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
DizzyEggg 0c60ffe22a decompile title screen 2018-02-04 16:11:00 +01:00
DizzyEggg e13eacda39 decompile item icon 2018-02-02 16:06:20 +01:00
DizzyEggg 9fbedcc41c coord weather fix conflicts 2018-01-31 00:02:16 +01:00
DizzyEggg e6fb626c1f decompile_coord_event_weather 2018-01-29 16:46:56 +01:00
DizzyEggg 78728ae454 add rgb constants 2018-01-29 14:36:13 +01:00
DizzyEggg f53a39e7a2 mystery event labels 2018-01-21 19:30:01 +01:00
DizzyEggg 0bc7fb92db start decompiling mystery event script 2018-01-21 12:36:11 +01:00
Devin 9c84e8fd56 Fix typos in songs.h and song_table.inc again, and made the comments match. 
I'm sorry if I sound like a brolen record. ;)
 2018-01-16 19:36:34 -05:00
Devin 200aea1b09 Fixed typos 2018-01-15 14:10:07 -05:00
Devin 694f7f45bf Add most English song and SFX names as comments in songs.h and song_table.inc 2018-01-15 04:41:24 -05:00
Diegoisawesome e852700954 Merge remote-tracking branch 'origin/avara-opponent-constants' 2017-12-31 17:40:28 -06:00
Diegoisawesome 31140b10c5 Merge remote-tracking branch 'Egg/dump_battle_anim_scripts' 2017-12-31 13:35:14 -06:00
DizzyEggg 4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
DizzyEggg ca29ad22e8 dump trainer ai scripts 2017-12-30 16:04:31 +01:00
Diegoisawesome 2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
Diegoisawesome f9a9391ff3 Split/extract/port landmark 2017-12-26 21:20:29 -06:00
sceptillion e675043558 phoneme constants 2017-12-22 00:14:56 -08:00
sceptillion 96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
DizzyEggg 720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg 7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
PikalaxALT 6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg 44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
Avara c8ac4e8ce4 Opponents fixed and moved~ 2017-12-12 02:58:57 +00:00
camthesaxman c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00