Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-11 22:45:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,563 Commits 2 Branches 0 Tags 366 MiB
e78094de85
Commit Graph

1665 Commits

Author SHA1 Message Date
PikalaxALT
ecf7cf9835 through sub_80FFF80 2020-03-06 17:07:36 -05:00
PikalaxALT
3581ce9ba2 Decomp and doc clear_save_data_screen 2020-03-06 10:57:42 -05:00
PikalaxALT
f483a93bea
Merge pull request #290 from PikalaxALT/field_message_box 
Decompile field_message_box
 2020-03-06 09:59:23 -05:00
PikalaxALT
fef3383c6c Address review comments; struct pointer style fix in scrcmd.c 2020-03-06 09:06:44 -05:00
GriffinR
4e67eb8a18 Combine animated door frames 2020-03-05 21:38:09 -05:00
GriffinR
1bb4b48024 Label field door metatiles 2020-03-05 21:24:36 -05:00
PikalaxALT
3a894f7b08 Static symbols in dbp 2020-03-05 14:50:53 -05:00
PikalaxALT
83137b4005 Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking 2020-03-05 14:38:26 -05:00
GriffinR
eb4327a714 Move strings.s to src 2020-03-05 14:20:02 -05:00
PikalaxALT
7f81fdc8df Port dodrio_berry_picking_3 from emerald 2020-03-05 14:03:23 -05:00
PikalaxALT
b56c2b75b4 Finish dodrio_berry_picking_2.c 2020-03-05 13:58:14 -05:00
PikalaxALT
cb99443c51 through sub_81556E0 2020-03-05 10:31:31 -05:00
PikalaxALT
362cddc0f5
Merge pull request #285 from GriffinRichards/doc-scriptclean 
Clean up script documentation
 2020-03-05 06:06:51 -05:00
GriffinR
102744163b Use explicit initializers for help text 2020-03-05 01:12:29 -05:00
GriffinR
a82a7b5fcb Lowercase new pokedude labels 2020-03-04 18:29:32 -05:00
GriffinR
4df660dc76 Add enums for help system text, label help context 2020-03-04 18:26:54 -05:00
PikalaxALT
e9c3b78d9f through sub_8154A2C; reorganize dbp files a bit 2020-03-04 17:21:41 -05:00
PikalaxALT
6871f3dd33 through sub_8153048 2020-03-04 14:58:44 -05:00
PikalaxALT
171e4bbea4 through sub_815184C 2020-03-04 13:56:54 -05:00
GriffinR
13e06bf7f8 Combine special prefixes, drop more 2020-03-04 10:42:16 -05:00
GriffinR
4c1d30a832 Add more metatile labels 2020-03-03 22:23:40 -05:00
GriffinR
7af1b35d17 Sync some specials/drop unnecessary prefixes 2020-03-03 17:45:25 -05:00
PikalaxALT
c2f85a5326 Address review comments 2020-03-03 15:42:14 -05:00
GriffinR
1aa1f18972 Sync trainer_battle.inc 2020-03-03 14:52:32 -05:00
GriffinR
4c4b19da7e Label help system text 2020-03-03 14:02:34 -05:00
PikalaxALT
89e5082d51 Merge branch 'master' of github.com:pret/pokefirered into berry_crush 2020-03-03 13:47:35 -05:00
PikalaxALT
dd22d97814
Merge pull request #283 from GriffinRichards/fix-eventticket 
Sync event ticket flag names
 2020-03-03 13:47:29 -05:00
PikalaxALT
8a7c2ded11 Port berry_crush_3 from Emerald 2020-03-03 12:24:18 -05:00
GriffinR
2e8570499d Sync event ticket flag names 2020-03-03 01:44:06 -05:00
PikalaxALT
8594e7f72d Port berry_crush_2 from emerald 2020-03-02 21:36:30 -05:00
PikalaxALT
f77b0feba6 Port berry_crush.c part 1 from Emerald 2020-03-02 16:57:00 -05:00
GriffinR
63e0b54f96 Label pokedude text 2020-03-02 16:35:52 -05:00
PikalaxALT
f5011a27d6
Merge pull request #282 from PikalaxALT/field_effect_helpers 
port field_effect_helpers from emerald
 2020-03-02 14:11:32 -05:00
GriffinR
dd5f3c3c3d Add missing script labels 2020-03-02 13:52:16 -05:00
PikalaxALT
6363d39e99 port field_effect_helpers from emerald 2020-03-02 13:34:34 -05:00
GriffinR
4ab3d77d80 Fix special var names 2020-03-02 12:57:54 -05:00
GriffinR
6191739a4d Label sign bg events 2020-03-02 12:24:05 -05:00
PikalaxALT
0169a98c68
Merge pull request #278 from GriffinRichards/doc-miscscript 
Split/label some common event scripts
 2020-03-02 12:19:18 -05:00
PikalaxALT
e8504c7a3f
Merge pull request #276 from GriffinRichards/doc-sixisland 
Document Six and Seven Island scripts
 2020-03-02 12:17:52 -05:00
PikalaxALT
ae08a40290
Merge pull request #279 from PikalaxALT/field_effect 
Field effect
 2020-03-02 12:11:22 -05:00
PikalaxALT
d12dd578b8 Address review comments 2020-03-02 11:16:34 -05:00
GriffinR
6280a3786b
Merge branch 'master' into doc-sixisland 2020-03-02 10:48:56 -05:00
PikalaxALT
5198a05272
Merge pull request #275 from GriffinRichards/doc-fiveisland 
Document Five Island scripts
 2020-03-02 10:48:13 -05:00
GriffinR
a1995d8029 Fix alignment 2020-03-02 10:36:46 -05:00
GriffinR
8ff7977b89 Merge branch 'master' into doc-fourisland 2020-03-02 10:34:35 -05:00
PikalaxALT
d758ae0dc2 Merge branch 'master' of github.com:pret/pokefirered into field_effect 2020-03-02 10:15:07 -05:00
PikalaxALT
875dde7a0c Rename remaining field effect callbacks 2020-03-02 09:51:21 -05:00
PikalaxALT
a7966b5047 Finish field_effect.c 2020-03-02 09:47:33 -05:00
GriffinR
62100376b7 Split/label some common event scripts 2020-03-02 00:19:11 -05:00
PikalaxALT
c36ef94a0d address review comments 2020-02-29 21:00:31 -05:00
PikalaxALT
cbd380f2bf Name many functions in cable_club.c 2020-02-29 17:01:03 -05:00
PikalaxALT
21dddd5760 Finish cable_club.c 2020-02-29 16:31:57 -05:00
PikalaxALT
9b9ae3d337 through sub_8080E6C 2020-02-29 14:30:01 -05:00
PikalaxALT
fb064f17ba Fly field effect 2020-02-28 17:10:06 -05:00
PikalaxALT
f825186655 Use VS Seeker field effect 2020-02-28 15:55:12 -05:00
PikalaxALT
80e5031619 Use Surf field effect 2020-02-28 15:29:16 -05:00
PikalaxALT
0c492c087e Show Mon field effect 2020-02-28 15:19:50 -05:00
PikalaxALT
410aaa00ff Teleport field effect 2020-02-28 14:26:54 -05:00
PikalaxALT
fb56341fe4 Escape Rope field effect 2020-02-28 14:14:34 -05:00
PikalaxALT
8f42b7b56d Lavaridge Gym 1F Warp field effect 2020-02-28 13:23:51 -05:00
PikalaxALT
9cf19244fa Port Lavaridge Gym B1F Warp from Emerald 2020-02-28 13:18:21 -05:00
PikalaxALT
8a09273846 Unused dive field effect 2020-02-28 11:16:03 -05:00
PikalaxALT
c117bc6864 Waterfall field effect 2020-02-28 10:19:34 -05:00
PikalaxALT
1779aedbf0 Escalator field effect 2020-02-28 10:02:40 -05:00
GriffinR
948b695ad4 Document Six Island scripts 2020-02-28 09:54:01 -05:00
PikalaxALT
db12644f00 FallWarpEffect funcs 2020-02-28 09:06:19 -05:00
GriffinR
7d7c51973c Document Five Island scripts 2020-02-28 00:22:34 -05:00
GriffinR
968ac4742a Sync trainer_card.c 2020-02-27 17:15:27 -05:00
PikalaxALT
e07c771f18 through Task_FallWarpFieldEffect 2020-02-27 16:59:05 -05:00
PikalaxALT
9c03c850a2 Fly field effect 2020-02-27 16:35:06 -05:00
GriffinR
2d9327a1ff Document Four Island scripts, trainer_card.inc 2020-02-27 14:21:13 -05:00
PikalaxALT
0d88e2d1de through MultiplyPaletteRGBComponents 2020-02-27 14:08:26 -05:00
PikalaxALT
c93915120f Port many field_effect.c names from Emerald 2020-02-27 11:45:08 -05:00
PikalaxALT
456c817338 Decompile fldeff hooks 2020-02-27 09:18:54 -05:00
PikalaxALT
435fe59621
Merge pull request #270 from GriffinRichards/doc-oneisland 
Document One Island scripts
 2020-02-26 14:08:19 -05:00
