diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /src/battle_main.c | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index ff376a5e4..a0eb7274f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -97,7 +97,6 @@ extern u16 gLastLandedMoves[]; extern u16 gLastHitByType[]; extern u16 gUnknown_02024C4C[]; extern u16 gLockedMoves[]; -extern u8 gLastHitBy[]; extern u16 gChosenMovesByBanks[]; extern u32 gHitMarker; extern u8 gUnknown_02024C70[]; @@ -2514,7 +2513,7 @@ void debug_sub_8012688(void) &gMonFrontPicTable[gCurrentMove], gMonFrontPicCoords[gCurrentMove].coords, gMonFrontPicCoords[gCurrentMove].y_offset, - (void *)0x02000000, + (void *)EWRAM, gUnknown_081FAF4C[1], gCurrentMove); LoadCompressedPalette(gMonPaletteTable[gCurrentMove].data, 272, 32); @@ -2574,7 +2573,7 @@ void debug_sub_80129F8(u8 taskId) &gMonFrontPicTable[gCurrentMove], gMonFrontPicCoords[gCurrentMove].coords, gMonFrontPicCoords[gCurrentMove].y_offset, - (void *)0x02000000, + (void *)EWRAM, gUnknown_081FAF4C[1], gCurrentMove); LoadCompressedPalette(gMonPaletteTable[gCurrentMove].data, 272, 32); |