ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,502 Commits 1 Branch 0 Tags 235 MiB
df1b804af8
Commit Graph

1388 Commits

Author SHA1 Message Date
scnorton
2eba82b0fb sub_8026634 2019-03-26 11:59:39 -04:00
Marcus Huderle
e6caf0ff10 Port mevent2.c from pokefirered 2019-03-24 18:29:00 -05:00
Marcus Huderle
cf917a8733 Decompile berry_powder.c 2019-03-24 14:50:16 -05:00
Marcus Huderle
456cc3a6f0 Split out the remaining wireless-related files 2019-03-24 13:15:37 -05:00
Marcus Huderle
a5ee2c14fd Merge remote-tracking branch 'upstream/master' into use_pokeblock 
# Conflicts:
#	include/menu_specialized.h
 2019-03-23 10:14:31 -05:00
Fontbane
e8add87bf3 Document Field Effects and some related text 
Also VAR_TRICK_HOUSE_LEVEL
 2019-03-23 09:57:37 -05:00
Fontbane
7d54c2b960 EventScript and Text Documentation 
In event_script.s. Also renamed a couple events for consistency/detail.
 2019-03-23 09:57:37 -05:00
Marcus Huderle
65391a1eb2 Merge remote-tracking branch 'upstream/master' into use_pokeblock 
# Conflicts:
#	src/use_pokeblock.c
 2019-03-23 09:39:46 -05:00
Marcus Huderle
a7d5f032b1 Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c 2019-03-22 14:16:26 -05:00
Marcus Huderle
f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
Marcus Huderle
7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -05:00
Marcus Huderle
e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor 
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
 2019-03-17 17:20:40 -05:00
Phlosioneer
092608aef6 Add a constant for "no music" on maps. 2019-03-16 12:31:29 -05:00
Phlosioneer
8cea949e6d Move constant and EWRAM data into C. 2019-03-15 19:33:30 -04:00
Phlosioneer
8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -05:00
Phlosioneer
13c2f91b11 Moved last contest data into C 2019-03-09 23:51:39 -05:00
Phlosioneer
0c935a8bd5 Move the contest opponent filter to C 2019-03-09 22:54:17 -05:00
Phlosioneer
a32e8e7405 Move gContestOpponents into C 
2,400 LOC by hand.
 2019-03-09 20:56:36 -05:00
Phlosioneer
0e8f94a83e Last bit of cleanup on contest_opponents 2019-03-09 02:49:57 -05:00
Phlosioneer
153499ed6f Clean up contest_opponents.inc 2019-03-09 01:38:38 -05:00
Phlosioneer
5b4b0a245b Move contest winner list to C 2019-03-09 00:01:49 -05:00
Phlosioneer
88c3781880 Move text pointer tables into C 2019-03-08 22:33:40 -05:00
Phlosioneer
b7cfa9d365 Move more contest constants into C 2019-03-08 21:39:51 -05:00
Phlosioneer
b93d923826 Merge branch 'master' into move-tutor 2019-03-08 02:27:20 -05:00
Phlosioneer
eac70acab6 Change filename to something more descriptive 2019-03-08 02:17:01 -05:00
Phlosioneer
aa7657a82a Move constants into C 
Also figured out what one of the graphics files is for.
 2019-03-06 22:58:05 -05:00
Phlosioneer
0da83abad2 Several nonmatching functions 
Huge and difficult.
 2019-03-06 22:27:30 -05:00
Phlosioneer
4345ba8e6c More decompiled and cleanup 2019-03-05 22:32:28 -05:00
DizzyEggg
b150091436 Rename an erroneously named battlescript 2019-03-05 17:06:29 +01:00
Phlosioneer
9bea9e1624 Start decompiling menu_unknown 2019-03-05 06:06:20 -05:00
Phlosioneer
0e3fc4956b Rename asm file 2019-03-05 00:06:43 -05:00
Phlosioneer
907492fd6e Split rom asm file in half 
The first half is ui/menu stuff, while the second half is link-related
stuff.
 2019-03-04 23:26:51 -05:00
Phlosioneer
cae63cf1c7 Rename move tutor to move relearner 2019-03-04 20:56:39 -05:00
Phlosioneer
4ea5e85bed Fix typos 
This is an updated version of #554, since it hasn't been updated in two
weeks.
 2019-03-03 09:31:47 -06:00