PikalaxALT
e3447d2366
Merge pull request #269 from GriffinRichards/doc-pallet 
Document Pallet Town scripts
 2020-02-26 14:07:48 -05:00
GriffinR
e3ffb01912
Merge branch 'master' into doc-oneisland 2020-02-26 13:58:26 -05:00
PikalaxALT
13f14218e1
Merge pull request #268 from GriffinRichards/doc-routes4 
Document Routes 20-25, teleporter/escalator anim
 2020-02-26 13:57:36 -05:00
PikalaxALT
cac0681b2c Name cut grass metatiles 2020-02-26 13:15:21 -05:00
PikalaxALT
4747fcb629 Name methods in fldeff_cut 2020-02-26 09:21:49 -05:00
PikalaxALT
51e2b99b9d Finish fldeff_cut 2020-02-26 09:11:24 -05:00
GriffinR
ad4f363a58 Document One Island scripts 2020-02-26 00:26:05 -05:00
PikalaxALT
41644b283a through sub_8097A20 2020-02-25 16:52:16 -05:00
PikalaxALT
565114625f fldeff_cut through SetUpFieldMove_Cut 2020-02-25 16:35:38 -05:00
GriffinR
44c9109c2a Document Pallet Town scripts 2020-02-25 15:46:07 -05:00
GriffinR
15dbc58959 Document teleporter and escalator anim 2020-02-25 02:47:28 -05:00
PikalaxALT
3666a47d1c Port script_movement 2020-02-24 15:32:19 -05:00
PikalaxALT
a0fa06a066
Merge pull request #265 from GriffinRichards/sync-objgfx 
Sync object event gfx constants
 2020-02-24 09:02:25 -05:00
PikalaxALT
9e1b0319b2 Name battle terrains; address review comments 2020-02-23 21:06:59 -05:00
GriffinR
1fc8db43b7 Sync object event gfx constants 2020-02-23 17:00:12 -05:00
PikalaxALT
890d85ff02 battle_bg 2020-02-23 16:26:33 -05:00
GriffinR
f66d0dfce3 Move graphics.s through pokemon to src 2020-02-22 11:49:09 -05:00
PikalaxALT
7624b5e5c0 Fix typo; use constants in some data/field_player_avatar arrays 2020-02-21 16:44:36 -05:00
PikalaxALT
93b05b4e42 Fix typo 2020-02-21 16:13:35 -05:00
PikalaxALT
58382e8af8 Remove defunct header 2020-02-21 16:05:22 -05:00
PikalaxALT
540c33405a Remove constants/movement_commands.h 2020-02-21 15:46:19 -05:00
PikalaxALT
69d8833b31 Prelim names for mvmt actions; merge field_ground_effect into evobjmv 2020-02-21 13:41:18 -05:00
PikalaxALT
14a599bbc2 Address review comments; name some methods in event_object_movement 2020-02-21 09:02:06 -05:00
PikalaxALT
93ee43a31a Finish trainer_see 2020-02-20 14:52:37 -05:00
PikalaxALT
abc39d86f3 Decomp all trainer see funcs 2020-02-20 14:03:29 -05:00
PikalaxALT
0125c1440e trainer_see through CheckPathBetweenTrainerAndPlayer 2020-02-19 15:43:59 -05:00
PikalaxALT
c0b6148640 Address review comments 2020-02-19 14:22:26 -05:00
PikalaxALT
9d44bc0bda Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump 2020-02-19 08:47:50 -05:00
PikalaxALT
5c530e1330 Finish porting pokemon_jump from Emerald 2020-02-18 16:39:44 -05:00
GriffinR
753e894b6a Move map type/battle scene constants for porymap 2020-02-18 16:22:43 -05:00
GriffinR
729c224bf2 Name battle scene and map type constants 2020-02-18 16:16:03 -05:00
PikalaxALT
f65e07fb1f pokemon_jump_3,4 2020-02-18 15:52:45 -05:00
PikalaxALT
af6f99b931 Port pokemon_jump from emerald, 1 2020-02-18 14:50:24 -05:00
PikalaxALT
e4d15a2338 Move GameFreak structs out of LinkManager header 2020-02-16 14:52:13 -05:00
PikalaxALT
8989bcd6aa fix alignment in AgbRfu_LinkManager.h 2020-02-16 14:35:14 -05:00
PikalaxALT
13357596b7
Merge pull request #256 from GriffinRichards/fix-species 
Fix DEX constant order
 2020-02-16 12:25:06 -05:00
GriffinR
2c92f89adc
Merge branch 'master' into doc-tilesets 2020-02-16 12:16:04 -05:00
PikalaxALT
9addd6a6b6
Merge pull request #248 from GriffinRichards/doc-caves 
Document remaining cave scripts
 2020-02-16 12:14:55 -05:00
GriffinR
6bee17b4ce
Merge branch 'master' into doc-tilesets 2020-02-16 12:09:13 -05:00
GriffinR
01de877fc8
Merge branch 'master' into doc-tilesets 2020-02-16 12:07:24 -05:00
PikalaxALT
3b40ec23c7
Merge pull request #246 from GriffinRichards/doc-pokemonleague 
Document Pokemon League scripts
 2020-02-16 12:07:20 -05:00
PikalaxALT
6c52359bcb
Merge pull request #257 from jiangzhengwenjz/librfu 
match RFU SDK v1.0.26
 2020-02-16 12:06:26 -05:00
PikalaxALT
b6899a0de1
Merge pull request #245 from GriffinRichards/doc-rockets 
Document Team Rocket scripts
 2020-02-16 12:05:13 -05:00
GriffinR
b4fce4020d
Merge branch 'master' into doc-tilesets 2020-02-16 11:29:06 -05:00
GriffinR
fd0fc184d6 Merge branch 'master' of https://github.com/pret/pokefirered into doc-pokemonleague 2020-02-16 11:28:03 -05:00
PikalaxALT
4e07002d13
Merge pull request #244 from GriffinRichards/doc-saffron 
Document Saffron City scripts
 2020-02-16 11:23:34 -05:00
GriffinR
659afd708b
Merge branch 'master' into doc-tilesets 2020-02-16 11:18:30 -05:00
PikalaxALT
51b7b11a55
Merge pull request #243 from GriffinRichards/doc-celadon 
Document Celadon City scripts
 2020-02-16 11:16:02 -05:00
