Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-04-26 00:02:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renaming objects related to tomomichi debug menu

Browse Source
This commit is contained in:
PikalaxALT 2018-03-15 08:46:22 -04:00
parent e49ff77a07
commit fed5701e8e
4 changed files with 857 additions and 859 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
data/scripts/debug.inc vendored
View File

@ -1,13 +1,13 @@
.if DEBUG
DebugScript_081C1CFE:: @ 81C1CFE
setflag 0x804
setflag FLAG_SYS_GAME_CLEAR
call EverGrandeCity_HallOfFame_EventScript_19FC13
end
DebugScript_081C1D07:: @ 81C1D07
checkitem ITEM_COIN_CASE, 1
compare 0x800d, 1
compare RESULT, 1
goto_if_eq DebugScript_081C1D1D
giveitem ITEM_COIN_CASE, 1
end
@ -22,7 +22,7 @@ DebugScript_081C1D23:: @ 81C1D23
end
DebugScript_081C1D24:: @ 81C1D24
setvar 0x40ba, 1
setvar VAR_NEW_MAUVILLE_STATE, 1
end
DebugScript_081C1D2A:: @ 81C1D2A
@ -34,7 +34,7 @@ DebugScript_081C1D34:: @ 81C1D34
DebugScript_081C1D35:: @ 81C1D35
getpartysize
compare 0x800d, 6
compare RESULT, 6
goto_if_eq DebugScript_081C1D45
giveegg SPECIES_KYOGRE
end
@ -451,8 +451,8 @@ DebugScript_081C23E2:: @ 81C23E2
end
DebugScript_081C23E6:: @ 81C23E6
setflag 0x081
setflag 0x071
setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
setflag FLAG_LEGENDARY_BATTLE_COMPLETED
warp MAP_SOOTOPOLIS_CITY, 0xFF, 31, 33
waitstate
end
@ -463,15 +463,15 @@ DebugScript_081C23F6:: @ 81C23F6
DebugScript_081C23FD:: @ 81C23FD
getpartysize
compare 0x800d, 1
compare RESULT, 1
goto_if_eq DebugScript_081C2436
compare 0x800d, 2
compare RESULT, 2
goto_if_eq DebugScript_081C2445
compare 0x800d, 3
compare RESULT, 3
goto_if_eq DebugScript_081C2454
compare 0x800d, 4
compare RESULT, 4
goto_if_eq DebugScript_081C2463
compare 0x800d, 5
compare RESULT, 5
goto_if_eq DebugScript_081C2472
end
@ -489,15 +489,15 @@ DebugScript_081C2472:
DebugScript_081C2482:: @ 81C2482
getpartysize
compare 0x800d, 1
compare RESULT, 1
goto_if_eq DebugScript_081C24BB
compare 0x800d, 2
compare RESULT, 2
goto_if_eq DebugScript_081C24CA
compare 0x800d, 3
compare RESULT, 3
goto_if_eq DebugScript_081C24D9
compare 0x800d, 4
compare RESULT, 4
goto_if_eq DebugScript_081C24E8
compare 0x800d, 5
compare RESULT, 5
goto_if_eq DebugScript_081C24F7
end
@ -515,7 +515,7 @@ DebugScript_081C24F7:
DebugScript_081C2507:: @ 81C2507
getpartysize
compare 0x800d, 6
compare RESULT, 6
goto_if_eq DebugScript_081C2517
giveegg SPECIES_BARBOACH
end
@ -525,7 +525,7 @@ DebugScript_081C2517:: @ 81C2517
DebugScript_081C2518:: @ 81C2518
getpartysize
compare 0x800d, 6
compare RESULT, 6
goto_if_eq DebugScript_081C2528
giveegg SPECIES_SHROOMISH
end

6
include/contest_painting.h
View File

@ -40,9 +40,9 @@ struct Unk2015E00
struct ContestEntry
{
/*0x00*/ u32 var0;
/*0x04*/ u32 var4;
/*0x08*/ u16 var8;
/*0x00*/ u32 personality;
/*0x04*/ u32 otId;
/*0x08*/ u16 species;
/*0x0A*/ u8 contestType;
/*0x0B*/ u8 pokemon_name[POKEMON_NAME_LENGTH];
/*0x15*/ u8 pad15;

1663
src/debug/tomomichi_debug_menu.c
View File

File diff suppressed because it is too large Load Diff

11
src/scene/contest_painting.c
View File

@ -333,8 +333,7 @@ static void sub_8106AC4(u16 species, u8 arg1)
{
void *pal;
// Unsure what gUnknown_03005E8C->var0 is supposed to be.
pal = GetMonSpritePalFromOtIdPersonality(species, gUnknown_03005E8C->var4, gUnknown_03005E8C->var0);
pal = GetMonSpritePalFromOtIdPersonality(species, gUnknown_03005E8C->otId, gUnknown_03005E8C->personality);
LZDecompressVram(pal, gUnknown_03005E90);
if (arg1 == 1)
@ -346,7 +345,7 @@ static void sub_8106AC4(u16 species, u8 arg1)
0x2000000,
gUnknown_081FAF4C[1],
species,
(u32)gUnknown_03005E8C->var0
(u32)gUnknown_03005E8C->personality
);
sub_8106B90(gUnknown_081FAF4C[1], gUnknown_03005E90, gUnknown_03005E10);
}
@ -359,7 +358,7 @@ static void sub_8106AC4(u16 species, u8 arg1)
0x2000000,
gUnknown_081FAF4C[0],
species,
(u32)gUnknown_03005E8C->var0
(u32)gUnknown_03005E8C->personality
);
sub_8106B90(gUnknown_081FAF4C[0], gUnknown_03005E90, gUnknown_03005E10);
}
@ -743,7 +742,7 @@ static void sub_8106F6C(u8 arg0)
gUnknown_03005E20.var_4 = gUnknown_03005E10;
gUnknown_03005E20.var_8 = gUnknown_03005E90;
gUnknown_03005E20.var_18 = 0;
gUnknown_03005E20.var_1F = gUnknown_03005E8C->var0 % 256;
gUnknown_03005E20.var_1F = gUnknown_03005E8C->personality % 256;
gUnknown_03005E20.var_19 = 0;
gUnknown_03005E20.var_1A = 0;
gUnknown_03005E20.var_1B = 64;
@ -779,7 +778,7 @@ static void sub_8106F6C(u8 arg0)
static void sub_8107090(u8 arg0, u8 arg1)
{
sub_8106F4C();
sub_8106AC4(gUnknown_03005E8C->var8, 0);
sub_8106AC4(gUnknown_03005E8C->species, 0);
sub_8106F6C(sub_8106EE0(arg0));
sub_8106E98(arg0);
sub_8106C40(arg0, arg1);