ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 13:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,358 Commits 1 Branch 0 Tags 235 MiB
f4a65dbb1c
Commit Graph

1365 Commits

Author SHA1 Message Date
PikalaxALT
7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6 through sub_801A960 2019-04-01 22:08:50 -05:00
Phlosioneer
845307b3a6 Rename contest AI stuff 2019-04-01 22:16:07 -04:00
PikalaxALT
08f4d3e105 Rename these objects to union_room_battle 2019-04-01 14:41:37 -04:00
PikalaxALT
4ea8217f81 file split 2019-04-01 14:25:58 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
huderlem
1e8e5af033
Merge pull request #607 from Phlosioneer/contest-data 
Contest data
 2019-04-01 07:37:15 -05:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Phlosioneer
207a54393c Fix mistakes and use EVENT_OBJ_GFX_* macros 2019-03-31 20:07:24 -04:00
PikalaxALT
ade0183378 Document mystery_gift 2019-03-31 18:59:52 -04:00
PikalaxALT
93c4e35d84 infer additional file split after task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
aafe9df454 through sub_8018798 2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52 Start decompiling mystery gift 2019-03-31 15:43:51 -05:00
PikalaxALT
5a0142da08 infer additional file split after task00_mystery_gift 2019-03-31 15:53:38 -04:00
PikalaxALT
db4e9505ad Merge branch 'master' into mystery_gift 2019-03-31 10:39:11 -04:00
Marcus Huderle
500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
huderlem
b9bf3bf072
Merge pull request #637 from DizzyEggg/pokeblock_attempt 
Use Pokeblock clean-up and some menu_specialised decomp
 2019-03-31 08:39:18 -05:00
DizzyEggg
aa7f69f067 Begin use pokeblock and menu specialised 2019-03-31 12:59:01 +02:00
PikalaxALT
5bf7886a70 through sub_8018798 2019-03-30 14:36:52 -04:00
PikalaxALT
ed53220be2 Start decompiling mystery gift 2019-03-30 13:15:48 -04:00
PikalaxALT
ccac4694cd Merge branch 'master' into continue_union_room 2019-03-30 12:41:10 -04:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
Marcus Huderle
accc5ae8dd Merge remote-tracking branch 'upstream/master' into union_room_chat 
# Conflicts:
#	ld_script.txt
 2019-03-29 21:27:08 -05:00
PikalaxALT
ae0e70d7bb sub_80179D4 and rodata 2019-03-29 11:57:03 -04:00
PikalaxALT
7c45a7c443 port mevent_801BAAC from fire red 2019-03-28 07:32:25 -05:00
DizzyEggg
5dd653a89e Use constants in atk89_statbuffchange 2019-03-27 07:47:01 -05:00
Marcus Huderle
af1baa89f1 Start decompiling union_room_chat.c 2019-03-26 21:58:20 -05:00
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