GriffinR
1d006c2661
Merge branch 'master' into doc-tilesets 2020-02-16 11:13:58 -05:00
GriffinR
533df93dc1
Merge branch 'master' into doc-caves 2020-02-16 11:08:43 -05:00
jiangzhengwenjz
fb8ac4af93 match RFU SDK v1.0.26 2020-02-16 13:57:02 +08:00
GriffinR
a4cd331634
Merge branch 'master' into doc-ttower 2020-02-15 20:44:57 -05:00
PikalaxALT
aa4a979334 More function documentation in union_room, link, link_rfu_2 2020-02-12 15:32:14 -05:00
PikalaxALT
32dc21b634 Remove defunct macros and move trainer tower pointers and dummy header 2020-02-11 16:56:09 -05:00
PikalaxALT
325c5b3f11 Document ereader_helpers.c 2020-02-11 16:26:50 -05:00
PikalaxALT
11af7a0751 Rename unk headers 2020-02-11 13:49:19 -05:00
PikalaxALT
9ff146b0bc document minigame_countdown.c 2020-02-11 13:43:14 -05:00
PikalaxALT
354d837d6f document digit_obj_util 2020-02-11 10:49:36 -05:00
PikalaxALT
fafcdf3c60 Multiversion support for api buff size 2020-02-11 08:57:39 -05:00
GriffinR
b313f568a5 Fix DEX constant order 2020-02-10 17:03:55 -05:00
PikalaxALT
371f9fda6e Annotate AgbRfu_LinkManager.c with local defines 2020-02-10 12:20:55 -05:00
PikalaxALT
b9f1132aa6 link_rfu.c --> AgbRfu_LinkManager.c 2020-02-10 12:07:22 -05:00
PikalaxALT
c0373e9e93 Address review comments 2020-02-10 11:11:25 -05:00
PikalaxALT
78caeff45b Name remaining funcs in union_room.c 2020-02-06 10:44:22 -05:00
PikalaxALT
6af7391add More renaming in union_room.c 2020-02-04 17:01:57 -05:00
PikalaxALT
4770fac9eb More mevent documentation 2020-02-04 14:16:45 -05:00
PikalaxALT
e0d25c3289 Document wireless_communication_status_screen 2020-02-03 20:09:14 -05:00
PikalaxALT
7bd0a83d35 I'm so original with these commit names 2020-02-03 16:41:25 -05:00
PikalaxALT
d522588538 Some more documentation of array sizes 2020-02-03 13:51:38 -05:00
PikalaxALT
46a3ca5134 Union room activity documentation 2020-02-03 13:42:57 -05:00
GriffinR
34deceb136 Remove old references to battle pyramid 2020-02-03 12:08:27 -05:00
PikalaxALT
aed9c28dc3 Document rfu_union_tool 2020-02-03 11:02:02 -05:00
PikalaxALT
2b5b956936 Merge branch 'master' of github.com:pret/pokefirered into add_arm_agbcc 2020-02-03 10:08:43 -05:00
PikalaxALT
ceeed6247d Port object event flags from emerald 2020-02-02 11:23:04 -05:00
PikalaxALT
ba7403c74e Document event_object_80688E4 2020-02-02 11:10:07 -05:00
PikalaxALT
708fa70823 event_object_80688E4 2020-02-01 21:39:02 -05:00
PikalaxALT
a59d878378 Use RFU_CHILD_MAX for four arrays 2020-02-01 17:01:29 -05:00
PikalaxALT
0d60939fd7 Some small fixes 2020-02-01 16:46:52 -05:00
PikalaxALT
08aafe093c More rfu documentation 2020-02-01 15:34:33 -05:00
PikalaxALT
01fedfa61c Minor style consistency edit in union_room_chat 2020-02-01 10:22:28 -05:00
PikalaxALT
5ca03c0e32 name STWIStatus.unk_2c 2020-01-31 16:57:52 -05:00
PikalaxALT
88bda9fabd Dcoument args to two STWI routines 2020-01-31 16:23:04 -05:00
PikalaxALT
2d4c004004 More documentation and symbol propagation 2020-01-31 15:30:52 -05:00
GriffinR
4ab216f309 Rename generic building tilesets, SAFFRON_CITY_CLASSIC 2020-01-31 14:57:57 -05:00
PikalaxALT
7d77b93123 Use SIO_ defines in librfu_intr 2020-01-31 13:27:10 -05:00
PikalaxALT
7e894aa4d0 Decompile librfu_intr against agbcc_arm 2020-01-31 09:26:00 -05:00
PikalaxALT
e3307a5b7a Still more documentation of RFU 2020-01-30 14:54:21 -05:00
PikalaxALT
78196be41e More RFU documentation 2020-01-30 10:48:42 -05:00
PikalaxALT
8a3eb95ed4 Yet more documentation of rfu fields and functions 2020-01-29 16:54:03 -05:00
PikalaxALT
664fa0130a More doccing of linkManager 2020-01-29 16:10:52 -05:00
PikalaxALT
1cc9d0eea9 Document link_rfu.c as official SDK linkManager.c 2020-01-29 12:39:54 -05:00
GriffinR
f6af394f2a Label tilesets and remaining layouts 2020-01-29 03:59:03 -05:00
PikalaxALT
517f8fc9ef Start doccing help system 2020-01-28 16:05:15 -05:00
GriffinR
30f01c7df6 Document Sevii Island caves 2020-01-28 14:26:34 -05:00
GriffinR
0ddd7ebb1d Sync STEB_CB, WEATHER_SHADE 2020-01-28 14:26:18 -05:00
GriffinR
eae373576d Document Victory Road scripts 2020-01-28 04:21:03 -05:00
GriffinR
017fa7e336 Trainer Hill --> Trainer Tower 2020-01-26 18:34:06 -05:00
GriffinR
5106fc1c9a Move ReadTrainerTowerAndValidate 2020-01-26 16:50:32 -05:00
GriffinR
91844cdfb2 Document Pokemon League scripts 2020-01-26 16:38:17 -05:00
PikalaxALT
2e934469b8
Merge pull request #242 from jiangzhengwenjz/field 
field_screen_effect
 2020-01-26 15:33:56 -05:00
PikalaxALT
a2c6174ee9
Merge pull request #241 from GriffinRichards/doc-viridian 
Document Viridian City scripts and adjacent routes
 2020-01-26 15:32:39 -05:00
GriffinR
bf7bab92e2 Document Rocket Warehouse script 2020-01-26 02:26:19 -05:00
GriffinR
493c43f9b1 Document Rocket Hideout scripts 2020-01-26 01:50:14 -05:00
GriffinR
ce9f821b4e Document Saffron City scripts 2020-01-25 22:31:36 -05:00
PikalaxALT
52fbc43d73 Address review comments 2020-01-25 21:00:51 -05:00
jiangzhengwenjz
5b36288064 field_screen_effect 2020-01-26 09:27:55 +08:00
PikalaxALT
0ebdbcfd5b Document union room chat 2020-01-25 19:58:39 -05:00
PikalaxALT
1f47b6ae4f union_room_chat_objects 2020-01-25 16:10:18 -05:00
PikalaxALT
c0b05784d6 Finish union_room_chat_display 2020-01-25 13:35:34 -05:00
GriffinR
35c0e1f60a Document Celadon City scripts 2020-01-25 13:18:46 -05:00
PikalaxALT
f249df41e3 union_room_chat_display through sub_812A1B8 2020-01-25 10:47:17 -05:00
PikalaxALT
c99246fccf through sub_81298F8 2020-01-25 08:52:18 -05:00
PikalaxALT
70e7f464ca PLAYER_NAME_LENGTH to 7 2020-01-24 21:57:31 -05:00
PikalaxALT
2531afb6ab Merge branch 'master' of github.com:pret/pokefirered into union_room_chat 2020-01-24 21:42:03 -05:00
GriffinR
97d2555fad
Merge branch 'master' into doc-viridian 2020-01-24 20:50:53 -05:00
GriffinR
c0be66fc2e Document Viridian City scripts and adjacent routes 2020-01-24 20:46:09 -05:00
PikalaxALT
a09e66b53f
Merge pull request #238 from GriffinRichards/doc-vermilion 
Document Vermilion City and SS Anne scripts
 2020-01-24 17:04:11 -05:00