Phlosioneer
27aa27a2e9 Fix tabs 2019-03-03 02:58:50 -05:00
Phlosioneer
4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars 
Document all event vars
 2019-03-02 08:24:46 -06:00
Phlosioneer
25050b9944 Fix tabs, do suggested rename 2019-03-02 04:13:27 -05:00
huderlem
3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff 
Document overworld.c and link stuff in general
 2019-03-01 08:43:55 -06:00
Phlosioneer
a7e5852f1d More minor fixes 2019-03-01 01:49:11 -05:00
Phlosioneer
459fd93b59 Fix minor errors 2019-03-01 01:18:58 -05:00
hondew
9ed0f77528 fixed issues in data and include dirs 2019-02-28 21:21:56 -06:00
hondew
5c8cc5225f document slot machine 2019-02-28 21:21:56 -06: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
c1348d22f3 Name most event scripts related to unusual weather 2019-02-27 04:27:54 -05:00
Phlosioneer
fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -05:00
Phlosioneer
b8a60b055b Fix previous merge 2019-02-26 22:11:43 -05:00
Phlosioneer
3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
Phlosioneer
accea672f1 Incorporate feedback 2019-02-26 22:04:44 -05:00
Marcus Huderle
231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -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
8816aa527d Update map script files 2019-02-25 08:01:22 -06:00
Phlosioneer
5f7a971313 Source file part of map script renaming 2019-02-25 08:01:22 -06:00
Phlosioneer
1cd5cb09cf Merge branch 'master' into weather-15 2019-02-25 02:30:35 -05:00
Phlosioneer
4e5fae0086 Merge branch 'master' into event-vars 2019-02-25 02:24:20 -05:00
Phlosioneer
04db99bb0a More misc event names 2019-02-24 10:10:18 -06:00
Phlosioneer
0de831fd29 Name some common single-entry movements 2019-02-24 10:10:18 -06:00
Phlosioneer
4582fd1545 Name a ton of commonly used event scripts 2019-02-24 10:10:18 -06:00
Marcus Huderle
bb508ade64 Decompile more of easy_chat.c 2019-02-24 10:09:57 -06:00
ultima-soul
eb48cc2f7e Decompile through sub_8167930. 2019-02-23 09:08:07 -08: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
Marcus Huderle
d3f66a98ff Decompile more easy_chat 2019-02-22 11:46:05 -06: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
Marcus Huderle
b105d20d1e Decompile chunk of easy_chat.c 2019-02-21 17:46:14 -06:00
Diegoisawesome
1b0079445d
Merge pull request #559 from Phlosioneer/finish-newgame-docs 
Finish and polish new_game.c
 2019-02-18 13:28:50 -06:00
Diegoisawesome
924cbe9ee4
Merge pull request #560 from Phlosioneer/regi-documentation 
Document the regi* code more
 2019-02-18 13:23:19 -06: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
Diegoisawesome
047d8288cc
Merge pull request #557 from Phlosioneer/navgear-decompile 
Navgear decompile
 2019-02-18 00:34:01 -06:00
Phlosioneer
0a7b97ee06
Merge branch 'master' into multiplayer-stuff 2019-02-18 01:19:16 -05:00
Phlosioneer
5695617d64 Merge branch 'master' into multiplayer-stuff 2019-02-18 01:12:47 -05:00
Phlosioneer
08579edbcd Clean up mistakes and bad formatting 2019-02-18 01:03:44 -05:00
Phlosioneer
be08a662a8 More data moved into C code 2019-02-17 23:14:14 -05:00
Phlosioneer
a4aaf279ac Move more data into pokenav, name some strings 2019-02-17 23:14:14 -05:00
Phlosioneer
bf4c1a73c0 Start moving pokenav data into C files 
The types and usage of many of the globals are now known.
 2019-02-17 23:14:14 -05:00
Marcus Huderle
19b76bffda Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:41 -06:00
garak
0b1bb9e4e9 use strings for map json coord_event var_value 2019-02-16 16:14:43 -06: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
986d3d8b2f Finish and polish new_game.c 
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
 2019-02-15 03:40:57 -05:00
Diegoisawesome
dfb896356c Merge branch 'master' of github.com:pret/pokeemerald 2019-02-12 00:40:42 -06:00
Diegoisawesome
449fb25f23 Clear up misnamed time-based flags and functions 2019-02-12 00:40:34 -06: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
Phlosioneer
f2f1b1978b Done documenting link code in overworld.c 2019-02-10 03:54:50 -05:00
Phlosioneer
3fd878483f Start renaming symbols 
I finally figured out what the code is trying to do. I have a foothold;
the rest should follow.
 2019-02-10 00:50:46 -05:00
