summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-17 00:30:54 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-17 00:30:54 -0500
commit4c15629b612da2e10ef2aee25cd5ecd5ebaf6bf4 (patch)
tree38147c55ac3e17e9ce88c2677233a8800f3dfca6
parent3ab6bf09d8d6bb86e83033e8a7138d02e3917c55 (diff)
oops
-rw-r--r--src/debug/crash.c2
-rw-r--r--src/pokemon/pokedex.c64
2 files changed, 1 insertions, 65 deletions
diff --git a/src/debug/crash.c b/src/debug/crash.c
index 702dbc32a..85058d285 100644
--- a/src/debug/crash.c
+++ b/src/debug/crash.c
@@ -35,7 +35,7 @@ void Crash(u8 *text)
ResetTasks();
ResetSpriteData();
SetMainCallback2(CB2_CrashIdle);
- DmaFill32Large(3, 0, (void *)VRAM, 0x18000, 0x1000);
+ DmaFill32Large(3, 0, (void *)VRAM, 0x18000, 0x1000);
Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8);
Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8);
LoadFontDefaultPalette(&gWindowTemplate_81E6FD8);
diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c
index bdd136ff5..faebe526a 100644
--- a/src/pokemon/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -4152,70 +4152,6 @@ bool16 CompletedNationalPokedex(void)
return TRUE;
}
-/*
-CompletedNationalPokedex:
- push {r4, r5, lr}
- mov r0, #0x0
-.L1236:
- add r0, r0, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- add r0, r4, #0
- mov r1, #0x1
- bl GetSetPokedexFlag
- lsl r0, r0, #0x18
- cmp r0, #0
- beq .L1252 @cond_branch
- add r0, r4, #0
- cmp r0, #0x95
- bls .L1236 @cond_branch
- mov r0, #0x98
-.L1242:
- add r0, r0, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- add r0, r4, #0
- mov r1, #0x1
- bl GetSetPokedexFlag
- lsl r0, r0, #0x18
- cmp r0, #0
- beq .L1252 @cond_branch
- add r0, r4, #0
- cmp r0, #0xf9
- bls .L1242 @cond_branch
- mov r0, #0xfc
- ldr r5, .L1253
-.L1248:
- add r0, r0, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- add r0, r4, #0
- mov r1, #0x1
- bl GetSetPokedexFlag
- lsl r0, r0, #0x18
- cmp r0, #0
- bne .L1247 @cond_branch
-.L1252:
- mov r0, #0x0
- b .L1251
-.L1254:
- .align 2, 0
-.L1253:
- .word 0x17f
-.L1247:
- add r0, r4, #0
- cmp r0, r5
- bls .L1248 @cond_branch
- mov r0, #0x1
-.L1251:
- pop {r4, r5}
- pop {r1}
- bx r1
-.Lfe84:
- .size CompletedNationalPokedex,.Lfe84-CompletedNationalPokedex
- .align 2, 0
-*/
-
static void sub_8091060(u16 a)
{
if (!(a & 0x100))