summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-11-07 15:09:26 -0800
committerYamaArashi <shadow962@live.com>2015-11-07 15:09:26 -0800
commit795246a93d174e783472997359888420fea71b96 (patch)
tree25f59c057224f0211d1e48d3c2f6d7e2d25a3d5e /asm
parent6292ec87fc3458f99f63965fd643181ec5b13fca (diff)
pokemon graphics labels
Diffstat (limited to 'asm')
-rw-r--r--asm/emerald.s178
-rw-r--r--asm/macros.s20
2 files changed, 105 insertions, 93 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 03d80c155..fa4632578 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -72182,7 +72182,7 @@ sub_802C9D4: ; 802C9D4
beq @0802CAF4
ldrh r2, [r7]
lsls r0, r2, 3
- ldr r1, =gUnknown_08301418
+ ldr r1, =gMonStillFrontPicTable
adds r0, r1
ldr r3, [r7, 0x8]
mov r1, r8
@@ -87561,7 +87561,7 @@ sub_80345F0: ; 80345F0
lsls r0, 1
cmp r5, r0
ble @08034610
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
ldr r0, [r0]
bl LZ77UnCompWram
b @08034618
@@ -87588,7 +87588,7 @@ sub_8034628: ; 8034628
adds r4, r0, 0
adds r5, r1, 0
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
movs r1, 0
cmp r4, r0
@@ -87658,7 +87658,7 @@ sub_8034654: ; 8034654
mov r0, r8
cmp r0, 0
bne @080346C0
- ldr r0, =gUnknown_083028B8
+ ldr r0, =gMonBackPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
@@ -87666,7 +87666,7 @@ sub_8034654: ; 8034654
.align 2, 0
.pool
@080346C0:
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
@@ -87678,7 +87678,7 @@ sub_8034654: ; 8034654
lsls r0, 1
cmp r7, r0
ble @080346E8
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
ldr r0, [r0]
@080346DC:
adds r1, r4, 0
@@ -88145,7 +88145,7 @@ LZ77UnCompAnyRam: ; 8034A08
lsls r0, 1
cmp r5, r0
ble @08034A28
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
ldr r0, [r0]
bl LZ77UnCompWram
b @08034A30
@@ -88215,7 +88215,7 @@ load_poke_gfx_probably: ; 8034A40
mov r0, r8
cmp r0, 0
bne @08034AAC
- ldr r0, =gUnknown_083028B8
+ ldr r0, =gMonBackPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
@@ -88223,7 +88223,7 @@ load_poke_gfx_probably: ; 8034A40
.align 2, 0
.pool
@08034AAC:
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
@@ -88235,7 +88235,7 @@ load_poke_gfx_probably: ; 8034A40
lsls r0, 1
cmp r7, r0
ble @08034AD4
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
ldr r0, [r0]
@08034AC8:
adds r1, r4, 0
@@ -88272,7 +88272,7 @@ help_system_enable_unless_flashback__sp199: ; 8034AFC
adds r4, r0, 0
adds r5, r1, 0
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
movs r1, 0
cmp r4, r0
@@ -88300,7 +88300,7 @@ sub_8034B28: ; 8034B28
lsls r0, 1
cmp r2, r0
ble @08034B44
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
ldr r0, [r0]
bl LZ77UnCompWram
b @08034B4A
@@ -88322,7 +88322,7 @@ sub_8034B50: ; 8034B50
adds r4, r0, 0
adds r5, r1, 0
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
movs r1, 0
cmp r4, r0
@@ -88392,7 +88392,7 @@ sub_8034B7C: ; 8034B7C
mov r0, r8
cmp r0, 0
bne @08034BE8
- ldr r0, =gUnknown_083028B8
+ ldr r0, =gMonBackPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
@@ -88400,7 +88400,7 @@ sub_8034B7C: ; 8034B7C
.align 2, 0
.pool
@08034BE8:
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
lsls r1, 3
adds r1, r0
ldr r0, [r1]
@@ -88412,7 +88412,7 @@ sub_8034B7C: ; 8034B7C
lsls r0, 1
cmp r7, r0
ble @08034C10
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
ldr r0, [r0]
@08034C04:
adds r1, r5, 0
@@ -164559,7 +164559,7 @@ sub_805DC0C: ; 805DC0C
bl battle_get_per_side_status
lsls r0, 24
lsls r2, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r2, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -164734,7 +164734,7 @@ sub_805DD7C: ; 805DD7C
beq @0805DE2C
@0805DE00:
lsls r0, r5, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -164750,7 +164750,7 @@ sub_805DD7C: ; 805DD7C
.pool
@0805DE2C:
lsls r0, r5, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -165590,7 +165590,7 @@ sub_805E448: ; 805E448
mov r9, r3
ldr r4, [r2, 0xC]
lsls r0, r1, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -165662,7 +165662,7 @@ sub_805E448: ; 805E448
adds r4, r0, 0
mov r1, r8
lsls r0, r1, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -165701,7 +165701,7 @@ sub_805E448: ; 805E448
adds r4, r0, 0
mov r1, r8
lsls r0, r1, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -197046,7 +197046,7 @@ species_and_otid_get_pal: ; 806E740
lsls r0, 1
cmp r4, r0
bls @0806E75C
- ldr r0, =gUnknown_08303678
+ ldr r0, =gMonPaletteTable
ldr r0, [r0]
b @0806E788
.align 2, 0
@@ -197062,13 +197062,13 @@ species_and_otid_get_pal: ; 806E740
eors r0, r3
cmp r0, 0x7
bls @0806E780
- ldr r0, =gUnknown_08303678
+ ldr r0, =gMonPaletteTable
lsls r1, r4, 3
b @0806E784
.align 2, 0
.pool
@0806E780:
- ldr r0, =gUnknown_08304438
+ ldr r0, =gMonShinyPaletteTable
lsls r1, r5, 3
@0806E784:
adds r1, r0
@@ -197125,13 +197125,13 @@ sub_806E7CC: ; 806E7CC
cmp r0, 0x7
bls @0806E7F4
lsls r0, r4, 3
- ldr r1, =gUnknown_08303678
+ ldr r1, =gMonPaletteTable
b @0806E7F8
.align 2, 0
.pool
@0806E7F4:
lsls r0, r4, 3
- ldr r1, =gUnknown_08304438
+ ldr r1, =gMonShinyPaletteTable
@0806E7F8:
adds r0, r1
pop {r4}
@@ -203226,7 +203226,7 @@ sub_807163C: ; 807163C
bl pokemon_getattr
adds r3, r0, 0
lsls r0, r4, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r2, [r1]
@@ -221682,7 +221682,7 @@ sub_807ACFC: ; 807ACFC
cmp r6, 0
bne @0807AD94
lsls r0, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -221696,7 +221696,7 @@ sub_807ACFC: ; 807ACFC
.pool
@0807AD94:
lsls r0, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r2, [r1]
@@ -225010,7 +225010,7 @@ sub_807BBEC: ; 807BBEC
adds r0, 0xF2
ldrh r2, [r0]
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -227170,7 +227170,7 @@ sub_807CFC8: ; 807CFC8
adds r0, 0xF2
ldrh r2, [r0]
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -316172,7 +316172,7 @@ sub_80A8394: ; 80A8394
beq @080A8488
@080A845E:
lsls r0, r6, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -316186,7 +316186,7 @@ sub_80A8394: ; 80A8394
.pool
@080A8488:
lsls r0, r6, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -316237,7 +316237,7 @@ sub_80A8394: ; 80A8394
beq @080A8524
@080A84F6:
lsls r0, r6, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -316256,7 +316256,7 @@ sub_80A8394: ; 80A8394
.pool
@080A8524:
lsls r0, r6, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -320121,7 +320121,7 @@ c2_title_screen_1: ; 80AA7A4
ldr r0, =gUnknown_08DE0644
ldr r1, =0x06004800
bl LZ77UnCompVram
- ldr r0, =gUnknown_08DDE258
+ ldr r0, =gTitleScreenBgPalette
movs r2, 0xF0
lsls r2, 1
movs r1, 0
@@ -342952,7 +342952,7 @@ sub_80B5F84: ; 80B5F84
str r2, [sp, 0x4]
movs r1, 0
str r1, [sp, 0x8]
- ldr r1, =gUnknown_08303678
+ ldr r1, =gMonPaletteTable
lsls r4, r0, 3
adds r4, r1
ldrh r1, [r4, 0x4]
@@ -363888,7 +363888,7 @@ sub_80C0D30: ; 80C0D30
mov r8, r0
lsls r1, 16
lsrs r1, 16
- ldr r4, =gUnknown_0856E694
+ ldr r4, =gMonFootprintTable
adds r0, r1, 0
bl NationalPokedexNumToSpecies
lsls r0, 16
@@ -370155,7 +370155,7 @@ sub_80C4140: ; 80C4140
sub_80C41D8: ; 80C41D8
push {r4,r5,lr}
sub sp, 0x4
- ldr r0, =gUnknown_08DDE1F8
+ ldr r0, =gMonIconPalettes
ldr r4, =0x02039ce8
ldr r1, [r4]
movs r5, 0x8D
@@ -381961,7 +381961,7 @@ sub_80CA44C: ; 80CA44C
cmp r4, 0
beq @080CA4E8
lsls r0, r4, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r5, =0x000022c4
adds r1, r2, r5
@@ -385709,7 +385709,7 @@ sub_80CC230: ; 80CC230
mov r10, r0
mov r6, r10
mov r2, sp
- ldr r1, =gUnknown_0857C388
+ ldr r1, =gMonIconPaletteIndices
adds r1, r6, r1
ldr r3, =0x0000dac0
adds r0, r3, 0
@@ -399082,7 +399082,7 @@ sub_80D2CC4: ; 80D2CC4
ldr r0, =gUnknown_0857C5E8
str r0, [sp, 0x24]
str r6, [sp, 0x28]
- ldr r0, =gUnknown_0857C388
+ ldr r0, =gMonIconPaletteIndices
adds r0, r4, r0
ldr r1, =0x0000dac0
adds r5, r1, 0
@@ -399155,7 +399155,7 @@ sub_80D2D78: ; 80D2D78
ldr r2, =gUnknown_0857C5E8
str r2, [sp, 0xC]
str r1, [sp, 0x10]
- ldr r2, =gUnknown_0857C388
+ ldr r2, =gMonIconPaletteIndices
adds r2, r0, r2
ldr r7, =0x0000dac0
adds r1, r7, 0
@@ -399343,7 +399343,7 @@ sub_80D2EF8: ; 80D2EF8
sub_80D2F04: ; 80D2F04
push {r4,r5,lr}
movs r4, 0
- ldr r5, =gUnknown_0857C540
+ ldr r5, =gMonIconPaletteTable
@080D2F0A:
lsls r0, r4, 3
adds r0, r5
@@ -399372,10 +399372,10 @@ sub_80D2F28: ; 80D2F28
movs r1, 0x82
lsls r1, 1
@080D2F3A:
- ldr r0, =gUnknown_0857C388
+ ldr r0, =gMonIconPaletteIndices
adds r0, r1, r0
ldrb r0, [r0]
- ldr r1, =gUnknown_0857C540
+ ldr r1, =gMonIconPaletteTable
lsls r0, 3
adds r4, r0, r1
ldrh r0, [r4, 0x4]
@@ -399399,10 +399399,10 @@ sub_80D2F68: ; 80D2F68
push {r4,lr}
lsls r0, 16
lsrs r0, 16
- ldr r1, =gUnknown_0857C388
+ ldr r1, =gMonIconPaletteIndices
adds r0, r1
ldrb r0, [r0]
- ldr r1, =gUnknown_0857C540
+ ldr r1, =gMonIconPaletteTable
lsls r0, 3
adds r4, r0, r1
ldrh r0, [r4, 0x4]
@@ -399425,7 +399425,7 @@ sub_80D2F68: ; 80D2F68
sub_80D2F9C: ; 80D2F9C
push {r4,r5,lr}
movs r4, 0
- ldr r5, =gUnknown_0857C540
+ ldr r5, =gMonIconPaletteTable
@080D2FA2:
lsls r0, r4, 3
adds r0, r5
@@ -399455,10 +399455,10 @@ sub_80D2FC0: ; 80D2FC0
movs r1, 0x82
lsls r1, 1
@080D2FD2:
- ldr r0, =gUnknown_0857C388
+ ldr r0, =gMonIconPaletteIndices
adds r0, r1, r0
ldrb r0, [r0]
- ldr r1, =gUnknown_0857C540
+ ldr r1, =gMonIconPaletteTable
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x4]
@@ -399474,10 +399474,10 @@ sub_80D2FF0: ; 80D2FF0
push {lr}
lsls r0, 16
lsrs r0, 16
- ldr r1, =gUnknown_0857C388
+ ldr r1, =gMonIconPaletteIndices
adds r0, r1
ldrb r0, [r0]
- ldr r1, =gUnknown_0857C540
+ ldr r1, =gMonIconPaletteTable
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x4]
@@ -399502,7 +399502,7 @@ sub_80D3020: ; 80D3020
adds r3, r1, 0
lsls r0, 16
lsrs r0, 16
- ldr r2, =gUnknown_0857BCA8
+ ldr r2, =gMonIconTable
lsls r1, r0, 2
adds r1, r2
ldr r2, [r1]
@@ -399530,7 +399530,7 @@ sub_80D304C: ; 80D304C
lsrs r4, r0, 16
cmp r4, 0xA0
bhi @080D3074
- ldr r6, =gUnknown_0857C540
+ ldr r6, =gMonIconPaletteTable
movs r5, 0x5
@080D305A:
ldr r0, [r6]
@@ -399565,7 +399565,7 @@ sub_80D3080: ; 80D3080
movs r1, 0x82
lsls r1, 1
@080D3092:
- ldr r0, =gUnknown_0857C388
+ ldr r0, =gMonIconPaletteIndices
adds r0, r1, r0
ldrb r0, [r0]
pop {r1}
@@ -399578,7 +399578,7 @@ sub_80D3080: ; 80D3080
sub_80D30A0: ; 80D30A0
lsls r0, 16
lsrs r0, 16
- ldr r1, =gUnknown_0857C388
+ ldr r1, =gMonIconPaletteIndices
adds r0, r1
ldrb r0, [r0]
bx lr
@@ -399598,8 +399598,8 @@ sub_80D30B0: ; 80D30B0
movs r2, 0x82
lsls r2, 1
@080D30C2:
- ldr r1, =gUnknown_0857C540
- ldr r0, =gUnknown_0857C388
+ ldr r1, =gMonIconPaletteTable
+ ldr r0, =gMonIconPaletteIndices
adds r0, r2, r0
ldrb r0, [r0]
lsls r0, 3
@@ -415532,7 +415532,7 @@ sub_80DB174: ; 80DB174
cmp r4, r0
bne @080DB1B8
lsls r0, r5, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -415545,7 +415545,7 @@ sub_80DB174: ; 80DB174
.pool
@080DB1B8:
lsls r0, r5, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -467819,7 +467819,7 @@ sub_80F6404: ; 80F6404
ldr r3, =0x02039e00
ldr r4, =0x02039f25
mov r9, r4
- ldr r4, =gUnknown_0830A18C
+ ldr r4, =gMonFrontPicTable
mov r12, r4
ldr r4, =0x020244d4
mov r8, r4
@@ -468563,7 +468563,7 @@ sub_80F6A64: ; 80F6A64
sub_80F6A9C: ; 80F6A9C
push {r4-r6,lr}
movs r4, 0
- ldr r6, =gUnknown_0857C388
+ ldr r6, =gMonIconPaletteIndices
movs r5, 0xA0
lsls r5, 16
@080F6AA6:
@@ -468578,7 +468578,7 @@ sub_80F6A9C: ; 80F6A9C
adds r0, r6
ldrb r0, [r0]
lsls r0, 5
- ldr r1, =gUnknown_08DDE1F8
+ ldr r1, =gMonIconPalettes
adds r0, r1
lsrs r1, r5, 16
movs r2, 0x20
@@ -472931,7 +472931,7 @@ sub_80F8D28: ; 80F8D28
cmp r0, r1
bne @080F8DC4
lsls r0, r6, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -472944,7 +472944,7 @@ sub_80F8D28: ; 80F8D28
.pool
@080F8DC4:
lsls r0, r6, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -585203,7 +585203,7 @@ sub_81302E8: ; 81302E8
cmp r4, 0
bne @08130348
lsls r0, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r4, =0x020244d4
ldr r1, [r4]
@@ -585223,7 +585223,7 @@ sub_81302E8: ; 81302E8
.pool
@08130348:
lsls r0, r5, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
adds r0, r1
ldr r4, =0x020244d4
ldr r1, [r4]
@@ -612017,7 +612017,7 @@ evolution_cutscene: ; 813DA8C
bl pokemon_getattr
mov r9, r0
lsls r0, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r2, =0x020244d4
ldr r1, [r2]
@@ -612073,7 +612073,7 @@ evolution_cutscene: ; 813DA8C
strb r0, [r1]
mov r1, r10
lsls r0, r1, 3
- ldr r2, =gUnknown_0830A18C
+ ldr r2, =gMonFrontPicTable
adds r0, r2
ldr r2, =0x020244d4
ldr r1, [r2]
@@ -612275,7 +612275,7 @@ sub_813DD7C: ; 813DD7C
movs r0, 0x4
strb r0, [r1]
lsls r0, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -612485,7 +612485,7 @@ sub_813DF70: ; 813DF70
bl pokemon_getattr
adds r4, r0, 0
lsls r0, r6, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -612659,7 +612659,7 @@ sub_813E1D4: ; 813E1D4
movs r4, 0
strb r6, [r0]
lsls r0, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -728651,7 +728651,7 @@ sub_8179DF4: ; 8179DF4
bl pokemon_getattr
adds r4, r0, 0
lsls r0, r5, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -766013,13 +766013,13 @@ load_pokemon_image_TODO: ; 818CFF4
cmp r1, 0
bne @0818D028
lsls r0, r4, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
b @0818D03C
.align 2, 0
.pool
@0818D028:
lsls r0, r4, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
b @0818D054
.align 2, 0
.pool
@@ -766027,7 +766027,7 @@ load_pokemon_image_TODO: ; 818CFF4
cmp r0, 0
bne @0818D050
lsls r0, r4, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
@0818D03C:
adds r0, r1
str r2, [sp]
@@ -766040,7 +766040,7 @@ load_pokemon_image_TODO: ; 818CFF4
.pool
@0818D050:
lsls r0, r4, 3
- ldr r1, =gUnknown_083028B8
+ ldr r1, =gMonBackPicTable
@0818D054:
adds r0, r1
str r2, [sp]
@@ -810853,7 +810853,7 @@ sub_81A3D58: ; 81A3D58
cmp r0, 0
bne @081A3D88
lsls r0, r4, 17
- ldr r1, =gUnknown_08C40000
+ ldr r1, =0x8C4 << 16
adds r0, r1
lsrs r0, 16
bl flag_set
@@ -810862,7 +810862,7 @@ sub_81A3D58: ; 81A3D58
.pool
@081A3D88:
lsls r0, r4, 17
- ldr r1, =gUnknown_08C50000
+ ldr r1, =0x8C5 << 16
adds r0, r1
lsrs r0, 16
bl flag_set
@@ -873770,7 +873770,7 @@ sub_81C45F4: ; 81C45F4
beq @081C4668
ldrh r2, [r5, 0x2]
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -873781,7 +873781,7 @@ sub_81C45F4: ; 81C45F4
@081C4668:
ldrh r2, [r5, 0x2]
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, =0x020244d4
ldr r1, [r1]
@@ -873811,7 +873811,7 @@ sub_81C45F4: ; 81C45F4
@081C46A6:
ldrh r2, [r5, 0x2]
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, [r4]
@081C46B0:
@@ -873824,7 +873824,7 @@ sub_81C45F4: ; 81C45F4
@081C46CC:
ldrh r2, [r5, 0x2]
lsls r0, r2, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r1, [r3, 0x8]
@081C46D6:
@@ -873851,7 +873851,7 @@ sub_81C45F4: ; 81C45F4
@081C4700:
ldrh r4, [r5, 0x2]
lsls r4, 3
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
adds r4, r0
movs r0, 0
movs r1, 0x1
@@ -873867,7 +873867,7 @@ sub_81C45F4: ; 81C45F4
@081C472C:
ldrh r4, [r5, 0x2]
lsls r4, 3
- ldr r0, =gUnknown_0830A18C
+ ldr r0, =gMonFrontPicTable
adds r4, r0
movs r0, 0
movs r1, 0x1
@@ -892800,7 +892800,7 @@ sub_81CDB98: ; 81CDB98
bl sub_81D2C68
adds r5, r0, 0
lsls r0, r4, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
mov r2, r9
lsls r1, r2, 13
@@ -903892,7 +903892,7 @@ sub_81D3094: ; 81D3094
bl sub_81D2C68
adds r5, r0, 0
lsls r0, r4, 3
- ldr r1, =gUnknown_0830A18C
+ ldr r1, =gMonFrontPicTable
adds r0, r1
movs r1, 0x1
str r1, [sp]
diff --git a/asm/macros.s b/asm/macros.s
index 4d44a7ac5..4a33fd82b 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -5,10 +5,6 @@
.include "asm/macros/ec.s"
.include "asm/macros/map.s"
- .macro include_range start, end
- .incbin "base_emerald.gba", \start, \end - \start
- .endm
-
.macro region_map_entry x, y, width, height, name
.byte \x
.byte \y
@@ -16,3 +12,19 @@
.byte \height
.4byte gMapName_\name
.endm
+
+ .macro obj_tiles address, uncompressed_size, tag
+ .4byte \address
+ .2byte \uncompressed_size
+ .2byte \tag
+ .endm
+
+ .macro obj_pal address, tag
+ .4byte \address
+ .2byte \tag
+ .2byte 0; padding
+ .endm
+
+ .macro zero_fill count
+ .fill \count
+ .endm