AnonymousRandomPerson
9e49584621
Merge pull request #231 from DizzyEggg/sub_805D8C8
...
GithubCI / build (push) Has been cancelled
Match/Document sub_805D8C8 and fix fakematches with static inlines
2024-10-20 17:02:58 -04:00
DizzyEggg
da198b95ca
sub_805E2C4 in C
2024-10-16 15:51:30 +02:00
Mateon1
9607bbc020
Refactor color and format constants
2024-10-15 17:14:36 +02:00
Mateon1
aad27b9c26
Ground script decomp
2024-10-15 00:26:15 +02:00
Mateon1
fa2d34f2d9
Tutorial renames
2024-10-15 00:26:15 +02:00
Mateon1
13b8d6ed69
Remove duplicates in charmap
2024-10-15 00:26:15 +02:00
Mateon1
1bdb63d68d
Hack out escaped characters
2024-10-15 00:26:15 +02:00
Mateon1
439a43e82c
Document more script var stuff
2024-09-20 00:57:27 +02:00
AnonymousRandomPerson
c4dd5fe96e
Merge pull request #215 from mateon1/mateon-2024-sep
...
Mateon 2024 sep
2024-09-18 13:29:09 -04:00
DizzyEggg
3dd20e5803
some documentation on damage struct
2024-09-17 23:26:03 +02:00
Mateusz Naściszewski
ae3c563713
Mega rename
2024-09-15 20:29:02 +02:00
AnonymousRandomPerson
76f698c0f7
Updated some AI symbol names
2024-08-29 23:24:58 -04:00
AnonymousRandomPerson
af12c8a0e0
Merge pull request #206 from SethBarberee/july_august_2024
...
July august 2024
2024-08-22 23:02:45 -04:00
Seth Barberee
ffdb42c276
nit: sort funcs and extern data
2024-08-17 20:23:16 -07:00
Seth Barberee
00a4611d4c
Move more data to friend_rescue.c
2024-08-17 20:20:18 -07:00
Seth Barberee
8385305027
decomp another full file w/ data and ram
2024-08-15 19:59:42 -07:00
Seth Barberee
a66a508999
more rescue mail stuff
2024-08-02 10:42:30 -07:00
Luis Boto
6507ddc1f0
fix: undo non-script file changes
2024-07-29 08:30:26 +02:00
Luis Boto
d254dbed4e
triggerCutscene macro calls
2024-07-28 20:05:17 +02:00
Luis Boto
b7b232f1e7
warpDungeon macro calls
2024-07-28 19:47:09 +02:00
Luis Boto
83e7c1a5b8
include macros.asm relocation
2024-07-27 21:55:40 +02:00
Luis Boto
8fcd0acc73
rotate parameter constants
2024-07-27 21:33:33 +02:00
Luis Boto
fda23f0632
closeThread macro calls
2024-07-27 21:20:46 +02:00
Luis Boto
ecfdeb7fe9
rotate macro calls
2024-07-27 20:55:44 +02:00
Luis Boto
7e35ad2730
setFlag macro calls
2024-07-27 20:31:30 +02:00
Luis Boto
b84f4a62d6
pause macro calls
2024-07-27 20:21:36 +02:00
Luis Boto
cfd793ee67
closeTextBox macro calls
2024-07-27 20:09:23 +02:00
Luis Boto
0d8aa52af7
Team formation cutscene macro calls
2024-07-27 19:30:58 +02:00
Luis Boto
bebf62aa9e
Some more unknown animation calls
2024-07-27 19:07:13 +02:00
Luis Boto
e503eeaf73
Completed setAnimation calls on cutscenes_1.s
2024-07-27 12:19:03 +02:00
Luis Boto
6406b53f98
Completed setAnimation calls on cutscenes.s
2024-07-26 20:02:21 +02:00
Luis Boto
758eebfb2b
More setAnimation calls on cutscenes.s
2024-07-26 19:52:08 +02:00
Luis Boto
3814db8818
setAnimation calls on cutscenes.s
2024-07-26 19:41:22 +02:00
Mateusz Naściszewski
fd2c4c42a8
Even more names
2024-07-22 19:29:12 +02:00
Seth Barberee
bd416232ab
continue documenting
2024-07-20 10:59:15 -07:00
Seth Barberee
fb07afd55b
lots of documentation
2024-07-20 10:59:15 -07:00
Seth Barberee
2e31bcdeb4
more documentation and move some data to src
2024-07-20 10:18:26 -07:00
Kermalis
edb1db5bc4
Stuff
2024-07-19 00:24:28 -04:00
Seth Barberee
9ee69e7478
forgot to rename these to proper names
2024-04-15 16:21:49 -07:00
Seth Barberee
5fe3e86372
finish moving data to src - math
2024-03-26 21:10:10 -07:00
Seth Barberee
6c0e119963
move some data to src in math.c
2024-03-25 22:21:48 -07:00
Seth Barberee
94932b551a
move WindowBG to src
2024-03-18 20:38:22 -07:00
Seth Barberee
f5bd176a12
continue moving data
2024-03-17 14:15:20 -07:00
Seth Barberee
9abab93ad3
move more data to src
2024-03-17 11:26:00 -07:00
Seth Barberee
e6e032124d
match remaining data, use defines and document IsNotValidDungeon
2024-03-10 17:37:59 -07:00
Seth Barberee
4f4dc91976
Move more data to src in pokemon_3
2024-03-06 20:48:54 -08:00
Seth Barberee
5ee826049e
move more data to src
2024-03-06 20:48:54 -08:00
Seth Barberee
e99149c556
split out into multiple files and move data to src
2024-03-06 20:48:54 -08:00
Ashley Coleman
57df7143c7
fix typo
2023-11-07 16:05:53 -08:00
Ashley Coleman
b22203a842
Use direct names for MonsterCategory
2023-11-07 15:41:42 -08:00
Kermalis
4c41a29719
Clean/split pokemon_mail and personality_test
2023-10-22 00:00:38 -04:00
Kermalis
14a15254a5
Some charmap stuff
2023-10-21 23:59:03 -04:00
Kermalis
47a8644af8
Update data_8115F5C.s
2023-10-21 23:54:11 -04:00
Kermalis
67c58e6dca
Use globaldata.h to clean "pksdir0" in source
2023-10-21 23:53:23 -04:00
Kermalis
4bf6afa144
Data for adventure_log
2023-10-21 23:53:23 -04:00
Roshan Padaki
0bbc544e9f
[data] stringify more files
2023-09-26 20:11:12 -04:00
Seth Barberee
005b7cbfe9
Merge pull request #160 from rpadaki/roshan/data/document-fn-lookups
...
[decomp] trig functions + lookup tables
2023-09-25 17:12:15 -07:00
Seth Barberee
5f3590eac7
Merge pull request #159 from rpadaki/roshan/stringify-cutscenes
...
[data] stringify cutscenes.s
2023-09-25 17:08:07 -07:00
Roshan Padaki
03673db0f7
funny observation
2023-09-25 19:43:07 -04:00
Roshan Padaki
1e2fea3f57
[data] stringify cutscenes.s
2023-09-25 19:38:48 -04:00
Roshan Padaki
d1d3f49169
[data] string representations of text in 80f9c8.s
2023-09-25 19:35:46 -04:00
Kermalis
90a51e6ef6
ARG_NICKNAME_0
2023-09-24 20:21:13 -04:00
Roshan Padaki
c8a7778224
[data] identify sin fn lookup
2023-09-24 00:06:16 -04:00
Kermalis
281f29d03c
Finish common_strings FOINALLY
2023-09-23 05:26:13 -04:00
Kermalis
fad1832b01
Makuhita dojo common_strings
2023-09-23 05:11:06 -04:00
Kermalis
6dcc8e3ab5
Gulpin shop common_strings
2023-09-23 04:54:54 -04:00
Kermalis
df1e337cdf
Wigglytuff shop common_strings
2023-09-23 04:34:55 -04:00
Kermalis
63687bd7a5
Kecleon common_strings
2023-09-23 04:20:16 -04:00
Kermalis
7fbe27f7b8
Split+data options_menu
2023-09-23 03:33:46 -04:00
Kermalis
3635746993
#= text macro
2023-09-21 20:59:20 -04:00
Kermalis
b888afb5d9
Split+data hints_menu
2023-09-20 23:11:41 -04:00
Kermalis
c6bc80e6d8
Split+data code_801602C
2023-09-20 22:52:40 -04:00
Kermalis
fdcef19d85
Split+data code_8023144/code_80227B8
2023-09-20 22:26:35 -04:00
Kermalis
8b7c5e5ff5
Split+data code_801EE10_1
2023-09-18 20:54:51 -04:00
Kermalis
6b419cc73b
Split+data wigglytuff_shop
2023-09-18 19:58:43 -04:00
Kermalis
322e13a6be
Properly split+data code_801C620/code_801D760
2023-09-18 01:13:13 -04:00
Kermalis
9fa7035ded
Debug menu 1 data
2023-09-15 01:28:50 -04:00
Kermalis
7e713ef0eb
Luminous Cave data
2023-09-14 23:55:49 -04:00
Kermalis
805fa045a7
Split credits
2023-09-14 21:38:05 -04:00
Kermalis
2b74ea0c1a
Match sub_8013DD0
2023-09-13 04:10:45 -04:00
Kermalis
11d12d5012
Match sub_8013AA0, gCommonKangStorage
2023-09-12 08:27:10 -04:00
Kermalis
6a6f489d67
ARG_VALUE_0 ARG_VALUE_1 and gCommonFelicity
2023-09-11 19:23:20 -04:00
Kermalis
ed4d98838d
Move some common strings to src
2023-09-11 17:53:34 -04:00
Kermalis
0f7fd64f82
Felicity bank data
2023-09-10 23:00:41 -04:00
Kermalis
016b518c7d
Split out common_strings.s
2023-09-10 07:12:39 -04:00
Kermalis
21cf77f46f
Annotate some more for the text1/text2 puzzle
2023-09-09 17:13:43 -04:00
Kermalis
1db7dcf813
Make note for wigglytuff_shop
2023-09-07 05:29:26 -04:00
Kermalis
aa15a03ffd
gulpin_shop data
2023-09-07 05:20:15 -04:00
Kermalis
624dca1a93
Rename gulpin_shop_1 and move data to src
2023-09-07 05:06:31 -04:00
Kermalis
012094c503
Split file_system into decompress
2023-09-07 03:26:32 -04:00
Kermalis
36b18f6348
Clean code_8009804
2023-09-07 01:52:30 -04:00
Kermalis
88785ba4ee
Split kangaskhan storage and kecleon bros
2023-09-07 00:13:17 -04:00
Kermalis
fad15ef868
Annotate some stuff dawg
2023-09-06 01:41:38 -04:00
Kermalis
d22675ff22
Split code_801B3C0 and move data to src
2023-09-05 02:07:05 -04:00
Kermalis
f66479a012
Clean friend_area
2023-09-04 01:32:49 -04:00
Kermalis
72430d1072
Remove most "struct" which makes the repo smolr
2023-09-02 01:46:26 -04:00
Seth Barberee
4c60221b54
dump some more data and cleanup
2023-08-27 22:21:22 -07:00
Kermalis
1d49c480eb
Rename and doc SpriteOAM with defines
2023-08-26 10:29:55 -04:00
Kermalis
a10e7454fc
NAKED sub_8007AA4
2023-08-07 11:11:58 -04:00
Kermalis
c419a607d0
Nonmatch sub_8007958 for now
2023-08-07 10:09:14 -04:00
Kermalis
175400074e
NAKED match xxx_draw_char()
2023-08-07 08:16:51 -04:00
Kermalis
9917619da8
Pascal naming
2023-08-05 13:20:00 -04:00
Kermalis
417eb19802
Clean Kangaskhan 2/2
2023-08-05 12:56:50 -04:00
Kermalis
0db7804d6b
gUnknown_203B210 -> gKecleonBrosWork
2023-08-05 11:42:20 -04:00
Kermalis
0290a45172
Forgor these two funcs
2023-08-04 01:08:38 -04:00
Kermalis
f510d377e0
Clean/Correct some structs
...
Changed UnkTextStruct2_sub to ushorts because they are loaded as int16s in text.s (which I was working on)
That might change some current nonmatchings since they revolve around this struct
2023-07-25 01:41:05 -04:00
Kermalis
a5c7e736f9
Clean gulpin/felicity
2023-07-22 19:14:33 -04:00
Seth Barberee
6c5433950a
more decomp work and ram setup
2023-06-25 16:37:48 -07:00
AnonymousRandomPerson
e9b69049fc
Defined function pointers for data_8115F5C
2023-06-15 23:53:13 -04:00
AnonymousRandomPerson
c23c833381
Subbed charmap macros in data_80E7D40
2023-06-15 22:31:32 -04:00
AnonymousRandomPerson
8a940f2863
Removed more hard-coded pointers
2023-06-14 23:58:16 -04:00
AnonymousRandomPerson
18d508ae9f
Defined pointers for data.s
2023-06-14 22:30:40 -04:00
AnonymousRandomPerson
e1db703133
Defined pointers for data_8270000
2023-06-14 22:23:27 -04:00
AnonymousRandomPerson
de2a002f61
Defined pointers for data_8107010
2023-06-13 23:58:02 -04:00
AnonymousRandomPerson
a5a7c6c8f1
Defined pointers for data_8115F5C
2023-06-12 00:14:35 -04:00
AnonymousRandomPerson
89b06756e4
Defined pointers for data_8106A4C
2023-06-11 23:50:42 -04:00
AnonymousRandomPerson
53475b5c8f
Defined pointers for data_810AE24
2023-06-11 23:46:46 -04:00
AnonymousRandomPerson
d5954e63a8
Defined pointers for data_80F4468
2023-06-11 23:39:46 -04:00
AnonymousRandomPerson
46f7ede0ae
Defined pointers for data_80F59C8
2023-06-11 23:36:03 -04:00
AnonymousRandomPerson
576ba80951
Defined pointers for data_80B9BB8
2023-06-11 22:26:28 -04:00
AnonymousRandomPerson
37403f0bb3
Defined pointers for cutscenes.s
2023-06-11 22:16:26 -04:00
AnonymousRandomPerson
490f60ad43
Defined pointers for cutscenes_1.s
2023-06-11 21:44:25 -04:00
AnonymousRandomPerson
fe9a56131a
Defined pointers for titlemenu_sbin
2023-06-10 00:08:00 -04:00
AnonymousRandomPerson
b815d41f5f
Defined pointers for system_sbin
2023-06-10 00:00:15 -04:00
AnonymousRandomPerson
42fbcecdde
Defined pointers for sound_data
2023-06-09 21:46:57 -04:00
AnonymousRandomPerson
b79ffe4a79
Defined pointers for ornament.sbin
2023-06-08 23:26:57 -04:00
AnonymousRandomPerson
b113d80b1a
Removed more spurious pointers
2023-06-08 23:11:27 -04:00
AnonymousRandomPerson
c5f15501c8
Defined pointers for monster_sbin
2023-06-07 18:34:19 -04:00
AnonymousRandomPerson
a7d20ddced
Merge branch 'master' of https://github.com/pret/pmd-red
2023-06-07 00:31:04 -04:00
AnonymousRandomPerson
6401fe650a
Defined pointers for ground_sbin and effect_sbin
2023-06-06 23:50:36 -04:00
AnonymousRandomPerson
0d9397ab73
Expanded SIRO/AT4PX strings in dungeon_sbin
2023-06-05 00:15:24 -04:00
AnonymousRandomPerson
2ff4eac29a
Removed some false positive dungeon.sbin pointers
2023-06-04 23:42:27 -04:00
AnonymousRandomPerson
f9e05a2054
Renamed gender-specific text color
2023-06-04 22:35:24 -04:00
Seth Barberee
59c5ea161d
Move more data to src
2023-06-02 16:04:19 -07:00
Seth Barberee
456aa703c4
move more data to src
2023-05-28 10:45:13 -07:00
Seth Barberee
c7d3ab03b0
more decomp, move of some data, and code cleanup
2023-05-27 09:19:08 -07:00
AnonymousRandomPerson
e8bcb50482
Finish defining pointers for dungeon_sbin
2023-05-25 00:07:39 -04:00
AnonymousRandomPerson
3195e0fb6c
Define pointers for trappat/zmappat.inc
2023-05-25 00:07:20 -04:00
AnonymousRandomPerson
cbc485cef1
Define pointers for jyochu.inc
2023-05-25 00:03:18 -04:00
AnonymousRandomPerson
4e148f4033
Define pointers for fixedmap.inc
2023-05-25 00:02:14 -04:00
AnonymousRandomPerson
7c0da75620
Defined pointers for banfont.inc
2023-05-25 00:00:12 -04:00
AnonymousRandomPerson
5519f32b60
Defined pointers for most of dungeon_sbin
2023-05-24 23:59:59 -04:00
Cheng Hann Gan
cfe7799295
Merge pull request #122 from SethBarberee/items_found_ptrs
...
Create ptrs for each dungeon item entry
2023-03-19 12:11:31 -04:00
Seth Barberee
089bd48186
Merge pull request #125 from SethBarberee/feb_2023
...
Feb 2023
2023-03-04 00:14:10 -06:00
Seth Barberee
08f7182576
finish out another file and more documenting
2023-02-24 18:14:21 -08:00
AnonymousRandomPerson
62f51f6d28
Fixed some labels on dungeon data struct
2023-02-14 15:09:39 -05:00
AnonymousRandomPerson
97496603de
Dumped dungeon parameters
2023-02-14 00:02:52 -05:00
Seth Barberee
1c92acbef7
move some more menu items over and figure out sub_8035CF4
2023-02-13 16:59:10 -08:00
Seth Barberee
534e8e61e2
Create ptrs for each dungeon item entry
2023-02-05 21:21:47 -08:00
AnonymousRandomPerson
7c8572c519
Dumped move range strings
2023-02-05 22:12:46 -05:00
AnonymousRandomPerson
5421f4fdf4
Dumped ability descriptions
2023-02-05 19:57:06 -05:00
AnonymousRandomPerson
a43d2b0a79
Dumped ability names
2023-02-05 19:40:54 -05:00
Dennis H
06504623ea
fix all merge conflicts
2023-01-31 11:08:37 +01:00
AnonymousRandomPerson
0e67eae75c
Auto-generate learnset_ptrs.s
2023-01-30 18:35:03 -05:00
AnonymousRandomPerson
88a6b44677
Merge branch 'master' of https://github.com/pret/pmd-red
2023-01-30 18:01:24 -05:00
AnonymousRandomPerson
ce86d2686a
Added NONMATCHING for learnset access functions
2023-01-30 00:42:21 -05:00
AnonymousRandomPerson
0934aa95d2
Added learnset pointers
2023-01-29 22:27:35 -05:00
AnonymousRandomPerson
2c2d250bc2
Dumped learnset data
2023-01-29 21:58:44 -05:00
AnonymousRandomPerson
39ef57251f
Labeled spawnAmountRange
2023-01-28 18:34:04 -05:00
Seth Barberee
1e48a0d739
decomp most of 8057824 file
2023-01-23 11:14:36 -08:00
Seth Barberee
4a7e7807c4
move some more data over
2023-01-20 09:58:22 -08:00
Dennis H
c747b82d16
some more move decomp + documenting
2023-01-15 20:49:02 +01:00
AnonymousRandomPerson
b22feb80af
Merge remote-tracking branch 'upstream/master'
2023-01-13 22:36:16 -05:00
Seth Barberee
aca93c70b7
last decomp for this branch
2023-01-13 17:22:41 -08:00
Seth Barberee
31e1c409e8
move some data to friend area action menu
2023-01-13 17:22:41 -08:00
Seth Barberee
33f621ea79
label/document game options
2023-01-13 17:22:41 -08:00
Seth Barberee
f66b3d6622
move some data to ground_main
2023-01-13 17:22:41 -08:00
Seth Barberee
c8675a1647
more more data over
2023-01-13 17:22:41 -08:00
AnonymousRandomPerson
be20f60ee0
Synced some symbol names with EoS hacking
2023-01-08 04:23:00 -05:00
Seth Barberee
bd96ff0fca
some script work
2022-12-03 16:20:36 -08:00
Seth Barberee
29c9956bf6
finish out ai_targeting and move data
2022-11-18 16:54:10 -08:00
Seth Barberee
efaf26662b
Finish converting pokemon found tables to JSON
2022-10-17 09:24:15 -05:00
Seth Barberee
04fa09ec81
more decomping
2022-10-10 10:04:41 -07:00
Seth Barberee
56415343db
build dungeon trap data in JSON and make it shiftable
2022-10-06 20:48:18 -07:00
Seth Barberee
d9893a6274
decomp a few more
2022-07-31 19:13:05 -07:00
AnonymousRandomPerson
e59285462c
Merge remote-tracking branch 'upstream/master'
2022-05-30 13:24:40 -04:00
Seth Barberee
a73802a8e4
forgot to rename the field in the JSON
2022-05-30 10:02:27 -07:00
Seth Barberee
7780e0eba6
do some more decomp
2022-05-28 22:27:11 -07:00
AnonymousRandomPerson
821e14995b
Merge remote-tracking branch 'upstream/master'
2022-05-29 00:24:02 -04:00
AnonymousRandomPerson
1448e5903d
Added NONMATCHING for Wander()
2022-05-29 00:10:38 -04:00
Seth Barberee
773510c329
decomp more of rescue password and label GetDungeonFloorCount
2022-05-16 20:23:45 -07:00
Seth Barberee
ecb8582e87
dump and fix some more pointers
2022-05-14 18:40:58 -07:00
Seth Barberee
84107163ef
move some more data to src
2022-05-12 19:52:07 -07:00
Seth Barberee
69510344aa
finish out dialogue labeling, label some moltres fight funcs, and cleanup some more text macros
2022-05-07 09:05:52 -07:00
Seth Barberee
482ade61be
address review commnts, label almost all dialogue and few more funcs
2022-05-07 07:51:12 -07:00
Seth Barberee
01ca155b81
start dumping dialogues
2022-04-16 09:17:32 -07:00
Seth Barberee
e80b02cb09
move more data to src
2022-04-10 09:45:16 -07:00
AnonymousRandomPerson
4e2a813822
Decomped CanMoveForward()
2022-03-26 22:47:38 -04:00
AnonymousRandomPerson
9a4864c1cf
Decomped WeightWeakTypePicker()
2022-03-10 22:32:17 -05:00
AnonymousRandomPerson
a5296a2f99
Merge remote-tracking branch 'upstream/master'
2022-02-26 13:29:30 -05:00
AnonymousRandomPerson
6e56b9f034
Decomped CanUseStatusMove()
2022-02-24 23:38:21 -05:00
AnonymousRandomPerson
598a588589
Decomped CanAttackInFront()
2022-02-21 17:03:34 -05:00
AnonymousRandomPerson
4aafa434a6
Decomped IsTileGround()
2022-02-20 23:43:06 -05:00
AnonymousRandomPerson
96372eb336
Decomped CanUseOnSelfWithStatusChecker()
2022-02-20 21:59:22 -05:00
Seth Barberee
6bf6f8ded1
finish moving data to load_screen
2022-02-17 18:59:56 -06:00
Seth Barberee
ee5fb3584d
move data from data to wonder_mail
2022-02-17 18:59:56 -06:00
Seth Barberee
b2e109dab1
Move some data to src and add some more headers
...
- Finish moving all data for main menu to src
- Move some more data to wonder_mail
- Add some headers to clean up some externs
2022-02-17 18:54:59 -06:00
AnonymousRandomPerson
a9b5977d4c
Decomped MoveMatchesChargingStatus
2022-02-05 20:23:01 -05:00
AnonymousRandomPerson
f728e7e90e
Decomped DecideAttack()
2022-02-04 23:13:01 -05:00
AnonymousRandomPerson
5dc5b3b1f9
Used official or more common names for music tracks
2022-01-26 00:07:18 -05:00
AnonymousRandomPerson
154c442505
Decomped CanMoveInDirection()
2022-01-25 22:46:40 -05:00
AnonymousRandomPerson
74d89a6fe4
Made recruit rate signed in species data
2022-01-16 23:45:59 -05:00
AnonymousRandomPerson
453618864e
Decomped HasStatusAffectingActions()
2022-01-13 22:56:30 -05:00
AnonymousRandomPerson
52e7368f30
Labeled CalculateFacingDir()
2022-01-08 00:08:00 -06:00
AnonymousRandomPerson
393e6e9eb0
Fixed typo with Munchlax
2022-01-06 22:48:26 -06:00
AnonymousRandomPerson
d9b1ef43a6
Labeled Warp Scarf variables
2022-01-06 21:52:23 -06:00
AnonymousRandomPerson
2fa42b2987
Moved some constants from data to source
2022-01-04 23:34:35 -06:00
AnonymousRandomPerson
d40d2e55a3
Decomped IsTargetStraightAhead()
2021-12-28 21:38:42 -06:00
Seth Barberee
e7a59a1a21
move pokemon mail data to src
2021-12-22 17:00:21 -06:00
Seth Barberee
7a1956f51d
Merge pull request #87 from SethBarberee/personality_test_data_2
...
Personality test data 2
2021-12-21 15:05:05 -06:00
mid-kid
99a038284b
Translate all .include to #include
...
This decision was made to reduce the complexity of using .include whilst
juggling with tools/scaninc and tools/preproc:
- tools/scaninc doesn't apply the proper search rules for .include (it
assumes #include behavior). In particular, it doesn't consider paths
starting from $PWD, and doesn't scan the included files as a result.
- .include had to be processed before #include by preproc in many cases,
as code was being included that had to be preprocessed by CPP (think
of #define). This contradicts standard GCC behavior.
To make include paths consistent across the asm/ data/ and src/
directories, the following files were moved:
- constants/ → include/asm/constants/
- asm/macros/ → include/asm/macros/
- asm/macros.inc → include/asm/macros.inc
- include/macros/m4a.inc → include/asm/macros/m4a.inc
As part of the necessary changes for this to work, the scaninc method in
the makefile was improved to generate .d files that don't choke when
files are missing.
2021-12-20 16:29:12 +01:00
mid-kid
bc43a77380
Finish de-incbinning data_80E59A8.s and data_80E7D40.s
2021-12-20 16:16:37 +01:00
mid-kid
51bff00712
Finish de-incbinning data_80D47B8.s and data_80DED44.s
2021-12-20 16:11:19 +01:00
AnonymousRandomPerson
7acad69795
Renamed inconsistent color macros
2021-12-19 17:19:13 -06:00
Seth Barberee
2ec7cc5bad
fix nonmatch and move question references
2021-12-19 14:59:10 -08:00
Seth Barberee
3021ae9077
all data moved except questions
2021-12-19 14:59:10 -08:00
AnonymousRandomPerson
b458476078
Swapped out more text macros
2021-12-14 22:54:04 -05:00
AnonymousRandomPerson
cd9a8c5a38
Decomped CanTarget()
2021-12-14 22:54:03 -05:00
mid-kid
087405b9d9
Dump and document status sprites
2021-12-13 10:44:48 -06:00
mid-kid
8213467c21
Dump status names and descriptions
2021-12-13 10:44:48 -06:00
mid-kid
ca10fd795e
Dump unidentified tables
2021-12-13 10:44:48 -06:00
mid-kid
2fcfbc2266
Finish de-incbinning data.s
2021-12-13 10:44:48 -06:00
Seth Barberee
4fc272fea6
No wifi + 2 days on train = more decomp ( #80 )
...
* No wifi + 2 days on train = more decomp
* layin some more
* one func, one file
2021-12-01 14:33:06 -08:00
Cheng Hann Gan
938a88551f
Labeled more symbols ( #77 )
...
* Labeled more symbols
* Fixed comment typo
* Renamed some functions
2021-11-20 08:47:46 -08:00
Geotale
1355271988
Add some labels and convert some strings for some data ( #74 )
...
* Adding in all missing strings and labels
Quite a few strings and labels were missing. This should fix all of them. "NaiveQuest1Answers" might have the second option incorrect, but it's kinda hard to count bytes and this does seem to be a valid answer, and should be checked in the future.
* Add all strings, labels, and update pointers
Like the previous commit, I have 0 clue if this builds lol -- I can't quite test this, because I can't run a compiler to do so, and I don't own a copy of the game. Should still match I would think. JobHeadline may have something incorrect about trailing 0 bytes, but it seems to have been an observational mistake on my end on it having 5 of them rather than 4?
* Fix consistency with previous labels (+typo fix)
Basically just "Message" with "Text", and replace "Headlline" with "Headline"
* Fix mistyped labels from previous commit
It seems I'm not very good at this assembly thing. "NewFriendAreas" -> "NewFriendArea", like originally.
* Replace the rest of "Message" with "Text"
I forgot to replace some stuff
* Forgot an A
Insert an A to create "BraveQuest2A_Ignore" instead of "BraveQuest2_Ignore"
* Forgot a space, remove more
Removed some extra whitespace, add a space between ".string" and a quotation mark that I had missed. Hope this didn't break anything somehow.
* Add back all comments, fix missing pointer
I accidentally deleted all comments. I've now fixed that, and added in a pointer to NaiveQuest1_Love because I had missed it somewhere else.
* Add in TimidQuest3 answer pointers I had missed
This should be the last of the missing pointers?
* Tabs -> Spaces
Fixed formatting by converting all tabs to spaces. I don't actually know when I changed them to tabs, but I'd guess I did pretty early on...
* Add some labels
A few labels were missing, tried to fill them in.
* Made a data assembler!
I can now basically ensure that the files match! Found an error with two labels reversed, but that seems to be the only thing that was incorrect.
* Left out a space somehow
Simply just adds a space between a ".string" and the actual string
* Make the files actually match
Took a bit of time, but I believe I've finally got this file actually matching!
I was lazy with strings when first encoding and wrote decimal offsets for octal character encodings sometimes which is fun. All instances of this should now be fixed!
* Fix some labels
I believe this was just missing two labels that I forgot to change when copy-pasting them for the general format...
Meh, still, glad to have it fixed.
* Replace hexadecimal string escapes with octal ones
I tried committing this before but it doesn't seem to have worked for some reason -- Just in case it did and I'm rewriting this on accident.
I should have done some research apparently -- ARM asm doesn't support hexadecimal escape sequences, only octal ones. Should be fixed now!
* Replace octal escape sequences with ".byte"
It turns out those aren't supported either -- That's okay, though it looks a bit more messy imo.
* Update data/pokemon_mail.s
* fix up conflicts and labels
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2021-11-18 10:19:20 -08:00
Cheng Hann Gan
a432de845c
Expanded charmap usage ( #76 )
...
* Added item icons/Hiragana to charmap
* Use color formatting charmap macros
* Removed redundant text formatting macros
2021-11-18 09:21:00 -08:00
Seth Barberee
bfaa55f2fe
Label and doc iq skills and tactics info ( #75 )
...
* label/doc iq skills/tactics info
* decomp a few more dungeon_util and label some funcs
* doc the IQSkills field
2021-11-15 11:02:26 -08:00
mid-kid
681ca68ac9
Disassemble some more tables and the first graphic ( #71 )
...
* Sync tools/ directory with pokeemerald
We really ought to have a central repository for this mess
* Make incremental builds faster
Scientists hate him!
He made NODEP disappear with this ONE SIMPLE TRICK!!!
Want to know more? -> __click here__ <-
* Disassemble some more tables and the first graphic
2021-11-04 14:07:26 -07:00
mid-kid
8f162f70ba
Disassemble a script-related table
2021-11-04 02:10:38 +01:00
Seth Barberee
3a1db3dfac
Moves and some friend_area_action_menu
2021-11-02 16:31:16 -07:00
mid-kid
412a2d1dbe
Extract shop dialogue
2021-11-03 00:08:22 +01:00
Cheng Hann Gan
dd128d78c6
Decomped more dungeon AI ( #67 )
...
* Decomped IsMovingClient()
* Fixed typos in boss dialogue
* Fixed spelling of Pelipper
* Decomped CannotUseItems
* Decomped ShouldAvoidEnemies()
* Decomped HasAbility()
* Decomped HasTactic()
* Decomped CannotMove
* Decomped CannotAct() and IsCharging()
2021-10-28 09:01:07 -07:00
Seth Barberee
3e5dd1d047
Death by 74 files ( #65 )
...
* death by 74 files
* 20% reached
* doc move stuff in pokemon
* fix undef reference
* doc more and plumb a few more constanst for num party members and num moves
* that struct is def PokemonMove.. clean up all code with it
2021-10-22 10:01:07 -07:00
FieryMewtwo
18726d97cf
More text cleanup ( #62 )
...
* Update build.yml
temporarily so that I can edit without having to try to figure out why my Git client keeps crashing
* Fix references to the old save.inc text labels
* Labels
welp here we go again
* Give Wonder Mail client 'thanks' text more descriptive function label names
* Change back the workflow
2021-10-11 09:04:44 -07:00
Seth Barberee
25794a39c3
Finish main menu decomp ( #59 )
...
* decomp rest of main_menu
* move some main menu data over
* decomp some more wonder mail
* decomp the dungeon dialogue scene switches
* more wonder mail
* consolidate struct_802F204
* another wonder mail func
* more wonder mail
* slight cleanup
2021-10-11 09:03:17 -07:00
Cheng Hann Gan
2d4c802d76
Extracted species/item/move strings ( #63 )
...
* Extracted species/item/move strings
* Used binary strings for bitwise flag variables
2021-10-10 07:59:35 -07:00
FieryMewtwo
fb7a3a03e7
Update Luminous Cave text to use more descriptive labels ( #61 )
...
* Update luminous_cave.inc
* Fix pointers
* Fix pointers
again
* Fix pointers
finally done
2021-10-08 13:24:23 -07:00
Cheng Hann Gan
78632822c3
Added move data JSON ( #60 )
...
* Added move data JSON
* Fixed typo
* Fixed name of placeholder move
2021-10-05 17:09:53 -07:00
Cheng Hann Gan
c15bd01b90
Fixed CRLF->LF ( #58 )
...
Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
2021-10-01 13:31:27 -07:00
Cheng Hann Gan
12aec1bb71
Created species/item data JSONs ( #57 )
...
* Created species data JSON
* Added item data JSON
* Removed address field from JSONs
-Moved constants/item.h import to item.h.
* Used default values for some JSON fields
-Use item ID macros for item evolutions.
2021-09-28 09:50:36 -07:00
Seth Barberee
0d3b11e81a
Data work and decomp some mail/pelipper board ( #54 )
...
* data work and decomp some mail/pelipper board
* resuce -> rescue
* label more data
2021-09-24 00:49:43 -05:00
Cheng Hann Gan
8237e29a16
Defined more in-dungeon structs and enums ( #53 )
...
* Defined DungeonEntity
* Rename EntityType enums
* Revert EntityType rename
* Defined more in-dungeon structs and enums
* Added more dungeon global structs/enums
* Prefixed dungeonGlobalData with g
* Fixed compile errors
* Removed some CRLFs
* Fixed compile after merge
* Revert Makefile
* Rename DungeonEntityData.entityType
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
* Renamed symbols per PR comments
Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2021-09-09 16:22:48 -07:00
Seth Barberee
4eff188244
Thank You Mail and minor DungeonEnitity Work ( #52 )
...
* Thank You Mail: split out code into own file w/ data
* use constant for facingDir
2021-09-08 21:32:59 -07:00
Seth Barberee
db05ce306f
More PMD grind ( #50 )
...
* more sese grind
* match sub_802ABF8
* some more work
2021-09-01 18:05:30 -07:00
Seth Barberee
459171cf48
Decomp most of friend_rescue ( #49 )
...
* decomp most of friend_rescue
* dump corresponding data
* more data dumping and name some personality test funcs
* dump more text
2021-08-20 22:10:15 -05:00
Seth Barberee
d988394595
More data dumping and some code cleaning ( #46 )
...
* more data dumping and some code cleaning
* split out cutscene scripts
* initial start at script conversion
* more script work
* use correct type
* clearer up struct field names
* split known scripts into seperate files
* no need to preproc pure ascii strings in debug
* more cutscene work
* split out personality test scripts
* solidify text macros and doc some dungeon fields
* more scripting work
2021-08-12 17:26:01 -07:00
Dennis
bad7f7f688
More item related decomp ( #45 )
...
* decompile sub_80918EC
* some more item related functions
* more item functions
* more decomp, fix types in other places
* more small functions
* more item related decomp
* one more weird branching item function
* fix global.h includes
* figured out branch pattern
* decompile sub_8090F58
* make temporary struct for function
* 🦀 items.s is gone 🦀
* some renaming
* rename some obvious item related constants
* fix spelling error
2021-07-17 09:45:13 -07:00
Seth Barberee
a65d358927
minor code cleanup
2021-07-12 17:50:19 -05:00
Dennis
da7b30612f
More work on item related functions ( #44 )
...
* decompile sub_8091290
* decompile sub_80912c8
* rename functions / struct field
* more names
* decompile 80913A0
* decompile GetItemMove
* decompile sub_80913E0
* rename function
* decompile CanSellItem function
* rename inventory struct
* add some item check functions
* fix renaming stuff
* this file shouldnt have been here
* forgot merge conflict
* decompile more item functions
* rename some stuff
* fix HM/TM naming
* Update src/code_801AFA4.c
Use enum value for USED_TM
* Fix incorrect value
* decompile sub_80915F4
* decompile HasGummiItem
* decompiled another function and renamed stuff
* decompile 2 smaller functions
* more functions
* more decompiling and renaming
* redo change that was undone in the merge
2021-07-12 14:10:32 -05:00
Dennis
92a8e55fdd
Decompiled some item related functions ( #42 )
...
* decompile sub_8091290
* decompile sub_80912c8
* rename functions / struct field
* more names
* decompile 80913A0
* decompile GetItemMove
* decompile sub_80913E0
* rename function
* decompile CanSellItem function
* rename inventory struct
* add some item check functions
* fix renaming stuff
* this file shouldnt have been here
* forgot merge conflict
* decompile more item functions
* rename some stuff
* fix HM/TM naming
* Update src/code_801AFA4.c
Use enum value for USED_TM
* Fix incorrect value
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2021-07-10 11:23:20 -05:00