Marcus Huderle
6f1d2b870c Give proper names to dynamic map layouts 2019-02-09 09:57:30 -06:00
Marcus Huderle
40dc6833c5 Fully document tileset animations 2019-02-08 15:07:42 -06:00
Marcus Huderle
6add3e1794 Document some battle dome stuff 2019-02-08 11:08:25 -06:00
Marcus Huderle
3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
Marcus Huderle
a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
huderlem
b0ee100975
Merge pull request #543 from pret/mapdata 
Convert map data to JSON
 2019-02-04 21:36:18 -06:00
Marcus Huderle
d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
DizzyEggg
a7f94bbeea Dump last battle anim file 2019-02-02 11:55:11 +01: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
Marcus Huderle
14641e916e Cleanup Rustboro City House layout label 2019-01-29 14:36:02 -06:00
Marcus Huderle
bd667102fa Fix PetaburgCity map scripts label 2019-01-29 14:36:02 -06:00
Marcus Huderle
e43f341799 Cleanup link contest map scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle
d2d44a97b8 Cleanup link contest map events 2019-01-29 14:36:02 -06:00
Marcus Huderle
36a1825bbe Document trainer approach funcs, and use movement type constants in scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
Diegoisawesome
183b6857ff
Merge pull request #458 from ultima-soul/contest 
Decompile more of contest
 2019-01-27 23:08:24 -06:00
Diegoisawesome
6b2dda422b Merge branch 'master' of github.com:pret/pokeemerald 2019-01-27 00:11:44 -06:00
Diegoisawesome
7a60f36954 Clean up variable numbers mistakenly written as decimal 2019-01-27 00:11:32 -06:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
ebfaf3f6be Merge branch 'master' into dump 2019-01-24 21:30:19 +01:00
DizzyEggg
524db6068e Merge branch 'master' into trainer_card 2019-01-22 21:59:32 +01:00
Diegoisawesome
900f294011 Add var const prefix for some missed var numbers 2019-01-21 22:34:01 -06:00
DizzyEggg
4e396207d3 document more of trainer card 2019-01-20 18:24:35 +01:00
DizzyEggg
576d1b3474 Document and match somne trainer card 2019-01-19 23:04:33 +01:00
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01:00
Diegoisawesome
6857b73ee3 Split pokenav so calcrom works properly 2019-01-14 15:25:29 -06:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
Slawter666
f8c2fcb9b2 Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base 2019-01-05 19:54:26 +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
b471bba55e Use better names for match call texts 2019-01-02 19:46:15 -06:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette 
Port/decompile roulette
 2019-01-02 17:00:33 -06:00
Diegoisawesome
6202ae1df0 Extract rodata from roulette 2019-01-02 16:40:40 -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
Diegoisawesome
af1e44befe Continue porting roulette 2018-12-31 18:07:29 -06:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
Diegoisawesome
c5c6e437ec Document, cleanup, extract data from trade 2018-12-31 01:23:27 -06:00
Marcus Huderle
58f130d007 Document some battle anims and helpers 2018-12-30 11:04:17 -06:00
Diegoisawesome
2fb9f490fb Almost done with trade 2018-12-29 12:46:15 -06:00
Melody
dc6c0ed17e add event object var references 2018-12-29 11:56:53 -06:00
Marcus Huderle
6e7bdb3ca4 Document misc field_specials things 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
c3dde7353d
Add newline to Route111_NoMirageTower layout.inc 
To match all other layout.inc files.
 2018-12-26 17:04:24 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro (#483) 2018-12-26 12:20:15 -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
Melody
c7971ecb20 improve event script object calls 2018-12-25 11:20:33 -06:00
Diegoisawesome
a54aa03d20
Merge pull request #475 from DizzyEggg/learn 
asm party and fldeff clean-up
 2018-12-24 16:50:14 -06:00
Diegoisawesome
c2ca57e8ac
Merge pull request #477 from melthelesbian/object_script_commands 
use player constant in obj script commands
 2018-12-24 16:09:42 -06:00
Melody
38293d4293 use player constant in obj script commands 2018-12-24 16:31:24 -05:00