pret/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-10-06 17:10:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dungeon pokemon/Floor ID JSON Part 1 (#39)

Browse Source 
* 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
This commit is contained in:
Seth Barberee
2021-06-09 22:54:21 -05:00
committed by GitHub
parent eaa141c612
commit 377bd14ea6
152 changed files with 55612 additions and 52652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_8098BDC.c
+6 -6
View File
@@ -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;