PikalaxALT
d22dd0f08b through sub_8129560 2020-01-24 17:03:03 -05:00
PikalaxALT
14b7ed7a5f through sub_8128FB8 2020-01-24 13:07:41 -05:00
GriffinR
9ecd065b50 Review changes 2020-01-24 12:39:40 -05:00
GriffinR
ce5bc554e5 Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered into doc-ttower 2020-01-24 05:11:37 -05:00
GriffinR
c63a889bf4 Floor beaten --> floor cleared 2020-01-24 05:09:50 -05:00
GriffinR
39556605cd
Merge branch 'master' into doc-ttower 2020-01-24 03:03:45 -05:00
GriffinR
ef1f9ead0b Document Trainer Tower scripts 2020-01-24 02:57:45 -05:00
PikalaxALT
4ff5769f42 union_room_chat through sub_81287B4 2020-01-23 16:52:41 -05:00
PikalaxALT
85e5c57e8c
Merge pull request #237 from GriffinRichards/sync-ai 
Sync AI scripts
 2020-01-23 15:33:01 -05:00
PikalaxALT
5435bc4325
Merge pull request #232 from GriffinRichards/doc-cinnabar 
Document Cinnabar Island scripts
 2020-01-23 15:31:48 -05:00
GriffinR
a01d83a434
Merge branch 'master' into sync-ai 2020-01-23 10:24:11 -05:00
PikalaxALT
7824a413de Normalize union room UnkStruct arrays; remove STAT_STAGE_ defines 2020-01-23 10:10:57 -05:00
GriffinR
c2bf9898a5 Document Vermilion scripts 2020-01-23 02:03:40 -05:00
GriffinR
e7cd8c59f4 Remove unused BF battle types, clarify Ghost battle type flags 2020-01-22 21:02:25 -05:00
PikalaxALT
90c99d1ce2 union_room_message 2020-01-22 20:10:46 -05:00
GriffinR
d084a5ca84 Sync AI scripts 2020-01-22 19:21:40 -05:00
PikalaxALT
390d7975b3 Resolve review comments, 1 2020-01-22 15:59:08 -05:00
PikalaxALT
12d12e70a1 union_room_battle 2020-01-22 15:46:48 -05:00
PikalaxALT
2037045ab0 UnkStruct_Shared.gname 2020-01-22 14:42:18 -05:00
PikalaxALT
48f7bbe6f6 Some documentation of rfu_union_tool 2020-01-22 14:29:37 -05:00
PikalaxALT
c4626ec296 Finish rfu_union_tool decomp 2020-01-22 13:47:30 -05:00
PikalaxALT
401276242a through sub_811BDA8 2020-01-22 13:39:36 -05:00
PikalaxALT
2d4be89ee5 Merge branch 'master' of github.com:pret/pokefirered into union_room 2020-01-22 12:38:19 -05:00
PikalaxALT
0495cce904 start decomping rfu_union_tool 2020-01-22 12:38:17 -05:00
GriffinR
d58a5decde
Merge branch 'master' into doc-cinnabar 2020-01-22 11:41:40 -05:00
PikalaxALT
e97d3532d4
Merge pull request #231 from GriffinRichards/doc-staticmon 
Document static mon scripts
 2020-01-22 11:41:14 -05:00
PikalaxALT
6eec1c1cc9
Merge pull request #234 from GriffinRichards/doc-fuchsia 
Document Fuchsia City and Safari Zone scripts
 2020-01-22 11:40:46 -05:00
GriffinR
fbf0c4616c
Merge branch 'master' into doc-cinnabar 2020-01-22 11:38:44 -05:00
PikalaxALT
c75296640d
Merge pull request #235 from GriffinRichards/doc-miscscript 
Document some misc small scripts
 2020-01-22 11:37:37 -05:00
PikalaxALT
70bb1a99e2 union_room_player_avatar --> rfu_union_tool (by assert statements) 2020-01-22 10:35:47 -05:00
PikalaxALT
1e7df548fe Fix struct offset comments 2020-01-22 10:31:14 -05:00
PikalaxALT
944f150b5e Static methods in union_room.c; remove src/data/union_room.h 2020-01-22 10:19:58 -05:00
PikalaxALT
26716a8733 Split remaining union room data 2020-01-22 10:13:34 -05:00
PikalaxALT
9f9b4dd13d Data through gUnknown_84570C8 2020-01-21 14:36:13 -05:00
PikalaxALT
5e0a845fc4 finish union_room.s code decomp 2020-01-20 20:21:58 -05:00
PikalaxALT
1fd20be8e1 sub_81186E0 2020-01-20 17:08:24 -05:00
PikalaxALT
a083f0f57f through sub_81186C8 2020-01-20 15:24:36 -05:00
GriffinR
2908c9fa95 Document some misc small scripts 2020-01-20 15:17:34 -05:00
PikalaxALT
ac5bfcf1ce through sub_8117A0C 2020-01-20 14:46:01 -05:00
PikalaxALT
8d5af53329 through sub_8116738 2020-01-20 12:14:55 -05:00
PikalaxALT
cedebf15ee sub_8115A68 2020-01-20 09:09:02 -05:00
GriffinR
5b27d3d268 Document Safari Zone scripts 2020-01-20 01:32:25 -05:00
GriffinR
2cd1460cc5 Document Fuchsia City scripts 2020-01-19 23:41:58 -05:00
GriffinR
84c198ac76
Merge branch 'master' into doc-cinnabar 2020-01-19 17:00:39 -05:00
PikalaxALT
c365f58833 Address review comments 2020-01-19 16:19:35 -05:00
PikalaxALT
6e41dd7b21 Document item_menu 2020-01-19 14:47:23 -05:00
PikalaxALT
4c62d0f35f through InitTutorialBag 2020-01-18 22:14:54 -05:00
PikalaxALT
0ed743a582 through sub_810A554 2020-01-18 19:54:25 -05:00
PikalaxALT
24e199fdfd through sub_81090DC 2020-01-18 12:59:26 -05:00
PikalaxALT
dfcfe6d8e1 through MoveItemSlotInList 2020-01-18 11:52:32 -05:00
PikalaxALT
1c3f865acf through ItemMenu_StartFadeToExitCallback 2020-01-18 10:26:51 -05:00
PikalaxALT
2ce545fc21 through sub_810899C 2020-01-18 09:23:48 -05:00
PikalaxALT
881199142c through bag_menu_print_cursor 2020-01-17 22:23:20 -05:00
PikalaxALT
dbf3ac402d through sub_8108560 2020-01-17 16:40:53 -05:00
PikalaxALT
f6e050cf35 through sub_81081AC 2020-01-17 15:11:46 -05:00
GriffinR
009595b4df Finish Cinnabar Island scripts 2020-01-17 15:09:54 -05:00
GriffinR
3101657e97 Sync pc_transfer 2020-01-17 14:08:46 -05:00
GriffinR
a4f5f41e24 Document static mon scripts 2020-01-17 10:51:41 -05:00
PikalaxALT
29ef170879 Finish save_failed_screen 2020-01-17 10:49:57 -05:00
PikalaxALT
fc9a008481 through sub_80F5334 2020-01-17 09:51:32 -05:00
PikalaxALT
8bdd942c9e
Merge pull request #229 from PikalaxALT/box_party_pokemon_dropdown 
box_party_pokemon_dropdown
 2020-01-16 16:44:36 -05:00
PikalaxALT
4d0f46f0cd box_party_pokemon_dropdown 2020-01-16 15:41:01 -05:00
GriffinR
fba3fc738a Document Pokemon Tower scripts 2020-01-16 13:05:26 -05:00
PikalaxALT
fad3674028
Merge pull request #225 from GriffinRichards/doc-questlog 
Document some quest log
 2020-01-16 09:53:08 -05:00
GriffinR
153858af60 Merge master into doc-questlog 2020-01-15 16:27:36 -05:00
GriffinR
04d176334a Document some Quest Log 2020-01-15 16:00:45 -05:00
PikalaxALT
e03a61e239 Use librfu consts in link_rfu_*.c 2020-01-15 13:54:06 -05:00
PikalaxALT
411f4852c6
Merge pull request #216 from PikalaxALT/link_rfu 
Port link_rfu from Emerald
 2020-01-15 11:07:17 -05:00
PikalaxALT
2f81b4a204
Merge pull request #222 from GriffinRichards/doc-mansion 
Document Pokemon Mansion scripts
 2020-01-14 20:30:32 -05:00
