Merge branch 'master' into battle_engine_v2

This commit is contained in:
DizzyEggg 2018-09-16 09:22:05 +02:00
commit 0800a44f7a
497 changed files with 11278 additions and 23635 deletions

View file

@ -90,7 +90,7 @@ tidy:
rm -r build/*
include graphics_file_rules.mk
include event_obj_graphics_makefile_rules.mk
include spritesheet_rules.mk
%.s: ;
%.png: ;
@ -173,5 +173,5 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION)
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent

File diff suppressed because it is too large Load diff

View file

@ -1,260 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81BA040
sub_81BA040: @ 81BA040
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
movs r0, 0
mov r10, r0
ldr r1, =gFacilityTrainers
ldr r0, =gSlateportBattleTentTrainers
str r0, [r1]
ldr r1, =gFacilityTrainerMons
ldr r0, =gSlateportBattleTentMons
str r0, [r1]
ldr r7, =gSaveBlock2Ptr
ldr r1, =0x0000ffff
mov r8, r1
_081BA062:
mov r2, r10
lsls r6, r2, 1
_081BA066:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1E
bl __umodsi3
lsls r0, 16
lsrs r3, r0, 16
movs r5, 0
ldr r1, [r7]
ldr r4, =0x00000cb2
adds r0, r1, r4
ldrh r0, [r0]
cmp r5, r0
bge _081BA0AA
ldr r2, =0x00000cb4
adds r0, r1, r2
ldrh r0, [r0]
cmp r0, r3
beq _081BA0AA
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r1, r4
ldrh r2, [r0]
adds r4, 0x2
adds r1, r4
_081BA09C:
adds r1, 0x2
adds r5, 0x1
cmp r5, r2
bge _081BA0AA
ldrh r0, [r1]
cmp r0, r3
bne _081BA09C
_081BA0AA:
ldr r0, [r7]
ldr r1, =0x00000cb2
adds r0, r1
ldrh r0, [r0]
cmp r5, r0
bne _081BA066
ldr r2, =gTrainerBattleOpponent_A
strh r3, [r2]
ldrh r3, [r2]
ldr r4, =gFacilityTrainers
ldr r1, [r4]
movs r0, 0x34
muls r0, r3
adds r0, r1
ldr r0, [r0, 0x30]
adds r1, r6, r0
ldrh r0, [r1]
cmp r0, r8
beq _081BA0DE
ldr r3, =0x0000ffff
_081BA0D2:
adds r1, 0x2
movs r6, 0x1
add r10, r6
ldrh r0, [r1]
cmp r0, r3
bne _081BA0D2
_081BA0DE:
mov r0, r10
cmp r0, 0x8
bgt _081BA110
movs r1, 0
mov r10, r1
b _081BA062
.pool
_081BA110:
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r6, =0x00000cb2
adds r3, r1, r6
ldrh r0, [r3]
cmp r0, 0x1
bhi _081BA12A
lsls r0, 1
ldr r3, =0x00000cb4
adds r1, r3
adds r1, r0
ldrh r0, [r2]
strh r0, [r1]
_081BA12A:
ldrh r1, [r2]
ldr r2, [r4]
movs r0, 0x34
muls r0, r1
adds r0, r2
ldr r0, [r0, 0x30]
mov r9, r0
movs r5, 0
ldr r7, =gUnknown_03001298
mov r8, sp
_081BA13E:
bl Random
lsls r0, 16
lsrs r0, 16
mov r1, r10
bl __modsi3
lsls r0, 1
add r0, r9
ldrh r0, [r0]
strh r0, [r7]
movs r2, 0
ldrh r0, [r7]
ldr r4, =gFacilityTrainerMons
ldr r3, [r4]
lsls r0, 4
adds r0, r3
ldr r1, =gSaveBlock2Ptr
ldrh r6, [r0]
ldr r1, [r1]
_081BA166:
movs r4, 0xE7
lsls r4, 4
adds r0, r1, r4
ldrh r0, [r0]
lsls r0, 4
adds r0, r3
ldrh r0, [r0]
cmp r6, r0
beq _081BA180
adds r1, 0xC
adds r2, 0x1
cmp r2, 0x5
ble _081BA166
_081BA180:
cmp r2, 0x6
bne _081BA220
movs r4, 0
cmp r4, r5
bge _081BA1B0
mov r0, sp
ldrh r0, [r0]
cmp r0, r6
beq _081BA1B0
ldr r6, =gUnknown_03001298
ldr r3, =gFacilityTrainerMons
mov r2, sp
_081BA198:
adds r2, 0x2
adds r4, 0x1
cmp r4, r5
bge _081BA1B0
ldrh r0, [r6]
ldr r1, [r3]
lsls r0, 4
adds r0, r1
ldrh r1, [r2]
ldrh r0, [r0]
cmp r1, r0
bne _081BA198
_081BA1B0:
cmp r4, r5
bne _081BA220
movs r4, 0
cmp r4, r5
bge _081BA1E6
ldr r6, =gBattleFrontierHeldItems
mov r12, r6
add r3, sp, 0x8
_081BA1C0:
ldrh r2, [r3]
cmp r2, 0
beq _081BA1DE
ldr r1, =gUnknown_03001298
ldrh r0, [r1]
ldr r6, =gFacilityTrainerMons
ldr r1, [r6]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0xA]
lsls r0, 1
add r0, r12
ldrh r0, [r0]
cmp r2, r0
beq _081BA1E6
_081BA1DE:
adds r3, 0x2
adds r4, 0x1
cmp r4, r5
blt _081BA1C0
_081BA1E6:
cmp r4, r5
bne _081BA220
lsls r2, r5, 1
ldrh r0, [r7]
ldr r1, =gFacilityTrainerMons
ldr r4, [r1]
lsls r0, 4
adds r0, r4
ldrh r0, [r0]
mov r3, r8
strh r0, [r3]
add r1, sp, 0x8
adds r1, r2
ldr r3, =gBattleFrontierHeldItems
ldrh r0, [r7]
lsls r0, 4
adds r0, r4
ldrb r0, [r0, 0xA]
lsls r0, 1
adds r0, r3
ldrh r0, [r0]
strh r0, [r1]
ldr r0, =gUnknown_03006298
adds r2, r0
ldrh r0, [r7]
strh r0, [r2]
movs r4, 0x2
add r8, r4
adds r5, 0x1
_081BA220:
cmp r5, 0x3
bne _081BA13E
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BA040
.align 2, 0 @ Don't pad with nop.

View file

@ -2544,7 +2544,7 @@ _08163718:
adds r0, r6, r2
adds r2, r3, 0
str r3, [sp, 0x1C]
bl sub_81A7024
bl SetMonMoveAvoidReturn
ldr r3, [sp, 0x1C]
adds r0, r3, 0x1
lsls r0, 24
@ -2662,7 +2662,7 @@ _08163818:
ldr r2, =gEnemyParty
adds r0, r6, r2
adds r2, r7, 0
bl sub_81A7024
bl SetMonMoveAvoidReturn
ldr r1, =gFacilityTrainerMons
ldr r0, [r1]
adds r0, r5, r0

View file

@ -1,762 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81520A8
sub_81520A8: @ 81520A8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r7, r0, 24
lsls r4, 24
lsrs r4, 24
mov r8, r4
movs r0, 0
lsrs r4, r3, 24
cmp r0, r8
bcs _08152122
_081520DA:
ldr r2, [sp]
movs r3, 0
adds r6, r4, 0x1
adds r0, 0x1
mov r12, r0
cmp r3, r7
bcs _0815210C
lsls r5, r4, 6
_081520EA:
lsls r0, r2, 1
adds r0, r5
add r0, r10
mov r1, r9
strh r1, [r0]
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r7
bcc _081520EA
_0815210C:
adds r0, r6, 0
asrs r0, 5
lsls r0, 5
subs r0, r6, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r12
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r8
bcc _081520DA
_08152122:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81520A8
thumb_func_start sub_8152134
sub_8152134: @ 8152134
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r0, 24
mov r12, r0
lsls r4, 24
lsrs r4, 24
mov r9, r4
movs r0, 0
adds r5, r1, 0
lsrs r4, r3, 24
cmp r0, r9
bcs _081521AE
_08152164:
ldr r2, [sp]
movs r3, 0
adds r7, r4, 0x1
adds r0, 0x1
mov r8, r0
cmp r3, r12
bcs _08152198
lsls r6, r4, 6
_08152174:
lsls r0, r2, 1
adds r0, r6
add r0, r10
ldrh r1, [r5]
strh r1, [r0]
adds r5, 0x2
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r12
bcc _08152174
_08152198:
adds r0, r7, 0
asrs r0, 5
lsls r0, 5
subs r0, r7, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r8
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r9
bcc _08152164
_081521AE:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8152134
thumb_func_start sub_81521C0
sub_81521C0: @ 81521C0
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r4, r0, 24
movs r5, 0
cmp r4, 0
beq _081521FE
cmp r4, 0x40
bls _081521D6
movs r4, 0x40
_081521D6:
ldr r6, =gUnknown_0203ABB8
movs r0, 0x8
bl AllocZeroed
str r0, [r6]
cmp r0, 0
beq _081521FE
lsls r0, r4, 1
adds r0, r4
lsls r0, 4
bl AllocZeroed
ldr r1, [r6]
str r0, [r1, 0x4]
cmp r0, 0
bne _08152208
adds r0, r1, 0
bl Free
str r5, [r6]
_081521FE:
movs r0, 0
b _08152244
.pool
_08152208:
strb r4, [r1]
cmp r5, r4
bcs _08152242
adds r3, r6, 0
ldr r0, =gDummyOamData
mov r12, r0
movs r2, 0x4
mov r8, r2
_08152218:
ldr r0, [r3]
ldr r2, [r0, 0x4]
lsls r1, r5, 1
adds r1, r5
lsls r1, 4
adds r2, r1, r2
mov r0, r12
ldm r0!, {r6,r7}
stm r2!, {r6,r7}
ldr r0, [r3]
ldr r0, [r0, 0x4]
adds r1, r0
ldrb r0, [r1, 0x19]
mov r2, r8
orrs r0, r2
strb r0, [r1, 0x19]
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, r4
bcc _08152218
_08152242:
movs r0, 0x1
_08152244:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81521C0
thumb_func_start sub_8152254
sub_8152254: @ 8152254
push {r4-r7,lr}
movs r3, 0
ldr r0, =gUnknown_0203ABB8
ldr r2, [r0]
adds r5, r0, 0
cmp r2, 0
bne _0815226C
movs r0, 0
b _081522C4
.pool
_0815226C:
ldrb r2, [r2]
cmp r3, r2
bcs _08152292
ldr r0, =gMain+0x238
mov r12, r0
ldr r4, =gDummyOamData
adds r2, r5, 0
_0815227A:
lsls r1, r3, 3
add r1, r12
adds r0, r4, 0
ldm r0!, {r6,r7}
stm r1!, {r6,r7}
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
ldr r0, [r2]
ldrb r0, [r0]
cmp r3, r0
bcc _0815227A
_08152292:
ldr r1, [r5]
ldrb r0, [r1]
lsls r2, r0, 1
adds r2, r0
ldr r0, [r1, 0x4]
lsls r2, 4
movs r1, 0
bl memset
ldr r0, [r5]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r5]
movs r4, 0
str r4, [r0, 0x4]
movs r1, 0
movs r2, 0x8
bl memset
ldr r0, [r5]
bl Free
str r4, [r5]
movs r0, 0x1
_081522C4:
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_8152254
thumb_func_start sub_81522D4
sub_81522D4: @ 81522D4
push {r4-r7,lr}
mov r7, r8
push {r7}
movs r6, 0
ldr r0, =gUnknown_0203ABB8
ldr r1, [r0]
adds r3, r0, 0
cmp r1, 0
beq _081522EC
ldr r0, [r1, 0x4]
cmp r0, 0
bne _081522F4
_081522EC:
movs r0, 0
b _081523D2
.pool
_081522F4:
ldrb r1, [r1]
cmp r6, r1
bcs _081523D0
adds r7, r3, 0
movs r0, 0x3
mov r8, r0
_08152300:
ldr r0, [r7]
ldr r1, [r0, 0x4]
lsls r0, r6, 1
adds r0, r6
lsls r5, r0, 4
adds r2, r5, r1
ldrb r1, [r2, 0x19]
movs r0, 0x3
ands r0, r1
cmp r0, 0x3
bne _081523C2
ldr r1, [r2, 0x2C]
cmp r1, 0
beq _08152322
adds r0, r2, 0
bl _call_via_r1
_08152322:
ldr r0, [r7]
ldr r0, [r0, 0x4]
adds r2, r5, r0
ldrb r1, [r2, 0x19]
movs r0, 0x4
ands r0, r1
cmp r0, 0
beq _08152348
lsls r0, r6, 3
ldr r1, =gMain+0x238
adds r0, r1
ldr r1, =gDummyOamData
ldm r1!, {r2,r3}
stm r0!, {r2,r3}
b _081523C0
.pool
_08152348:
ldrb r0, [r2, 0xE]
ldrb r4, [r2, 0xA]
adds r0, r4
strb r0, [r2]
ldr r4, [r7]
ldr r3, [r4, 0x4]
adds r3, r5, r3
movs r0, 0x8
ldrsh r2, [r3, r0]
movs r1, 0xC
ldrsh r0, [r3, r1]
adds r2, r0
ldr r1, =0x000001ff
adds r0, r1, 0
ands r2, r0
ldrh r0, [r3, 0x2]
ldr r1, =0xfffffe00
mov r12, r1
mov r1, r12
ands r0, r1
orrs r0, r2
strh r0, [r3, 0x2]
ldr r3, [r4, 0x4]
adds r3, r5, r3
ldrb r0, [r3, 0x19]
lsls r0, 27
lsrs r0, 30
mov r2, r8
ands r0, r2
lsls r0, 2
ldrb r1, [r3, 0x5]
movs r4, 0xD
negs r4, r4
adds r2, r4, 0
ands r1, r2
orrs r1, r0
strb r1, [r3, 0x5]
ldr r4, [r7]
ldr r2, [r4, 0x4]
adds r2, r5, r2
ldrh r3, [r2, 0x14]
ldr r1, =0x000003ff
adds r0, r1, 0
adds r1, r3, 0
ands r1, r0
mov r12, r1
ldrh r0, [r2, 0x4]
ldr r3, =0xfffffc00
adds r1, r3, 0
ands r0, r1
mov r1, r12
orrs r0, r1
strh r0, [r2, 0x4]
lsls r1, r6, 3
ldr r2, =gMain+0x238
ldr r0, [r4, 0x4]
adds r1, r2
adds r0, r5, r0
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
_081523C0:
ldr r3, =gUnknown_0203ABB8
_081523C2:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
ldr r0, [r3]
ldrb r0, [r0]
cmp r6, r0
bcc _08152300
_081523D0:
movs r0, 0x1
_081523D2:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81522D4
thumb_func_start sub_81523F4
sub_81523F4: @ 81523F4
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 24
lsrs r6, r1, 24
cmp r4, 0
beq _08152430
ldrh r0, [r4, 0x10]
bl GetSpriteTileStartByTag
lsls r0, 16
lsrs r5, r0, 16
ldr r0, =0x0000ffff
cmp r5, r0
beq _08152430
strb r6, [r4, 0x18]
ldrb r0, [r4, 0x1]
lsrs r0, 6
ldrb r1, [r4, 0x3]
lsrs r1, 6
bl sub_80355F8
lsls r0, 24
lsrs r0, 24
muls r0, r6
adds r0, r5, r0
strh r0, [r4, 0x14]
movs r0, 0x1
b _08152432
.pool
_08152430:
movs r0, 0
_08152432:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81523F4
thumb_func_start sub_8152438
sub_8152438: @ 8152438
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _0815246C
ldrb r1, [r0]
cmp r2, r1
bcs _0815246C
ldr r1, [r0, 0x4]
lsls r0, r2, 1
adds r0, r2
lsls r0, 4
adds r3, r0, r1
ldrb r1, [r3, 0x19]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0815246C
str r4, [r3, 0x2C]
adds r0, r2, 0
b _0815246E
.pool
_0815246C:
movs r0, 0xFF
_0815246E:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8152438
thumb_func_start sub_8152474
sub_8152474: @ 8152474
push {r4,r5,lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r1, 24
lsrs r4, r1, 24
lsls r2, 16
lsrs r5, r2, 16
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _081524A8
ldrb r1, [r0]
cmp r3, r1
bcs _081524A8
ldr r1, [r0, 0x4]
lsls r0, r3, 1
adds r0, r3
lsls r0, 4
adds r2, r0, r1
ldrb r1, [r2, 0x19]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _081524A8
cmp r4, 0x7
bls _081524B0
_081524A8:
movs r0, 0xFF
b _081524BC
.pool
_081524B0:
lsls r1, r4, 1
adds r0, r2, 0
adds r0, 0x1A
adds r0, r1
strh r5, [r0]
adds r0, r3, 0
_081524BC:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8152474
thumb_func_start sub_81524C4
sub_81524C4: @ 81524C4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
mov r9, r0
ldr r0, [sp, 0x30]
ldr r4, [sp, 0x34]
ldr r5, [sp, 0x38]
lsls r1, 16
lsrs r1, 16
str r1, [sp]
lsls r2, 16
lsrs r2, 16
mov r8, r2
lsls r3, 16
lsrs r3, 16
str r3, [sp, 0x4]
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
lsls r4, 24
lsrs r4, 24
str r4, [sp, 0xC]
lsls r5, 24
lsrs r5, 24
mov r10, r5
movs r5, 0
ldr r0, =gUnknown_0203ABB8
ldr r0, [r0]
cmp r0, 0
beq _0815255E
mov r1, r9
cmp r1, 0
bne _08152530
b _0815255E
.pool
_08152514:
adds r5, r2, 0
adds r0, r5, 0
movs r1, 0
movs r2, 0x30
bl memset
strb r4, [r5, 0x16]
ldrb r0, [r5, 0x19]
movs r1, 0x1
orrs r0, r1
movs r1, 0x2
orrs r0, r1
strb r0, [r5, 0x19]
b _0815255A
_08152530:
movs r4, 0
ldrb r1, [r0]
cmp r5, r1
bcs _0815255A
ldr r6, [r0, 0x4]
adds r3, r1, 0
movs r7, 0x1
_0815253E:
lsls r0, r4, 1
adds r0, r4
lsls r0, 4
adds r2, r0, r6
ldrb r1, [r2, 0x19]
adds r0, r7, 0
ands r0, r1
cmp r0, 0
beq _08152514
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r3
bcc _0815253E
_0815255A:
cmp r5, 0
bne _08152562
_0815255E:
movs r0, 0xFF
b _081525C0
_08152562:
adds r1, r5, 0
mov r0, r9
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
mov r0, sp
ldrh r0, [r0]
strh r0, [r5, 0x10]
mov r1, r8
strh r1, [r5, 0x12]
mov r2, sp
ldrh r2, [r2, 0x4]
strh r2, [r5, 0x8]
mov r3, sp
ldrh r3, [r3, 0x8]
strh r3, [r5, 0xA]
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 4
ldrb r1, [r5, 0x5]
movs r4, 0xF
ands r4, r1
orrs r4, r0
strb r4, [r5, 0x5]
mov r0, r10
cmp r0, 0x3
bhi _081525B6
movs r1, 0x3
ands r1, r0
lsls r3, r1, 3
ldrb r2, [r5, 0x19]
movs r0, 0x19
negs r0, r0
ands r0, r2
orrs r0, r3
strb r0, [r5, 0x19]
lsls r1, 2
movs r0, 0xD
negs r0, r0
ands r4, r0
orrs r4, r1
strb r4, [r5, 0x5]
_081525B6:
adds r0, r5, 0
ldr r1, [sp, 0xC]
bl sub_81523F4
ldrb r0, [r5, 0x16]
_081525C0:
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_81524C4
thumb_func_start sub_81525D0
sub_81525D0: @ 81525D0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gUnknown_0203ABB8
ldr r0, [r6]
cmp r0, 0
beq _081525F2
ldr r1, [r0, 0x4]
lsls r0, r5, 1
adds r0, r5
lsls r4, r0, 4
adds r2, r4, r1
ldrb r1, [r2, 0x19]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _081525FC
_081525F2:
movs r0, 0xFF
b _0815263C
.pool
_081525FC:
adds r0, r2, 0
movs r1, 0
movs r2, 0x30
bl memset
ldr r0, [r6]
ldr r0, [r0, 0x4]
adds r0, r4, r0
movs r1, 0xA0
strb r1, [r0]
ldr r3, [r6]
ldr r2, [r3, 0x4]
adds r2, r4, r2
ldrh r1, [r2, 0x2]
ldr r0, =0xfffffe00
ands r0, r1
movs r1, 0xF0
orrs r0, r1
strh r0, [r2, 0x2]
ldr r1, [r3, 0x4]
adds r1, r4, r1
ldrb r0, [r1, 0x19]
movs r2, 0x4
orrs r0, r2
strb r0, [r1, 0x19]
lsls r1, r5, 3
ldr r0, =gMain+0x238
adds r1, r0
ldr r0, =gDummyOamData
ldm r0!, {r2,r3}
stm r1!, {r2,r3}
adds r0, r5, 0
_0815263C:
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_81525D0
.align 2, 0 @ Don't pad with nop.

View file

@ -74,7 +74,7 @@ sub_80B23B0: @ 80B23B0
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x3
bl CopyWindowToVram

View file

@ -2237,7 +2237,7 @@ _080F6BD0:
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0
movs r1, 0x7
bl GetWindowAttribute

View file

@ -438,7 +438,7 @@ _081301A6:
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r4, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x1
bl CopyBgTilemapBufferToVram
_081301D4:

View file

@ -4644,7 +4644,7 @@ sub_811D028: @ 811D028
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r4-r6}
pop {r0}
@ -4693,7 +4693,7 @@ sub_811D058: @ 811D058
str r4, [sp, 0x4]
str r2, [sp, 0x8]
mov r2, r9
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r3-r5}
mov r8, r3

View file

@ -3022,7 +3022,7 @@ _0808CA94:
movs r0, 0
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@ -3133,7 +3133,7 @@ fish6: @ 808CB6C
movs r0, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@ -3266,7 +3266,7 @@ fish9: @ 808CC64
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@ -3423,7 +3423,7 @@ fishB: @ 808CD94
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
movs r0, 0xD
strh r0, [r5, 0x8]
movs r0, 0x1
@ -3471,7 +3471,7 @@ fishC: @ 808CE04
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]

View file

@ -4454,7 +4454,7 @@ _081B243E:
adds r0, r4, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@ -4502,7 +4502,7 @@ _081B24C0:
adds r0, r5, 0
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
b _081B2540
.pool
_081B2514:
@ -4525,7 +4525,7 @@ _081B2514:
adds r0, r5, 0
movs r1, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_081B2540:
adds r0, r5, 0
bl PutWindowTilemap
@ -5108,7 +5108,7 @@ sub_81B2A3C: @ 81B2A3C
str r1, [sp, 0x8]
movs r1, 0
adds r2, r5, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4,r5}
pop {r0}
@ -5804,7 +5804,7 @@ _081B2FF2:
ldr r1, [r1]
str r1, [sp, 0x8]
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
_081B3018:
add sp, 0xC
pop {r3}
@ -5938,7 +5938,7 @@ _081B3104:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
_081B313C:
@ -6132,7 +6132,7 @@ _081B328C:
str r1, [sp, 0x10]
movs r1, 0x1
mov r2, r9
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -6193,7 +6193,7 @@ sub_81B3300: @ 81B3300
movs r0, 0x6
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4}
pop {r0}
@ -12508,7 +12508,7 @@ _081B6A40:
adds r0, r6, 0
mov r1, r10
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
cmp r4, 0
beq _081B6A82
adds r0, r7, 0x1

View file

@ -4387,7 +4387,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0x1
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d1d
adds r2, r1
@ -4398,7 +4398,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0x2
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r0, =0x00000d41
adds r2, r0
@ -4409,7 +4409,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0x2
movs r3, 0xA
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d65
adds r2, r1
@ -4420,7 +4420,7 @@ sub_80CA4FC: @ 80CA4FC
movs r0, 0
movs r1, 0
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _080CA5E8
.pool
_080CA588:
@ -4434,7 +4434,7 @@ _080CA588:
movs r0, 0
movs r1, 0
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000cf9
adds r2, r1
@ -4445,7 +4445,7 @@ _080CA588:
movs r0, 0
movs r1, 0x1
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r0, =0x00000d1d
adds r2, r0
@ -4456,7 +4456,7 @@ _080CA588:
movs r0, 0
movs r1, 0x2
movs r3, 0x6
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d41
adds r2, r1
@ -4467,7 +4467,7 @@ _080CA588:
movs r0, 0
movs r1, 0x2
movs r3, 0xA
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_080CA5E8:
movs r0, 0
movs r1, 0x2
@ -5337,7 +5337,7 @@ _080CAD30:
movs r0, 0x1
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x1
movs r1, 0x2
movs r2, 0xE
@ -18189,7 +18189,7 @@ _080D17DA:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0x4
bl sub_8199F74
bl AddTextPrinterParameterized5
add sp, 0x14
pop {r4}
pop {r0}

View file

@ -1471,7 +1471,7 @@ sub_81C7BA4: @ 81C7BA4
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4,r5}
pop {r0}
@ -2559,7 +2559,7 @@ _081C8434:
str r6, [sp, 0x8]
adds r2, r7, 0
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@ -3707,7 +3707,7 @@ sub_81C8CB4: @ 81C8CB4
str r2, [sp, 0x4]
str r6, [sp, 0x8]
movs r2, 0x8
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0
movs r1, 0x1
bl sub_81C8C64
@ -3769,7 +3769,7 @@ sub_81C8D4C: @ 81C8D4C
str r2, [sp, 0x8]
adds r2, r5, 0
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0
bl sub_81C8C64
@ -3835,7 +3835,7 @@ sub_81C8DBC: @ 81C8DBC
movs r1, 0x7
movs r2, 0x2
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
ldrh r0, [r6, 0x8]
lsls r4, 1
ldrb r1, [r6, 0x4]
@ -3897,7 +3897,7 @@ sub_81C8E54: @ 81C8E54
movs r1, 0x7
adds r2, r5, 0
movs r3, 0x2
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r0, [r7, 0x8]
ldrb r1, [r7, 0x4]
str r1, [sp]
@ -7078,7 +7078,7 @@ sub_81CA714: @ 81CA714
str r6, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4-r6}
pop {r0}
@ -7116,7 +7116,7 @@ sub_81CA770: @ 81CA770
str r6, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4-r6}
pop {r0}
@ -10073,7 +10073,7 @@ sub_81CBE88: @ 81CBE88
movs r1, 0x7
adds r2, r3, 0
movs r3, 0x2
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@ -10108,7 +10108,7 @@ sub_81CBEB4: @ 81CBEB4
adds r0, r5, 0
movs r1, 0x7
adds r2, r6, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r4-r6}
pop {r0}
@ -10156,7 +10156,7 @@ _081CBF24:
movs r1, 0x7
add r2, sp, 0xC
adds r3, r4, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0x2C
pop {r4,r5}
pop {r0}
@ -10190,7 +10190,7 @@ _081CBF76:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0x10
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x80
lsls r0, 21
adds r6, r0
@ -10375,7 +10375,7 @@ sub_81CC0E0: @ 81CC0E0
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x20
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@ -10409,7 +10409,7 @@ sub_81CC11C: @ 81CC11C
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@ -10452,7 +10452,7 @@ sub_81CC158: @ 81CC158
adds r0, r2, 0
adds r2, r5, 0
movs r3, 0x20
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r4,r5}
pop {r0}
@ -11694,7 +11694,7 @@ _081CCB44:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r1, [r5]
ldrb r2, [r5, 0x3]
adds r0, r4, 0
@ -11726,7 +11726,7 @@ _081CCB8E:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =0x00001041
movs r0, 0xC
str r0, [sp]
@ -11756,7 +11756,7 @@ _081CCBDC:
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrh r1, [r5]
ldrb r2, [r5, 0x3]
adds r0, r4, 0
@ -12035,7 +12035,7 @@ _081CCE08:
movs r1, 0x7
adds r2, r6, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x80
lsls r0, 21
adds r4, r0
@ -15151,7 +15151,7 @@ _081CE7DA:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _081CE924
_081CE800:
bl sub_81CDD5C
@ -15176,7 +15176,7 @@ _081CE80C:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add r1, sp, 0xC
movs r0, 0xFC
strb r0, [r1]
@ -15202,7 +15202,7 @@ _081CE80C:
movs r1, 0x1
add r2, sp, 0xC
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl sub_81CDD48
adds r1, r0, 0
lsls r1, 16
@ -15218,7 +15218,7 @@ _081CE80C:
movs r1, 0x1
add r2, sp, 0xC
movs r3, 0x1C
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _081CE924
.pool
_081CE89C:
@ -17198,7 +17198,7 @@ sub_81CF7F4: @ 81CF7F4
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0x1
@ -17214,7 +17214,7 @@ sub_81CF7F4: @ 81CF7F4
movs r1, 0x1
adds r2, r4, 0
movs r3, 0x22
bl PrintTextOnWindow
bl AddTextPrinterParameterized
mov r1, r8
ldrb r0, [r1, 0x8]
movs r1, 0x2
@ -18597,7 +18597,7 @@ sub_81D02B0: @ 81D02B0
adds r0, r4, 0
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0x1C
pop {r4,r5}
pop {r0}
@ -20108,7 +20108,7 @@ sub_81D0E84: @ 81D0E84
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldrb r0, [r5, 0xA]
movs r1, 0x2
bl CopyWindowToVram
@ -20155,7 +20155,7 @@ _081D0F2E:
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r5, r0
@ -20195,7 +20195,7 @@ _081D0F7C:
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r6, r0
@ -20260,7 +20260,7 @@ sub_81D0FF0: @ 81D0FF0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r6]
cmp r0, 0
beq _081D1040
@ -20305,7 +20305,7 @@ _081D104A:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x3C
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x2
bl CopyWindowToVram
@ -20379,7 +20379,7 @@ sub_81D10D0: @ 81D10D0
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
mov r1, r8
ldrb r0, [r1, 0xC]
movs r1, 0x2
@ -21106,7 +21106,7 @@ _081D1D8C:
movs r1, 0x1
movs r2, 0x8
adds r3, r5, 0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
_081D1DAC:
add sp, 0x34
pop {r4,r5}
@ -22636,7 +22636,7 @@ sub_81D28FC: @ 81D28FC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_PPSlash
movs r1, 0x29
mov r10, r1
@ -22648,7 +22648,7 @@ sub_81D28FC: @ 81D28FC
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_PowerSlash
movs r0, 0x1
adds r1, r5, 0
@ -22665,7 +22665,7 @@ sub_81D28FC: @ 81D28FC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_AccuracySlash
movs r0, 0x1
adds r1, r5, 0
@ -22682,7 +22682,7 @@ sub_81D28FC: @ 81D28FC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
negs r0, r0
cmp r9, r0
@ -22711,7 +22711,7 @@ _081D29C4:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =gText_PPSlash
movs r0, 0x1
movs r2, 0
@ -22732,7 +22732,7 @@ _081D29C4:
movs r0, 0
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r6, 0x1]
cmp r0, 0x1
bhi _081D2A3C
@ -22756,7 +22756,7 @@ _081D2A4A:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x6A
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r6, 0x3]
cmp r0, 0
bne _081D2A70
@ -22781,7 +22781,7 @@ _081D2A7E:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x6A
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =gMoveDescriptionPointers
mov r0, r9
subs r0, 0x1
@ -22796,7 +22796,7 @@ _081D2A7E:
movs r1, 0x7
adds r2, r5, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_081D2AB6:
add sp, 0x2C
pop {r3-r5}
@ -22835,7 +22835,7 @@ sub_81D2ACC: @ 81D2ACC
str r6, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_Appeal2
movs r0, 0x1
adds r1, r5, 0
@ -22851,7 +22851,7 @@ sub_81D2ACC: @ 81D2ACC
movs r0, 0x1
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r5, =gText_Jam2
movs r0, 0x1
adds r1, r5, 0
@ -22866,7 +22866,7 @@ sub_81D2ACC: @ 81D2ACC
movs r0, 0x1
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
negs r0, r0
cmp r4, r0
@ -22894,7 +22894,7 @@ _081D2B6C:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r1, =gContestEffectDescriptionPointers
ldrb r0, [r4]
lsls r0, 2
@ -22908,7 +22908,7 @@ _081D2B6C:
movs r1, 0x7
adds r2, r5, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x1
movs r1, 0x2
bl CopyWindowToVram
@ -22969,7 +22969,7 @@ sub_81D2BF4: @ 81D2BF4
str r0, [sp, 0xC]
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r4}
pop {r0}
@ -24411,7 +24411,7 @@ _081D36CA:
movs r1, 0x1
movs r2, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
lsls r0, r7, 1
mov r4, sp
adds r4, r0
@ -24434,7 +24434,7 @@ _081D3704:
movs r1, 0x1
movs r2, 0x38
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0
ldrsh r1, [r4, r0]
adds r0, r1, 0
@ -24465,7 +24465,7 @@ _081D373A:
mov r0, r8
movs r1, 0x1
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
@ -24583,7 +24583,7 @@ _081D3808:
movs r1, 0x1
movs r2, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x38
lsls r4, 24
lsrs r4, 24
@ -24597,7 +24597,7 @@ _081D3808:
movs r1, 0x1
adds r2, r4, 0
adds r3, r5, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
@ -28977,7 +28977,7 @@ PrintOnTrainerHillRecordsWindow: @ 81D5C8C
movs r0, 0
movs r1, 0x1
movs r3, 0x2
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0x12
movs r0, 0
mov r8, r0
@ -29000,7 +29000,7 @@ _081D5CD6:
movs r0, 0
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
adds r7, 0xF
ldr r0, =gSaveBlock1Ptr
ldr r1, =0x00003718
@ -29066,7 +29066,7 @@ _081D5CD6:
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
adds r7, 0x11
movs r1, 0x1
add r8, r1

View file

@ -2831,7 +2831,7 @@ sub_8017020: @ 8017020
thumb_func_start sub_801704C
sub_801704C: @ 801704C
push {lr}
bl sub_8197224
bl RunTextPrintersAndIsPrinter0Active
lsls r0, 16
cmp r0, 0
beq _0801705C
@ -2871,7 +2871,7 @@ _08017076:
b _080170AE
.pool
_0801709C:
bl sub_8197224
bl RunTextPrintersAndIsPrinter0Active
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@ -5689,7 +5689,7 @@ _08018720:
movs r1, 0x1
movs r2, 0x4
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
movs r0, 0
adds r1, r7, 0
movs r2, 0xDE
@ -5705,7 +5705,7 @@ _08018720:
movs r0, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
movs r0, 0
movs r1, 0x2
bl CopyWindowToVram
@ -5877,7 +5877,7 @@ sub_8018884: @ 8018884
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
movs r0, 0x1
movs r1, 0x1
movs r2, 0xF
@ -6230,7 +6230,7 @@ _08018B4A:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
ldrb r0, [r4]
movs r1, 0x1
movs r2, 0xF
@ -6376,7 +6376,7 @@ _08018C8C:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
ldrb r0, [r5]
movs r1, 0x1
movs r2, 0xF
@ -9928,7 +9928,7 @@ _0801A93A:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
add sp, 0x18
pop {r4-r7}
pop {r0}
@ -10249,7 +10249,7 @@ sub_801AB68: @ 801AB68
movs r1, 0x1
adds r2, r6, 0
ldr r3, [sp, 0x14]
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
add sp, 0x18
pop {r3-r5}
mov r8, r3
@ -12955,7 +12955,7 @@ _0801C1D0:
movs r1, 0x3
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r4, [r7]
movs r1, 0xDA
lsls r1, 1
@ -12996,7 +12996,7 @@ _0801C22E:
adds r0, r5, 0
movs r1, 0x3
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
ldr r2, [r7]
ldr r0, [r2, 0x4]
mov r9, r6
@ -13023,7 +13023,7 @@ _0801C266:
movs r1, 0x1
movs r2, 0xA6
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
b _0801C498
.pool
_0801C2A0:
@ -13064,7 +13064,7 @@ _0801C2A2:
lsrs r0, r2, 24
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x1
lsls r4, 24
lsrs r0, r4, 24
@ -13104,7 +13104,7 @@ _0801C304:
adds r0, r5, 0
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r2, [r7]
ldrb r1, [r2, 0x8]
movs r0, 0x3
@ -13137,7 +13137,7 @@ _0801C304:
adds r0, r5, 0
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
mov r9, r6
b _0801C498
.pool
@ -13202,7 +13202,7 @@ _0801C3CE:
ldr r0, [sp, 0x10]
movs r1, 0x3
ldr r3, [sp, 0x14]
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r0, r1, r5
ldr r2, =0x00000306
@ -13240,7 +13240,7 @@ _0801C3CE:
ldr r0, [sp, 0x10]
movs r1, 0x3
ldr r3, [sp, 0x14]
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, r4
adds r1, 0x2A
@ -14515,7 +14515,7 @@ _0801CEEC:
str r4, [sp, 0x8]
movs r1, 0x3
movs r3, 0x6
bl box_print
bl AddTextPrinterParameterized3
_0801CF1C:
ldr r6, =gUnknown_02022C78
ldr r4, [r6]
@ -14550,7 +14550,7 @@ _0801CF1C:
str r4, [sp, 0x8]
movs r1, 0x3
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -20539,7 +20539,7 @@ sub_801FDDC: @ 801FDDC
str r4, [sp, 0x4]
str r6, [sp, 0x8]
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x18]
ldr r2, =gText_No
@ -20549,7 +20549,7 @@ sub_801FDDC: @ 801FDDC
str r6, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x18]
movs r1, 0x1
@ -20757,7 +20757,7 @@ _0801FFE2:
adds r0, r5, 0
movs r1, 0x1
adds r2, r6, 0
bl sub_8199F74
bl AddTextPrinterParameterized5
b _0802007A
.pool
_08020050:
@ -20779,7 +20779,7 @@ _08020050:
adds r0, r5, 0
movs r1, 0x1
adds r2, r6, 0
bl sub_8199F74
bl AddTextPrinterParameterized5
_0802007A:
ldr r0, =gUnknown_02022C88
ldr r0, [r0]
@ -20926,7 +20926,7 @@ _08020154:
movs r0, 0x1
movs r1, 0x2
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x34
pop {r3-r5}
mov r8, r3
@ -21004,7 +21004,7 @@ _08020206:
movs r0, 0x2
movs r1, 0
lsrs r2, r5, 24
bl box_print
bl AddTextPrinterParameterized3
adds r4, 0x4
adds r7, 0x1
adds r0, r6, 0
@ -21043,7 +21043,7 @@ _08020248:
movs r4, 0x80
lsls r4, 19
lsrs r2, r4, 24
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0x1
str r0, [sp, 0x48]
adds r6, 0xC
@ -21094,7 +21094,7 @@ _080202AC:
movs r0, 0x2
movs r1, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
adds r2, r7, 0
add r0, sp, 0xC
str r0, [sp]
@ -21106,7 +21106,7 @@ _080202AC:
movs r0, 0x2
movs r1, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
_08020300:
ldr r7, [sp, 0x48]
mov r4, r10
@ -21299,7 +21299,7 @@ sub_8020420: @ 8020420
movs r1, 0x2
movs r2, 0
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r4,r5}
pop {r0}
@ -23909,7 +23909,7 @@ sub_80219C8: @ 80219C8
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3}
mov r8, r3
@ -24217,7 +24217,7 @@ _08021C5E:
ldr r1, =gStringVar4
str r1, [sp, 0x8]
movs r1, 0x2
bl box_print
bl AddTextPrinterParameterized3
ldr r3, [sp, 0x18]
ldr r2, [sp, 0xC]
ldrb r2, [r2, 0x8]
@ -24260,7 +24260,7 @@ _08021CC8:
str r2, [sp, 0x8]
movs r1, 0x2
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
lsls r0, r5, 24
lsrs r5, r0, 24
ldr r3, [sp, 0xC]
@ -24324,7 +24324,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_SpaceSec
movs r0, 0x2
adds r1, r4, 0
@ -24345,7 +24345,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x9F
lsls r0, 1
add r0, r8
@ -24386,7 +24386,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_SpaceMin
movs r0, 0x2
adds r1, r4, 0
@ -24406,7 +24406,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x9E
lsls r0, 1
add r0, r8
@ -24437,7 +24437,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
adds r0, r7, 0
adds r0, 0xE
lsls r0, 24
@ -24452,7 +24452,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_TimesPerSec
movs r0, 0x2
adds r1, r4, 0
@ -24474,7 +24474,7 @@ sub_8021D34: @ 8021D34
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
mov r4, r8
ldrb r2, [r4, 0x16]
ldrh r0, [r4, 0x16]
@ -24555,7 +24555,7 @@ _08021F0A:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
b _08021FDE
.pool
_08021FC4:
@ -24570,7 +24570,7 @@ _08021FC4:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
_08021FDE:
adds r0, r7, 0
adds r0, 0xE
@ -24591,7 +24591,7 @@ _08021FDE:
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r0, =gStringVar1
ldr r4, [sp, 0x10]
ldrh r1, [r4, 0x8]
@ -24620,7 +24620,7 @@ _08021FDE:
movs r1, 0x2
adds r2, r6, 0
adds r3, r7, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@ -24942,7 +24942,7 @@ _080222D0:
movs r1, 0x1
adds r2, r7, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r0, =gText_PressingSpeedRankings
mov r10, r0
movs r0, 0x1
@ -24962,7 +24962,7 @@ _080222D0:
movs r1, 0x1
adds r2, r7, 0
movs r3, 0x11
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x29
mov r10, r0
_08022336:
@ -24985,7 +24985,7 @@ _08022336:
movs r1, 0x1
movs r2, 0
mov r3, r10
bl box_print
bl AddTextPrinterParameterized3
movs r0, 0x1
ldr r1, =gText_TimesPerSec
movs r2, 0x1
@ -25005,7 +25005,7 @@ _08022336:
movs r1, 0x1
adds r2, r7, 0
mov r3, r10
bl box_print
bl AddTextPrinterParameterized3
movs r2, 0
mov r0, r9
lsls r4, r0, 1
@ -25078,7 +25078,7 @@ _080223CA:
movs r1, 0x1
adds r2, r7, 0
mov r3, r10
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [sp, 0x10]
lsls r0, r1, 24
lsrs r0, 24
@ -25326,7 +25326,7 @@ _08022616:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
b _0802269C
.pool
_08022668:
@ -25353,7 +25353,7 @@ _08022668:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
_0802269C:
ldr r1, =0x000001bb
adds r0, r6, r1
@ -26229,7 +26229,7 @@ _08022D42:
movs r0, 0
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _08022DB2
.pool
_08022D90:
@ -26248,7 +26248,7 @@ _08022D90:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
_08022DB2:
movs r0, 0
movs r1, 0x3
@ -28812,7 +28812,7 @@ _080241A6:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -29171,7 +29171,7 @@ _08024460:
str r1, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _080244AC
.pool
_08024490:
@ -29187,7 +29187,7 @@ _08024490:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
_080244AC:
movs r0, 0
movs r1, 0x3
@ -29653,7 +29653,7 @@ sub_80247D4: @ 80247D4
movs r1, 0x1
mov r2, r9
mov r3, r8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r3,r4}
mov r8, r3
@ -29695,7 +29695,7 @@ sub_802482C: @ 802482C
adds r0, r6, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
str r4, [sp]
adds r0, r6, 0
mov r1, r8
@ -36210,7 +36210,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
movs r1, 0x1
adds r2, r4, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r6, 0
ldr r2, =gStringVar1
mov r8, r2
@ -36252,7 +36252,7 @@ _08027C76:
adds r0, r7, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, [sp, 0x18]
lsls r3, r2, 3
subs r3, r5
@ -36269,7 +36269,7 @@ _08027C76:
adds r0, r7, 0
movs r1, 0x1
mov r2, r8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r6, 0x1
cmp r6, 0x2
ble _08027C76
@ -39391,7 +39391,7 @@ _0802955A:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
mov r2, r10
ldr r0, [r2]
add r0, r9
@ -39648,7 +39648,7 @@ _08029774:
str r3, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
@ -39677,7 +39677,7 @@ _080297CC:
movs r1, 0x1
movs r2, 0x1C
adds r3, r6, 0
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
mov r1, r9
movs r2, 0
@ -39704,7 +39704,7 @@ _080297CC:
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gUnknown_02022CF8
ldr r0, [r2]
add r0, r10
@ -39719,7 +39719,7 @@ _080297CC:
movs r1, 0x1
ldr r2, =gText_SpacePoints
lsrs r3, 24
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -39858,7 +39858,7 @@ _0802996C:
movs r5, 0
str r5, [sp, 0x8]
mov r2, r8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r4]
add r0, r9
ldrb r0, [r0]
@ -39869,7 +39869,7 @@ _0802996C:
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0x44
bl PrintTextOnWindow
bl AddTextPrinterParameterized
mov r9, r5
ldr r0, [sp, 0xC]
cmp r9, r0
@ -39908,7 +39908,7 @@ _080299F2:
str r6, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl box_print
bl AddTextPrinterParameterized3
movs r7, 0
mov r8, r5
mov r0, r9
@ -39971,7 +39971,7 @@ _08029A36:
mov r1, r10
str r1, [sp, 0x8]
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
b _08029B10
.pool
_08029AE0:
@ -39997,7 +39997,7 @@ _08029AE0:
str r1, [sp, 0x8]
movs r1, 0x1
ldr r2, =gStringVar4
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_08029B10:
adds r0, r7, 0x1
lsls r0, 24
@ -40125,7 +40125,7 @@ _08029BFC:
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r6, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _08029F88
.pool
_08029C60:
@ -40291,7 +40291,7 @@ _08029DA0:
str r6, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl DynamicPlaceholderTextUtil_Reset
bl sub_802762C
lsls r0, 16
@ -40317,7 +40317,7 @@ _08029DA0:
movs r1, 0x1
adds r2, r7, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
bl sub_80279C8
lsls r0, 24
lsrs r4, r0, 24
@ -40363,7 +40363,7 @@ _08029EA8:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_08029EC8:
ldr r4, =gUnknown_02022CF8
ldr r0, [r4]
@ -40597,7 +40597,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@ -40609,7 +40609,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@ -40622,7 +40622,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@ -40634,7 +40634,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@ -40701,7 +40701,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@ -40714,7 +40714,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@ -40731,7 +40731,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@ -40901,7 +40901,7 @@ _0802A3AE:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _0802A410
.pool
_0802A3D8:
@ -41021,7 +41021,7 @@ _0802A4AC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@ -41181,7 +41181,7 @@ _0802A610:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
@ -47057,7 +47057,7 @@ _0802D46A:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@ -47141,7 +47141,7 @@ _0802D516:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@ -47259,7 +47259,7 @@ _0802D606:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@ -47339,7 +47339,7 @@ _0802D6AA:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@ -47538,7 +47538,7 @@ sub_802D7E8: @ 802D7E8
str r1, [sp, 0x4]
str r3, [sp, 0x8]
movs r1, 0x1
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@ -47592,7 +47592,7 @@ sub_802D884: @ 802D884
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@ -47645,7 +47645,7 @@ sub_802D8FC: @ 802D8FC
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@ -47951,7 +47951,7 @@ sub_802DB8C: @ 802DB8C
movs r1, 0
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add r0, sp, 0xC
str r0, [sp]
str r4, [sp, 0x4]
@ -47961,7 +47961,7 @@ sub_802DB8C: @ 802DB8C
movs r1, 0
movs r2, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x10
pop {r4}
pop {r0}
@ -48390,7 +48390,7 @@ sub_802DED8: @ 802DED8
movs r1, 0x1
adds r2, r4, 0
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r0, [r6]
adds r0, 0x1C
add r0, r8
@ -49203,7 +49203,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r6, 0
adds r7, r4, 0
movs r0, 0xFF
@ -49231,7 +49231,7 @@ _0802E58A:
adds r0, r7, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [sp, 0x20]
ldm r0!, {r1}
str r0, [sp, 0x20]
@ -49258,7 +49258,7 @@ _0802E58A:
adds r0, r7, 0
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x80
lsls r0, 21
add r8, r0

View file

@ -519,7 +519,7 @@ _081406E0:
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@ -751,7 +751,7 @@ sub_8140914: @ 8140914
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r5]
movs r1, 0x3
bl CopyWindowToVram
@ -2655,7 +2655,7 @@ _08141902:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@ -2678,7 +2678,7 @@ _08141928:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@ -2816,7 +2816,7 @@ sub_8141A18: @ 8141A18
movs r1, 0x1
mov r2, r8
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r5]
movs r1, 0x3
bl CopyWindowToVram
@ -3012,7 +3012,7 @@ _08141BB0:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@ -3039,7 +3039,7 @@ _08141C58:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@ -3071,7 +3071,7 @@ _08141CBC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@ -3158,7 +3158,7 @@ _08141D44:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
@ -4676,7 +4676,7 @@ sub_81429F0: @ 81429F0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -4753,7 +4753,7 @@ sub_8142A88: @ 8142A88
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -4778,7 +4778,7 @@ _08142B28:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -4808,7 +4808,7 @@ _08142B78:
movs r1, 0x1
adds r2, r5, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram

View file

@ -761,7 +761,7 @@ _080E23D4:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_LogOff
movs r0, 0x31
str r0, [sp]
@ -770,7 +770,7 @@ _080E23D4:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _080E247A
.pool
_080E2448:
@ -795,7 +795,7 @@ _080E2448:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_080E247A:
ldr r0, =0x000008ab
bl FlagGet
@ -813,7 +813,7 @@ _080E247A:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
b _080E24C6
.pool
_080E24B0:
@ -826,7 +826,7 @@ _080E24B0:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
_080E24C6:
ldr r4, =gStringVar4
ldr r1, =gText_PlayersPC
@ -877,7 +877,7 @@ ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
add sp, 0x10
pop {r0}
bx r0
@ -1228,7 +1228,7 @@ _080E2802:
adds r0, r6, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -1606,7 +1606,7 @@ _080E2B12:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
b _080E2B70
.pool
_080E2B40:
@ -1630,7 +1630,7 @@ _080E2B40:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParameterized
bl AddTextPrinterParameterized2
_080E2B70:
add sp, 0x10
pop {r4}
@ -1687,7 +1687,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionPokemon
movs r0, 0x19
str r0, [sp]
@ -1696,7 +1696,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionBag
movs r0, 0x29
str r0, [sp]
@ -1705,7 +1705,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionPokenav
movs r0, 0x39
str r0, [sp]
@ -1714,7 +1714,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
movs r0, 0x49
@ -1724,7 +1724,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionSave
movs r0, 0x59
str r0, [sp]
@ -1733,7 +1733,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionOption
movs r0, 0x69
str r0, [sp]
@ -1742,7 +1742,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r2, =gText_MenuOptionExit
movs r0, 0x79
str r0, [sp]
@ -1751,7 +1751,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x10
str r0, [sp]
movs r0, 0x8

View file

@ -839,7 +839,7 @@ _080E0176:
adds r0, r6, 0
movs r1, 0x7
adds r3, r7, 0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
_080E01AC:
add sp, 0x14
pop {r4-r7}
@ -1201,7 +1201,7 @@ BuyMenuPrint: @ 80E04A4
str r6, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
add sp, 0x14
pop {r4-r6}
pop {r0}

File diff suppressed because it is too large Load diff

View file

@ -1881,7 +1881,7 @@ sub_807825C: @ 807825C
lsrs r1, 24
movs r0, 0x1C
bl SetGpuReg
bl sub_8197224
bl RunTextPrintersAndIsPrinter0Active
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
@ -4588,7 +4588,7 @@ _080798BC:
str r0, [sp, 0x8]
adds r0, r5, 0
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
add r6, sp, 0x28
adds r0, r6, 0
ldr r1, [sp, 0x60]
@ -4608,7 +4608,7 @@ _080798BC:
movs r1, 0x1
movs r2, 0
movs r3, 0
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r5, 0
bl PutWindowTilemap
adds r0, r5, 0
@ -4847,7 +4847,7 @@ sub_8079B84: @ 8079B84
adds r0, r4, 0
movs r1, 0
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@ -5599,7 +5599,7 @@ sub_807A19C: @ 807A19C
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x14
movs r2, 0xC
@ -14295,7 +14295,7 @@ sub_807F1A8: @ 807F1A8
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
adds r0, r5, 0
movs r1, 0x3
bl CopyWindowToVram

View file

@ -419,7 +419,7 @@ _080C2A2C:
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -1747,7 +1747,7 @@ sub_80C3574: @ 80C3574
movs r1, 0x1
movs r2, 0x14
movs r3, 0x1C
bl box_print
bl AddTextPrinterParameterized3
b _080C35FA
.pool
_080C35E0:
@ -1762,7 +1762,7 @@ _080C35E0:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x21
bl box_print
bl AddTextPrinterParameterized3
_080C35FA:
add sp, 0x2C
pop {r4,r5}
@ -1818,7 +1818,7 @@ _080C365C:
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0x2C
pop {r4}
pop {r0}
@ -1848,7 +1848,7 @@ sub_80C3684: @ 80C3684
movs r1, 0x1
movs r2, 0x14
movs r3, 0x38
bl box_print
bl AddTextPrinterParameterized3
b _080C36DE
.pool
_080C36C4:
@ -1863,7 +1863,7 @@ _080C36C4:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x39
bl box_print
bl AddTextPrinterParameterized3
_080C36DE:
ldr r0, =gStringVar1
ldr r4, =gUnknown_02039CE8
@ -1910,7 +1910,7 @@ _080C3740:
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r4,r5}
pop {r0}
@ -1964,7 +1964,7 @@ sub_80C378C: @ 80C378C
movs r1, 0x1
movs r2, 0x14
movs r3, 0x48
bl box_print
bl AddTextPrinterParameterized3
b _080C37F6
.pool
_080C37DC:
@ -1979,7 +1979,7 @@ _080C37DC:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x49
bl box_print
bl AddTextPrinterParameterized3
_080C37F6:
ldr r5, =gStringVar4
ldr r4, =gUnknown_02039CE8
@ -2025,7 +2025,7 @@ _080C3854:
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
_080C386E:
add sp, 0xC
pop {r4,r5}
@ -2060,7 +2060,7 @@ sub_80C3880: @ 80C3880
movs r1, 0x1
movs r2, 0x14
movs r3, 0x58
bl box_print
bl AddTextPrinterParameterized3
b _080C38E2
.pool
_080C38C8:
@ -2075,7 +2075,7 @@ _080C38C8:
movs r1, 0x1
movs r2, 0x10
movs r3, 0x59
bl box_print
bl AddTextPrinterParameterized3
_080C38E2:
ldr r0, =gUnknown_02039CE8
ldr r1, [r0]
@ -2159,7 +2159,7 @@ _080C395C:
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
adds r7, 0x12
lsls r2, r7, 24
lsrs r2, 24
@ -2177,7 +2177,7 @@ _080C395C:
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add r7, r10
mov r0, r9
adds r1, r6, 0
@ -2194,7 +2194,7 @@ _080C395C:
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3-r5}
mov r8, r3
@ -2235,7 +2235,7 @@ sub_80C3A18: @ 80C3A18
movs r0, 0x1
movs r1, 0x1
movs r2, 0x8
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, 0x19
movs r0, 0x1
@ -2256,7 +2256,7 @@ sub_80C3A18: @ 80C3A18
str r1, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
ldr r0, =gUnknown_0856FB4A
mov r8, r0
ldr r1, [r7]
@ -2271,7 +2271,7 @@ sub_80C3A18: @ 80C3A18
movs r0, 0x1
movs r1, 0x1
movs r2, 0x8
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r7]
adds r1, 0x33
movs r0, 0x1
@ -2292,7 +2292,7 @@ sub_80C3A18: @ 80C3A18
str r1, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
bl box_print
bl AddTextPrinterParameterized3
_080C3ACE:
add sp, 0xC
pop {r3}
@ -2363,7 +2363,7 @@ sub_80C3B50: @ 80C3B50
movs r1, 0x1
movs r2, 0x88
movs r3, 0x9
bl box_print
bl AddTextPrinterParameterized3
b _080C3BB6
.pool
_080C3B8C:
@ -2385,7 +2385,7 @@ _080C3B8C:
movs r0, 0x1
movs r1, 0x1
movs r3, 0x9
bl box_print
bl AddTextPrinterParameterized3
_080C3BB6:
add sp, 0xC
pop {r4}
@ -2470,7 +2470,7 @@ sub_80C3C34: @ 80C3C34
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
ldr r1, =gUnknown_0856FB57
ldr r0, [r6]
adds r0, r5
@ -2492,7 +2492,7 @@ sub_80C3C34: @ 80C3C34
movs r0, 0x1
movs r1, 0x1
adds r3, r4, 0
bl box_print
bl AddTextPrinterParameterized3
add sp, 0xC
pop {r3-r5}
mov r8, r3
@ -6361,7 +6361,7 @@ _080C5DC2:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0x5
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gText_BattleRecord
movs r0, 0x1
adds r1, r4, 0
@ -6376,7 +6376,7 @@ _080C5DC2:
movs r0, 0x1
movs r1, 0x1
movs r3, 0x5
bl box_print
bl AddTextPrinterParameterized3
str r6, [sp]
mov r0, r8
str r0, [sp, 0x4]
@ -6386,7 +6386,7 @@ _080C5DC2:
movs r1, 0x8
movs r2, 0x5
movs r3, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r4, =gStringVar4
ldr r5, =gUnknown_02039CEC
ldr r0, [r5]
@ -6408,7 +6408,7 @@ _080C5DC2:
movs r0, 0x2
movs r1, 0x8
movs r3, 0x10
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r5]
ldrh r0, [r1, 0x8]
subs r0, 0x5
@ -6476,7 +6476,7 @@ sub_80C5ED0: @ 80C5ED0
movs r1, 0x1
movs r2, 0x2
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
b _080C5F3A
.pool
_080C5F18:
@ -6495,7 +6495,7 @@ _080C5F18:
movs r1, 0x1
movs r2, 0x2
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
_080C5F3A:
movs r0, 0x3
movs r1, 0x3
@ -7983,7 +7983,7 @@ _080C6BB8:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
b _080C6C0E
.pool
_080C6BF0:
@ -8000,7 +8000,7 @@ _080C6BF0:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
_080C6C0E:
adds r0, r4, 0x1
lsls r0, 24
@ -8024,7 +8024,7 @@ _080C6C0E:
movs r1, 0x1
movs r2, 0x4
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r4, 0
_080C6C40:
adds r0, r4, 0
@ -8084,7 +8084,7 @@ _080C6C94:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r5, =gUnknown_02039CF4
ldr r1, [r5]
ldrb r3, [r1, 0x10]
@ -8104,7 +8104,7 @@ _080C6C94:
movs r0, 0x1
movs r1, 0x7
movs r2, 0x4
bl box_print
bl AddTextPrinterParameterized3
ldr r1, [r5]
ldr r2, [r1, 0x4]
ldrb r0, [r1, 0x10]
@ -8148,7 +8148,7 @@ _080C6C94:
movs r1, 0x1
movs r2, 0x4
movs r3, 0
bl box_print
bl AddTextPrinterParameterized3
movs r4, 0
_080C6D4A:
adds r0, r4, 0
@ -8258,7 +8258,7 @@ _080C6E08:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
ldr r0, [sp, 0x4C]
mov r10, r4
cmp r0, 0x6
@ -8410,7 +8410,7 @@ sub_80C6EAC: @ 80C6EAC
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParameterized2
bl AddTextPrinterParameterized4
lsrs r5, 1
adds r0, r7, 0
ldr r1, [sp, 0x24]

View file

@ -879,7 +879,7 @@ sub_8166D44: @ 8166D44
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0x2
@ -1095,7 +1095,7 @@ sub_8166F50: @ 8166F50
movs r0, 0x2
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0x2
@ -1134,7 +1134,7 @@ sub_8166FB0: @ 8166FB0
movs r0, 0x2
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
add sp, 0xC
pop {r0}
bx r0
@ -2536,7 +2536,7 @@ sub_8167BA0: @ 8167BA0
movs r0, 0
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
bl AddTextPrinterParameterized
ldr r0, [r7]
ldr r1, =0x00008041
adds r0, r1
@ -2572,7 +2572,7 @@ sub_8167BA0: @ 8167BA0
movs r1, 0x1
movs r2, 0x2
movs r3, 0x1
bl box_print
bl AddTextPrinterParameterized3
_08167C46:
mov r2, r8
cmp r2, 0

View file

@ -8,3 +8,6 @@ gUnknown_03006208
gSaveUnusedVar
gSaveFileStatus
gGameContinueCallback
gRamSaveSectionLocations
gSaveUnusedVar2
gUnknown_03006294

View file

@ -6,371 +6,6 @@
.section .rodata
.align 2
gUnknown_0860F13C:: @ 860F13C
.incbin "graphics/unknown/unknown_60F13C.gbapal"
.align 2
gUnknown_0860F15C:: @ 860F15C
.incbin "graphics/unknown/unknown_60F15C.gbapal"
.align 2
gUnknown_0860F17C:: @ 860F17C
.incbin "graphics/unknown/unknown_60F17C.gbapal"
.align 2
gUnknown_0860F1BC:: @ 860F1BC
.incbin "graphics/unknown/unknown_60F1BC.4bpp"
.align 2
gUnknown_0860F3BC:: @ 860F3BC
.incbin "graphics/unknown/unknown_60F3BC.4bpp"
.align 2
gUnknown_0860F43C:: @ 860F43C
.incbin "graphics/unknown/unknown_60F43C.4bpp"
.align 2
gUnknown_0860F53C:: @ 860F53C
.incbin "graphics/unknown/unknown_60F53C.4bpp"
.align 2
gUnknown_0860F63C:: @ 860F63C
.incbin "graphics/unknown/unknown_60F63C.4bpp"
.align 2
gUnknown_0860F6BC:: @ 860F6BC
.incbin "graphics/unknown/unknown_60F6BC.4bpp"
.align 2
gUnknown_0860F7BC:: @ 860F7BC
.incbin "graphics/unknown/unknown_60F7BC.4bpp"
.align 2
gUnknown_0860F83C:: @ 860F83C
.incbin "graphics/unknown/unknown_60F83C.4bpp"
.align 2
gUnknown_0860F93C:: @ 860F93C
.incbin "graphics/unknown/unknown_60F93C.4bpp"
.align 2
gUnknown_0860FA3C:: @ 860FA3C
.incbin "graphics/unknown/unknown_60FA3C.4bpp"
.align 2
gUnknown_0861023C:: @ 861023C
.incbin "graphics/unknown/unknown_61023C.bin"
.align 2
gUnknown_0861033C:: @ 861033C
.incbin "graphics/unknown/unknown_61033C.4bpp"
.align 2
gUnknown_0861039C:: @ 861039C
.incbin "graphics/unknown/unknown_61039C.gbapal"
.align 2
gUnknown_086103BC:: @ 86103BC
obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065
obj_tiles gUnknown_0860F43C, 0x0100, 0x0066
obj_tiles gUnknown_0860F53C, 0x0100, 0x0067
obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d
null_obj_tiles
.align 2
gUnknown_086103E4:: @ 86103E4
obj_tiles gUnknown_085B18AC, 0x0800, 0x0064
null_obj_tiles
.align 2
gUnknown_086103F4:: @ 86103F4
obj_pal gUnknown_0860F13C, 0x0064
obj_pal gUnknown_0860F15C, 0x0065
obj_pal gUnknown_0860F17C, 0x0066
obj_pal gUnknown_0861039C, 0x0067
null_obj_pal
.align 2
gUnknown_0861041C:: @ 861041C
.4byte sub_819BCCC
.4byte sub_819BC30
.4byte sub_819BCD0
.align 2
gUnknown_08610428:: @ 8610428
.4byte 0x00000180, 0x00003195, 0x000021bb
.align 2
gUnknown_08610434:: @ 8610434
window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001
window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019
window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f
window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b
window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb
null_window_template
.align 1
gUnknown_0861046C:: @ 861046C
.incbin "graphics/unknown/unknown_61046C.gbapal"
gUnknown_08610476:: @ 8610476
.byte 0x00, 0x02, 0x00
gUnknown_08610479:: @ 8610479
.byte 0x00, 0x04, 0x00
.align 2
gUnknown_0861047C:: @ 861047C
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_08610484:: @ 8610484
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_0861048C:: @ 861048C
.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08610494:: @ 8610494
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00
.align 2
gUnknown_0861049C:: @ 861049C
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_086104A4:: @ 86104A4
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_086104AC:: @ 86104AC
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gUnknown_086104B4:: @ 86104B4
.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_086104FC:: @ 86104FC
.4byte gUnknown_0861049C
.align 2
gUnknown_08610500:: @ 8610500
.4byte gUnknown_086104A4
.align 2
gUnknown_08610504:: @ 8610504
.4byte gUnknown_086104AC
.4byte gUnknown_086104B4
.align 2
gUnknown_0861050C:: @ 861050C
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0861056C:: @ 861056C
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_086105BC:: @ 86105BC
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_086105CC:: @ 86105CC
.4byte gUnknown_0861050C
.4byte gUnknown_0861056C
.4byte gUnknown_086105BC
.align 2
gUnknown_086105D8:: @ 86105D8
spr_template 0x0064, 0x0064, gUnknown_0861047C, gUnknown_08610504, NULL, gDummySpriteAffineAnimTable, sub_819A44C
.align 2
gUnknown_086105F0:: @ 86105F0
spr_template 0x0065, 0x0066, gUnknown_08610484, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610608:: @ 8610608
spr_template 0x0066, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610620:: @ 8610620
spr_template 0x0067, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610638:: @ 8610638
spr_template 0x006d, 0x0067, gUnknown_08610494, gUnknown_08610500, NULL, gUnknown_086105CC, SpriteCallbackDummy
.align 2
gUnknown_08610650:: @ 8610650
obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065
obj_tiles gUnknown_0860F43C, 0x0100, 0x0066
obj_tiles gUnknown_0860F53C, 0x0100, 0x0067
obj_tiles gUnknown_0860F63C, 0x0080, 0x0068
obj_tiles gUnknown_0860F6BC, 0x0100, 0x0069
obj_tiles gUnknown_0860F7BC, 0x0100, 0x006a
obj_tiles gUnknown_0860F83C, 0x0100, 0x006b
obj_tiles gUnknown_0860F93C, 0x0100, 0x006c
obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d
null_obj_tiles
.align 2
gUnknown_086106A0:: @ 86106A0
obj_tiles gUnknown_085B18AC, 0x0800, 0x0064
null_obj_tiles
.align 2
gUnknown_086106B0:: @ 86106B0
obj_pal gUnknown_0860F13C, 0x0064
obj_pal gUnknown_0860F15C, 0x0065
obj_pal gUnknown_0860F17C, 0x0066
obj_pal gUnknown_0861039C, 0x0067
null_obj_pal
.align 2
gUnknown_086106D8:: @ 86106D8
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_086106E0:: @ 86106E0
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_086106E8:: @ 86106E8
.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_086106F0:: @ 86106F0
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00
.align 2
gUnknown_086106F8:: @ 86106F8
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_08610700:: @ 8610700
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_08610708:: @ 8610708
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gUnknown_08610710:: @ 8610710
.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_08610758:: @ 8610758
.4byte gUnknown_086106F8
.align 2
gUnknown_0861075C:: @ 861075C
.4byte gUnknown_08610700
.align 2
gUnknown_08610760:: @ 8610760
.4byte gUnknown_08610708
.4byte gUnknown_08610710
.align 2
gUnknown_08610768:: @ 8610768
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_086107C8:: @ 86107C8
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_08610818:: @ 8610818
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_08610828:: @ 8610828
.4byte gUnknown_08610768
.4byte gUnknown_086107C8
.4byte gUnknown_08610818
.align 2
gUnknown_08610834:: @ 8610834
spr_template 0x0064, 0x0064, gUnknown_086106D8, gUnknown_08610760, NULL, gDummySpriteAffineAnimTable, sub_819A44C
.align 2
gUnknown_0861084C:: @ 861084C
spr_template 0x0065, 0x0066, gUnknown_086106E0, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610864:: @ 8610864
spr_template 0x0066, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0861087C:: @ 861087C
spr_template 0x0067, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610894:: @ 8610894
spr_template 0x006d, 0x0067, gUnknown_086106F0, gUnknown_0861075C, NULL, gUnknown_08610828, SpriteCallbackDummy
.align 2
gUnknown_086108AC:: @ 86108AC
.4byte sub_819F114
.4byte sub_819F0CC
.4byte sub_819F134
.align 2
gUnknown_086108B8:: @ 86108B8
.4byte 0x00001180, 0x00003195, 0x000001aa, 0x000021bb
.align 2
gUnknown_086108C8:: @ 86108C8
window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001
window_template 0x02, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019
window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f
window_template 0x00, 0x15, 0x0e, 0x09, 0x06, 0x0f, 0x006b
window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x00a1
window_template 0x02, 0x15, 0x0f, 0x09, 0x05, 0x0e, 0x006b
window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1
window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df
null_window_template
gUnknown_08610918:: @ 8610918
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00
gUnknown_08610922:: @ 8610922
.byte 0x00, 0x02, 0x00
gUnknown_08610925:: @ 8610925
.byte 0x00, 0x04, 0x00
.align 2
gUnknown_08610928:: @ 8610928
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000003, sub_819F1AC
.align 2
gUnknown_08610948:: @ 8610948
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000002, sub_819F1DC
.4byte 0x00000003, sub_819F1AC
.align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data
gUnknown_08610970:: @ 8610970

View file

@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085EFE74:: @ 85EFE74
.byte 0x04, 0x15, 0x05, 0x15, 0x06, 0x15, 0x07, 0x15
.byte 0x08, 0x15, 0x09, 0x15, 0x0a, 0x15, 0x0b, 0x15
.byte 0x0c, 0x15, 0x0c, 0x16, 0x0c, 0x17, 0x0d, 0x17
.byte 0x0d, 0x18, 0x0d, 0x19, 0x0d, 0x1a, 0x0d, 0x1b
.byte 0x0c, 0x1b, 0x0c, 0x1c, 0x04, 0x1d, 0x05, 0x1d
.byte 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x09, 0x1d
.byte 0x0a, 0x1d, 0x0b, 0x1d, 0x0c, 0x1d, 0x04, 0x1c
.byte 0x04, 0x1b, 0x03, 0x1b, 0x03, 0x1a, 0x03, 0x19
.byte 0x03, 0x18, 0x03, 0x17, 0x04, 0x17, 0x04, 0x16

View file

@ -1,219 +0,0 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082FF1D8:: @ 82FF1D8
.incbin "graphics/link/minigame_digits.gbapal"
.align 2
gUnknown_082FF1F8:: @ 82FF1F8
.incbin "graphics/link/minigame_digits.4bpp.lz"
.align 2
gUnknown_082FF2B8:: @ 82FF2B8
.incbin "graphics/link/minigame_digits2.4bpp.lz"
.align 2
gUnknown_082FF3A8:: @ 82FF3A8
obj_frame_tiles gHeap + 0x8000, 0x800
obj_frame_tiles gHeap + 0x8800, 0x800
obj_frame_tiles gHeap + 0x9000, 0x800
obj_frame_tiles gHeap + 0x9800, 0x800
.align 2
gUnknown_082FF3C8:: @ 82FF3C8
obj_frame_tiles gHeap + 0xA000, 0x800
obj_frame_tiles gHeap + 0xA800, 0x800
obj_frame_tiles gHeap + 0xB000, 0x800
obj_frame_tiles gHeap + 0xB800, 0x800
.align 2
gUnknown_082FF3E8:: @ 82FF3E8
obj_frame_tiles gHeap + 0xC000, 0x800
obj_frame_tiles gHeap + 0xC800, 0x800
obj_frame_tiles gHeap + 0xD000, 0x800
obj_frame_tiles gHeap + 0xD800, 0x800
.align 2
gUnknown_082FF408:: @ 82FF408
obj_frame_tiles gHeap + 0xE000, 0x800
obj_frame_tiles gHeap + 0xE800, 0x800
obj_frame_tiles gHeap + 0xF000, 0x800
obj_frame_tiles gHeap + 0xF800, 0x800
.align 2
gUnknown_082FF428:: @ 82FF428
obj_frame_tiles gTrainerBackPic_Brendan, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x1800, 0x0800
.align 2
gUnknown_082FF448:: @ 82FF448
obj_frame_tiles gTrainerBackPic_May, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x1800, 0x0800
.align 2
gUnknown_082FF468:: @ 82FF468
obj_frame_tiles gTrainerBackPic_Red, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x1800, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x2000, 0x0800
.align 2
gUnknown_082FF490:: @ 82FF490
obj_frame_tiles gTrainerBackPic_Leaf, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x1800, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x2000, 0x0800
.align 2
gUnknown_082FF4B8:: @ 82FF4B8
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800
.align 2
gUnknown_082FF4D8:: @ 82FF4D8
obj_frame_tiles gTrainerBackPic_RubySapphireMay, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800
.align 2
gUnknown_082FF4F8:: @ 82FF4F8
obj_frame_tiles gTrainerBackPic_Wally, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x1800, 0x0800
.align 2
gUnknown_082FF518:: @ 82FF518
obj_frame_tiles gTrainerBackPic_Steven, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x1800, 0x0800
.align 2
gAnimCmd_General_Frame0:: @ 82FF538
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
AnimCmd_82FF540:: @ 82FF540
.2byte 0x0003, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082FF548:: @ 82FF548
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF558:: @ 82FF558
.2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF568:: @ 82FF568
.2byte 0x0028, 0x0028, 0x0000, 0x0000, 0x0012, 0x0012, 0x0c00, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF580:: @ 82FF580
.2byte 0xfffe, 0xfffe, 0x1200, 0x0000, 0xfff0, 0xfff0, 0x0f00, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF598:: @ 82FF598
.2byte 0x00a0, 0x0100, 0x0000, 0x0000, 0x0004, 0x0000, 0x0800, 0x0000
.2byte 0xfffc, 0x0000, 0x0800, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_082FF5B8:: @ 82FF5B8
.2byte 0x0002, 0x0002, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF5C8:: @ 82FF5C8
.2byte 0xfffe, 0xfffe, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF5D8:: @ 82FF5D8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff0, 0xfff0, 0x0900, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF5F0:: @ 82FF5F0
.2byte 0x0004, 0x0004, 0x3f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF600:: @ 82FF600
.2byte 0x0000, 0x0000, 0x05fd, 0x0000, 0x0000, 0x0000, 0x0503, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF618:: @ 82FF618
.4byte gUnknown_082FF548
.4byte gUnknown_082FF568
.4byte gUnknown_082FF580
.4byte gUnknown_082FF598
.4byte gUnknown_082FF5B8
.4byte gUnknown_082FF5C8
.4byte gUnknown_082FF5F0
.4byte gUnknown_082FF600
.4byte gUnknown_082FF5D8
.align 2
gUnknown_082FF63C:: @ 82FF63C
.2byte 0xfffc, 0xfffc, 0x3f04, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF64C:: @ 82FF64C
.2byte 0x0000, 0x0000, 0x0503, 0x0000, 0x0000, 0x0000, 0x05fd, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF664:: @ 82FF664
.2byte 0x0000, 0x0000, 0x14fb, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000
.2byte 0x0000, 0x0000, 0x1405, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF684:: @ 82FF684
.2byte 0x0000, 0x0000, 0x6e09, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF694:: @ 82FF694
.4byte gUnknown_082FF548
.4byte gUnknown_082FF568
.4byte gUnknown_082FF580
.4byte gUnknown_082FF598
.4byte gUnknown_082FF5B8
.4byte gUnknown_082FF5C8
.4byte gUnknown_082FF63C
.4byte gUnknown_082FF64C
.4byte gUnknown_082FF664
.4byte gUnknown_082FF5D8
.4byte gUnknown_082FF684
.align 2
gUnknown_082FF6C0:: @ 82FF6C0
.4byte gUnknown_082FF558
.4byte gUnknown_082FF568
.4byte gUnknown_082FF580
.4byte gUnknown_082FF598
.4byte gUnknown_082FF5B8
.4byte gUnknown_082FF5C8
.4byte gUnknown_082FF63C
.4byte gUnknown_082FF64C
.4byte gUnknown_082FF664
.4byte gUnknown_082FF5D8
.4byte gUnknown_082FF684

View file

@ -8,179 +8,6 @@
.section .rodata
.align 2
.2byte 0x0300, 0x0000
.align 2
gUnknown_0831A988:: @ 831A988
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A990:: @ 831A990
.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A998:: @ 831A998
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9A8:: @ 831A9A8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9C8:: @ 831A9C8
.4byte gUnknown_0831A998
.4byte gUnknown_0831A9A8
.align 2
gUnknown_0831A9D0:: @ 831A9D0
spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831A9E8:: @ 831A9E8
spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gBattleBgTemplates:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
null_window_template
.align 2
gBattleWindowTemplates:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
.align 2
gBattleTerrainTable:: @ 831ABA8
@ tall_grass
.4byte gBattleTerrainTiles_TallGrass
.4byte gBattleTerrainTilemap_TallGrass
.4byte gBattleTerrainAnimTiles_TallGrass
.4byte gBattleTerrainAnimTilemap_TallGrass
.4byte gBattleTerrainPalette_TallGrass
@ long_grass
.4byte gBattleTerrainTiles_LongGrass
.4byte gBattleTerrainTilemap_LongGrass
.4byte gBattleTerrainAnimTiles_LongGrass
.4byte gBattleTerrainAnimTilemap_LongGrass
.4byte gBattleTerrainPalette_LongGrass
@ sand
.4byte gBattleTerrainTiles_Sand
.4byte gBattleTerrainTilemap_Sand
.4byte gBattleTerrainAnimTiles_Sand
.4byte gBattleTerrainAnimTilemap_Sand
.4byte gBattleTerrainPalette_Sand
@ underwater
.4byte gBattleTerrainTiles_Underwater
.4byte gBattleTerrainTilemap_Underwater
.4byte gBattleTerrainAnimTiles_Underwater
.4byte gBattleTerrainAnimTilemap_Underwater
.4byte gBattleTerrainPalette_Underwater
@ water
.4byte gBattleTerrainTiles_Water
.4byte gBattleTerrainTilemap_Water
.4byte gBattleTerrainAnimTiles_Water
.4byte gBattleTerrainAnimTilemap_Water
.4byte gBattleTerrainPalette_Water
@ pond_water
.4byte gBattleTerrainTiles_PondWater
.4byte gBattleTerrainTilemap_PondWater
.4byte gBattleTerrainAnimTiles_PondWater
.4byte gBattleTerrainAnimTilemap_PondWater
.4byte gBattleTerrainPalette_PondWater
@ rock
.4byte gBattleTerrainTiles_Rock
.4byte gBattleTerrainTilemap_Rock
.4byte gBattleTerrainAnimTiles_Rock
.4byte gBattleTerrainAnimTilemap_Rock
.4byte gBattleTerrainPalette_Rock
@ cave
.4byte gBattleTerrainTiles_Cave
.4byte gBattleTerrainTilemap_Cave
.4byte gBattleTerrainAnimTiles_Cave
.4byte gBattleTerrainAnimTilemap_Cave
.4byte gBattleTerrainPalette_Cave
@ building
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Building
@ plain
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Plain
.align 2
gUnknown_0831AC70:: @ 831AC70
.4byte REG_BG3HOFS

View file

@ -1,6 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0

View file

@ -1,15 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gTruckCamera_HorizontalTable:: @ 858E898
.byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
gUnknown_0858E8AB:: @ 858E8AB
.byte 0x18, 0xFE
gUnknown_0858E8AD:: @ 858E8AD
.byte 0x17, 0xFE

View file

@ -1,21 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_085920D8:: @ 85920D8
.4byte sub_81B617C
.4byte CB2_ReturnToField
.4byte NULL
.align 2
gUnknown_085920E4:: @ 85920E4
.byte 0x02, 0x04, 0x01, 0x03
.align 2
gUnknown_085920E8:: @ 85920E8
.4byte sub_80FE03C
.4byte bag_menu_inits_lists_menu

View file

@ -2,526 +2,8 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_085A7424:: @ 85A7424
.4byte 0x1F8
.4byte 0x11C5
.4byte 0x21D6
.4byte 0x11E7
gUnknown_085A7434:: @ 85A7434
window_template 0, 2, 15, 0x1B, 4, 15, 0x194
null_window_template
gUnknown_085A7444:: @ 85A7444
window_template 0, 1, 3, 20, 13, 13, 1
gUnknown_085A744C:: @ 85A744C
.byte 3, 1, 2, 0
gUnknown_083ECAAC:: @ 85A7450
.4byte sub_8101D5C
.4byte sub_8101D8C
.4byte sub_8101DB0
.4byte sub_8101DF4
.4byte sub_8101E10
.4byte sub_8101E3C
.4byte sub_8101F44
.4byte sub_8101F60
.4byte sub_8101F88
.4byte sub_8101FA4
.4byte sub_8102008
.4byte sub_8102034
.4byte sub_8102058
.4byte sub_8102090
.4byte sub_81020C8
.4byte sub_81021E0
.4byte sub_81021FC
.4byte sub_8102264
.4byte sub_81022A0
.4byte sub_81022CC
.4byte sub_81022F0
.4byte sub_8102318
.4byte sub_8102344
.4byte sub_810239C
.4byte sub_81023B8
.4byte sub_81023E0_
.4byte sub_81023FC
.4byte sub_8102424
.4byte sub_8102460
gUnknown_085A74C4:: @ 85A74C4
.4byte sub_812BB34
.4byte sub_812BB68
.4byte sub_812BC20
gUnknown_085A74D0:: @ 85A74D0
.4byte sub_812BF64
.4byte sub_812BF68
.4byte sub_812BF88
.4byte sub_812C01C
.4byte sub_812C0E0
gUnknown_085A74E4:: @ 85A74E4
.4byte sub_812C138
.4byte sub_812C3A0
.4byte sub_812C4BC
gUnknown_085A74F0:: @ 85A74F0
.4byte sub_812C5DC
.4byte sub_812C628
.4byte sub_812C8FC
gUnknown_085A74FC:: @ 85A74FC
.2byte 2, 4, 4, 4, 8, 0
gUnknown_085A7508:: @ 85A7508
.4byte sub_812C238
.4byte sub_812C290
.4byte sub_812C290
gUnknown_085A7514:: @ 85A7514
.4byte sub_812C3C8
.4byte sub_812C3C8
.4byte sub_812C414
gUnknown_085A7520:: @ 85A7520
.4byte sub_812C500
.4byte sub_812C500
.4byte sub_812C55C
gUnknown_085A752C:: @ 85A752C
.4byte sub_812C64C
.4byte j5_08111E84
.4byte sub_812C74C
gUnknown_085A7538:: @ 85A7538
.4byte sub_812C920
.4byte sub_812CA08
.4byte sub_812CB80
gUnknown_085A7544:: @ 85A7544
.4byte sub_812CDA4
.4byte sub_812CDD8
.4byte sub_812CDF4
gUnknown_085A7550:: @ 85A7550
.2byte 5, 10, 15, 0
gUnknown_085A7558:: @ 85A7558
.4byte nullsub_50
.4byte sub_812D264
.4byte sub_812D28C
.4byte sub_812D30C
gUnknown_085A7568:: @ 85A7568
.2byte 0x9E
gUnknown_085A756A:: @ 85A756A
.2byte 0x6E, 0x9F, 0x6F, 0xAF, 0x7F
gUnknown_085A7574:: @ 85A7574
.4byte sub_812D51C
.4byte sub_812D594
.4byte sub_812D60C
.4byte sub_812D63C
.4byte sub_812D6EC
.4byte sub_812D740
.4byte sub_812D774
.4byte sub_812D7E4
.4byte sub_812D870
.4byte sub_812D920
.4byte sub_812D950
.4byte sub_812D9A4
.4byte sub_812DA20
.4byte sub_812DA6C
.4byte sub_812DA90
.4byte sub_812DB04
.4byte sub_812DB8C
.4byte sub_812D950
.4byte sub_812DBBC
gUnknown_085A75C0:: @ 85A75C0
.byte 1, 1, 2, 2
gUnknown_085A75C4:: @ 85A75C4
.2byte 0x40, 0x30, 0x18, 8
gUnknown_085A75CC:: @ 85A75CC
.2byte 10, 8, 6, 4
gUnknown_085A75D4:: @ 85A75D4
.4byte sub_812DD04
.4byte sub_812DD28
.4byte sub_812DD48
.4byte sub_812DD28
.4byte sub_812DD78
.4byte sub_812DD28
.4byte sub_812DDC4
.4byte sub_812DD28
.4byte sub_812DE14
.4byte sub_812DD28
.4byte sub_812DE30
.4byte sub_812DD28
.4byte sub_812DE48
.4byte sub_812DD28
.4byte sub_812DE7C
gUnknown_085A7610:: @ 85A7610
.4byte nullsub_51
gUnknown_085A7614:: @ 85A7614
.2byte 16
gUnknown_085A7616:: @ 85A7616
.2byte 0, 0x40, 0x80, 0xC0
gUnknown_085A761E:: @ 85A761E
.2byte 4, -4, 4, -4
gUnknown_085A7626:: @ 85A7626
.2byte 4, 4, -4, -4
gUnknown_085A762E:: @ 85A762E
.2byte 0, 0xFFD8, 0, 0, 0x30, 0, 0x18, 0
gUnknown_085A763E:: @ 85A763E
.2byte 0xFFE0, 0, 0xFFE0, 0xFFD0, 0, 0xFFD0, 0, 0xFFD0
gUnknown_085A764E:: @ 85A764E
.2byte 16, 12, 16, 0, 0, 4, 8, 8
gUnknown_085A765E:: @ 85A765E
.2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18
gUnknown_085A766E:: @ 85A766E
.byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6
.byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4
.byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4
gUnknown_085A76AD:: @ 85A76AD
.byte 1, 0, 5, 4, 3, 2, 0
gUnknown_083ECCF8:: @ 85A76B4
.2byte 0, 6, 0, 10, 0, 2
gUnknown_083ECD04:: @ 85A76C0
.byte 1, 1, 12
.byte 1, 1, 14
.byte 2, 2, 14
.byte 2, 2, 14
.byte 2, 3, 16
.byte 3, 3, 16
gUnknown_083ECD16:: @ 85A76D2
.byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32
.byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23
.byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E
gUnknown_083ECD28:: @ 85A76E4
.byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19
.byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16
.byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28
.byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF
.byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28
gUnknown_083ECD46:: @ 85A7702
.byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5
.byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5
.byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28
.byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64
.byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64
.byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6
gUnknown_083ECDAC:: @ 85A7768
.byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05
.byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06
.byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23
.byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32
.byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C
gUnknown_083ECE12:: @ 85A77CE
.2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100
gUnknown_083ECE1C:: @ 85A77D8
.byte 10, 0, 5, 0
.byte 10, 0, 10, 0
.byte 10, 0, 15, 0
.byte 10, 0, 25, 0
.byte 10, 0, 35, 0
gUnknown_083ECE30:: @ 85A77EC
.byte 0, 0
.byte 5, 0
.byte 10, 0
.byte 15, 0
.byte 20, 0
gUnknown_083ECE3A:: @ 85A77F6
.byte 6, 4, 3, 2, 5, 0, 0, 0
gUnknown_083ECE42:: @ 85A77FE
.byte 0x80, 0
.byte 0x20, 0
.byte 0x40, 0
gUnknown_083ECE48:: @ 85A7804
.byte 16, 0
.byte 8, 0
.byte 4, 0
.byte 2, 0
.byte 1, 0
sSym2Match:: @ 85A780E
.byte 7, 8, 4, 3, 0, 5, 2, 0
sSlotMatchFlags:: @ 85A7816
.2byte 1, 2, 4, 8, 16, 32, 64, 128, 256
sSlotPayouts:: @ 85A7828
.2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C
gUnknown_085A783A:: @ 85A783A
.2byte 0xD0, 0x38
.2byte 0xB8, 0
.2byte 0xC8, 8
.2byte 0xD8, 0x10
.2byte 0xE8, 0x18
.2byte 0xD0, 0x48
.2byte 0xD0, 8
.2byte 0xD0, 0x40
.2byte 0xD0, 0x38
.2byte 0xC0, 0x58
.2byte 0xE0, 0x58
.2byte 0xC0, 0x78
.2byte 0xE0, 0x78
.2byte 0x90, 0x38
.2byte 0x110, 0x58
.2byte 0xA8, 0x70
.2byte 0xD0, 0x54
.2byte 0xD0, 0x70
.2byte 0xBC, 0x34
.2byte 0xD0, 0x34
.2byte 0xE4, 0x34
.2byte 0xB8, 0x48
.2byte 0xC4, 0x48
.2byte 0xD0, 0x48
.2byte 0xDC, 0x48
.2byte 0xE8, 0x48
.2byte 0xBC, 0x34
.2byte 0xD0, 0x34
.2byte 0xE4, 0x34
.2byte 0xB8, 0x48
.2byte 0xC4, 0x48
.2byte 0xD0, 0x48
.2byte 0xDC, 0x48
.2byte 0xE8, 0x48
.2byte 0x00, 0x00
.2byte 0
gUnknown_085A78C8:: @ 85A78C8
.4byte sub_812F078
.4byte sub_812F36C
.4byte sub_812F36C
.4byte sub_812F36C
.4byte sub_812F36C
.4byte sub_812F3B4
.4byte sub_812F2CC
.4byte sub_812F078
.4byte sub_812F078
.4byte sub_812F080
.4byte sub_812F104
.4byte sub_812F11C
.4byte sub_812F134
.4byte sub_812F150
.4byte sub_812F1B8
.4byte sub_812F21C
.4byte sub_812F078
.4byte sub_812F470
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F648
gUnknown_085A7954:: @ 85A7954
.byte 0x19
.byte 0x22
.2byte 0
.byte 0x2
.byte 0
.2byte 0
.byte 0x9
.byte 0x10
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7964:: @ 85A7964
.byte 0xA
.byte 0x1
.2byte 0
.byte 0xB
.byte 2
.2byte 0
.byte 0xC
.byte 0x3
.2byte 0
.byte 0xD
.byte 4
.2byte 0
.byte 0x5
.byte 5
.2byte 0
.byte 0x8
.byte 0x6
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7980:: @ 85A7980
.byte 0x3
.byte 0x7
.2byte 0
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A798C:: @ 85A798C
.byte 0x4
.byte 0x8
.2byte 0
.byte 0x6
.byte 0x9
.2byte 0
.byte 0x6
.byte 0xA
.2byte 1
.byte 0x6
.byte 0xB
.2byte 2
.byte 0x6
.byte 0xC
.2byte 3
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79A4:: @ 85A79A4
.byte 0
.byte 0xD
.2byte 0
.byte 1
.byte 0xE
.2byte 0
.byte 0x7
.byte 0xF
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79B4:: @ 85A79B4
.byte 0x13
.byte 0x1A
.2byte 0
.byte 0x14
.byte 0x1B
.2byte 1
.byte 0x15
.byte 0x1C
.2byte 2
.byte 0xE
.byte 0x1D
.2byte 3
.byte 0xF
.byte 0x1E
.2byte 4
.byte 0x10
.byte 0x1F
.2byte 5
.byte 0x11
.byte 0x20
.2byte 6
.byte 0x12
.byte 0x21
.2byte 7
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79DC:: @ 85A79DC
.byte 0x16
.byte 0x12
.2byte 0
.byte 0x17
.byte 0x13
.2byte 1
.byte 0x18
.byte 0x14
.2byte 2
.byte 0xE
.byte 0x15
.2byte 3
.byte 0xF
.byte 0x16
.2byte 4
.byte 0x10
.byte 0x17
.2byte 5
.byte 0x11
.byte 0x18
.2byte 6
.byte 0x12
.byte 0x19
.2byte 7
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7A04:: @ 85A7A04
.4byte gUnknown_085A7954
.4byte gUnknown_085A7964
.4byte gUnknown_085A7980
.4byte gUnknown_085A798C
.4byte gUnknown_085A79A4
.4byte gUnknown_085A79DC
.4byte gUnknown_085A79B4
gUnknown_085A7A20:: @ 85A7A20
.4byte sub_812F7C0
.4byte sub_812F784
.4byte sub_812F794
.4byte nullsub_101
.4byte nullsub_101
.4byte sub_812F794
.4byte sub_812F794
.align 2
gUnknown_085A7A3C:: @ 85A7A3C
.2byte 0
@ -820,50 +302,50 @@ gUnknown_085A7C8C:: @ 85A7C8C
gUnknown_085A7CDC:: @ 85A7CDC
.4byte gUnknown_085A7C8C
gUnknown_085A7CE0:: @ 85A7CE0
spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154
gSpriteTemplate_83ED414:: @ 85A7CE0
spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18
gUnknown_085A7CF8:: @ 85A7CF8
spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E2A8
gSpriteTemplate_83ED42C:: @ 85A7CF8
spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C
gUnknown_085A7D10:: @ 85A7D10
gSpriteTemplate_83ED444:: @ 85A7D10
spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D28:: @ 85A7D28
spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424
gSpriteTemplate_83ED45C:: @ 85A7D28
spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170
gUnknown_085A7D40:: @ 85A7D40
gSpriteTemplate_83ED474:: @ 85A7D40
spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D58:: @ 85A7D58
gSpriteTemplate_83ED48C:: @ 85A7D58
spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D70:: @ 85A7D70
gSpriteTemplate_83ED4A4:: @ 85A7D70
spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D88:: @ 85A7D88
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_812E6C4
gSpriteTemplate_83ED4BC:: @ 85A7D88
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C
gUnknown_085A7DA0:: @ 85A7DA0
gSpriteTemplate_83ED4D4:: @ 85A7DA0
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7DB8:: @ 85A7DB8
gSpriteTemplate_83ED4EC:: @ 85A7DB8
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7DD0:: @ 85A7DD0
spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_812E9E8
gSpriteTemplate_83ED504:: @ 85A7DD0
spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C
gUnknown_085A7DE8:: @ 85A7DE8
spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_812EB48
gSpriteTemplate_83ED51C:: @ 85A7DE8
spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784
gUnknown_085A7E00:: @ 85A7E00
spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_812EC64
gSpriteTemplate_83ED534:: @ 85A7E00
spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894
gUnknown_085A7E18:: @ 85A7E18
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_812ED20
gSpriteTemplate_83ED54C:: @ 85A7E18
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C
gUnknown_085A7E30:: @ 85A7E30
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14
gSpriteTemplate_83ED564:: @ 85A7E30
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38
gUnknown_085A7E48:: @ 85A7E48
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@ -907,8 +389,8 @@ gUnknown_085A7F68:: @ 85A7F68
gUnknown_085A7F80:: @ 85A7F80
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7F98:: @ 85A7F98
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54
gSpriteTemplate_83ED6CC:: @ 85A7F98
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70
gUnknown_085A7FB0:: @ 85A7FB0
subsprite -64, -64, 3, 0, 64x64
@ -916,7 +398,7 @@ gUnknown_085A7FB0:: @ 85A7FB0
subsprite -64, 0, 3, 0, 64x64
subsprite 0, 0, 3, 0, 64x64
gUnknown_085A7FC0:: @ 85A7FC0
gSubspriteTables_83ED704:: @ 85A7FC0
.4byte 4, gUnknown_085A7FB0
gUnknown_085A7FC8:: @ 85A7FC8
@ -927,7 +409,7 @@ gUnknown_085A7FC8:: @ 85A7FC8
subsprite -32, 4, 1, 16, 32x8
subsprite 0, 4, 1, 20, 32x8
gUnknown_085A7FE0:: @ 85A7FE0
gSubspriteTables_83ED73C:: @ 85A7FE0
.4byte 6, gUnknown_085A7FC8
gUnknown_085A7FE8:: @ 85A7FE8
@ -935,7 +417,7 @@ gUnknown_085A7FE8:: @ 85A7FE8
subsprite -32, 12, 1, 32, 32x8
subsprite 0, 12, 1, 36, 32x8
gUnknown_085A7FF4:: @ 85A7FF4
gSubspriteTables_83ED75C:: @ 85A7FF4
.4byte 3, gUnknown_085A7FE8
gUnknown_085A7FFC:: @ 85A7FFC
@ -945,7 +427,7 @@ gUnknown_085A7FFC:: @ 85A7FFC
subsprite -32, 16, 1, 40, 32x8
subsprite 0, 16, 1, 44, 32x8
gUnknown_085A8010:: @ 85A8010
gSubspriteTables_83ED78C:: @ 85A8010
.4byte 5, gUnknown_085A7FFC
gUnknown_085A8018:: @ 85A8018
@ -954,7 +436,7 @@ gUnknown_085A8018:: @ 85A8018
subsprite -32, 0, 1, 8, 32x8
subsprite 0, 0, 1, 12, 32x8
gUnknown_085A8028:: @ 85A8028
gSubspriteTables_83ED7B4:: @ 85A8028
.4byte 4, gUnknown_085A8018
gUnknown_085A8030:: @ 85A8030
@ -962,7 +444,7 @@ gUnknown_085A8030:: @ 85A8030
subsprite -8, -4, 1, 0, 16x8
subsprite -8, 4, 1, 0, 16x8
gUnknown_085A803C:: @ 85A803C
gSubspriteTables_83ED7D4:: @ 85A803C
.4byte 3, gUnknown_085A8030
gUnknown_085A8044:: @ 85A8044
@ -1173,7 +655,7 @@ gUnknown_085A8244:: @ 85A8244
gUnknown_085A825C:: @ 85A825C
.4byte 6, gUnknown_085A8244
gUnknown_085A8264:: @ 85A8264
gUnknown_083EDB5C:: @ 85A8264
.4byte gUnknown_085A7E48
.4byte gUnknown_085A7E60
.4byte gUnknown_085A7E78
@ -1201,7 +683,7 @@ gUnknown_085A8264:: @ 85A8264
.4byte gUnknown_085A7F08
.4byte gDummySpriteTemplate
gUnknown_085A82CC:: @ 85A82CC
gUnknown_083EDBC4:: @ 85A82CC
.4byte gUnknown_085A8058
.4byte gUnknown_085A8070
.4byte gUnknown_085A8088
@ -1230,7 +712,7 @@ gUnknown_085A82CC:: @ 85A82CC
.4byte NULL
.align 2
gUnknown_085A8334:: @ 85A8334
sSlotMachineSpriteSheets:: @ 85A8334
obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000
obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001
obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002
@ -1252,7 +734,7 @@ gUnknown_085A8334:: @ 85A8334
.align 2
.byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0
gUnknown_085A83E4:: @ 85A83E4
gUnknown_083EDCDC:: @ 85A83E4
.4byte gUnknown_08DD19F8
@ might be a palette idk
.byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1
@ -1272,29 +754,29 @@ gUnknown_085A8402:: @ 85A8402
gUnknown_085A8404:: @ 85A8404
.byte 0xBF, 0x4A, 0, 0
gUnknown_085A8408:: @ 85A8408
gUnknown_083EDD08:: @ 85A8408
.4byte gUnknown_085A83FC
.4byte gUnknown_085A83FE
.4byte gUnknown_085A8400
.4byte gUnknown_085A8402
.4byte gUnknown_085A8404
gUnknown_085A841C:: @ 85A841C
gUnknown_083EDD1C:: @ 85A841C
.4byte gSlotMachineMenu_Pal + 0x94
.4byte gSlotMachineMenu_Pal + 0x96
.4byte gSlotMachineMenu_Pal + 0x98
.4byte gSlotMachineMenu_Pal + 0x9A
.4byte gSlotMachineMenu_Pal + 0x9C
gUnknown_085A8430:: @ 85A8430
gUnknown_083EDD30:: @ 85A8430
.byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D
gUnknown_085A8435:: @ 85A8435
gUnknown_083EDD35:: @ 85A8435
.byte 0, 0
.byte 1, 2
.byte 3, 4
gUnknown_085A843B:: @ 85A843B
gUnknown_083EDD3B:: @ 85A843B
.byte 1, 2, 2
gUnknown_085A843E:: @ 85A843E
@ -1307,12 +789,12 @@ gUnknown_085A847E:: @ 85A847E
.incbin "graphics/slot_machine/85A847E.gbapal"
.align 2
gUnknown_085A84A0:: @ 85A84A0
gUnknown_083EDDA0:: @ 85A84A0
.4byte gUnknown_085A843E
.4byte gUnknown_085A845E
.4byte gUnknown_085A847E
gUnknown_085A84AC:: @ 85A84AC
gUnknown_083EDDAC:: @ 85A84AC
.4byte gSlotMachineMenu_Pal + 0x20
gUnknown_085A84B0:: @ 85A84B0
@ -1324,20 +806,20 @@ gUnknown_085A84D0:: @ 85A84D0
gUnknown_085A84F0:: @ 85A84F0
.incbin "graphics/slot_machine/85A84F0.gbapal"
gUnknown_085A8510:: @ 85A8510
gUnknown_083EDE10:: @ 85A8510
.4byte gUnknown_085A84B0
.4byte gUnknown_085A84D0
.4byte gUnknown_085A84F0
.4byte gUnknown_08DCF230
gUnknown_085A8520:: @ 85A8520
gUnknown_083EDE20:: @ 85A8520
.4byte gUnknown_08DCF230
gUnknown_085A8524:: @ 85A8524
gPalette_83EDE24:: @ 85A8524
.incbin "graphics/slot_machine/85A8524.bin"
.align 2
gUnknown_085A8544:: @ 85A8544
gSlotMachineSpritePalettes:: @ 85A8544
obj_pal gUnknown_08DCF170, 0
obj_pal gUnknown_08DCF190, 1
obj_pal gUnknown_08DCF1B0, 2
@ -1348,10 +830,10 @@ gUnknown_085A8544:: @ 85A8544
obj_pal gUnknown_08DCF1F0, 7
null_obj_pal
gUnknown_085A858C:: @ 85A858C
sReelTimeGfx:: @ 85A858C
.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz"
gUnknown_085A96E0:: @ 85A96E0
sReelTimeWindowTilemap:: @ 85A96E0
@if anyone knows what this tilemap is please do share
.incbin "graphics/slot_machine/85A96E0.bin"

View file

@ -1,618 +0,0 @@
OVERWORLDGFXDIR := graphics/event_objects/pics
$(OVERWORLDGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/may/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/artist.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/beauty.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/camper.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/contest_old_man.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/cook.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/hiker.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/lass.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/leaf.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/man_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_4.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_6.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_7.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/maniac.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mom.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/nurse.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/red.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/sailor.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/scott.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/steven.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/teala.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/wallace.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/wally.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8
$(OVERWORLDGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/ash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 1
$(OVERWORLDGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2

Binary file not shown.

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 783 B

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 816 B

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 708 B

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 495 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 620 B

After

Width:  |  Height:  |  Size: 504 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 580 B

After

Width:  |  Height:  |  Size: 464 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 626 B

After

Width:  |  Height:  |  Size: 510 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 691 B

After

Width:  |  Height:  |  Size: 575 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 681 B

After

Width:  |  Height:  |  Size: 565 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 724 B

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 717 B

After

Width:  |  Height:  |  Size: 601 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 489 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 639 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 636 B

After

Width:  |  Height:  |  Size: 520 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 654 B

After

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 657 B

After

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 583 B

After

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 465 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 645 B

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 689 B

After

Width:  |  Height:  |  Size: 573 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 524 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 B

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 B

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 377 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 380 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 344 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 245 B

Some files were not shown because too many files have changed in this diff Show more