diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-06-09 22:54:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 22:54:21 -0500 |
| commit | 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch) | |
| tree | 5440970e02a7890791b234aa233e91e5c1d65b40 /src/code_8098BDC.c | |
| parent | eaa141c612dd1689936a21bd57018a55ff686b69 (diff) | |
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json
* rule tweaking to actually build tool before parsing JSON
* delete .inc pokemon for tiny Woods and Thunderwave
* silence git complaining about br_ips and ips_patch
* use defines for species and pass the header file for species
* convert sinister woods
* convert MtThunderPeak
* convert silent chasm
* add trial floor_id w/ tiny woods
* change make rule name to fix compile
* MtSteel converted and bugfix
* convert few floor headers and great canyon pokemon
* code cleanup
* unify unkData into UnkTextStruct2
* more code cleanup and some text decomp
* doc more funcs and decomp/split some stuff
* document more save stuff
* more save work and move some data
* pika sniped UpdateNatureTotal
* decomp a litle and convert a few more dungeons
* better scanning for json files
* mt freeze and peak
Diffstat (limited to 'src/code_8098BDC.c')
| -rw-r--r-- | src/code_8098BDC.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code_8098BDC.c b/src/code_8098BDC.c index f4a745f..c060642 100644 --- a/src/code_8098BDC.c +++ b/src/code_8098BDC.c @@ -257,13 +257,13 @@ bool8 sub_8098E18(s16 r0, u32 r1) } // Unused -u32 sub_8098EB0(u32 r0, u32 r1, u32 r2, u32 r3) +u32 sub_8098EB0(u32 r0) { if(gUnknown_20398A8 == 0) { if(gUnknown_203B49D != 0) { - Log(NULL, &gUnknown_8115FA4, r0, r3); + Log(NULL, &gUnknown_8115FA4, r0); gUnknown_20398A8 = 7; gUnknown_20398AC = 1; gUnknown_20398B0 = r0; @@ -274,11 +274,11 @@ u32 sub_8098EB0(u32 r0, u32 r1, u32 r2, u32 r3) return 0; } -u32 sub_8098F00(u32 r0, u32 r1, u32 r2, u32 r3) +u32 sub_8098F00(u32 r0) { if(gUnknown_20398A8 == 0) { - Log(NULL, &gUnknown_8115FC8, r0, r3); + Log(NULL, &gUnknown_8115FC8, r0); gUnknown_20398A8 = 9; gUnknown_20398AC = 1; gUnknown_20398B0 = r0; @@ -288,11 +288,11 @@ u32 sub_8098F00(u32 r0, u32 r1, u32 r2, u32 r3) return 0; } -u32 sub_8098F44(u32 r0, u32 r1, u32 r2, u32 r3) +u32 sub_8098F44(u32 r0) { if(gUnknown_20398A8 == 0) { - Log(NULL, &gUnknown_8115FE8, r0, r3); + Log(NULL, &gUnknown_8115FE8, r0); gUnknown_20398A8 = 10; gUnknown_20398AC = 1; gUnknown_20398B0 = r0; |