PikalaxALT
cdc04dfe9f
Merge pull request #221 from GriffinRichards/doc-cerulean 
Document Cerulean City scripts
 2020-01-14 20:29:03 -05:00
GriffinR
0999b55beb Document Pokemon Mansion scripts 2020-01-14 18:58:52 -05:00
PikalaxALT
de939451d7 link_rfu_4 mostly 2020-01-14 17:07:43 -05:00
GriffinR
f544f6e356 Document Cerulean City scripts 2020-01-14 16:41:38 -05:00
PikalaxALT
5ef7bf7bf4 data/link_rfu.s --> data/easy_chat_2.s 2020-01-14 14:57:41 -05:00
PikalaxALT
0d5f88f496 Move UnkRfuStruct_2 to link_rfu.h where it belongs 2020-01-14 12:45:33 -05:00
PikalaxALT
246e3461c7 Move GFtgtGname out of librfu.h 2020-01-14 12:41:43 -05:00
PikalaxALT
b76b38c257 Finish porting link_rfu_2 2020-01-14 12:27:56 -05:00
GriffinR
a5d8b98fde Sync macros to have Give/Take Add/Remove unity 2020-01-13 22:35:09 -05:00
PikalaxALT
d9ea5a0815 link_rfu_2 through rfufunc_80FA020 2020-01-13 22:08:11 -05:00
PikalaxALT
36306a82d1 link_rfu_2 through sub_80F8F5C 2020-01-13 20:40:47 -05:00
PikalaxALT
eec9e0d914 Split link_rfu_2 2020-01-13 17:03:36 -05:00
PikalaxALT
2a5cde336b Address review comments 2020-01-13 14:04:02 -05:00
PikalaxALT
6daa053320 Static syms 2020-01-13 11:25:42 -05:00
PikalaxALT
28a2bb7c93 Remove unneeded filler 2020-01-13 11:21:55 -05:00
PikalaxALT
ce60043a58 link_rfu COMMON syms 2020-01-13 11:20:35 -05:00
PikalaxALT
11fd159ae8 Port link_rfu from Emerald 2020-01-13 11:17:38 -05:00
PikalaxALT
78b4487008
Merge pull request #214 from jiangzhengwenjz/nonmatching 
fake match CreatePartyStatusSummarySprites
 2020-01-12 18:26:07 -05:00
jiangzhengwenjz
08cfae52fe CreatePartyStatusSummarySprites 2020-01-13 06:42:50 +08:00
GriffinR
0676e73286 Remove unused link groups, dead label 2020-01-12 16:53:55 -05:00
GriffinR
f276383293 Merge master into sync-script 2020-01-12 16:03:06 -05:00
PikalaxALT
483613e128
Fix header guard 2020-01-12 14:45:53 -05:00
PikalaxALT
034f597482 Address review comments, 2 2020-01-12 14:34:54 -05:00
PikalaxALT
bcf07cb837 Merge branch 'master' of github.com:pret/pokefirered into script_pokemon_util 2020-01-12 14:18:34 -05:00
PikalaxALT
74fa8075ee
Merge pull request #210 from jiangzhengwenjz/party_menu 
script_pokemon_util_80BF8FC
 2020-01-12 14:18:22 -05:00
PikalaxALT
ae41a2742c Finish battle_interface.c decomp 2020-01-12 12:13:03 -05:00
PikalaxALT
d09a3d7f1c through TryAddPokeballIconToHealthbox 2020-01-12 11:17:58 -05:00
PikalaxALT
9d2f1af103 through PrintSafariMonInfo 2020-01-11 10:58:30 -05:00
GriffinR
6bcb508c3f Update some movement cmds 2020-01-11 01:00:50 -05:00
GriffinR
0bb7f18b8e Sync Cable Club scripts 2020-01-11 00:47:47 -05:00
PikalaxALT
3310aadb54 Much battle_interface data to C 2020-01-10 21:34:44 -05:00
PikalaxALT
3e79c7890f through UpdateLvlInHealthbox 2020-01-10 16:32:32 -05:00
GriffinR
91bf7665c6 Sync split scripts, more misc splits/doc 2020-01-10 15:01:50 -05:00
PikalaxALT
3f54c7caa1 Port script_pokemon_util_80A0058 2020-01-10 11:51:13 -05:00
jiangzhengwenjz
e300f2ece0 script_pokemon_util_80BF8FC 2020-01-10 22:28:20 +08:00
GriffinR
9fafa12285 More basic script constants 2020-01-10 03:50:11 -05:00
jiangzhengwenjz
dd381f4982 use headers in main.c 2020-01-10 14:12:32 +08:00
jiangzhengwenjz
3a8006e30c s32 to sio32 2020-01-10 06:27:50 +08:00
jiangzhengwenjz
0ce29c0ee9 use constants 2020-01-10 03:48:00 +08:00
GriffinR
94fbc3ac48 Sync temp vars 2020-01-09 14:46:14 -05:00
GriffinR
d071f05504 Split more files from event_scripts.s 2020-01-09 14:01:45 -05:00
GriffinR
a40c63fe48 Use dir constants 2020-01-09 13:25:10 -05:00
jiangzhengwenjz
f12c1edf3f update documentation & func types 2020-01-10 02:13:35 +08:00
GriffinR
c39d295386 Label used movement steps 2020-01-09 12:57:13 -05:00
GriffinR
16dc234d99 Some stdscript sync, start syncing cable_club.inc 2020-01-08 23:44:55 -05:00
jiangzhengwenjz
a7ec7175f1 resolve a fake match 2020-01-09 12:38:57 +08:00
jiangzhengwenjz
1fda78fd0a k.o. librfu_rfu 2020-01-09 12:38:57 +08:00
jiangzhengwenjz
5bf8d1c62d fix rfu_STC_analyzeLLSF 
Co-authored-by: Normmatt <normmatt234@gmail.com>
 2020-01-09 12:38:57 +08:00
jiangzhengwenjz
6cbce0b966 librfu through 0x81E2C40 2020-01-09 12:38:57 +08:00
jiangzhengwenjz
973cb394b2 librfu through 0x81E13F0 2020-01-09 12:38:57 +08:00
jiangzhengwenjz
8f1a8972c1 librfu_stwi 
Co-authored-by: Max Thomas <mtinc2@gmail.com>
 2020-01-09 12:38:57 +08:00
jiangzhengwenjz
a436d79177 partially sync with knizz's documentation 2020-01-09 12:38:56 +08:00
GriffinR
7eb5464860 Sync some event_scripts.s, split files 2020-01-08 21:05:04 -05:00
GriffinR
2e5bf6c9ef Use map_script constants, name unique map_script labels 2020-01-08 19:16:57 -05:00
GriffinR
31d31d3260 Sync compare macros, some event_scripts.s doc, begin map_scripts constants 2020-01-08 18:09:24 -05:00
PikalaxALT
f8e911bcf5 Partial documentation of region map 2020-01-08 16:03:42 -05:00
PikalaxALT
f257e2006a Port region_map rodata to C 2020-01-07 20:51:12 -05:00
PikalaxALT
b3bb58267b Port image_processing_effects from Emerald 2020-01-07 19:18:26 -05:00
PikalaxALT
1235d7c506 through sub_80C527C 2020-01-07 16:25:13 -05:00
PikalaxALT
ce44eb021c through sub_80C4E08 2020-01-07 15:37:15 -05:00
PikalaxALT
ccb5c0f324 Merge branch 'master' of github.com:pret/pokefirered into region_map 2020-01-06 13:59:20 -05:00
PikalaxALT
26f7ba4823
Merge pull request #204 from mrgriffin/field-screen-effect 
Decompile field_screen_effect
 2020-01-06 13:35:48 -05:00
PikalaxALT
2c825017e6 through sub_80C1A94 2020-01-04 13:12:22 -05:00
PikalaxALT
e58e6689b8 through sub_80C1920 2020-01-03 16:04:43 -05:00
PikalaxALT
e2fb677742 through sub_80C144C 2020-01-03 11:00:37 -05:00
PikalaxALT
20c5160bf7 through sub_80C1058 2020-01-03 10:22:37 -05:00
PikalaxALT
3535cf2ebc through sub_80C0E5C 2020-01-03 09:09:02 -05:00
PikalaxALT
5a4ffc9a8e sub_80C04E4 2020-01-02 10:48:43 -05:00
Martin Griffin
8fb5ce5790 Decompile field_screen_effect 2019-12-27 16:31:07 +00:00
Martin Griffin
5c9114a245 Decompile field_tasks 2019-12-27 16:09:45 +00:00
PikalaxALT
59581b3c57 region_map through sub_80BFFD0 2019-12-23 13:33:06 -05:00
PikalaxALT
25d2e64ae5 Unify pokedex_screen rodata 2019-12-22 14:43:42 -05:00
PikalaxALT
6dfcec1181 Decompile post_battle_event_funcs 2019-12-21 20:37:24 -05:00
PikalaxALT
e1fa1869b5
Merge pull request #197 from PikalaxALT/pokedex_screen 
Some documentation in pokedex_screen
 2019-12-21 14:45:09 -05:00
jiangzhengwenjz
16396b8ebb clean up 2019-12-22 03:37:13 +08:00
PikalaxALT
f1f3f4b8a2 Some documentation in pokedex_screen 2019-12-21 12:17:06 -05:00
PikalaxALT
d6741335d6 Rename title screen assets and remove dummied standalone pal 2019-12-20 15:35:40 -05:00
PikalaxALT
67cf45f7b3 Match player name choices in LG 2019-12-20 13:53:56 -05:00
PikalaxALT
ba5861e452 leafgreen match .text 2019-12-20 10:05:25 -05:00
PikalaxALT
969efabaf5
Merge pull request #184 from jiangzhengwenjz/nonmatching 
fake match sub_804C728 & sub_804CF14; fix build with NONMATCHING defined
 2019-12-19 13:39:38 -05:00
PikalaxALT
3d123182a8 Delete obsolete comment 2019-12-19 11:32:55 -05:00
PikalaxALT
dd0da2484f Match FireRed Rev1 2019-12-19 10:23:05 -05:00
jiangzhengwenjz
84d9a1e723 sub_804C728; sub_804CF14 2019-12-19 13:43:11 +08:00
garak
8ee35bc615 *actual* final pass at unifying on object event 2019-12-17 21:35:09 -05:00
garak
fabe354c01 final pass at unifying on object event 2019-12-17 20:16:40 -05:00
garak
ddaa88390e eventobject -> objectevent take 3 2019-12-17 18:49:34 -05:00
garak
4668d17866 dump leftover subsprite tables 2019-12-17 15:05:23 -05:00
garak
7a0edab573 fix rebase conflicts 2019-12-17 15:05:23 -05:00
garak
cdd882f3cc disassemble movement type arrays 2019-12-17 15:05:23 -05:00
garak
46a8b0fb29 finish object event rename 2019-12-17 15:05:23 -05:00
garak
36b2301fd2 mostly standardize to object event to prep for disassembly 2019-12-17 15:05:23 -05:00
PikalaxALT
3301c8ff1d address review comments 2019-12-14 21:57:25 -05:00
PikalaxALT
be8b7a6f13 through sub_81051D0 2019-12-13 14:55:19 -05:00
PikalaxALT
e38355d255 through sub_8104EC0 2019-12-13 10:50:31 -05:00
PikalaxALT
2b2e3dc3e7 through sub_8104C2C 2019-12-13 09:37:46 -05:00
PikalaxALT
5df43761c0 through sub_8104A34 2019-12-12 19:00:42 -05:00
PikalaxALT
af1c24b751 Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen 2019-12-11 19:51:51 -05:00
PikalaxALT
f12824e3b1
Merge pull request #180 from ghoulslash/trainer-card 
Trainer card
 2019-12-11 18:20:58 -05:00
PikalaxALT
0d586d304d sub_8103AC8 2019-12-11 17:06:27 -05:00
Evan
b0623a44bd update TrainerCardData struct 2019-12-11 14:35:09 -05:00
Evan
9806a60837 finish trainer card matching and data 2019-12-11 11:35:10 -05:00
PikalaxALT
f55abfddc5 through sub_8103A40 2019-12-11 11:02:42 -05:00
PikalaxALT
6645ad8ccf Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen 2019-12-10 14:13:41 -05:00
jiangzhengwenjz
c609b533d4 sub_815A1F8 2019-12-11 02:47:33 +08:00
PikalaxALT
30f74d1c37 through sub_810345C 2019-12-10 13:27:37 -05:00
PikalaxALT
d4314287ae through sub_8102F80 2019-12-10 12:33:19 -05:00
PikalaxALT
efb171875c Nonmatching sub_810287C; annotate rodata 2019-12-09 16:26:22 -05:00
PikalaxALT
9d70b8a4d9 Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen 2019-12-09 08:59:59 -05:00
PikalaxALT
f21b113bc6
Merge pull request #177 from ghoulslash/battle-anim 
battle_anim*
 2019-12-07 20:20:57 -05:00
Evan
cb1e4ab326 update static declarations 2019-12-06 22:44:15 -07:00
PikalaxALT
7871a505b3 pokedex_screen through sub_810250C 2019-12-06 16:57:33 -05:00
Evan
ebd1037036 update header file 2019-12-05 19:18:32 -07:00
Evan
66cf904343 data type fixes 2019-12-05 14:18:45 -07:00
Evan
9f2a53eec3 fix merge conflicts 2019-12-04 21:35:31 -07:00
Evan
c8b22e2680 format fixes 2019-12-04 21:18:40 -07:00
Evan
bc36d1cb2a fix merge conflicts 2019-12-04 18:58:55 -07:00
Evan
6581fdb69d almost all matching 2019-12-04 18:53:21 -07:00
Evan
661a581176 matching up battle_anim_special 2019-12-04 14:54:52 -07:00
Evan
2453b88b9d resolve compiler errors 2019-12-04 14:54:52 -07:00
Evan
f1bd7a41cc resolve compiler errors 2019-12-04 14:54:52 -07:00
Evan
2f3ad83711 start anim objtemplates 2019-12-04 14:54:52 -07:00
Evan
9bc5170673 resolve data/battle_anim.s 2019-12-04 14:54:52 -07:00
Evan
45ff887858 anim particle gfx graphics names 2019-12-04 14:54:51 -07:00
Evan
4f67dc41a4 port all to c 2019-12-04 14:54:51 -07:00
jiangzhengwenjz
251b0ee0c4 resolve change requests 2019-12-04 14:54:51 -07:00
jiangzhengwenjz
03ab807aaa clean up 2019-12-04 14:54:51 -07:00
PikalaxALT
058999f49b Address review comments 2019-12-04 14:54:50 -07:00
PikalaxALT
8742161431 battle_message 2 2019-12-04 14:54:50 -07:00
PikalaxALT
aa0d8cdaa0 battle_message 1 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
1ffe7f78cb party_menu fourth quarter 2019-12-04 14:54:50 -07:00
PikalaxALT
98be2d1805 fldeff_sweetscent ewram 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
17743fe0e6 party_menu third quarter 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
27ff20d31d party_menu second quarter 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
069eb2baed party_menu first quarter 2019-12-04 14:54:50 -07:00
jiangzhengwenjz
d89a2d791e party_menu data 2019-12-04 14:54:49 -07:00
jiangzhengwenjz
622fcd2cb9 document some symbols 2019-12-04 14:54:49 -07:00
Evan
aa272d1e51 matching up battle_anim_special 2019-12-04 14:49:35 -07:00
ultima-soul
58cf331340 Merge branch 'master' into data_dump 2019-12-04 11:44:52 -08:00
PikalaxALT
3362b7f671
Merge pull request #173 from ghoulslash/pokeball 
Pokeball
 2019-12-04 13:06:48 -05:00
Evan
aacb202f81 resolve compiler errors 2019-12-03 10:54:47 -07:00
ultima-soul
e45aee1ff2 Port/dump dodrio_berry_picking data. 2019-12-02 22:47:45 -08:00
Evan
f2eb137154 resolve compiler errors 2019-12-02 20:58:12 -07:00
Evan
86e62e24c1 start anim objtemplates 2019-12-01 20:23:36 -05:00
Evan
1bdeb05793 resolve data/battle_anim.s 2019-12-01 13:00:24 -05:00
Evan
7de43f7249 anim particle gfx graphics names 2019-12-01 11:49:27 -05:00
Evan
98c3bb201f port all to c 2019-11-30 15:09:08 -05:00
Evan
b626882708 all matching except Task_DoPokeballSendOutAnim 2019-11-30 10:50:58 -05:00
Evan
52013cf052 remove errors 2019-11-28 11:13:26 -05:00
Evan
d81a67ea2d fix nonmatchings 2019-11-28 11:04:49 -05:00
Evan
cba5ebbd5a remove pokeball.s 2019-11-27 07:14:33 -07:00
Evan
31d8bfb048 fix merge conflicts 2019-11-26 13:55:24 -07:00
Evan
d1142b4290 extract graphics data 2019-11-26 11:47:12 -07:00
Evan
c73f061cc6 update ewram 2019-11-25 15:04:38 -07:00
Evan
e6a882cc92 separate sea cottage anim functions 2019-11-24 17:22:02 -07:00
Evan
2cc4db0c78 remove .s files 2019-11-24 16:23:06 -07:00
PikalaxALT
bb8c712f75
Merge pull request #160 from jiangzhengwenjz/party_menu 
party_menu
 2019-11-24 08:44:21 -05:00
jiangzhengwenjz
0ca414959b resolve change requests 2019-11-24 09:31:04 +08:00
jiangzhengwenjz
7817546781 clean up 2019-11-24 08:57:57 +08:00
PikalaxALT
14725e1592 Address review comments 2019-11-23 19:21:31 -05:00
PikalaxALT
e3bc9c44cd battle_message 2 2019-11-23 18:12:33 -05:00
PikalaxALT
13e1ed54b2 battle_message 1 2019-11-23 16:51:05 -05:00
jiangzhengwenjz
972c044d71 party_menu fourth quarter 2019-11-24 03:03:29 +08:00
PikalaxALT
5579507837 fldeff_sweetscent ewram 2019-11-23 10:55:30 -05:00
jiangzhengwenjz
5c1bdd0eb5 party_menu third quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz
49eb350462 party_menu second quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz
499c09a49f party_menu first quarter 2019-11-23 08:09:23 +08:00
jiangzhengwenjz
1d96920da0 party_menu data 2019-11-23 08:09:23 +08:00
jiangzhengwenjz
a4e7a35960 document some symbols 2019-11-23 08:09:22 +08:00
Evan
407d22af8e fix PR merge conflicts 2019-11-21 09:31:40 -07:00
PikalaxALT
a1b2110052 Address review comments 2019-11-20 16:36:38 -05:00
PikalaxALT
19212151e2 Add missing files; documentation 2019-11-20 14:18:08 -05:00
Evan
39a71e64d1 fix nonmatching 2019-11-20 09:57:19 -07:00
PikalaxALT
e7cb5476c4 Port evolution_scene 2019-11-20 11:08:30 -05:00
Evan
9f7c34d645 match Task_OptionMenu 2019-11-19 19:51:03 -07:00
Evan
30d967a51a pr fixes 2019-11-19 14:21:00 -07:00
Evan
31d3df51f1 fix tab vs space format 2019-11-19 14:21:00 -07:00
Evan
ec2673ebe5 update option menu const structs 2019-11-19 14:21:00 -07:00
Evan
52f64335ed match baserom 2019-11-19 14:21:00 -07:00
Evan
a26885c755 matching rom 2019-11-19 14:21:00 -07:00
Evan
422533386d matching up to sub_8088D8C 2019-11-19 14:21:00 -07:00
Evan
a48e03b78c remove compile errors 2019-11-19 14:21:00 -07:00
PikalaxALT
789eb58882 Address review comments 2019-11-19 11:49:21 -05:00
PikalaxALT
ff3fb43622 Merge branch 'master' of github.com:pret/pokefirered into dism_more_data 2019-11-19 11:12:41 -05:00
jiangzhengwenjz
63f8834b6b resolve review comments 2019-11-19 23:45:59 +08:00
jiangzhengwenjz
1d3ae2fe78 Merge branch 'master' into battle 2019-11-19 10:26:40 +08:00
PikalaxALT
b2070e0681 Decompile evolution_graphics.c 2019-11-18 15:16:08 -05:00
PikalaxALT
f04e6737b2 remove declaration of nonexistent map_name_popup routine 2019-11-12 15:30:48 -05:00
PikalaxALT
f6e8873892 Resolve comments on map_name_popup 2019-11-12 15:24:36 -05:00
PikalaxALT
4c61bead05 Document field_door code 2019-11-12 13:53:47 -05:00
PikalaxALT
3cbc312130 Dump field_door data; start field_door decomp 2019-11-12 11:21:49 -05:00
PikalaxALT
734cbfdb20 Decomp map_name_popup 2019-11-11 21:46:57 -05:00
PikalaxALT
f316b22f96 Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata 2019-11-11 17:08:21 -05:00
PikalaxALT
36c159f7fa SAVE_STAT_ enums 2019-11-11 14:20:02 -05:00
PikalaxALT
e560b55325 Port mevent scripts to C 2019-11-11 11:09:24 -05:00
PikalaxALT
451310c0c8 Address review comments 2019-11-10 20:25:41 -05:00
PikalaxALT
fa91b511b9 Finish documentation of learn_move syms 2019-11-10 19:43:47 -05:00
PikalaxALT
89b1087c37 Decomp learn_move and start documentation 2019-11-09 22:06:56 -05:00
PikalaxALT
aba284d3be Update comment on BattleStruct.field_DA 2019-11-09 15:59:49 -05:00
PikalaxALT
807fe60b22 Document battle_tower.c 2019-11-09 14:53:30 -05:00
PikalaxALT
55bede6ca2 Finish decomp of battle_tower 2019-11-09 13:59:24 -05:00
jiangzhengwenjz
17b55f50db clean up 2019-11-09 23:41:45 +08:00
jiangzhengwenjz
a4a44dd18e fire; update constants 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
ab9ce0e641 electric 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
94c1924ed8 ice 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
7e4a3697cd fighting 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
253ffec035 poison 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
5fa2f4f18b battle_controller_pokedude remaining stuff 2019-11-09 12:26:53 +08:00
jiangzhengwenjz
378e85d00b thru sub_8159824 2019-11-09 12:26:52 +08:00
jiangzhengwenjz
a937f72283 thru PokedudeHandleSetRawMonData 2019-11-09 12:26:52 +08:00
jiangzhengwenjz
71eb0fc9d8 battle_controller_pokedude data 2019-11-09 12:26:52 +08:00
PikalaxALT
d25196154f Sync Ruby/Sapphire Battle Tower structs 2019-11-08 16:55:44 -05:00
PikalaxALT
7f5db562cc Rename fldeff scripts 2019-11-08 11:27:22 -05:00
PikalaxALT
e97a442590 Dump Battle Tower data left over from R/S-J 2019-11-07 20:28:39 -05:00
PikalaxALT
2b521f243a Get rid of a knizz comment 2019-11-07 10:56:35 -05:00
PikalaxALT
64485f5cd1 TRAINER_SECRET_BASE propagation 2019-11-07 09:23:21 -05:00
PikalaxALT
4cad26157e Rename ghost battle scripts 2019-11-06 18:32:17 -05:00
PikalaxALT
f14f13b312 Document battle_scripts_2.s 2019-11-06 18:25:36 -05:00
PikalaxALT
60b75e85c9 Finish documentation of battle_scripts_1 2019-11-06 18:15:43 -05:00
PikalaxALT
d97eb6353d Sync battle script documentation with Emerald, 1 2019-11-06 15:52:58 -05:00
PikalaxALT
629cb532d8 Update macros for battle_scripts_2 2019-11-06 15:05:04 -05:00
PikalaxALT
f3be95d0c0 Dump battle_scripts_2.s 2019-11-06 14:06:51 -05:00
PikalaxALT
69edfecc16 Update battle scripts with more defines 2019-11-06 13:09:59 -05:00
PikalaxALT
95d19b8e88 Sync battle script commands with emerald 2019-11-06 11:26:22 -05:00
PikalaxALT
2ed15a3bb5 Fix whitespace in battle_string_ids.h 2019-11-05 21:29:46 -05:00
PikalaxALT
91e305255c Dump battle scripts 1 2019-11-05 21:27:47 -05:00
PikalaxALT
eff10f0e50 Battle message buffers; review comments 2019-11-04 20:32:10 -05:00
PikalaxALT
2fa08605b8 Propagate save status, type, and sector defines 2019-11-04 17:12:02 -05:00
PikalaxALT
57b328ad40 Decomp hall_of_fame 2019-11-04 16:20:11 -05:00
PikalaxALT
d16532c262 Some more documentation 2019-11-04 09:33:19 -05:00
PikalaxALT
0f4621c730 Split mevent_client from mevent_server 2019-11-04 09:07:15 -05:00
PikalaxALT
89e0168cce Document mevent scripts 2019-11-03 19:16:53 -05:00
PikalaxALT
977925a9ee Exported function prototypes to mon_markings.h 2019-11-03 14:30:34 -05:00
PikalaxALT
8013fa861c Sync charmap with Emerald 2019-11-02 21:10:42 -04:00
PikalaxALT
ae97c32f7d Port mon_markings 2019-11-02 17:25:17 -04:00
PikalaxALT
2100eb9d81 Document easy_chat 2019-11-01 16:40:31 -04:00
PikalaxALT
115fd2aa9b Remove nonexistant easy_chat prototypes 2019-11-01 16:13:54 -04:00
PikalaxALT
36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -04:00
PikalaxALT
6a90a57318 Disassemble bike data 2019-11-01 13:51:30 -04:00
PikalaxALT
a8c2fecbd5 Redump easy chat to C 2019-11-01 13:36:16 -04:00
PikalaxALT
5913bcf0e9 Port pokemon_size_record from Emerald 2019-11-01 09:55:25 -04:00
PikalaxALT
079310c70b Finish decomp of wild_encounter 2019-10-31 18:45:07 -04:00
PikalaxALT
b07b36c6d2 wild_encounter through sub_8082C98 2019-10-31 14:31:21 -04:00
PikalaxALT
2b0bcdcad9 Resolve externed prototypes in C files 2019-10-31 09:19:33 -04:00
PikalaxALT
f86bb07027 Review comments and documentation 2019-10-30 21:06:15 -04:00
PikalaxALT
71dbb00800 Address review comments 2019-10-30 18:47:02 -04:00
PikalaxALT
1ba6cb2245 Some renaming; resolve trade bss 2019-10-30 16:51:43 -04:00
PikalaxALT
4fae033d1a Finish trade_scene data 2019-10-30 16:01:31 -04:00
PikalaxALT
f6d768d5ed Trade data; split off trade_scene 2019-10-30 14:20:32 -04:00
PikalaxALT
2c2c179eb9 Finish trade code 2019-10-30 12:49:16 -04:00
PikalaxALT
265f8b5b25 trade through sub_8053E1C; dynamic sys flags start idx 2019-10-30 11:16:26 -04:00
PikalaxALT
e7a66b2941 port sub_8050F3C 2019-10-29 21:29:10 -04:00
PikalaxALT
ce5c3fdd77 Trade through sub_804FFE4 2019-10-29 12:58:40 -04:00
PikalaxALT
4c5e645e90 trade port through sub_804FA14 2019-10-29 11:02:57 -04:00
PikalaxALT
b07899b2d2 Remove unused header 2019-10-28 20:39:06 -04:00
PikalaxALT
efe914a5ba trade through sub_804E944 2019-10-28 15:55:57 -04:00
PikalaxALT
e9cf9fc104 port shedinja_maker_maybe; resolve within-array party pointers 2019-10-28 12:16:01 -04:00
PikalaxALT
b290a1a570 trade through sub_804D694 2019-10-28 10:43:57 -04:00
PikalaxALT
3710c0a370 Nonmatching sub_804CF14 2019-10-28 10:23:51 -04:00
PikalaxALT
47534a1471 Merge branch 'master' of github.com:pret/pokefirered into trade 2019-10-27 20:52:55 -04:00
PikalaxALT
93f0703fcd Merge branch 'master' of github.com:pret/pokefirered into script_menu 2019-10-26 10:23:13 -04:00
jiangzhengwenjz
0ae4d58e98 resolve more review comments 2019-10-26 11:51:43 +08:00
jiangzhengwenjz
1481f9e819 resolve review comments 2019-10-26 06:03:42 +08:00
PikalaxALT
4b052a2040 Resolve review comments 2019-10-25 17:01:05 -04:00
PikalaxALT
2fce740005 Name strings used in field_specials 2019-10-25 14:59:46 -04:00
PikalaxALT
359ec8dde1 Name multichoice menus 2019-10-25 14:52:54 -04:00
PikalaxALT
15298c6cd1 Fix some string names 2019-10-25 14:01:40 -04:00
PikalaxALT
d33509ec93 script_menu name strings 2019-10-25 13:56:01 -04:00
jiangzhengwenjz
1230a5c48a clean up 2019-10-26 01:31:50 +08:00
PikalaxALT
00675eaafb script_menu data 2019-10-25 13:23:46 -04:00
PikalaxALT
0a440d658b Finish script_menu code decomp 2019-10-25 11:10:08 -04:00
jiangzhengwenjz
2f87855072 Merge branch 'master' into battle 2019-10-25 09:22:50 +08:00
jiangzhengwenjz
6ca932e5e9 revert some symbol documentation (I hate this) 2019-10-25 09:17:15 +08:00
jiangzhengwenjz
b8c2d14f6a battle_controller_oak_old_man 2019-10-25 08:51:14 +08:00
jiangzhengwenjz
631eccb92d thru OakOldManHandleSwitchInAnim 2019-10-25 05:57:26 +08:00
PikalaxALT
4fae71a4b0 Fix alignment in flags.h 2019-10-24 16:54:01 -04:00
PikalaxALT
a18e9c27e1 Rename specials according to Ruby 2019-10-24 16:31:38 -04:00
PikalaxALT
440d062936 fix erroneous var name reversion 2019-10-24 15:51:47 -04:00
PikalaxALT
7c3d9df380 Finish field_specials 2019-10-24 15:28:43 -04:00
PikalaxALT
0d73967f6c field_specials through Special_BattleCardAction; field_specials rodata 2019-10-24 11:42:45 -04:00
PikalaxALT
779d6187c6 field_specials through sub_80CC534 2019-10-24 10:22:39 -04:00
jiangzhengwenjz
b469207121 rename BATTLE_TYPE_OLD_MAN_TUTORIAL 2019-10-24 14:05:20 +08:00
PikalaxALT
db3be6ef2e field_specials through sub_80CBFA0 2019-10-23 20:43:41 -04:00
PikalaxALT
54d6414654 field_specials through sub_80CBDE8 2019-10-23 20:12:14 -04:00
PikalaxALT
f33f58eff7 Finish fixing SEAVAULT to SEVAULT 2019-10-23 15:32:23 -04:00
PikalaxALT
661e5d9221 field_specials through Task_AnimateElevatorWindowView 2019-10-23 15:31:23 -04:00
jiangzhengwenjz
1dc0b25c1e Merge branch 'master' into battle 2019-10-24 01:42:52 +08:00
PikalaxALT
8249a58a2c Split trainers and port species and move names 2019-10-22 21:24:16 -04:00
PikalaxALT
4dfc6699fe Update code style in some places 2019-10-22 20:09:08 -04:00
PikalaxALT
a5521e6b69 Remove incomplete menews_jison constant defs 2019-10-22 16:47:41 -04:00